Add patches to fix libgxps-0.2 and texlive-2011 support.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 4244c28a0f2e856f6605569e6493c8e7f62955cb..02cc21e84960e86af01db382045d4af24d2d82f7 100644 (file)
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.232 2011/11/16 10:56:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.233 2011/11/23 20:35:27 tetromino Exp $
+
+*evince-3.2.1-r1 (23 Nov 2011)
+
+  23 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +evince-3.2.1-r1.ebuild, +files/evince-3.2.1-libgxps-0.2.patch:
+  Add patches to fix libgxps-0.2 and texlive-2011 support.
 
   16 Nov 2011; Justin Lecher <jlec@gentoo.org> evince-2.32.0-r2.ebuild,
   evince-2.32.0-r3.ebuild, evince-3.2.1.ebuild:

diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 18475853c572f553db8fa9915a10be710f7fbc38..a6143eee1badc4c5823bc4f931a265ab358c61fe 100644 (file)
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
 AUX evince-2.32.0-dvi-CVEs.patch 3386 RMD160 af5b7e0f74566716b86974a1e2efc34e1b925be5 SHA1 3c4084017e790ed5f0a1a422c1c742e97f89918f SHA256 49d1ed8adc734a005d4d8fdc1912bb115d97f734071d64bcae0aae60f2b5626a
@@ -11,18 +11,21 @@ AUX evince-2.32.0-pk-fonts.patch 1005 RMD160 bf3db4170d868ed72887e9ab83e031d4184
 AUX evince-2.32.0-stop-spinner.patch 2370 RMD160 9136c30d8a8ab902da48aeb328320ba3a5773c85 SHA1 7414682d8c41c8a62ace0a493ae632757c4fc87f SHA256 140395d3c667d9af422054ed02d2b971c5668e52cafac86b6496ecd47f33ac97
 AUX evince-2.32.0-update-poppler.patch 1890 RMD160 8032f418acd4411e0a547a085d06bad8e757d081 SHA1 2e6acfd476e7bd82883ae34dacbb218e3ca5e76d SHA256 2990c789c8cfd50e46f4dfa7a2406499b3ee26f4db9840c8b9a6e1dee40f61f4
 AUX evince-2.32.0-use-popup.patch 766 RMD160 9260e11fae9fa98cc739602a308793199bc75ce7 SHA1 7711c4b6a0d64b31ca0935da4c94a633d6ae1cab SHA256 c53276beb4f975a9ed47fe35dd2756458d9e5e334234aeac2ff4d47ad790d9ea
+AUX evince-3.2.1-libgxps-0.2.patch 1317 RMD160 11ed8ec1d8beb1267c7e04154a5c226731c0722b SHA1 2b2900c65004db3a1349100acd1831a345b084b7 SHA256 6e98bf5625fd471913e7b461838a63d941ba04e73fe2c2e16b913c6730b8ddf0
 AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
 DIST evince-2.32.0.tar.bz2 2295272 RMD160 a2d52685ac119b70cf40f320de457b3dfbac2587 SHA1 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7
+DIST evince-3.2.1-synctex-1.17.patch.bz2 11938 RMD160 800c8f7254e9e225f74da7ce07e8167d28815bb5 SHA1 1c012cc97bad52876f34ef7571a9f77bee303b66 SHA256 929cf0300a4c67d447eeb417f8bfbaafa9988f036c23869728cd76c529243aa5
 DIST evince-3.2.1.tar.xz 3782932 RMD160 74a81f8970542c46717ea47243973cb81dbc4ee8 SHA1 993610957907df22677dab6f46648edf4b998c8f SHA256 9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35
 EBUILD evince-2.32.0-r2.ebuild 3829 RMD160 8adb2145684d7d2309481c3bf50e3cfaf2234b88 SHA1 a659fceed843fb65e3c84d9dd763eacb6273eb31 SHA256 44ebc76ca4f11f58beeecb16bb3b9886fc14aaf776c3144912a4fa20c529eb33
 EBUILD evince-2.32.0-r3.ebuild 4154 RMD160 46ae6aa4e6a43869f3e551c1bfc5929613ddbe1d SHA1 ba2072ddfc5bccd8b61b39b1ade13bcda22d2ee5 SHA256 daf8392de6a7c58c8bdd1e01b25877872ed475cf6bc9b94fed47c9dfa0719f79
