Attachment #856 for bug #6116

View | Details | Raw Unified | Return to bug 6116
Collapse All | Expand All




%else
# FLTK still uses the old foo-config system, which means that the
# tool must be reachable via $PATH
%if 0%{?crosscompile}
mkdir -p $RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin
ln -s %{_cendio_bindir}/fltk-config \
	$RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin/fltk-config

%defattr(-,root,root)
%if ! %{use_cmake}
%{_cendio_archdir}/%{_cendio_bindir}/fltk-config
%if 0%{?crosscompile}
%{_cendio_archdir}/usr/bin/fltk-config
%endif
%endif
- 
--
fltk/fltk.spec |   56 +-------------------------------------------------------
1 files changed, 1 insertions(+), 55 deletions(-)




%include /opt/cendio-build/lib/utils/macros

%global component fltk
%global use_cmake 1

Name: cendio-build-%{component}-%{_cendio_arch}
Summary: %{component} package for Cendio build environment

BuildRequires: cendio-build-zlib-%{_cendio_arch}
BuildRequires: cendio-build-libpng-%{_cendio_arch}
BuildRequires: cendio-build-libjpeg-%{_cendio_arch}

%if %{use_cmake}
BuildRequires: cendio-build-cmake-%{_cendio_arch}
%else
BuildRequires: cendio-build-autoconf-%{_cendio_arch}
%endif

Requires: cendio-build-base-%{_cendio_arch}
Requires: cendio-build-zlib-%{_cendio_arch}

# Enable ABI breaking features
sed -i 's@^//#define FLTK_ABI_VERSION@#define FLTK_ABI_VERSION@' FL/Enumerations.H

%if ! %{use_cmake}
# We modify configure.in so we need to regenerate it
%{cbrun} autoconf
%endif

# FLTK has a really broken way of determining its platform
%if 0%{?windows}
sed -i 's%`uname`%MINGW32%' configure
%endif
%if 0%{?osx}
sed -i 's%`uname`%Darwin%' configure
%endif

# We also need to avoid the tests as they assume that fluid can
# be executed (which it can't if we're cross compiling
sed -i 's%fluid test%fluid%' Makefile

export OSX_FRAMEWORKS=1
%endif

%if %{use_cmake}
# Note: Keep Cendio specific flags to the end, since we are
# documenting the rest of the options in the TigerVNC upstream
# BUILDING.txt.

    ${HAVE_PTHREAD+-DTHREADS_PTHREAD_ARG=0} \
    ${OSX_FRAMEWORKS+-DCMAKE_SHARED_LINKER_FLAGS="-framework Cocoa -framework Carbon"} \
    --debug-output
%else
# I hate silent builds
perl -pi -e 's|.SILENT:||g' makeinclude.in 
%{_cendio_configure} \
	--disable-localjpeg \
	--disable-localzlib --disable-localpng \
	--enable-xft --enable-shared
%endif
%{_cendio_make} VERBOSE=1

%install
rm -rf $RPM_BUILD_ROOT
%{_cendio_makeinstall}

%if %{use_cmake}
# When building with cmake, extra cmake files are installed. Get rid
# of them.  Unfortunately, the location various depending on platform.
# Can be /usr/i686-pc-mingw32/sys-root/mingw/CMake or

rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_libdir}/fltk
%endif

%else
# FLTK still uses the old foo-config system, which means that the
# tool must be reachable via $PATH
%if 0%{?crosscompile}
mkdir -p $RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin
ln -s %{_cendio_bindir}/fltk-config \
	$RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin/fltk-config
%endif

# Autotools installs stuff in legacy cat directories
rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}/cat?
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%if ! %{use_cmake}
%{_cendio_archdir}/%{_cendio_bindir}/fltk-config
%if 0%{?crosscompile}
%{_cendio_archdir}/usr/bin/fltk-config
%endif
%endif

# Cmake does not build fluid when cross compiling
%if ! 0%{?crosscompile}
%{_cendio_archdir}/%{_cendio_bindir}/fluid*
%endif 

