| 1 |
tetromino 12/11/03 06:48:20 |
| 2 |
|
| 3 |
Modified: evince-2.32.0-gold.patch |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-text/evince/files/evince-2.32.0-gold.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/files/evince-2.32.0-gold.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/files/evince-2.32.0-gold.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/files/evince-2.32.0-gold.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: evince-2.32.0-gold.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/files/evince-2.32.0-gold.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- evince-2.32.0-gold.patch 17 Oct 2011 18:20:48 -0000 1.1 |
| 23 |
+++ evince-2.32.0-gold.patch 3 Nov 2012 06:48:20 -0000 1.2 |
| 24 |
@@ -1,16 +1,52 @@ |
| 25 |
- thumbnailer/Makefile.am | 2 +- |
| 26 |
- 1 files changed, 1 insertions(+), 1 deletions(-) |
| 27 |
+From 11b951614a6b6cf567f33b04872b9d663989d2fe Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Alexandre Rostovtsev <tetromino@g.o> |
| 29 |
+Date: Sat, 3 Nov 2012 02:25:09 -0400 |
| 30 |
+Subject: [PATCH] build: link libdocument against libm and gmodule, and |
| 31 |
+ smclient against libICE |
| 32 |
|
| 33 |
-diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am |
| 34 |
-index 171c00f..b060a97 100644 |
| 35 |
---- a/thumbnailer/Makefile.am |
| 36 |
-+++ b/thumbnailer/Makefile.am |
| 37 |
-@@ -26,7 +26,7 @@ endif |
| 38 |
- |
| 39 |
- evince_thumbnailer_LDADD = \ |
| 40 |
- $(top_builddir)/libdocument/libevdocument.la \ |
| 41 |
-- $(FRONTEND_LIBS) |
| 42 |
-+ $(FRONTEND_LIBS) -lm |
| 43 |
+Needed for building with gnu gold |
| 44 |
+--- |
| 45 |
+ configure.ac | 6 ++++-- |
| 46 |
+ libdocument/Makefile.am | 1 + |
| 47 |
+ 2 files changed, 5 insertions(+), 2 deletions(-) |
| 48 |
+ |
| 49 |
+diff --git a/configure.ac b/configure.ac |
| 50 |
+index 4bf438d..b5d8e8b 100644 |
| 51 |
+--- a/configure.ac |
| 52 |
++++ b/configure.ac |
| 53 |
+@@ -163,8 +163,10 @@ dnl Check dependencies |
| 54 |
+ # SHELL_CFLAGS for shell implementation. |
| 55 |
+ # SHELL_LIBS |
| 56 |
+ |
| 57 |
++AC_CHECK_LIBM |
| 58 |
++AC_SUBST(LIBM) |
| 59 |
+ |
| 60 |
+-PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED) |
| 61 |
++PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-2.0) |
| 62 |
+ PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) |
| 63 |
+ PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) |
| 64 |
+ PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) |
| 65 |
+@@ -221,7 +223,7 @@ if test "$with_smclient" != "no"; then |
| 66 |
+ AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled]) |
| 67 |
+ |
| 68 |
+ case "$with_smclient" in |
| 69 |
+- xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;; |
| 70 |
++ xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;; |
| 71 |
+ *) SMCLIENT_PKGS="" ;; |
| 72 |
+ esac |
| 73 |
|
| 74 |
- schema_files = \ |
| 75 |
- evince-thumbnailer-dvi.schemas.in \ |
| 76 |
+diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am |
| 77 |
+index facf17c..3944fb7 100644 |
| 78 |
+--- a/libdocument/Makefile.am |
| 79 |
++++ b/libdocument/Makefile.am |
| 80 |
+@@ -114,6 +114,7 @@ libevdocument_la_LDFLAGS = \ |
| 81 |
+ |
| 82 |
+ libevdocument_la_LIBADD = \ |
| 83 |
+ $(LIBDOCUMENT_LIBS) \ |
| 84 |
++ $(LIBM) \ |
| 85 |
+ $(top_builddir)/cut-n-paste/synctex/libsynctex.la |
| 86 |
+ |
| 87 |
+ |
| 88 |
+-- |
| 89 |
+1.7.12.4 |
| 90 |
+ |
Archives