r29512 - in /desktop/experimental/evince/debian: changelog patches/02-link-missing-zlib-library.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Aug 25 14:44:52 2011
New Revision: 29512

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29512
Log:
debian/patches/02-link-missing-zlib-library.patch: Fix build failure with
binutils-gold (missing -lz). Closes: #638689

Added:
    desktop/experimental/evince/debian/patches/02-link-missing-zlib-library.patch
Modified:
    desktop/experimental/evince/debian/changelog
    desktop/experimental/evince/debian/patches/series

Modified: desktop/experimental/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/changelog?rev=29512&op=diff
==============================================================================
--- desktop/experimental/evince/debian/changelog [utf-8] (original)
+++ desktop/experimental/evince/debian/changelog [utf-8] Thu Aug 25 14:44:52 2011
@@ -7,6 +7,8 @@
   [ Michael Biebl ]
   * Rely on cdbs to call dh_girepository. Bump Build-Depends accordingly.
   * Bump debhelper compatibility level to 8.
+  * debian/patches/02-link-missing-zlib-library.patch: Fix build failure with
+    binutils-gold (missing -lz). Closes: #638689
 
  -- Michael Biebl <biebl at debian.org>  Tue, 23 Aug 2011 10:12:44 +0200
 

Added: desktop/experimental/evince/debian/patches/02-link-missing-zlib-library.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/patches/02-link-missing-zlib-library.patch?rev=29512&op=file
==============================================================================
--- desktop/experimental/evince/debian/patches/02-link-missing-zlib-library.patch (added)
+++ desktop/experimental/evince/debian/patches/02-link-missing-zlib-library.patch [utf-8] Thu Aug 25 14:44:52 2011
@@ -1,0 +1,32 @@
+Description: Fix build failure with binutils gold (missing -lz)
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638689
+Author: Michael Biebl <biebl at debian.org>
+diff --git a/configure.ac b/configure.ac
+index c7083e4..cf51e43 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,6 +148,7 @@ PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIR
+ PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gail-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+ PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
+ PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(ZLIB, zlib)
+ 
+ SHELL_PLATFORM_PKGS=
+ case "$with_platform" in
+diff --git a/cut-n-paste/synctex/Makefile.am b/cut-n-paste/synctex/Makefile.am
+index 881ef4a..69365d7 100644
+--- a/cut-n-paste/synctex/Makefile.am
++++ b/cut-n-paste/synctex/Makefile.am
+@@ -7,8 +7,12 @@ libsynctex_la_SOURCES = 	\
+ 	synctex_parser_utils.c
+ 
+ libsynctex_la_CFLAGS =	\
++	$(ZLIB_CFLAGS)		\
+ 	$(SHELL_CORE_CFLAGS)	\
+ 	$(WARNING_CFLAGS)	\
+ 	$(DISABLE_DEPRECATED)
+ 
++libsynctex_la_LIBADD =	\
++	$(ZLIB_LIBS)
++
+ -include $(top_srcdir)/git.mk

Modified: desktop/experimental/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/patches/series?rev=29512&op=diff
==============================================================================
--- desktop/experimental/evince/debian/patches/series [utf-8] (original)
+++ desktop/experimental/evince/debian/patches/series [utf-8] Thu Aug 25 14:44:52 2011
@@ -1,2 +1,3 @@
 00_gir-libdocument-library-path.patch
 01_configure-gdk-targets.patch
+02-link-missing-zlib-library.patch