%if 0%{?windows}
# With Autotools you get mgwfltknox DLL files. With cmake
# you get DLLs with normal names. 
%if ! %{use_cmake}
%{_cendio_archdir}/%{_cendio_bindir}/mgwfltknox*.dll
%else
%{_cendio_archdir}/%{_cendio_bindir}/libfltk*.dll
%endif
%endif

%{_cendio_archdir}/%{_cendio_includedir}/FL

- 
--
fltk/fltk.spec                       |   47 ++++-----------------
fltk/src/fltk-1.3.3-source.tar.gz    |  Bin 4986376 -> 0 bytes
fltk/src/fltk-1.3.4-source.tar.bz2   |  Bin 0 -> 4535833 bytes
fltk/src/fltk-1.3.x-clipbox.patch    |   24 ----------
fltk/src/fltk-1.3.x-crlf.patch       |   30 -------------
fltk/src/fltk-1.3.x-libdl.patch      |   32 --------------
fltk/src/fltk-1.3.x-net_wm_pid.patch |   34 ---------------
fltk/src/fltk-1.3.x-osx-clip.patch   |   77 ----------------------------------
8 files changed, 9 insertions(+), 235 deletions(-)
delete mode 100644 fltk/src/fltk-1.3.3-source.tar.gz
create mode 100644 fltk/src/fltk-1.3.4-source.tar.bz2
delete mode 100644 fltk/src/fltk-1.3.x-clipbox.patch
delete mode 100644 fltk/src/fltk-1.3.x-crlf.patch
delete mode 100644 fltk/src/fltk-1.3.x-libdl.patch
delete mode 100644 fltk/src/fltk-1.3.x-net_wm_pid.patch
delete mode 100644 fltk/src/fltk-1.3.x-osx-clip.patch





Name: cendio-build-%{component}-%{_cendio_arch}
Summary: %{component} package for Cendio build environment
Version: 1.3.4
Release: 1

License: Open Source/Proprietary (see COPYING)
Group: Development/Libraries

Source0: %{component}-%{version}-source.tar.bz2

# Set _NET_WM_PID on windows (upstream r10710)
Patch0: %{component}-1.3.x-net_wm_pid.patch
# OSX clipboard buffer overflow (upstream r10709)
Patch1: %{component}-1.3.x-osx-clip.patch
# Missing -ldl on link line (upstream r10590)
Patch2: %{component}-1.3.x-libdl.patch
# Bad CRLF handling on Windows (upstream r11873)
Patch3: %{component}-1.3.x-crlf.patch
# fl_clip_box() buggy on macOS (upstream r10576)
Patch4: %{component}-1.3.x-clipbox.patch

BuildRequires: cendio-build-build%{?native:-native}-%{_cendio_arch}
BuildRequires: cendio-build-zlib-%{_cendio_arch}

%prep
%setup -q -n %{component}-%{version}

%patch0 -p0
%patch1 -p1 -b .clip
%patch2 -p0 -b .libdl
%patch3 -p0 -b .crlf
%patch4 -p0 -b .clipbox

# Enable ABI breaking features
sed -i 's@^//#define FLTK_ABI_VERSION@#define FLTK_ABI_VERSION@' FL/Enumerations.H


rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/lib/FLTK-1.3/*.cmake
rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/CMake/*.cmake
rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/FLTK/.framework/Resources/CMake/*.cmake
rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/share/fltk/*.cmake
# Get rid of test program docs
rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}/man6
# cmake installs everything under FL, even patch backup files. Get rid of non-h files.
rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_includedir}/FL/*[!.Hh]

# cmake puts lots of stuff in the wrong places
%if %{_cendio_arch} != win32 && %{_cendio_arch} != win64
mkdir -p $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}
mv $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/man/* \
	$RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}/
rmdir $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/man
%endif

%if "%{_cendio_prefix}/lib" != "%{_cendio_libdir}"
mv $RPM_BUILD_ROOT%{_cendio_archdir}%{_cendio_prefix}/lib \
	$RPM_BUILD_ROOT%{_cendio_archdir}%{_cendio_libdir}
%endif

# These files break CMake's FindFLTK so just nuke them
%if 0%{?windows}
rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/CMake

%files
%defattr(-,root,root)

%{_cendio_archdir}/%{_cendio_bindir}/fltk-config

# Cmake does not build fluid when cross compiling
%if ! 0%{?crosscompile}
%{_cendio_archdir}/%{_cendio_bindir}/fluid*
%{_cendio_archdir}/%{_cendio_datadir}/applications/fluid.desktop
%{_cendio_archdir}/%{_cendio_datadir}/mime/packages/fluid.xml
%{_cendio_archdir}/%{_cendio_datadir}/icons/hicolor/*/apps/fluid.png
%endif 

