Update the gold patch to fix glib-2.32 problems; -lm is always needed for libdocument, not just for the thumbnailer executable. Add missing libICE dependency.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 58 insertions, 15 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index c3d7e20541e5..a68fe0e8cf72 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.251 2012/10/17 05:20:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.252 2012/11/03 06:48:20 tetromino Exp $
+
+  03 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evince-2.32.0-r4.ebuild, files/evince-2.32.0-gold.patch:
+  Update the gold patch to fix glib-2.32 problems; -lm is always needed for
+  libdocument, not just for the thumbnailer executable. Add missing libICE
+  dependency.
 
   17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -evince-2.32.0-r3.ebuild, evince-2.32.0-r4.ebuild, -evince-3.2.1-r1.ebuild,
diff --git a/app-text/evince/evince-2.32.0-r4.ebuild b/app-text/evince/evince-2.32.0-r4.ebuild
index 89d91711fa90..86e4cd44eae0 100644
--- a/app-text/evince/evince-2.32.0-r4.ebuild
+++ b/app-text/evince/evince-2.32.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.14 2012/10/17 05:20:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.15 2012/11/03 06:48:20 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -25,6 +25,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.5:2
 	>=x11-libs/gtk+-2.21.5:2[introspection?]
 	>=x11-libs/libSM-1
+	x11-libs/libICE
 	|| (
 		>=x11-themes/gnome-icon-theme-2.17.1
 		>=x11-themes/hicolor-icon-theme-0.10 )
diff --git a/app-text/evince/files/evince-2.32.0-gold.patch b/app-text/evince/files/evince-2.32.0-gold.patch
index dc846dfa3227..0388e9eef64e 100644
--- a/app-text/evince/files/evince-2.32.0-gold.patch
+++ b/app-text/evince/files/evince-2.32.0-gold.patch
@@ -1,16 +1,52 @@
- thumbnailer/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+From 11b951614a6b6cf567f33b04872b9d663989d2fe Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 3 Nov 2012 02:25:09 -0400
+Subject: [PATCH] build: link libdocument against libm and gmodule, and
+ smclient against libICE
 
-diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
-index 171c00f..b060a97 100644
---- a/thumbnailer/Makefile.am
-+++ b/thumbnailer/Makefile.am
-@@ -26,7 +26,7 @@ endif
+Needed for building with gnu gold
+---
+ configure.ac            | 6 ++++--
+ libdocument/Makefile.am | 1 +
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4bf438d..b5d8e8b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -163,8 +163,10 @@ dnl Check dependencies
+ # SHELL_CFLAGS     for shell implementation.
+ # SHELL_LIBS
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
+ 
+-PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-2.0)
+ PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+ PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+ PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+@@ -221,7 +223,7 @@ if test "$with_smclient" != "no"; then
+   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+ 
+   case "$with_smclient" in
+-    xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;;
++    xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;;
+     *) SMCLIENT_PKGS="" ;;
+   esac
  
- evince_thumbnailer_LDADD = \
- 	$(top_builddir)/libdocument/libevdocument.la	\
--	$(FRONTEND_LIBS)
-+	$(FRONTEND_LIBS) -lm
+diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
+index facf17c..3944fb7 100644
+--- a/libdocument/Makefile.am
++++ b/libdocument/Makefile.am
+@@ -114,6 +114,7 @@ libevdocument_la_LDFLAGS = \
  
- schema_files = \
- 	evince-thumbnailer-dvi.schemas.in  \
+ libevdocument_la_LIBADD = \
+ 	$(LIBDOCUMENT_LIBS)	\
++	$(LIBM)			\
+ 	$(top_builddir)/cut-n-paste/synctex/libsynctex.la
+ 
+ 
+-- 
+1.7.12.4
+