+EBUILD evince-3.2.1-r1.ebuild 3274 RMD160 745b414cb12f717a1692cfe0121bf34225f9cea9 SHA1 9ac3171a5cce0680a04f55eba7ff431d79b15351 SHA256 292059ca6be121659c48e2a3bc2443c4c2e54dc6926fbba95b364f677967cd1b
 EBUILD evince-3.2.1.ebuild 2924 RMD160 78de20af034275057d6c3d46ceb38e09afd4680f SHA1 2831f1d8ac760c59cc632b97e511610f454c3b8a SHA256 07928a2d7e019296ab74b069f4713c192054957faa9559bfa88fe0a738120d15
-MISC ChangeLog 34153 RMD160 86532f0a6faeef9ad0e8c845aad0b6e405cdc917 SHA1 03f9d8caf719c9b74855965a3b27cf98b79b6b99 SHA256 9f1849b487a1ae59a0aa72c721f9e5b25ac304eb1ee203e61b018c0a9590c0df
+MISC ChangeLog 34375 RMD160 f465955adc267c221d537dea738ec14b1b7f8fa3 SHA1 7076c44e91291da2551654586ac674a9f015d072 SHA256 debe26f8fb6e1e533a28b3c80f64f473afa4fe8122c445d6efc3845edca818e0
 MISC metadata.xml 788 RMD160 ddf6d5febf8fc7ac34fb1635150d00a776868307 SHA1 733f3038b004e15b00ff9f6d5735bc0e48da9112 SHA256 0a7faaea7094f6abb9429988ccea9ba62daa7c251b894da77d3c38dc3d9b0f6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7DltQACgkQgAnW8HDreRYr6gCgnGVpB0OqLeG91j5KxYgRxxJM
-Q0kAn0Uhd3qdZWAKD2Jcym0HKrx47CUC
-=4f5m
+iF4EAREIAAYFAk7NWRUACgkQdjK8w9WeBnA97QEAhnlFwVos58x17JRULjQtCUFn
+/WkqiaCBulW+d7h723oA/1BkXjDyrtcBNFkxEJopzHBR14FjCB0vhSnWXgVkuekf
+=BDeo
 -----END PGP SIGNATURE-----