%if 0%{?windows}


%{_cendio_archdir}/%{_cendio_libdir}/libfltk*

%if ! 0%{?windows}
%{_cendio_archdir}/%{_cendio_mandir}/man1/fltk-config.1
%{_cendio_archdir}/%{_cendio_mandir}/man1/fluid.1
%{_cendio_archdir}/%{_cendio_mandir}/man3/fltk.3
%{_cendio_archdir}/%{_cendio_mandir}/man6/blocks.6
%{_cendio_archdir}/%{_cendio_mandir}/man6/checkers.6
%{_cendio_archdir}/%{_cendio_mandir}/man6/sudoku.6
%endif

Lines 1-24 Link Here

(-)a/fltk/src/fltk-1.3.x-clipbox.patch (-7 lines)
1	------------------------------------------------------------------------
2	r10576 \| manolo \| 2015-02-13 13:00:19 +0100 (Fri, 13 Feb 2015) \| 1 line
3
4	Mac OS: made function Fl_Graphics_Driver::clip_box() more accurate for retina displays
5	------------------------------------------------------------------------
6	Index: src/fl_rect.cxx
7	===================================================================

Lines 1-30 Link Here

(-)a/fltk/src/fltk-1.3.x-crlf.patch (-2 lines)
1	Index: src/Fl_win32.cxx
2	===================================================================

Lines 1-32 Link Here

(-)a/fltk/src/fltk-1.3.x-libdl.patch (-2 lines)
1	Index: src/CMakeLists.txt
2	===================================================================

Lines 1-34 Link Here

(-)a/fltk/src/fltk-1.3.x-net_wm_pid.patch

Lines 1-77 Link Here

(-)a/fltk/src/fltk-1.3.x-osx-clip.patch (-1 lines)
1	diff -up fltk-1.3.3/src/Fl_cocoa.mm.clip fltk-1.3.3/src/Fl_cocoa.mm

Return to bug 6116

Lines 173-179 rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_libdir}/fltk Link Here

(-)a/fltk/fltk.spec (-4 / +2 lines)
173	%else	173	%else
174	# FLTK still uses the old foo-config system, which means that the	174	# FLTK still uses the old foo-config system, which means that the
175	# tool must be reachable via $PATH	175	# tool must be reachable via $PATH
176	%if %{crosscompile}	176	%if 0%{?crosscompile}
177	mkdir -p $RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin	177	mkdir -p $RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin
178	ln -s %{_cendio_bindir}/fltk-config \	178	ln -s %{_cendio_bindir}/fltk-config \
179	$RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin/fltk-config	179	$RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin/fltk-config
Lines 190-196 rm -rf $RPM_BUILD_ROOT Link Here
190	%defattr(-,root,root)	190	%defattr(-,root,root)
191	%if ! %{use_cmake}	191	%if ! %{use_cmake}
192	%{_cendio_archdir}/%{_cendio_bindir}/fltk-config	192	%{_cendio_archdir}/%{_cendio_bindir}/fltk-config
193	%if %{crosscompile}	193	%if 0%{?crosscompile}
194	%{_cendio_archdir}/usr/bin/fltk-config	194	%{_cendio_archdir}/usr/bin/fltk-config
195	%endif	195	%endif
196	%endif	196	%endif
197	-
198	--
199	fltk/fltk.spec \| 56 +-------------------------------------------------------	197	fltk/fltk.spec \| 56 +-------------------------------------------------------
200	1 files changed, 1 insertions(+), 55 deletions(-)	198	1 files changed, 1 insertions(+), 55 deletions(-)

Lines 5-11 Link Here

