[gentoo-commits] proj/gnome:gnome-next commit in: app-text/evince/files/, app-text/evince/

[Alexandre Restovtsev]

commit:     542f256f634329ea407fee610563a3cb85b24e3b
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 08:08:59 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 08:08:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=542f256f

app-text/evince: 3.1.2 → 3.1.90

Version bump with a number of bugfixes. Add missing kpathsea, atk,
libX11, gdk-pixbuf dependencies. Patches were applied upstream.

---
 .../{evince-3.1.2.ebuild => evince-3.1.90.ebuild}  |   22 ++---
 app-text/evince/evince-9999.ebuild                 |    7 ++
 ...evince-3.1.2-fix-evinceview-introspection.patch |   21 -----
 .../evince/files/evince-3.1.2-gdk-targets.patch    |   21 -----
 .../evince-3.1.2-limit-thumbnailing-time.patch     |   93 --------------------
 5 files changed, 15 insertions(+), 149 deletions(-)

diff --git a/app-text/evince/evince-3.1.2.ebuild b/app-text/evince/evince-3.1.90.ebuild
similarity index 84%
rename from app-text/evince/evince-3.1.2.ebuild
rename to app-text/evince/evince-3.1.90.ebuild
index 6326179..8f0c09d 100644
--- a/app-text/evince/evince-3.1.2.ebuild
+++ b/app-text/evince/evince-3.1.90.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -25,11 +25,17 @@ fi
 
 # 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
+	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
@@ -41,6 +47,7 @@ RDEPEND="
 	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 )
@@ -100,18 +107,5 @@ src_prepare() {
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 
-	# Various patches from upstream git, will be in next release
-	# Fix building of EvinceView-3.0.gir, needs eautoreconf
-	epatch "${FILESDIR}/${P}-fix-evinceview-introspection.patch"
-	# Adapt to changes in gdk-3.0.pc, needs eautoreconf
-	epatch "${FILESDIR}/${P}-gdk-targets.patch"
-	# Don't hang nautilus when a document takes too long to thumbnail
-	epatch "${FILESDIR}/${P}-limit-thumbnailing-time.patch"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
-
 	gnome2_src_prepare
 }

diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild
index e712132..8f0c09d 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -25,11 +25,17 @@ fi
 
 # 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
+	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
@@ -41,6 +47,7 @@ RDEPEND="
 	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 )

diff --git a/app-text/evince/files/evince-3.1.2-fix-evinceview-introspection.patch b/app-text/evince/files/evince-3.1.2-fix-evinceview-introspection.patch
deleted file mode 100644
index b228e01..0000000
--- a/app-text/evince/files/evince-3.1.2-fix-evinceview-introspection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1915baa92e72242450b6042603ad0e20de072c17 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dominique-gnomezilla@×××××××××××.net>
-Date: Sun, 19 Jun 2011 14:46:15 +0000
-Subject: libview: fix build with --enable-introspection
-
-Fixes bug #643382.
----
-diff --git a/libview/Makefile.am b/libview/Makefile.am
-index 7766c4b..2e8671e 100644
---- a/libview/Makefile.am
-+++ b/libview/Makefile.am
-@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte
- 	--output $@ \
- 	--pkg evince-document-$(EV_API_VERSION) \
- 	--pkg evince-view-$(EV_API_VERSION) \
-+	-L$(top_builddir)/libdocument/ \
- 	-I$(top_srcdir) \
- 	-I$(top_builddir) \
- 	-DEVINCE_COMPILATION \
---
-cgit v0.9.0.2

