diff --git a/.gitignore b/.gitignore index 93d85a8..cd0ca40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/fltk-1.1.10-source.tar.bz2 -/fltk-1.3.x-r9671.tar.bz2 -/fltk-1.3.2-source.tar.gz -/fltk-1.3.3-source.tar.gz +/fltk-1.3.4-1-source.tar.gz diff --git a/fltk-1.1.8-fluid_desktop.patch b/fltk-1.1.8-fluid_desktop.patch deleted file mode 100644 index e2ea8bd..0000000 --- a/fltk-1.1.8-fluid_desktop.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up fltk-1.3.0rc5/fluid/fluid.desktop.fluid_desktop fltk-1.3.0rc5/fluid/fluid.desktop ---- fltk-1.3.0rc5/fluid/fluid.desktop.fluid_desktop 2010-11-14 17:37:34.000000000 +0100 -+++ fltk-1.3.0rc5/fluid/fluid.desktop 2011-05-25 17:03:20.728727569 +0200 -@@ -6,5 +6,5 @@ Exec=fluid %F - Icon=fluid - Terminal=false - Type=Application --MimeType=application/x-fluid -+MimeType=application/x-fluid; - Categories=Development;GUIDesigner; diff --git a/fltk-1.3-L3156.patch b/fltk-1.3-L3156.patch deleted file mode 100644 index b61def2..0000000 --- a/fltk-1.3-L3156.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: src/fl_font.cxx -=================================================================== ---- src/fl_font.cxx (revision 10503) -+++ src/fl_font.cxx (revision 10504) -@@ -55,6 +55,12 @@ - # include "fl_font_x.cxx" - #endif // WIN32 - -+#if ! (defined(WIN32) || defined(__APPLE__)) -+XFontStruct *fl_X_core_font() -+{ -+ return fl_xfont.value(); -+} -+#endif - - double fl_width(const char* c) { - if (c) return fl_width(c, (int) strlen(c)); -Index: src/gl_draw.cxx -=================================================================== ---- src/gl_draw.cxx (revision 10503) -+++ src/gl_draw.cxx (revision 10504) -@@ -81,7 +81,7 @@ - * then sorting through them at draw time (for normal X rendering) to find which one can - * render the current glyph... But for now, just use the first font in the list for GL... - */ -- XFontStruct *font = fl_xfont; -+ XFontStruct *font = fl_X_core_font(); - int base = font->min_char_or_byte2; - int count = font->max_char_or_byte2-base+1; - fl_fontsize->listbase = glGenLists(256); -Index: FL/x.H -=================================================================== ---- FL/x.H (revision 10503) -+++ FL/x.H (revision 10504) -@@ -132,6 +132,7 @@ - XFontStruct *ptr; - }; - extern FL_EXPORT Fl_XFont_On_Demand fl_xfont; -+extern FL_EXPORT XFontStruct* fl_X_core_font(); - - // this object contains all X-specific stuff about a window: - // Warning: this object is highly subject to change! diff --git a/fltk-1.3.3-fltk_config.patch b/fltk-1.3.3-fltk_config.patch deleted file mode 100644 index 8d79a9b..0000000 --- a/fltk-1.3.3-fltk_config.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -up fltk-1.3.3/fltk-config.cmake.in.fltk_config fltk-1.3.3/fltk-config.cmake.in ---- fltk-1.3.3/fltk-config.cmake.in.fltk_config 2013-04-06 11:15:17.000000000 -0500 -+++ fltk-1.3.3/fltk-config.cmake.in 2016-06-26 18:34:24.369828419 -0500 -@@ -223,7 +223,7 @@ else - 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= -@@ -231,28 +231,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" -+ LDLIBS="-lfltk_forms$SHAREDSUFFIX" - LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" - fi - if test x$use_gl = xyes; then -- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" -+ LDLIBS="-lfltk_gl$SHAREDSUFFIX" - 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" - 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" - 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 -up fltk-1.3.3/fltk-config.in.fltk_config fltk-1.3.3/fltk-config.in ---- fltk-1.3.3/fltk-config.in.fltk_config 2013-04-05 10:28:43.000000000 -0500 -+++ fltk-1.3.3/fltk-config.in 2016-06-26 18:35:37.891323957 -0500 -@@ -42,8 +42,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@" -@@ -223,7 +223,7 @@ else - 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= -@@ -231,28 +231,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/fltk-1.3.3-no_undefined.patch b/fltk-1.3.3-no_undefined.patch deleted file mode 100644 index 7037bc8..0000000 --- a/fltk-1.3.3-no_undefined.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up fltk-1.3.3/configure.in.no_undefined fltk-1.3.3/configure.in ---- fltk-1.3.3/configure.in.no_undefined 2014-10-30 09:07:58.000000000 -0500 -+++ fltk-1.3.3/configure.in 2015-02-18 14:03:42.617667667 -0600 -@@ -1194,6 +1194,18 @@ if test -n "$GCC"; then - AC_MSG_RESULT(no)) - CFLAGS="$OLDCFLAGS" - -+ dnl Experimental (as of 17 Feb 2015): -+ dnl Make sure that shared libraries don't have undefined references -+ # See if ld supports -no-undefined... -+ AC_MSG_CHECKING(if ld supports -no-undefined) -+ OLDLDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -Wl,-no-undefined" -+ AC_TRY_LINK(,, -+ [DSOFLAGS="$DSOFLAGS -Wl,-no-undefined"] -+ AC_MSG_RESULT(yes), -+ AC_MSG_RESULT(no)) -+ LDFLAGS="$OLDLDFLAGS" -+ - # See if ld supports -Bsymbolic-functions... - AC_MSG_CHECKING(if ld supports -Bsymbolic-functions) - OLDLDFLAGS="$LDFLAGS" diff --git a/fltk-1.3.4-fltk_config.patch b/fltk-1.3.4-fltk_config.patch new file mode 100644 index 0000000..5f33a0f --- /dev/null +++ b/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/fltk-1.3.4-x-fluid_mimetype.patch b/fltk-1.3.4-x-fluid_mimetype.patch new file mode 100644 index 0000000..fe7f09a --- /dev/null +++ b/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/fltk.spec b/fltk.spec index 7f4ab6b..f34a790 100644 --- a/fltk.spec +++ b/fltk.spec @@ -8,8 +8,8 @@ Summary: C++ user interface toolkit Name: fltk -Version: 1.3.3 -Release: 9%{?dist} +Version: 1.3.4 +Release: 1%{?dist} # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details License: LGPLv2+ with exceptions @@ -18,20 +18,19 @@ 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://ftp.easysw.com/pub/fltk/%{version}%{?pre}/%{name}-%{version}%{?pre}-source.tar.gz +Source0: http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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.3-fltk_config.patch -Patch5: fltk-1.1.8-fluid_desktop.patch +Patch1: fltk-1.3.4-fltk_config.patch ## upstream patches -Patch100: fltk-1.3.3-no_undefined.patch -Patch101: fltk-1.3-L3156.patch + +## upstreamable patches +Patch100: fltk-1.3.4-x-fluid_mimetype.patch BuildRequires: desktop-file-utils BuildRequires: libjpeg-devel @@ -80,14 +79,11 @@ Requires: %{name}-devel %if 0%{?snap:1} %setup -q -n fltk-1.3.x-%{snap} %else -%setup -q -n fltk-%{version}%{?pre} +%setup -q -n fltk-%{version}-1 %endif %patch1 -p1 -b .fltk_config -%patch5 -p1 -b .fluid_desktop -%patch100 -p1 -b .no_undefined -%patch101 -p0 -b .L3156 - +%patch100 -p1 -b .x-fluid_mimetype # verbose build output sed -i.silent '\,^.SILENT:,d' makeinclude.in @@ -95,14 +91,15 @@ 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}" \ - --enable-largefile \ + --disable-localjpeg \ + --disable-localzlib \ + --disable-localpng \ --enable-shared \ --enable-threads \ --enable-xdbe \ @@ -113,12 +110,8 @@ make %{?_smp_mflags} %install - -make install install-desktop DESTDIR=$RPM_BUILD_ROOT - -# omit examples/games: -make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}* +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 @@ -134,7 +127,7 @@ mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs ## unpackaged files # errant docs -rm -rf $RPM_BUILD_ROOT%{_mandir}/cat* +rm -rv $RPM_BUILD_ROOT%{_mandir}/cat* %check @@ -145,15 +138,14 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc ANNOUNCEMENT CHANGES COPYING CREDITS README +%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 -%defattr(-,root,root,-) %doc __docs/* %{_bindir}/fltk-config %{?arch:%{_bindir}/fltk-config-%{arch}} @@ -167,7 +159,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %{_mandir}/man3/fltk.3* %files static -%defattr(-,root,root,-) %{_libdir}/libfltk.a %{_libdir}/libfltk_forms.a %{_libdir}/libfltk_gl.a @@ -188,16 +179,16 @@ update-desktop-database -q &> /dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %files fluid -%defattr(-,root,root,-) %{_bindir}/fluid %{_mandir}/man1/fluid.1* %{_datadir}/applications/fluid.desktop %{_datadir}/icons/hicolor/*/*/* -# FIXME, add according to new mime spec -%{_datadir}/mimelnk/*/*.desktop %changelog +* 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 diff --git a/sources b/sources index 4483790..81c7c06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ccdb0d19dc104b87179bd9fd10822e3 fltk-1.3.3-source.tar.gz +SHA512 (fltk-1.3.4-1-source.tar.gz) = 0be1c8e6bb7a8c7ef484941a73868d5e40b90e97a8e5dc747bac2be53a350621975406ecfd4a9bcee8eeb7afd886e75bf7a6d6478fd6c56d16e54059f22f0891