(-)a/fltk/fltk.spec (-57 / +1 lines)
5	%include /opt/cendio-build/lib/utils/macros	5	%include /opt/cendio-build/lib/utils/macros
6		6
7	%global component fltk	7	%global component fltk
8	%global use_cmake 1
9		8
10	Name: cendio-build-%{component}-%{_cendio_arch}	9	Name: cendio-build-%{component}-%{_cendio_arch}
11	Summary: %{component} package for Cendio build environment	10	Summary: %{component} package for Cendio build environment
Lines 32-43 BuildRequires: cendio-build-build%{?native:-native}-%{_cendio_arch} Link Here
32	BuildRequires: cendio-build-zlib-%{_cendio_arch}	31	BuildRequires: cendio-build-zlib-%{_cendio_arch}
33	BuildRequires: cendio-build-libpng-%{_cendio_arch}	32	BuildRequires: cendio-build-libpng-%{_cendio_arch}
34	BuildRequires: cendio-build-libjpeg-%{_cendio_arch}	33	BuildRequires: cendio-build-libjpeg-%{_cendio_arch}
35
36	%if %{use_cmake}
37	BuildRequires: cendio-build-cmake-%{_cendio_arch}	34	BuildRequires: cendio-build-cmake-%{_cendio_arch}
38	%else
39	BuildRequires: cendio-build-autoconf-%{_cendio_arch}
40	%endif
41		35
42	Requires: cendio-build-base-%{_cendio_arch}	36	Requires: cendio-build-base-%{_cendio_arch}
43	Requires: cendio-build-zlib-%{_cendio_arch}	37	Requires: cendio-build-zlib-%{_cendio_arch}
Lines 77-95 Requires: cendio-build-libXinerama-%{_cendio_arch} Link Here
77	# Enable ABI breaking features	71	# Enable ABI breaking features
78	sed -i 's@^//#define FLTK_ABI_VERSION@#define FLTK_ABI_VERSION@' FL/Enumerations.H	72	sed -i 's@^//#define FLTK_ABI_VERSION@#define FLTK_ABI_VERSION@' FL/Enumerations.H
79		73
80	%if ! %{use_cmake}
81	# We modify configure.in so we need to regenerate it
82	%{cbrun} autoconf
83	%endif
84
85	# FLTK has a really broken way of determining its platform
86	%if 0%{?windows}
87	sed -i 's%`uname`%MINGW32%' configure
88	%endif
89	%if 0%{?osx}
90	sed -i 's%`uname`%Darwin%' configure
91	%endif
92
93	# We also need to avoid the tests as they assume that fluid can	74	# We also need to avoid the tests as they assume that fluid can
94	# be executed (which it can't if we're cross compiling	75	# be executed (which it can't if we're cross compiling
95	sed -i 's%fluid test%fluid%' Makefile	76	sed -i 's%fluid test%fluid%' Makefile
Lines 109-115 export HAVE_PTHREAD=1 Link Here
109	export OSX_FRAMEWORKS=1	90	export OSX_FRAMEWORKS=1
110	%endif	91	%endif
111		92
112	%if %{use_cmake}
113	# Note: Keep Cendio specific flags to the end, since we are	93	# Note: Keep Cendio specific flags to the end, since we are
114	# documenting the rest of the options in the TigerVNC upstream	94	# documenting the rest of the options in the TigerVNC upstream
115	# BUILDING.txt.	95	# BUILDING.txt.
Lines 119-139 export OSX_FRAMEWORKS=1 Link Here
119	${HAVE_PTHREAD+-DTHREADS_PTHREAD_ARG=0} \	99	${HAVE_PTHREAD+-DTHREADS_PTHREAD_ARG=0} \
120	${OSX_FRAMEWORKS+-DCMAKE_SHARED_LINKER_FLAGS="-framework Cocoa -framework Carbon"} \	100	${OSX_FRAMEWORKS+-DCMAKE_SHARED_LINKER_FLAGS="-framework Cocoa -framework Carbon"} \
121	--debug-output	101	--debug-output
122	%else
123	# I hate silent builds
124	perl -pi -e 's\|.SILENT:\|\|g' makeinclude.in
125	%{_cendio_configure} \
126	--disable-localjpeg \
127	--disable-localzlib --disable-localpng \
128	--enable-xft --enable-shared
129	%endif
130	%{_cendio_make} VERBOSE=1	102	%{_cendio_make} VERBOSE=1
131		103
132	%install	104	%install
133	rm -rf $RPM_BUILD_ROOT	105	rm -rf $RPM_BUILD_ROOT
134	%{_cendio_makeinstall}	106	%{_cendio_makeinstall}
135		107
136	%if %{use_cmake}
137	# When building with cmake, extra cmake files are installed. Get rid	108	# When building with cmake, extra cmake files are installed. Get rid
138	# of them. Unfortunately, the location various depending on platform.	109	# of them. Unfortunately, the location various depending on platform.
139	# Can be /usr/i686-pc-mingw32/sys-root/mingw/CMake or	110	# Can be /usr/i686-pc-mingw32/sys-root/mingw/CMake or
Lines 170-214 rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/FLTK Link Here
170	rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_libdir}/fltk	141	rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_libdir}/fltk
171	%endif	142	%endif
172		143
173	%else
174	# FLTK still uses the old foo-config system, which means that the
175	# tool must be reachable via $PATH
176	%if 0%{?crosscompile}
177	mkdir -p $RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin
178	ln -s %{_cendio_bindir}/fltk-config \
179	$RPM_BUILD_ROOT%{_cendio_archdir}/usr/bin/fltk-config
180	%endif
181
182	# Autotools installs stuff in legacy cat directories
183	rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}/cat?
184	%endif
185
186	%clean	144	%clean
187	rm -rf $RPM_BUILD_ROOT	145	rm -rf $RPM_BUILD_ROOT
188		146
189	%files	147	%files
190	%defattr(-,root,root)	148	%defattr(-,root,root)
191	%if ! %{use_cmake}
192	%{_cendio_archdir}/%{_cendio_bindir}/fltk-config
193	%if 0%{?crosscompile}
194	%{_cendio_archdir}/usr/bin/fltk-config
195	%endif
196	%endif
197		149
198	# Cmake does not build fluid when cross compiling	150	# Cmake does not build fluid when cross compiling
199	%if ! 0%{?crosscompile} \|\| ! %{use_cmake}	151	%if ! 0%{?crosscompile}
200	%{_cendio_archdir}/%{_cendio_bindir}/fluid*	152	%{_cendio_archdir}/%{_cendio_bindir}/fluid*
201	%endif	153	%endif
202		154
203	%if 0%{?windows}	155	%if 0%{?windows}
204	# With Autotools you get mgwfltknox DLL files. With cmake
205	# you get DLLs with normal names.
206	%if ! %{use_cmake}
207	%{_cendio_archdir}/%{_cendio_bindir}/mgwfltknox*.dll
208	%else
209	%{_cendio_archdir}/%{_cendio_bindir}/libfltk*.dll	156	%{_cendio_archdir}/%{_cendio_bindir}/libfltk*.dll
210	%endif	157	%endif
211	%endif
212		158
213	%{_cendio_archdir}/%{_cendio_includedir}/FL	159	%{_cendio_archdir}/%{_cendio_includedir}/FL
214		160
215	-
216	--
217	fltk/fltk.spec \| 47 ++++-----------------	161	fltk/fltk.spec \| 47 ++++-----------------
218	fltk/src/fltk-1.3.3-source.tar.gz \| Bin 4986376 -> 0 bytes	162	fltk/src/fltk-1.3.3-source.tar.gz \| Bin 4986376 -> 0 bytes
219	fltk/src/fltk-1.3.4-source.tar.bz2 \| Bin 0 -> 4535833 bytes	163	fltk/src/fltk-1.3.4-source.tar.bz2 \| Bin 0 -> 4535833 bytes
220	fltk/src/fltk-1.3.x-clipbox.patch \| 24 ----------	164	fltk/src/fltk-1.3.x-clipbox.patch \| 24 ----------
221	fltk/src/fltk-1.3.x-crlf.patch \| 30 -------------	165	fltk/src/fltk-1.3.x-crlf.patch \| 30 -------------
222	fltk/src/fltk-1.3.x-libdl.patch \| 32 --------------	166	fltk/src/fltk-1.3.x-libdl.patch \| 32 --------------
223	fltk/src/fltk-1.3.x-net_wm_pid.patch \| 34 ---------------	167	fltk/src/fltk-1.3.x-net_wm_pid.patch \| 34 ---------------
224	fltk/src/fltk-1.3.x-osx-clip.patch \| 77 ----------------------------------	168	fltk/src/fltk-1.3.x-osx-clip.patch \| 77 ----------------------------------
225	8 files changed, 9 insertions(+), 235 deletions(-)	169	8 files changed, 9 insertions(+), 235 deletions(-)
226	delete mode 100644 fltk/src/fltk-1.3.3-source.tar.gz	170	delete mode 100644 fltk/src/fltk-1.3.3-source.tar.gz
227	create mode 100644 fltk/src/fltk-1.3.4-source.tar.bz2	171	create mode 100644 fltk/src/fltk-1.3.4-source.tar.bz2
228	delete mode 100644 fltk/src/fltk-1.3.x-clipbox.patch	172	delete mode 100644 fltk/src/fltk-1.3.x-clipbox.patch
229	delete mode 100644 fltk/src/fltk-1.3.x-crlf.patch	173	delete mode 100644 fltk/src/fltk-1.3.x-crlf.patch
230	delete mode 100644 fltk/src/fltk-1.3.x-libdl.patch	174	delete mode 100644 fltk/src/fltk-1.3.x-libdl.patch
231	delete mode 100644 fltk/src/fltk-1.3.x-net_wm_pid.patch	175	delete mode 100644 fltk/src/fltk-1.3.x-net_wm_pid.patch
232	delete mode 100644 fltk/src/fltk-1.3.x-osx-clip.patch	176	delete mode 100644 fltk/src/fltk-1.3.x-osx-clip.patch

