r37013 - in /packages/cimg/trunk/debian: changelog patches/20_fix-missing-libX11-binutils-gold.patch patches/series

[tille at users.alioth.debian.org]

Author: tille
Date: Sat Nov 13 15:49:20 2010
New Revision: 37013

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37013
Log:
Applied patch to fix binutils-gold issue; new upstream version

Added:
    packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch
Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/patches/series

Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=37013&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog (original)
+++ packages/cimg/trunk/debian/changelog Sat Nov 13 15:49:20 2010
@@ -1,3 +1,14 @@
+cimg (1.4.5-1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * debian/patches/20_fix-missing-libX11-binutils-gold.patch
+    fix FTBFS issue with binutils-gold because of missing libX11 when
+    linking the examples version graph (thanks for the patch to
+    Fabrice Coutadeur <fabricesp at ubuntu.com>)
+    Closes: #603299
+
+ -- Andreas Tille <tille at debian.org>  Sat, 13 Nov 2010 15:33:17 +0100
+
 cimg (1.4.4-1) unstable; urgency=low
 
   * New upstream version

Added: packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch?rev=37013&op=file
==============================================================================
--- packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch (added)
+++ packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch Sat Nov 13 15:49:20 2010
@@ -1,0 +1,15 @@
+Description: Fix a FTBFS with binutils-gold when building gmic_gimp because of
+ missing XGetWindowAttributes symbol, found in libX11. Adding thus -lX11 to link
+ options of gmic_gimp.
+Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
+--- cimg-1.4.4.orig/examples/Makefile
++++ cimg-1.4.4/examples/Makefile
+@@ -288,7 +288,7 @@ gmic_gimp.o: gmic.cpp gmic_def.h
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dcimg_build -Dgmic_gimp -Dgmic_minimal $(CIMG_OPT_CFLAGS) $(CIMG_FFTW3_CFLAGS) $(CIMG_PNG_CFLAGS)
+ 
+ gmic_gimp: gmic_gimp.o gmic_gimp.cpp
+-	$(CC) -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dcimg_build `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(CIMG_GIMP_CFLAGS)
++	$(CC) -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dcimg_build `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(CIMG_GIMP_CFLAGS) -lX11
+ 
+ # Specific targets for 'gmic'.
+ gmic_def: gmic_def.gmic

Modified: packages/cimg/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/series?rev=37013&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/series (original)
+++ packages/cimg/trunk/debian/patches/series Sat Nov 13 15:49:20 2010
@@ -1,1 +1,2 @@
 10_examples.patch
+20_fix-missing-libX11-binutils-gold.patch