Revision bump to include upstream patches reported by Arthur Taylor fixing random minimizing (bug #364311) and useless wakeups (bug #364313) problems.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 234 insertions, 1 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 64f9a4afa5e0..0b39961631d5 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.218 2011/04/16 13:49:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.219 2011/04/21 12:11:58 pacho Exp $
+
+*evince-2.32.0-r3 (21 Apr 2011)
+
+  21 Apr 2011; Pacho Ramos <pacho@gentoo.org> +evince-2.32.0-r3.ebuild,
+  +files/evince-2.32.0-stop-spinner.patch,
+  +files/evince-2.32.0-use-popup.patch:
+  Revision bump to include upstream patches reported by Arthur Taylor fixing
+  random minimizing (bug #364311) and useless wakeups (bug #364313) problems.
 
   16 Apr 2011; Pacho Ramos <pacho@gentoo.org> evince-2.32.0-r2.ebuild:
   gconf-2.m4 is needed for autoconf, bug #363781 by Jimmy C. Chau.
diff --git a/app-text/evince/evince-2.32.0-r3.ebuild b/app-text/evince/evince-2.32.0-r3.ebuild
new file mode 100644
index 000000000000..9c6b7dfed1dd
--- /dev/null
+++ b/app-text/evince/evince-2.32.0-r3.ebuild
@@ -0,0 +1,130 @@
+# 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-r3.ebuild,v 1.1 2011/04/21 12:11:58 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Simple document viewer for GNOME"
+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"
+
+IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+RDEPEND="
+	>=app-text/libspectre-0.2.0
+	>=dev-libs/glib-2.25.11:2
+	>=dev-libs/libxml2-2.5:2
+	>=x11-libs/gtk+-2.21.5:2[introspection?]
+	>=x11-libs/libSM-1
+	|| (
+		>=x11-themes/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	>=x11-libs/cairo-1.9.10
+	>=app-text/poppler-0.14[cairo]
+	djvu? ( >=app-text/djvu-3.5.17 )
+	dvi? (
+		virtual/tex-base
+		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
+	gnome? ( >=gnome-base/gconf-2:2[introspection?] )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6 )
+	nautilus? ( >=gnome-base/nautilus-2.10[introspection?] )
+	tiff? ( >=media-libs/tiff-3.6 )
+"
+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-scrollkeeper
+		--disable-static
+		--disable-tests
+		--enable-pdf
+		--enable-comics
+		--enable-impress
+		--enable-thumbnailer
+		--with-smclient=xsmp
+		--with-platform=gnome
+		--with-gtk=2.0
+		--enable-help
+		--disable-maintainer-mode
+		$(use_enable dbus)
+		$(use_enable djvu)
+		$(use_enable dvi)
+		$(use_with gnome gconf)
+		$(use_with gnome-keyring keyring)
+		$(use_enable introspection)
+		$(use_enable nautilus)
+		$(use_enable t1lib)
+		$(use_enable tiff)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Check for NULL in synctex_backward_search preventing segfault, upstream bug #630845
+	epatch "${FILESDIR}"/${P}-libdocument-segfault.patch
+
+	# Fix multiple security issues with dvi backend, bug #350681
+	epatch "${FILESDIR}"/${P}-dvi-CVEs.patch
+
+	# Fix problem with some pk fonts, upstream bug #639746
+	epatch "${FILESDIR}"/${P}-pk-fonts.patch
+
+	# Fix libview crash, upstream bug #630999
+	epatch "${FILESDIR}"/${P}-libview-crash.patch
+
+	# Fix another security issue in the dvi-backend
+	epatch "${FILESDIR}"/${P}-dvi-security.patch
+
+	# 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
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "intltoolize sed failed"
+
+	# Do not depend on gnome-icon-theme, bug #326855
+	sed 's/gnome-icon-theme//' -i configure.ac configure || die "sed failed"
+
+	# Fix .desktop file so menu item shows up
+	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+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-stop-spinner.patch b/app-text/evince/files/evince-2.32.0-stop-spinner.patch
new file mode 100644
index 000000000000..eb33019687c5
--- /dev/null
+++ b/app-text/evince/files/evince-2.32.0-stop-spinner.patch
@@ -0,0 +1,74 @@
+From 220956ee03fa37fb55079aff63675db26cd908f9 Mon Sep 17 00:00:00 2001
+From: Cristian KLEIN <cristiklein+gnome@gmail.com>
+Date: Thu, 16 Dec 2010 17:38:06 +0000
+Subject: libview: Stop the GtkSpinner when the loading window is hidden
+
+Fixes bug #637390.
+---
+diff --git a/libview/ev-loading-window.c b/libview/ev-loading-window.c
+index 4d5eaaf..434beac 100644
+--- a/libview/ev-loading-window.c
++++ b/libview/ev-loading-window.c
+@@ -33,6 +33,7 @@ struct _EvLoadingWindow {
+ 	GtkWindow  base_instance;
+ 
+ 	GtkWindow *parent;
++	GtkWidget *spinner;
+ 
+ 	gint       x;
+ 	gint       y;
+@@ -69,7 +70,6 @@ ev_loading_window_init (EvLoadingWindow *window)
+ 	GtkWindow   *gtk_window = GTK_WINDOW (window);
+ 	GtkWidget   *widget = GTK_WIDGET (window);
+ 	GtkWidget   *hbox;
+-	GtkWidget   *spinner;
+ 	GtkWidget   *label;
+ 	GtkStyle    *style;
+ 	GdkColor    fg, bg;
+@@ -79,10 +79,9 @@ ev_loading_window_init (EvLoadingWindow *window)
+ 
+ 	hbox = gtk_hbox_new (FALSE, 12);
+ 
+-	spinner = gtk_spinner_new ();
+-	gtk_spinner_start (GTK_SPINNER (spinner));
+-	gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
+-	gtk_widget_show (spinner);
++	window->spinner = gtk_spinner_new ();
++	gtk_box_pack_start (GTK_BOX (hbox), window->spinner, FALSE, FALSE, 0);
++	gtk_widget_show (window->spinner);
+ 
+ 	label = gtk_label_new (loading_text);
+ 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+@@ -222,10 +221,22 @@ ev_loading_window_hide (GtkWidget *widget)
+ 
+ 	window->x = window->y = 0;
+ 
++	gtk_spinner_stop (GTK_SPINNER (window->spinner));
++
+ 	GTK_WIDGET_CLASS (ev_loading_window_parent_class)->hide (widget);
+ }
+ 
+ static void
++ev_loading_window_show (GtkWidget *widget)
++{
++	EvLoadingWindow *window = EV_LOADING_WINDOW (widget);
++
++	gtk_spinner_start (GTK_SPINNER (window->spinner));
++
++	GTK_WIDGET_CLASS (ev_loading_window_parent_class)->show (widget);
++}
++
++static void
+ ev_loading_window_class_init (EvLoadingWindowClass *klass)
+ {
+ 	GObjectClass   *g_object_class = G_OBJECT_CLASS (klass);
+@@ -235,6 +246,7 @@ ev_loading_window_class_init (EvLoadingWindowClass *klass)
+ 	g_object_class->set_property = ev_loading_window_set_property;
+ 
+ 	gtk_widget_class->size_allocate = ev_loading_window_size_allocate;
++	gtk_widget_class->show = ev_loading_window_show;
+ 	gtk_widget_class->hide = ev_loading_window_hide;
+ 
+ 	g_object_class_install_property (g_object_class,
+--
+cgit v0.9
diff --git a/app-text/evince/files/evince-2.32.0-use-popup.patch b/app-text/evince/files/evince-2.32.0-use-popup.patch
new file mode 100644
index 000000000000..8bb52c80315d
--- /dev/null
+++ b/app-text/evince/files/evince-2.32.0-use-popup.patch
@@ -0,0 +1,21 @@
+From 464ec9077f4bc709e50c83372c9d4e1703533efa Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun, 20 Feb 2011 10:29:19 +0000
+Subject: libview: Use a popup window instead of a toplevel for loading window
+
+Fixes focus stealing when scrolling. See bug #633475.
+---
+diff --git a/libview/ev-loading-window.c b/libview/ev-loading-window.c
+index b413431..94576ee 100644
+--- a/libview/ev-loading-window.c
++++ b/libview/ev-loading-window.c
+@@ -266,6 +266,7 @@ ev_loading_window_new (GtkWindow *parent)
+ 	g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+ 
+ 	window = g_object_new (EV_TYPE_LOADING_WINDOW,
++                               "type", GTK_WINDOW_POPUP,
+ 			       "parent", parent,
+ 			       NULL);
+ 	return window;
+--
+cgit v0.9