diff --git a/app-text/evince/evince-3.2.1-r1.ebuild b/app-text/evince/evince-3.2.1-r1.ebuild
new file mode 100644 (file)
index 0000000..2ab712e
--- /dev/null
+++ b/app-text/evince/evince-3.2.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.1 2011/11/23 20:35:27 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="http://www.gnome.org/projects/evince/"
+
+SRC_URI="${SRC_URI}
+       http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-synctex-1.17.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug djvu doc dvi gnome-keyring +introspection nautilus t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+# atk used in libview
+# gdk-pixbuf used all over the place
+# libX11 used for totem-screensaver
+RDEPEND="
+       >=app-text/libspectre-0.2.0
+       dev-libs/atk
+       >=dev-libs/glib-2.25.11:2
+       >=dev-libs/libxml2-2.5:2
+       sys-libs/zlib
+       x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-3.0.2:3[introspection?]
+       x11-libs/libX11
+       >=x11-libs/libSM-1
+       x11-libs/libICE
+       gnome-base/gsettings-desktop-schemas
+       || (
+               >=x11-themes/gnome-icon-theme-2.17.1
+               >=x11-themes/hicolor-icon-theme-0.10 )
+       >=x11-libs/cairo-1.10.0
+       >=app-text/poppler-0.16[cairo]
+       djvu? ( >=app-text/djvu-3.5.17 )
+       dvi? (
+               virtual/tex-base
+               dev-libs/kpathsea
+               t1lib? ( >=media-libs/t1lib-5.0.0 ) )
+       gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
+       introspection? ( >=dev-libs/gobject-introspection-0.6 )
+       nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+       tiff? ( >=media-libs/tiff-3.6:0 )
+       xps? ( >=app-text/libgxps-0.2.0 )
+"
+DEPEND="${RDEPEND}
+       app-text/scrollkeeper
+       >=app-text/gnome-doc-utils-0.3.2
+       ~app-text/docbook-xml-dtd-4.1.2
+       >=dev-util/pkgconfig-0.9
+       sys-devel/gettext
+       >=dev-util/intltool-0.35
+       >=dev-util/gtk-doc-am-1.13
+       doc? ( >=dev-util/gtk-doc-1.13 )"
+
+ELTCONF="--portage"
+
+# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
+# Releases: http://people.redhat.com/zcerza/dogtail/releases/
+RESTRICT="test"
+
+pkg_setup() {
+       # Passing --disable-help would drop offline help, that would be inconsistent
+       # with helps of the most of Gnome apps that doesn't require network for that.
+       G2CONF="${G2CONF}
+               --disable-schemas-compile
+               --disable-scrollkeeper
+               --disable-static
+               --disable-tests
+               --enable-pdf
+               --enable-comics
+               --enable-thumbnailer
+               --with-smclient=xsmp
+               --with-platform=gnome
+               --enable-help
+               $(use_enable dbus)
+               $(use_enable djvu)
+               $(use_enable dvi)
+               $(use_with gnome-keyring keyring)
+               $(use_enable introspection)
+               $(use_enable nautilus)
+               $(use_enable t1lib)
+               $(use_enable tiff)
+               $(use_enable xps)"
+       DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+       # Do not depend on gnome-icon-theme, bug #326855
+       sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed"
+
+       # Fix .desktop file so menu item shows up
+       epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+
+       # Upstream patch to fix texlive-2011 compatibility, will be in next release
+       epatch "../${P}-synctex-1.17.patch"
+
+       # Patch from upstream git master branch to fix libgxps-0.2 compatibility
+       epatch "${FILESDIR}/${PN}-3.2.1-libgxps-0.2.patch"
+
+       gnome2_src_prepare
+}

diff --git a/app-text/evince/files/evince-3.2.1-libgxps-0.2.patch b/app-text/evince/files/evince-3.2.1-libgxps-0.2.patch
new file mode 100644 (file)
index 0000000..5bbded6
--- /dev/null
+++ b/app-text/evince/files/evince-3.2.1-libgxps-0.2.patch
@@ -0,0 +1,45 @@
+From 740263e84f812e069c25d32e6fbf40bec4c061e2 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun, 20 Nov 2011 16:18:30 +0100
+Subject: [PATCH] xps: Bump libgxps requirements to 0.2.0
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: remove update to configure.ac]
+---
+ backend/xps/xps-document.c |   14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/backend/xps/xps-document.c b/backend/xps/xps-document.c
+index 6e34f07..cbba96b 100644
+--- a/backend/xps/xps-document.c
++++ b/backend/xps/xps-document.c
+@@ -156,17 +156,7 @@ xps_document_get_page_size (EvDocument *document,
+                           double     *width,
+                           double     *height)
+ {
+-      GXPSPage *xps_page;
+-      guint     w, h;
+-
+-      xps_page = GXPS_PAGE (page->backend_page);
+-
+-      gxps_page_get_size (xps_page, &w, &h);
+-
+-      if (width)
+-              *width = (gdouble)w;
+-      if (height)
+-              *height = (gdouble)h;
++      gxps_page_get_size (GXPS_PAGE (page->backend_page), width, height);
+ }
+ 
+ static EvDocumentInfo *
+@@ -210,7 +200,7 @@ xps_document_render (EvDocument      *document,
+                    EvRenderContext *rc)
+ {
+       GXPSPage        *xps_page;
+-      guint            page_width, page_height;
++      gdouble          page_width, page_height;
+       guint            width, height;
+       cairo_surface_t *surface;
+       cairo_t         *cr;
+-- 
+1.7.8.rc3
+