From 33e36aec6b69b395a60cfdc039a97c663577a788 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 19 Nov 2014 21:13:19 +0100 Subject: [PATCH] - updated to 1.3.3 - updated as-needed patch - added export patch (exports XFont interface needed by libfltk_gl library) --- fltk-1.1.9-as-needed.patch | 118 ------------------------------------- fltk-1.3.0-as-needed.patch | 117 ------------------------------------ fltk-as-needed.patch | 49 +++++++++++++++ fltk-export.patch | 11 ++++ fltk.spec | 29 +++++---- 5 files changed, 76 insertions(+), 248 deletions(-) delete mode 100644 fltk-1.1.9-as-needed.patch delete mode 100644 fltk-1.3.0-as-needed.patch create mode 100644 fltk-as-needed.patch create mode 100644 fltk-export.patch diff --git a/fltk-1.1.9-as-needed.patch b/fltk-1.1.9-as-needed.patch deleted file mode 100644 index d5d0ee0..0000000 --- a/fltk-1.1.9-as-needed.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Nur fltk-1.1.9.orig/configure.in fltk-1.1.9/configure.in ---- fltk-1.1.9.orig/configure.in 2009-01-08 17:53:52.000000000 +0000 -+++ fltk-1.1.9/configure.in 2009-01-09 14:11:39.000000000 +0000 -@@ -179,10 +179,7 @@ - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" -- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -- if test "x$libdir" != "x/usr/lib"; then -- DSOLINK="-Wl,-rpath,$libdir" -- fi -+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" - ;; - AIX*) - DSONAME="libfltk_s.a" -diff -Nur fltk-1.1.9.orig/src/Makefile fltk-1.1.9/src/Makefile ---- fltk-1.1.9.orig/src/Makefile 2009-01-08 17:53:51.000000000 +0000 -+++ fltk-1.1.9/src/Makefile 2009-01-09 14:08:53.000000000 +0000 -@@ -210,13 +210,13 @@ - - libfltk.so.1.1: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.so - $(LN) libfltk.so.1.1 libfltk.so - - libfltk.sl.1.1: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.sl - $(LN) libfltk.sl.1.1 libfltk.sl - -@@ -232,7 +232,7 @@ - - libfltk_s.a: $(OBJECTS) - echo $(DSOCOMMAND) libfltk_s.o ... -- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) -+ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_s.a libfltk_s.o -@@ -246,13 +246,13 @@ - - libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.so - $(LN) libfltk_forms.so.1.1 libfltk_forms.so - - libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.sl - $(LN) libfltk_forms.sl.1.1 libfltk_forms.sl - -@@ -268,7 +268,7 @@ - - libfltk_forms_s.a: $(FLOBJECTS) - echo $(DSOCOMMAND) libfltk_forms_s.o ... -- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) -+ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o -@@ -282,13 +282,13 @@ - - libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_gl.so - $(LN) libfltk_gl.so.1.1 libfltk_gl.so - - libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_gl.sl - $(LN) libfltk_gl.sl.1.1 libfltk_gl.sl - -@@ -304,7 +304,7 @@ - - libfltk_gl_s.a: $(GLOBJECTS) - echo $(DSOCOMMAND) libfltk_gl_s.o ... -- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) -+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o -@@ -318,13 +318,13 @@ - - libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.so - $(LN) libfltk_images.so.1.1 libfltk_images.so - - libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.sl - $(LN) libfltk_images.sl.1.1 libfltk_images.sl - -@@ -340,7 +340,7 @@ - - libfltk_images_s.a: $(IMGOBJECTS) - echo $(DSOCOMMAND) libfltk_images_s.o ... -- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) -+ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o diff --git a/fltk-1.3.0-as-needed.patch b/fltk-1.3.0-as-needed.patch deleted file mode 100644 index b7adf26..0000000 --- a/fltk-1.3.0-as-needed.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- fltk-1.3.0/configure.in.orig 2011-03-06 17:54:58.000000000 +0100 -+++ fltk-1.3.0/configure.in 2011-12-11 18:11:20.000000000 +0100 -@@ -280,10 +280,7 @@ - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" -- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then -- DSOLINK="-Wl,-rpath,$libdir" -- fi -+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" - ;; - AIX*) - DSONAME="libfltk_s.a" - ---- fltk-1.3.0/src/Makefile.orig 2011-02-06 15:08:08.000000000 +0100 -+++ fltk-1.3.0/src/Makefile 2011-12-11 18:17:55.000000000 +0100 -@@ -240,13 +240,13 @@ - - libfltk.so.1.3: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.so - $(LN) libfltk.so.1.3 libfltk.so - - libfltk.sl.1.3: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.sl - $(LN) libfltk.sl.1.3 libfltk.sl - -@@ -262,7 +262,7 @@ - - libfltk_s.a: $(OBJECTS) - echo $(DSOCOMMAND) libfltk_s.o ... -- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) -+ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_s.a libfltk_s.o -@@ -276,13 +276,13 @@ - - libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.so - $(LN) libfltk_forms.so.1.3 libfltk_forms.so - - libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.sl - $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl - -@@ -298,7 +298,7 @@ - - libfltk_forms_s.a: $(FLOBJECTS) - echo $(DSOCOMMAND) libfltk_forms_s.o ... -- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) -+ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o -@@ -312,13 +312,13 @@ - - libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(GLDLIBS) -L. -lfltk - $(RM) libfltk_gl.so - $(LN) libfltk_gl.so.1.3 libfltk_gl.so - - libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(GLDLIBS) -L. -lfltk - $(RM) libfltk_gl.sl - $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl - -@@ -334,7 +334,7 @@ - - libfltk_gl_s.a: $(GLOBJECTS) - echo $(DSOCOMMAND) libfltk_gl_s.o ... -- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) -+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(GLDLIBS) - echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o -@@ -348,13 +348,13 @@ - - libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.so - $(LN) libfltk_images.so.1.3 libfltk_images.so - - libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.sl - $(LN) libfltk_images.sl.1.3 libfltk_images.sl - -@@ -370,7 +370,7 @@ - - libfltk_images_s.a: $(IMGOBJECTS) - echo $(DSOCOMMAND) libfltk_images_s.o ... -- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) -+ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o diff --git a/fltk-as-needed.patch b/fltk-as-needed.patch new file mode 100644 index 0000000..8630801 --- /dev/null +++ b/fltk-as-needed.patch @@ -0,0 +1,49 @@ +--- fltk-1.3.3/configure.in.orig 2014-11-18 22:26:21.621181598 +0100 ++++ fltk-1.3.3/configure.in 2014-11-19 16:58:39.211714220 +0100 +@@ -250,7 +250,7 @@ + GLDSONAME="libfltk_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" +- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" ++ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" + + # See if the compiler supports -fvisibility... + AC_CACHE_CHECK([if the compiler supports -fvisibility], +--- fltk-1.3.3/src/Makefile.orig 2014-10-30 17:05:22.000000000 +0100 ++++ fltk-1.3.3/src/Makefile 2014-11-18 22:26:21.624514932 +0100 +@@ -258,7 +258,7 @@ + + libfltk_s.a: $(OBJECTS) + echo $(DSOCOMMAND) libfltk_s.o ... +- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) ++ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_s.a libfltk_s.o +@@ -294,7 +294,7 @@ + + libfltk_forms_s.a: $(FLOBJECTS) + echo $(DSOCOMMAND) libfltk_forms_s.o ... +- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) ++ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o +@@ -330,7 +330,7 @@ + + libfltk_gl_s.a: $(GLOBJECTS) + echo $(DSOCOMMAND) libfltk_gl_s.o ... +- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) ++ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(GLDLIBS) + echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o +@@ -366,7 +366,7 @@ + + libfltk_images_s.a: $(IMGOBJECTS) + echo $(DSOCOMMAND) libfltk_images_s.o ... +- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) ++ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o diff --git a/fltk-export.patch b/fltk-export.patch new file mode 100644 index 0000000..a07e48d --- /dev/null +++ b/fltk-export.patch @@ -0,0 +1,11 @@ +--- fltk-1.3.3/FL/x.H.orig 2014-10-29 21:25:46.000000000 +0100 ++++ fltk-1.3.3/FL/x.H 2014-11-19 20:30:07.434515072 +0100 +@@ -114,7 +114,7 @@ + // With Xlib / X11 fonts, fl_xfont will return the current selected font. + // With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most + // similar to (usually the same as) the current XFT font. +-class Fl_XFont_On_Demand ++class FL_EXPORT Fl_XFont_On_Demand + { + public: + Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { } diff --git a/fltk.spec b/fltk.spec index 5b03e30..2ab244e 100644 --- a/fltk.spec +++ b/fltk.spec @@ -8,16 +8,17 @@ Summary: Fast Light Tool Kit Summary(pl.UTF-8): FLTK - "lekki" X11 toolkit Summary(pt_BR.UTF-8): Interface gráfica em C++ para X, OpenGL e Windows Name: fltk -Version: 1.3.2 -Release: 3 -License: LGPL with amendments (see COPYING) +Version: 1.3.3 +Release: 1 +License: LGPL v2 with amendments (see COPYING) Group: X11/Libraries Source0: http://fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz -# Source0-md5: 9f7e707d4fb7a5a76f0f9b73ff70623d +# Source0-md5: 9ccdb0d19dc104b87179bd9fd10822e3 Patch0: %{name}-desktop.patch -Patch1: %{name}-1.3.0-as-needed.patch +Patch1: %{name}-as-needed.patch Patch2: %{name}-link.patch Patch3: %{name}-libjpeg.patch +Patch4: %{name}-export.patch URL: http://www.fltk.org/ %{?with_opengl:BuildRequires: OpenGL-GLU-devel} BuildRequires: autoconf >= 2.50 @@ -34,8 +35,6 @@ BuildRequires: xorg-util-makedepend Obsoletes: libfltk1.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreqdep libGL.so.1 libGLU.so.1 - # don't propagate strip-flags to fltk-config. %define filterout_ld (-Wl,)?-[sS] (-Wl,)?--strip.* @@ -155,6 +154,7 @@ Gry FLTK: Atak Klocków!, Warcaby, Sudoku. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # gold doesn't understand -l:path/to/library.so @@ -187,12 +187,15 @@ rm -rf $RPM_BUILD_ROOT # less generic games' names for f in blocks checkers sudoku ; do -mv -f $RPM_BUILD_ROOT%{_bindir}/{,fltk-}${f} -mv -f $RPM_BUILD_ROOT%{_mandir}/man6/{,fltk-}${f}.6 +%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,fltk-}${f} +%{__mv} $RPM_BUILD_ROOT%{_mandir}/man6/{,fltk-}${f}.6 done +# we package mans in groff format +%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/cat? + # add link to documentation for fluid help; remove /usr/share/doc/fltk contents - it is installed during make install -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name} +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name} ln -sf %{name}-devel-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name} %clean @@ -219,9 +222,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libfltk_forms.so %attr(755,root,root) %{_libdir}/libfltk_images.so %{_includedir}/FL -%exclude %{_includedir}/FL/Fl_Gl_Window.* +%exclude %{_includedir}/FL/Fl_Gl_Window.H %exclude %{_includedir}/FL/gl* -%{_iconsdir}/*/*/*/fluid.png +%{_iconsdir}/hicolor/*/apps/fluid.png %{_desktopdir}/fluid.desktop # move to some KDE package? #%{_datadir}/mimelnk/application/x-fluid.desktop @@ -243,7 +246,7 @@ rm -rf $RPM_BUILD_ROOT %files gl-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libfltk_gl.so -%{_includedir}/FL/Fl_Gl_Window.* +%{_includedir}/FL/Fl_Gl_Window.H %{_includedir}/FL/gl* %files gl-static -- 2.43.0