Hello community, here is the log from the commit of package fltk for openSUSE:Factory checked in at 2013-01-24 09:55:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fltk (Old) and /work/SRC/openSUSE:Factory/.fltk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fltk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/fltk/fltk.changes 2012-11-28 10:18:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fltk.new/fltk.changes 2013-01-24 09:55:07.000000000 +0100 @@ -1,0 +2,28 @@ +Thu Jan 10 16:16:08 UTC 2013 - [email protected] + +- updated to 1.3.2: + - Removed unnecessary drawing calls (STR #2898) + - Fixed regression in FLTK 1.3.1 for unbundled Mac OS FLTK applications that + did not appear in dock nor have a menu bar (STR #2890). + - Fl_Table::clear() now calls table->clear() for consistency. (STR #2889) + - Fixed Fl_Scroll widget that fails under Mac OS X 10.8 and retina display (STR #2887). + - Prevents scrollbars from drawing when widget is sized too small to be visible (STR #2886). + - Documented how to make a Mac OS X FLTK application launchable by dropping files on its icon. + - Fixed a Mac-specific issue appeared with OS 10.8 (Mountain Lion): long delay before + opening when the application is started by dragging a file on the application icon. + - Fixed use of PNG image from im-memory data (STR #2884). + - Added static Fl_RGB_Image::max_size(size_t) to limit the maximum memory size allowed to + RGB images (STR #2881). +- add fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch to avoid adding unneeded libraries + to the link command of dependent packages. Those libraries didn't even need to be installed. +- remove automake BuildRequire +- substitute %if crazyness for pkgconfig() style BuildRequires +- correct libfltk1 group +- get rid of the fltk package which only contained duplicated doc files, probably by a packaging accident +- add fltk-1.3.2-verbose_build.patch +- add fltk-1.3.2-underlinking-patch +- remove fltk-as-needed.patch (integrated into fltk-1.3.2-underlinking-patch) +- don't add -fno-strict-aliasing to CFLAGS. Upstream already does that +- don't set glflags and fltkflags for make. I don't see it doing anything useful + +------------------------------------------------------------------- Old: ---- fltk-1.3.1-source.tar.bz2 fltk-as-needed.patch New: ---- fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch fltk-1.3.2-source.tar.gz fltk-1.3.2-underlinking.patch fltk-1.3.2-verbose_build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fltk.spec ++++++ --- /var/tmp/diff_new_pack.E0JAXQ/_old 2013-01-24 09:55:08.000000000 +0100 +++ /var/tmp/diff_new_pack.E0JAXQ/_new 2013-01-24 09:55:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fltk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,82 +18,32 @@ Name: fltk # Migrating Code from FLTK 1.1 to 1.3: http://www.fltk.org/doc-1.3/migration_1_3.html -Version: 1.3.1 +Version: 1.3.2 Release: 0 Summary: Free C++ GUI Toolkit for the X Window System, OpenGL, and WIN32 License: LGPL-2.1+ Group: Development/Libraries/X11 Url: http://www.fltk.org/ -# some of files were updated from CinePaint CVS: -# http://cinepaint.cvs.sourceforge.net/cinepaint/cinepaint-project/fltk/ -Source: %{name}-%{version}-source.tar.bz2 +Source: http://ftp.easysw.com/pub/fltk/%{version}/fltk-%{version}-source.tar.gz Source2: baselibs.conf -Patch0: fltk-as-needed.patch +# PATCH-FIX-UPSTREAM fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch http://www.fltk.org/str.php?L2918 [email protected] -- Don't ask dependent libraries to link against Xft without need. Broke games/toycars. +Patch0: fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch +# PATCH-FIX-UPSTREAM fltk-1.3.2-underlinking.patch http://www.fltk.org/str.php?L2919 [email protected] -- Link against all needed libraries. +Patch1: fltk-1.3.2-underlinking.patch +# PATCH-FIX-OPENSUSE fltk-1.3.2-verbose_build.patch [email protected] -- Make the build verbose so the post build checks can verify the CFLAGS +Patch2: fltk-1.3.2-verbose_build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libfltk1 >= %{version} - -BuildRequires: automake BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -%if 0%{?rhel_version} && 0%{?rhel_version} < 501 -BuildRequires: xorg-x11-Mesa-libGL -BuildRequires: xorg-x11-Mesa-libGLU -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libs -%else -BuildRequires: libX11-devel -BuildRequires: libXext-devel -BuildRequires: libXinerama-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif -BuildRequires: libjpeg BuildRequires: libjpeg-devel -BuildRequires: libpng -BuildRequires: libpng-devel -%endif -%if 0%{?suse_version} -BuildRequires: Mesa-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: xorg-x11-devel -%endif -%if 0%{?mandriva_version} -%ifarch x86_64 -BuildRequires: lib64mesagl1-devel -BuildRequires: lib64mesaglu1-devel -BuildRequires: lib64x11_6-devel -BuildRequires: lib64xext6-devel -BuildRequires: lib64xinerama1-devel -%if 0%{?mandriva_version} < 201000 -BuildRequires: lib64jpeg62 -BuildRequires: lib64jpeg62-devel -%else -BuildRequires: lib64jpeg-devel -BuildRequires: lib64jpeg7 -%endif -BuildRequires: lib64png-devel -BuildRequires: lib64png3 -%else -BuildRequires: libmesagl1-devel -BuildRequires: libmesaglu1-devel -BuildRequires: libx11_6-devel -BuildRequires: libxext6-devel -BuildRequires: libxinerama1-devel -%if 0%{?mandriva_version} < 201000 -BuildRequires: libjpeg62 -BuildRequires: libjpeg62-devel -%else -BuildRequires: libjpeg-devel -BuildRequires: libjpeg7 -%endif -BuildRequires: libpng-devel -BuildRequires: libpng3 -%endif -%endif +BuildRequires: pkgconfig +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xinerama) %description The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ @@ -108,10 +58,6 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: libfltk1 = %{version} -%if 0%{?suse_version} -BuildRequires: Mesa-devel -BuildRequires: xorg-x11-devel -%endif %description devel The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ @@ -124,7 +70,7 @@ %package -n libfltk1 Summary: FLTK Library -Group: Development/Libraries/C and C++ +Group: System/Libraries %description -n libfltk1 The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ @@ -136,19 +82,16 @@ without 3D support. - %prep %setup -q -%patch0 -p1 +%patch0 +%patch1 +%patch2 %build -export CFLAGS="%optflags -fno-strict-aliasing" -export CXXFLAGS="%optflags -fno-strict-aliasing" %configure \ --enable-shared --enable-threads -make glflags="-L%{_libdir} -lGL" \ - fltkflags="-L%{_libdir} -lfltk" \ - %{?_smp_mflags} +make %{?_smp_mflags} cd documentation make html %{?_smp_mflags} @@ -156,7 +99,7 @@ make install libdir=${RPM_BUILD_ROOT}%{_libdir}/ \ includedir=${RPM_BUILD_ROOT}%{_includedir} \ bindir=${RPM_BUILD_ROOT}%{_bindir} \ - docdir=${RPM_BUILD_ROOT}/%{_docdir}/fltk \ + docdir=${RPM_BUILD_ROOT}/%{_docdir}/fltk-devel/html/ \ mandir=${RPM_BUILD_ROOT}%{_mandir} STRIP=true rm -r ${RPM_BUILD_ROOT}%{_mandir}/cat* rm ${RPM_BUILD_ROOT}%{_libdir}/libfltk*.a @@ -165,13 +108,9 @@ %postun -n libfltk1 -p /sbin/ldconfig -%files -%defattr(-,root,root) -%doc CHANGES COPYING README - %files devel %defattr(-,root,root) -%doc examples documentation/html makeinclude +%doc examples makeinclude %{_mandir}/man*/* %{_libdir}/*.so %{_includedir}/* @@ -179,6 +118,7 @@ %files -n libfltk1 %defattr(-,root,root) +%doc CHANGES COPYING README %{_libdir}/*.so.* %changelog ++++++ fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch ++++++ Index: fltk-config.in =================================================================== --- fltk-config.in.orig +++ fltk-config.in @@ -231,7 +231,7 @@ 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" ++++++ fltk-1.3.2-underlinking.patch ++++++ Index: src/Makefile =================================================================== --- src/Makefile.orig +++ src/Makefile @@ -231,7 +231,7 @@ $(LIBNAME): $(OBJECTS) libfltk.so.1.3: $(OBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(OBJECTS) + $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) $(RM) libfltk.so $(LN) libfltk.so.1.3 libfltk.so @@ -267,7 +267,7 @@ $(FLLIBNAME): $(FLOBJECTS) libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk + $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(RM) libfltk_forms.so $(LN) libfltk_forms.so.1.3 libfltk_forms.so @@ -303,7 +303,7 @@ $(GLLIBNAME): $(GLOBJECTS) libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk + $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS) $(RM) libfltk_gl.so $(LN) libfltk_gl.so.1.3 libfltk_gl.so @@ -339,7 +339,7 @@ $(IMGLIBNAME): $(IMGOBJECTS) libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) $(RM) libfltk_images.so $(LN) libfltk_images.so.1.3 libfltk_images.so Index: configure =================================================================== --- configure.orig +++ configure @@ -2682,7 +2682,7 @@ if test x$enable_shared = xyes; then 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) -Wl,--as-needed -Wl,--no-undefined \$(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 ++++++ fltk-1.3.2-verbose_build.patch ++++++ Index: makeinclude.in =================================================================== --- makeinclude.in.orig +++ makeinclude.in @@ -130,9 +130,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755 INSTALL_DESKTOP = @INSTALL_DESKTOP@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ -# Be quiet when building... -.SILENT: - # Build commands and filename extensions... .SUFFIXES: .0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
