Fix menu categories, bug #393585 by Sergey S. Starikoff; apply another patch from 2.32 branch to fix another crash. Remove old.

(Portage version: 2.1.10.40/cvs/Linux x86_64)

4 files changed, 74 insertions, 10 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 1583549c311b..493ee8b86067 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,14 @@
 # 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.235 2011/12/04 04:34:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.236 2011/12/17 11:07:21 pacho Exp $
+
+*evince-2.32.0-r4 (17 Dec 2011)
+
+  17 Dec 2011; Pacho Ramos <pacho@gentoo.org> +evince-2.32.0-r4.ebuild,
+  +files/evince-2.32.0-create_thumbnail_frame-null.patch,
+  +files/evince-2.32.0-desktop-categories.patch, -evince-2.32.0-r2.ebuild:
+  Fix menu categories, bug #393585 by Sergey S. Starikoff; apply another patch
+  from 2.32 branch to fix another crash. Remove old.
 
   04 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org> evince-3.2.1.ebuild,
   evince-3.2.1-r1.ebuild:
diff --git a/app-text/evince/evince-2.32.0-r2.ebuild b/app-text/evince/evince-2.32.0-r4.ebuild
index 1d96162b731d..e0b8f755cd65 100644
--- a/app-text/evince/evince-2.32.0-r2.ebuild
+++ b/app-text/evince/evince-2.32.0-r4.ebuild
@@ -1,9 +1,11 @@
 # 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-2.32.0-r2.ebuild,v 1.9 2011/11/16 10:56:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.1 2011/12/17 11:07:21 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit eutils gnome2 autotools
 
@@ -12,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/evince/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 
 IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff"
 
@@ -70,7 +72,6 @@ pkg_setup() {
 		--with-platform=gnome
 		--with-gtk=2.0
 		--enable-help
-		--disable-maintainer-mode
 		$(use_enable dbus)
 		$(use_enable djvu)
 		$(use_enable dvi)
@@ -102,6 +103,18 @@ src_prepare() {
 	# Update poppler api
 	epatch "${FILESDIR}"/${P}-update-poppler.patch
 
+	# Stop the GtkSpinner when the loading window is hidden, upstream bug #637390
+	epatch "${FILESDIR}"/${P}-stop-spinner.patch
+
+	# Use a popup window instead of a toplevel for loading window, upstream bug #633475
+	epatch "${FILESDIR}"/${P}-use-popup.patch
+
+	# document: create_thumbnail_frame should return NULL when  
+	epatch "${FILESDIR}"/${P}-create_thumbnail_frame-null.patch
+
+	# Fix .desktop categories, upstream bug #666346
+	epatch "${FILESDIR}"/${P}-desktop-categories.patch
+
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
 		|| die "intltoolize sed failed"
@@ -117,12 +130,10 @@ src_prepare() {
 		cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!"
 	fi
 
+	# Fix underlinking with gold
+	epatch "${FILESDIR}"/${P}-gold.patch
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 	gnome2_src_prepare
 }
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of lafiles failed"
-}
diff --git a/app-text/evince/files/evince-2.32.0-create_thumbnail_frame-null.patch b/app-text/evince/files/evince-2.32.0-create_thumbnail_frame-null.patch
new file mode 100644
index 000000000000..19eaf1c91a2a
--- /dev/null
+++ b/app-text/evince/files/evince-2.32.0-create_thumbnail_frame-null.patch
@@ -0,0 +1,25 @@
+From 0fd1f66767ab3b71bef571bf734ce0038d696f4f Mon Sep 17 00:00:00 2001
+From: José Aliste <jaliste@src.gnome.org>
+Date: Fri, 26 Nov 2010 14:56:45 +0000
+Subject: document: create_thumbnail_frame should return NULL when
+
+source_pixbuf is NULL and width and height are not positive.
+
+Fixes bug #594408
+(cherry picked from commit 3d8180a605e8c98172e9e0e739e22b7f50ed7bad)
+---
+diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
+index d597127..6099b7f 100644
+--- a/libdocument/ev-document-misc.c
++++ b/libdocument/ev-document-misc.c
+@@ -56,7 +56,7 @@ create_thumbnail_frame (int        width,
+ 	}
+ 
+ 	/* make sure no one is passing us garbage */
+-	g_assert (width_r >= 0 && height_r >= 0);
++	g_return_val_if_fail (width_r >= 0 && height_r >= 0, NULL);
+ 
+ 	retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ 				 TRUE, 8,
+--
+cgit v0.9.0.2
diff --git a/app-text/evince/files/evince-2.32.0-desktop-categories.patch b/app-text/evince/files/evince-2.32.0-desktop-categories.patch
new file mode 100644
index 000000000000..eaceaed345fc
--- /dev/null
+++ b/app-text/evince/files/evince-2.32.0-desktop-categories.patch
@@ -0,0 +1,20 @@
+From ed7cda334dddc08b4b10a4c1c49df3f6c0a1bc41 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat, 17 Dec 2011 10:28:19 +0000
+Subject: evince.desktop: Add Office category
+
+Fixes bug #666346.
+---
+diff --git a/data/evince.desktop.in.in b/data/evince.desktop.in.in
+index e3b0160..7106d97 100644
+--- a/data/evince.desktop.in.in
++++ b/data/evince.desktop.in.in
+@@ -13,5 +13,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=evince
+ X-GNOME-Bugzilla-Component=BugBuddyBugs
+ X-GNOME-Bugzilla-Version=@VERSION@
+-Categories=GNOME;GTK;Graphics;VectorGraphics;Viewer;
++Categories=GNOME;GTK;Office;Viewer;Graphics;VectorGraphics;
+ MimeType=@EVINCE_MIME_TYPES@
+--
+cgit v0.9.0.2