Lines 8-31 Link Here

(-)a/fltk/fltk.spec (-38 / +9 lines)
8		8
9	Name: cendio-build-%{component}-%{_cendio_arch}	9	Name: cendio-build-%{component}-%{_cendio_arch}
10	Summary: %{component} package for Cendio build environment	10	Summary: %{component} package for Cendio build environment
11	Version: 1.3.3	11	Version: 1.3.4
12	Release: 9	12	Release: 1
13		13
14	License: Open Source/Proprietary (see COPYING)	14	License: Open Source/Proprietary (see COPYING)
15	Group: Development/Libraries	15	Group: Development/Libraries
16		16
17	Source0: %{component}-%{version}-source.tar.gz	17	Source0: %{component}-%{version}-source.tar.bz2
18
19	# Set _NET_WM_PID on windows (upstream r10710)
20	Patch0: %{component}-1.3.x-net_wm_pid.patch
21	# OSX clipboard buffer overflow (upstream r10709)
22	Patch1: %{component}-1.3.x-osx-clip.patch
23	# Missing -ldl on link line (upstream r10590)
24	Patch2: %{component}-1.3.x-libdl.patch
25	# Bad CRLF handling on Windows (upstream r11873)
26	Patch3: %{component}-1.3.x-crlf.patch
27	# fl_clip_box() buggy on macOS (upstream r10576)
28	Patch4: %{component}-1.3.x-clipbox.patch
29		18
30	BuildRequires: cendio-build-build%{?native:-native}-%{_cendio_arch}	19	BuildRequires: cendio-build-build%{?native:-native}-%{_cendio_arch}
31	BuildRequires: cendio-build-zlib-%{_cendio_arch}	20	BuildRequires: cendio-build-zlib-%{_cendio_arch}
Lines 62-73 Requires: cendio-build-libXinerama-%{_cendio_arch} Link Here
62	%prep	51	%prep
63	%setup -q -n %{component}-%{version}	52	%setup -q -n %{component}-%{version}
64		53
65	%patch0 -p0
66	%patch1 -p1 -b .clip
67	%patch2 -p0 -b .libdl
68	%patch3 -p0 -b .crlf
69	%patch4 -p0 -b .clipbox
70
71	# Enable ABI breaking features	54	# Enable ABI breaking features
72	sed -i 's@^//#define FLTK_ABI_VERSION@#define FLTK_ABI_VERSION@' FL/Enumerations.H	55	sed -i 's@^//#define FLTK_ABI_VERSION@#define FLTK_ABI_VERSION@' FL/Enumerations.H
73		56
Lines 112-135 rm -rf $RPM_BUILD_ROOT Link Here
112	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/lib/FLTK-1.3/*.cmake	95	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/lib/FLTK-1.3/*.cmake
113	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/CMake/*.cmake	96	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/CMake/*.cmake
114	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/FLTK/.framework/Resources/CMake/*.cmake	97	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/FLTK/.framework/Resources/CMake/*.cmake
		98	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/share/fltk/*.cmake
115	# Get rid of test program docs	99	# Get rid of test program docs
116	rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}/man6	100	rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}/man6
117	# cmake installs everything under FL, even patch backup files. Get rid of non-h files.	101	# cmake installs everything under FL, even patch backup files. Get rid of non-h files.
118	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_includedir}/FL/*[!.Hh]	102	rm -f $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_includedir}/FL/*[!.Hh]
119		103
120	# cmake puts lots of stuff in the wrong places
121	%if %{_cendio_arch} != win32 && %{_cendio_arch} != win64
122	mkdir -p $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}
123	mv $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/man/* \
124	$RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_mandir}/
125	rmdir $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/man
126	%endif
127
128	%if "%{_cendio_prefix}/lib" != "%{_cendio_libdir}"
129	mv $RPM_BUILD_ROOT%{_cendio_archdir}%{_cendio_prefix}/lib \
130	$RPM_BUILD_ROOT%{_cendio_archdir}%{_cendio_libdir}
131	%endif
132
133	# These files break CMake's FindFLTK so just nuke them	104	# These files break CMake's FindFLTK so just nuke them
134	%if 0%{?windows}	105	%if 0%{?windows}
135	rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/CMake	106	rm -rf $RPM_BUILD_ROOT%{_cendio_archdir}/%{_cendio_prefix}/CMake
Lines 147-155 rm -rf $RPM_BUILD_ROOT Link Here
147	%files	118	%files
148	%defattr(-,root,root)	119	%defattr(-,root,root)
149		120
		121	%{_cendio_archdir}/%{_cendio_bindir}/fltk-config
		122
150	# Cmake does not build fluid when cross compiling	123	# Cmake does not build fluid when cross compiling
151	%if ! 0%{?crosscompile}	124	%if ! 0%{?crosscompile}
152	%{_cendio_archdir}/%{_cendio_bindir}/fluid*	125	%{_cendio_archdir}/%{_cendio_bindir}/fluid*
		126	%{_cendio_archdir}/%{_cendio_datadir}/applications/fluid.desktop
		127	%{_cendio_archdir}/%{_cendio_datadir}/mime/packages/fluid.xml
		128	%{_cendio_archdir}/%{_cendio_datadir}/icons/hicolor/*/apps/fluid.png
153	%endif	129	%endif
154		130
155	%if 0%{?windows}	131	%if 0%{?windows}
Lines 160-170 rm -rf $RPM_BUILD_ROOT Link Here
160		136
161	%{_cendio_archdir}/%{_cendio_libdir}/libfltk*	137	%{_cendio_archdir}/%{_cendio_libdir}/libfltk*
162		138
163	%if ! 0%{?windows}
164	%{_cendio_archdir}/%{_cendio_mandir}/man1/fltk-config.1	139	%{_cendio_archdir}/%{_cendio_mandir}/man1/fltk-config.1
165	%{_cendio_archdir}/%{_cendio_mandir}/man1/fluid.1	140	%{_cendio_archdir}/%{_cendio_mandir}/man1/fluid.1
166	%{_cendio_archdir}/%{_cendio_mandir}/man3/fltk.3	141	%{_cendio_archdir}/%{_cendio_mandir}/man3/fltk.3
167	%{_cendio_archdir}/%{_cendio_mandir}/man6/blocks.6
168	%{_cendio_archdir}/%{_cendio_mandir}/man6/checkers.6
169	%{_cendio_archdir}/%{_cendio_mandir}/man6/sudoku.6
170	%endif