diff --git a/app-text/evince/files/evince-3.1.2-gdk-targets.patch b/app-text/evince/files/evince-3.1.2-gdk-targets.patch
deleted file mode 100644
index f787f36..0000000
--- a/app-text/evince/files/evince-3.1.2-gdk-targets.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 908348d355ba22ea364318f32dc033a8c9761f04 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@××××××.org>
-Date: Thu, 30 Jun 2011 13:23:49 +0000
-Subject: configure: Update smclient check for gdk targets
-
----
-diff --git a/configure.ac b/configure.ac
-index 20301dd..768c922 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -179,7 +179,7 @@ PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_
- # SM client
- # *********
- 
--GDK_TARGET="$($PKG_CONFIG --variable target gdk-3.0)"
-+GDK_TARGET="$($PKG_CONFIG --variable targets gdk-3.0)"
- 
- AC_MSG_CHECKING([which smclient backend to use])
- AC_ARG_WITH([smclient],
---
-cgit v0.9.0.2

diff --git a/app-text/evince/files/evince-3.1.2-limit-thumbnailing-time.patch b/app-text/evince/files/evince-3.1.2-limit-thumbnailing-time.patch
deleted file mode 100644
index 6c4f1a3..0000000
--- a/app-text/evince/files/evince-3.1.2-limit-thumbnailing-time.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 6e6d6e2afa7373579de4a651df0dc1fb45c5f6d2 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@×××××.org>
-Date: Sun, 26 Jun 2011 11:00:30 +0000
-Subject: thumbnailer: limit thumbnailing time to 15 seconds by default
-
-The limit can be disabled with no-limit command line option.
-
-Fixes bug #651655.
----
-diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
-index 94d6b77..596d264 100644
---- a/thumbnailer/evince-thumbnailer.c
-+++ b/thumbnailer/evince-thumbnailer.c
-@@ -35,12 +35,17 @@
- #endif
- 
- #define THUMBNAIL_SIZE 128
-+#define DEFAULT_SLEEP_TIME (15 * G_USEC_PER_SEC) /* 15 seconds */
-+
-+static gboolean finished = TRUE;
- 
- static gint size = THUMBNAIL_SIZE;
-+static gboolean time_limit = TRUE;
- static const gchar **file_arguments;
- 
- static const GOptionEntry goption_options[] = {
- 	{ "size", 's', 0, G_OPTION_ARG_INT, &size, NULL, "SIZE" },
-+        { "no-limit", 'l', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &time_limit, "Don't limit the thumbnailing time to 15 seconds", NULL },
- 	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, "<input> <ouput>" },
- 	{ NULL }
- };
-@@ -52,6 +57,41 @@ struct AsyncData {
- 	gboolean     success;
- };
- 
-+/* Time monitor: copied from totem */
-+G_GNUC_NORETURN static gpointer
-+time_monitor (gpointer data)
-+{
-+        const gchar *app_name;
-+
-+        g_usleep (DEFAULT_SLEEP_TIME);
-+
-+        if (finished)
-+                g_thread_exit (NULL);
-+
-+        app_name = g_get_application_name ();
-+        if (app_name == NULL)
-+                app_name = g_get_prgname ();
-+        g_print ("%s couldn't process file: '%s'\n"
-+                 "Reason: Took too much time to process.\n",
-+                 app_name,
-+                 (const char *) data);
-+
-+        exit (0);
-+}
-+
-+static void
-+time_monitor_start (const char *input)
-+{
-+        finished = FALSE;
-+        g_thread_create (time_monitor, (gpointer) input, FALSE, NULL);
-+}
-+
-+static void
-+time_monitor_stop (void)
-+{
-+        finished = TRUE;
-+}
-+
- static void
- delete_temp_file (GFile *file)
- {
-@@ -269,6 +309,9 @@ main (int argc, char *argv[])
- 		return -2;
- 	}
- 
-+        if (time_limit)
-+                time_monitor_start (input);
-+
- 	if (EV_IS_ASYNC_RENDERER (document)) {
- 		struct AsyncData data;
- 
-@@ -295,6 +338,7 @@ main (int argc, char *argv[])
- 		return -2;
- 	}
- 
-+        time_monitor_stop ();
- 	g_object_unref (document);
-         ev_shutdown ();
- 
---
-cgit v0.9.0.2