From 1ff433bc5eed7dfbca759ff651c0317ceb01e560 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2019 15:10:25 +0000 Subject: import fltk-1.3.4-5.el8 --- diff --git a/.fltk.metadata b/.fltk.metadata new file mode 100644 index 0000000..f4db3ca --- /dev/null +++ b/.fltk.metadata @@ -0,0 +1 @@ +0a2a40e34094b9758dc8552ffb32ae444bce8577 SOURCES/fltk-1.3.4-1-source.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..259e9d9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/fltk-1.3.4-1-source.tar.gz diff --git a/SOURCES/fltk-1.3.4-fltk_config.patch b/SOURCES/fltk-1.3.4-fltk_config.patch new file mode 100644 index 0000000..5f33a0f --- /dev/null +++ b/SOURCES/fltk-1.3.4-fltk_config.patch @@ -0,0 +1,58 @@ +diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in +--- fltk-1.3.4-1/fltk-config.in.fltk_config 2016-01-30 20:49:56.000000000 -0600 ++++ fltk-1.3.4-1/fltk-config.in 2017-03-04 12:29:28.910316677 -0600 +@@ -44,8 +44,8 @@ CXX="@CXX@" + + # flags for C++ compiler: + ARCHFLAGS="@ARCHFLAGS@" +-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" +-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" ++CFLAGS="" ++CXXFLAGS="" + LDFLAGS="@LDFLAGS@" + LDLIBS="@LIBS@" + OPTIM="@OPTIM@" +@@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then + includes="-I$BINARY_DIR $includes" + fi + +-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then ++if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then + libs=-L$libdir + else + libs= +@@ -236,28 +236,28 @@ fi + + # Calculate needed libraries + LDSTATIC="$libdir/libfltk.a $LDLIBS" +-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS" ++LDLIBS="-lfltk$SHAREDSUFFIX" + + if test x$use_forms = xyes; then + LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" + LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" + fi + if test x$use_gl = xyes; then +- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" ++ LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS" + LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" + fi + if test x$use_images = xyes; then +- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" ++ LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS" + LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC" + fi + + if test x$use_cairo = xyes; then +- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS" ++ LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS" + LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC" + fi + +-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS" +-LDSTATIC="$LDFLAGS $LDSTATIC" ++LDLIBS="$libs $LDLIBS" ++#LDSTATIC="$LDFLAGS $LDSTATIC" + + # Answer to user requests + if test -n "$echo_help"; then diff --git a/SOURCES/fltk-1.3.4-x-fluid_mimetype.patch b/SOURCES/fltk-1.3.4-x-fluid_mimetype.patch new file mode 100644 index 0000000..fe7f09a --- /dev/null +++ b/SOURCES/fltk-1.3.4-x-fluid_mimetype.patch @@ -0,0 +1,21 @@ +diff -up fltk-1.3.4-1/fluid/Makefile.x-fluid_mimetype fltk-1.3.4-1/fluid/Makefile +--- fltk-1.3.4-1/fluid/Makefile.x-fluid_mimetype 2016-07-17 14:51:54.000000000 -0500 ++++ fltk-1.3.4-1/fluid/Makefile 2017-03-04 12:42:00.573346286 -0600 +@@ -84,7 +84,7 @@ install-linux: + $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ + done + -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application +- $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application ++ #$(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application + + install-osx: + echo Installing Fluid in $(DESTDIR)/Applications... +@@ -104,7 +104,7 @@ uninstall: + uninstall-linux: + $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop + $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png +- $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop ++ #$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop + + uninstall-osx: + $(RM) -r $(DESTDIR)/Applications/fluid.app diff --git a/SOURCES/fltk-config.sh b/SOURCES/fltk-config.sh new file mode 100644 index 0000000..c70522d --- /dev/null +++ b/SOURCES/fltk-config.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +exec fltk-config-$(uname -i) "$@" diff --git a/SPECS/fltk.spec b/SPECS/fltk.spec new file mode 100644 index 0000000..5c2ae80 --- /dev/null +++ b/SPECS/fltk.spec @@ -0,0 +1,448 @@ +#global snap r9671 + +# TODO: +# * port .spec to use cmake + +# trim changelog included in binary rpms +%global _changelog_trimtime %(date +%s -d "1 year ago") + +Summary: C++ user interface toolkit +Name: fltk +Version: 1.3.4 +Release: 5%{?dist} + +# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details +License: LGPLv2+ with exceptions +Group: System Environment/Libraries +URL: http://www.fltk.org/ +%if "%{?snap:1}" == "1" +Source0: http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.3.x-%{snap}.tar.bz2 +%else +Source0: http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz +%endif + +Source1: fltk-config.sh + +## FIXME/TODO: upstream these asap -- Rex +# add lib64 support, drop extraneous libs (bug #708185) and ldflags (#1112930) +Patch1: fltk-1.3.4-fltk_config.patch + +## upstream patches + +## upstreamable patches +Patch100: fltk-1.3.4-x-fluid_mimetype.patch + +BuildRequires: desktop-file-utils +BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(gl) pkgconfig(glu) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xproto) +BuildRequires: xorg-x11-utils +BuildRequires: zlib-devel +BuildRequires: autoconf + +%description +FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit. +It provides modern GUI functionality without the bloat, and supports +3D graphics via OpenGL and its built-in GLUT emulation. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libstdc++-devel +Requires: pkgconfig(gl) pkgconfig(glu) +Requires: pkgconfig(ice) pkgconfig(sm) +Requires: pkgconfig(xft) pkgconfig(xt) pkgconfig(x11) +%description devel +%{summary}. + +%package static +Summary: Static libraries for %{name} +Requires: %{name}-devel = %{version}-%{release} +%description static +%{summary}. + +%package fluid +Summary: Fast Light User Interface Designer +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-devel +%description fluid +%{summary}, an interactive GUI designer for %{name}. + + +%prep +%if 0%{?snap:1} +%setup -q -n fltk-1.3.x-%{snap} +%else +%setup -q -n fltk-%{version}-1 +%endif + +%patch1 -p1 -b .fltk_config +%patch100 -p1 -b .x-fluid_mimetype + +# verbose build output +sed -i.silent '\,^.SILENT:,d' makeinclude.in +autoconf + + +%build +# set DSOFLAGS too, used to link shlibs (LDFLAGS used only for static libs) +%{?__global_ldflags:DSOFLAGS="%{__global_ldflags}" ; export DSOFLAGS} + +%configure \ + --with-links \ + --with-optim="%{optflags}" \ + --disable-localjpeg \ + --disable-localzlib \ + --disable-localpng \ + --enable-shared \ + --enable-threads \ + --enable-xdbe \ + --enable-xinerama \ + --enable-xft + +make %{?_smp_mflags} + + +%install +make install DESTDIR=$RPM_BUILD_ROOT +make install-linux -C fluid DESTDIR=$RPM_BUILD_ROOT + +# we only apply this hack to multilib arch's +%ifarch x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc +%global arch %(uname -i 2>/dev/null || echo undefined) +mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \ + $RPM_BUILD_ROOT%{_bindir}/fltk-config-%{arch} +install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config +%endif + +# docs +rm -rf __docs +mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs + +## unpackaged files +# errant docs +rm -rv $RPM_BUILD_ROOT%{_mandir}/cat* + + +%check +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%doc ANNOUNCEMENT CHANGES CREDITS README +%license COPYING +%{_libdir}/libfltk.so.1.3 +%{_libdir}/libfltk_forms.so.1.3 +%{_libdir}/libfltk_gl.so.1.3 +%{_libdir}/libfltk_images.so.1.3 + +%files devel +%doc __docs/* +%{_bindir}/fltk-config +%{?arch:%{_bindir}/fltk-config-%{arch}} +%{_includedir}/FL/ +%{_includedir}/Fl +%{_libdir}/libfltk.so +%{_libdir}/libfltk_forms.so +%{_libdir}/libfltk_gl.so +%{_libdir}/libfltk_images.so +%{_mandir}/man1/fltk-config.1* +%{_mandir}/man3/fltk.3* + +%files static +%{_libdir}/libfltk.a +%{_libdir}/libfltk_forms.a +%{_libdir}/libfltk_gl.a +%{_libdir}/libfltk_images.a + +%files fluid +%{_bindir}/fluid +%{_mandir}/man1/fluid.1* +%{_datadir}/applications/fluid.desktop +%{_datadir}/icons/hicolor/*/*/* + + +%changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 11 2018 Igor Gnatenko - 1.3.4-4 +- Remove obsolete scriptlets + +* Wed Aug 02 2017 Fedora Release Engineering - 1.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Mar 04 2017 Rex Dieter - 1.3.4-1 +- 1.3.4 (#1385984) + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jun 27 2016 Rex Dieter - 1.3.3-8 +- fltk_config.patch: remove @LARGEFILE@ @PTHREAD_FLAGS@ too (#1350069) + +* Sun Jun 26 2016 Rex Dieter - 1.3.3-7 +- -devel: Requires: pkgconfig(gl) pkgconfig(glu) +- cleaner DSOFLAGS +- fltk_config.patch: imposes internal build flags on the user (#1350069) + +* Wed Feb 03 2016 Fedora Release Engineering - 1.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Aug 17 2015 Adam Jackson 1.3.3-5 +- For whatever reason fltk thinks it's spelled DSOFLAGS not LDFLAGS, so set + that when building so hardening takes effect + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed May 06 2015 Rex Dieter 1.3.3-3 +- rebuild (gcc5) + +* Wed Feb 18 2015 Rex Dieter 1.3.3-2 +- pull in upstream fixes for undefined symbols + +* Fri Feb 13 2015 Rex Dieter 1.3.3-1 +- 1.3.3 + +* Sat Aug 16 2014 Fedora Release Engineering - 1.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Jun 25 2014 Rex Dieter 1.3.2-6 +- fltk-config transmits wrong ldflags (#1112930) + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Feb 24 2014 Rex Dieter 1.3.2-4 +- refresh clipboard patch (#920573) + +* Thu Jan 23 2014 jchaloup - 1.3.2-3 +- autoconfig moved from build to prep section + +* Thu Jan 16 2014 Petr Hracek - 1.3.2-2 +- fltk is not build properly (#1048857) + +* Mon Aug 26 2013 Rex Dieter 1.3.2-1 +- fltk-1.3.2 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jan 18 2013 Adam Tkac - 1.3.0-9 +- rebuild due to "jpeg8-ABI" feature drop + +* Tue Dec 04 2012 Adam Tkac - 1.3.0-8 +- fix ABI breakage caused by fltk-1_v4.3.x-cursor.patch (#883026) + +* Thu Nov 29 2012 Adam Tkac - 1.3.0-7 +- add xcursor BR + +* Wed Aug 22 2012 Adam Tkac - 1.3.0-6 +- update to 1.3.x snap r9671 +- add some not-yet-accepted patches needed by tigervnc + +* Thu Jul 19 2012 Fedora Release Engineering - 1.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 07 2011 Rex Dieter 1.3.0-3 +- rebuild (libpng) +- pkgconfig-style deps + +* Thu Aug 25 2011 Rex Dieter 1.3.0-2 +- fltk-config inconsistency on ARM (#733421) + +* Fri Jun 24 2011 Rex Dieter 1.3.0-1 +- 1.3.0 (final) +- --with-links + +* Fri May 27 2011 Adam Tkac - 1.3.0-0.2.rc5 +- fltk-config: don't emit unneeded -l flags (#708185) + +* Wed May 25 2011 Adam Tkac - 1.3.0-0.1.rc5 +- update to 1.3.0rc5 +- patches no longer needed + - fltk-1.1.9-test.patch + - fltk-1.1.9-rpath.patch + - fltk-1.1.10-pkgconfig_xft.patch + - fltk-1.1.10-fluid_target.patch +- regenerated other patches to match current source + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Dec 07 2010 Rex Dieter - 1.1.10-5 +- FTBFS fltk-1.1.10-4.fc15: ImplicitDSOLinking (#660884) + +* Wed Sep 29 2010 jkeating - 1.1.10-4 +- Rebuilt for gcc bug 634757 + +* Mon Sep 20 2010 Rex Dieter - 1.1.10-3 +- verbose build output (hint from mschwendt) + +* Tue Sep 07 2010 Rex Dieter - 1.1.10-2 +- drop BR: man , fixes FTBFS (#631212) + +* Sun Feb 14 2010 Rex Dieter - 1.1.10-1 +- fltk-1.1.10 +- FTBFS fltk-1.1.10-0.1.rc3.fc13: ImplicitDSOLinking (#564877) + +* Tue Dec 08 2009 Rex Dieter - 1.1.10-0.1.rc3 +- fltk-1.1.10rc3 + +* Mon Dec 07 2009 Rex Dieter - 1.1.9-7 +- real -static subpkg (#545145) + +* Fri Jul 24 2009 Fedora Release Engineering - 1.1.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Jun 28 2009 Rex Dieter - 1.1.9-5 +- fltk-fluid duplicate .desktop file (#508553) +- optimize scriptlets + +* Wed May 13 2009 Rex Dieter - 1.1.9-4 +- unbreak fltk-config --ldstaticflags (#500201) +- (another?) gcc44 patch +- -devel: +Provides: %%name-static +- fix multiarch conflicts (#341141) + +* Wed Mar 04 2009 Caolán McNamara - 1.1.9-3 +- fix uses of strchr wrt. constness + +* Tue Feb 24 2009 Fedora Release Engineering - 1.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Oct 01 2008 Rex Dieter 1.1.9-1 +- fltk-1.1.9 + +* Sat Mar 29 2008 Rex Dieter 1.1.8-1 +- fltk-1.1.8 (final) + +* Tue Feb 19 2008 Rex Dieter 1.1.8-0.8.r6027 +- fltk-1.1.x-r6027 + +* Mon Feb 11 2008 Rex Dieter 1.1.8-0.7.r5989 +- respin (gcc43) + +* Wed Dec 12 2007 Rex Dieter 1.1.8-0.6.r5989 +- --enable-largefile +- fltk-1.1.x-r5989 snapshot (1.1.8 pre-release) + +* Mon Aug 20 2007 Rex Dieter 1.1.8-0.5.r5750 +- License: LGPLv2+ with exceptions + +* Sat Aug 11 2007 Rex Dieter 1.1.8-0.4.r5750 +- License: LGPLv2+ (with exceptions) + +* Sun Apr 29 2007 Rex Dieter 1.1.8-0.3.r5750 +- *really* fix --rpath issue, using non-empty patch this time (#238284) + +* Sun Apr 29 2007 Rex Dieter 1.1.8-0.2.r5750 +- nuke --rpath (#238284) + +* Thu Apr 05 2007 Rex Dieter 1.1.8-0.1.r5750 +- fltk-1.1.x-r5750 snapshot (1.1.8 pre-release) +- --enable-xinerama +- patch for undefined symbols in libfltk_gl + +* Wed Apr 4 2007 Thomas Fitzsimmons - 1.1.7-9.r5555 +- Always apply fltk-config patch (#199656) +- Update fltk-1.1.7-config.patch + +* Wed Dec 13 2006 Rex Dieter 1.1.7-8.r5555 +- more 64bit hackage to workaround broken Makefile logic (#219348) + +* Wed Dec 13 2006 Rex Dieter 1.1.7-7.r5555 +- fltk-1.1.x-r5555 snapshot, for 64bit issues (#219348) +- restore static libs (they're tightly coupled with fltk-config) +- cleanup %%description's + +* Mon Dec 11 2006 Rex Dieter 1.1.7-6 +- move tests to %%check section + +* Mon Dec 11 2006 Rex Dieter 1.1.7-5 +- use included icon/.desktop files +- fix up fltk-config (#199656) + +* Mon Dec 11 2006 Rex Dieter 1.1.7-3 +- follow icon spec +- omit static libs + +* Wed Sep 06 2006 Michael J. Knox - 1.1.7-2 +- rebuild for FC6 + +* Mon Feb 13 2006 Ignacio Vazquez-Abrams 1.1.7-1 +- Upstream update + +* Thu Nov 17 2005 Ignacio Vazquez-Abrams 1.1.6-4 +- Fixed BR and -devel Requires for modular X + +* Sun Nov 13 2005 Ignacio Vazquez-Abrams 1.1.6-3 +- Update BuildRequires as well + +* Sun Nov 13 2005 Ignacio Vazquez-Abrams 1.1.6-2 +- Update Requires for -devel + +* Thu Oct 27 2005 Ignacio Vazquez-Abrams 1.1.6-1 +- Upstream update + +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 1.1.4-10 +- Fixed BR/Requires for x86_64 + +* Wed Apr 6 2005 Michael Schwendt +- rebuilt + +* Thu Nov 20 2003 Dams 0:1.1.4-0.fdr.8 +- Hopefully fixed Xft flags for rh80 + +* Thu Nov 20 2003 Dams 0:1.1.4-0.fdr.7 +- Fixed typo + +* Thu Nov 20 2003 Dams 0:1.1.4-0.fdr.6 +- Added xft.pc build dependency +- Added BuildReq:man + +* Sun Nov 9 2003 Ville Skyttä 0:1.1.4-0.fdr.4 +- Spec file cleanup +- Enabled xft and threads + +* Tue Oct 28 2003 Dams - 0:1.1.4-0.fdr.3 +- Added missing symlink in includedir + +* Wed Oct 1 2003 Dams 0:1.1.4-0.fdr.2 +- Removed comment after scriptlets + +* Wed Oct 1 2003 Dams 0:1.1.4-0.fdr.1 +- Updated to final 1.1.4 + +* Wed Sep 24 2003 Dams 0:1.1.4-0.fdr.0.4.rc1 +- Fixed documentation path in configure + +* Fri Aug 29 2003 Dams 0:1.1.4-0.fdr.0.3.rc1 +- Fixed typo in desktop entry +- Added missing BuildRequires ImageMagick and desktop-file-utils + +* Fri Aug 29 2003 Dams 0:1.1.4-0.fdr.0.2.rc1 +- Moved fluid to its own package +- Added missing Requires for devel package + +* Sat Aug 16 2003 Dams +- Initial build.