Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: media-video/totem/files/, media-video/totem/
Date: Mon, 21 Feb 2011 22:06:14
Message-Id: ac603e182fd4371844bcaa19757d452cae781212.nirbheek@gentoo
1 commit: ac603e182fd4371844bcaa19757d452cae781212
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 21:54:43 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 21 22:05:45 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac603e18
7
8 media-video/totem: 2.91.6 -> 2.91.7
9
10 * New Zeitgeist plugin, disabled
11
12 ---
13 media-video/totem/files/totem-libpeas-compat.patch | 47 --------------------
14 ...{totem-2.91.6-r1.ebuild => totem-2.91.7.ebuild} | 3 +-
15 2 files changed, 1 insertions(+), 49 deletions(-)
16
17 diff --git a/media-video/totem/files/totem-libpeas-compat.patch b/media-video/totem/files/totem-libpeas-compat.patch
18 deleted file mode 100644
19 index 5f6991a..0000000
20 --- a/media-video/totem/files/totem-libpeas-compat.patch
21 +++ /dev/null
22 @@ -1,47 +0,0 @@
23 -From 6da33d0d064e7dd6b5144d01ea1d73a8cde5b02d Mon Sep 17 00:00:00 2001
24 -From: Steve Frécinaux <code@×××××××.net>
25 -Date: Sun, 13 Feb 2011 23:41:22 +0000
26 -Subject: Update totem against latest libpeas API changes.
27 -
28 ----
29 -diff --git a/configure.in b/configure.in
30 -index 641f18f..ec129c7 100644
31 ---- a/configure.in
32 -+++ b/configure.in
33 -@@ -48,7 +48,7 @@ TOTEM_PLPARSER_REQS=2.32.2
34 - GNOMEICON_REQS=2.15.90
35 - DBUS_REQS=0.82
36 - VALA_REQS=0.11.1
37 --PEAS_REQS=0.7.1
38 -+PEAS_REQS=0.7.2
39 - PYTHON_REQS=2.3
40 - PYGOBJECT_REQS=2.27.0
41 -
42 -diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
43 -index cdff0bf..4518fe2 100644
44 ---- a/src/plugins/totem-plugins-engine.c
45 -+++ b/src/plugins/totem-plugins-engine.c
46 -@@ -120,6 +120,8 @@ totem_plugins_engine_get_default (TotemObject *totem)
47 - }
48 - g_strfreev (paths);
49 -
50 -+ peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
51 -+
52 - g_object_add_weak_pointer (G_OBJECT (engine),
53 - (gpointer) &engine);
54 -
55 -diff --git a/src/totem-menu.c b/src/totem-menu.c
56 -index 6e76184..1a2e54e 100644
57 ---- a/src/totem-menu.c
58 -+++ b/src/totem-menu.c
59 -@@ -1234,7 +1234,7 @@ plugins_action_callback (GtkAction *action, Totem *totem)
60 - G_CALLBACK (totem_plugins_response_cb),
61 - NULL, 0);
62 -
63 -- manager = peas_gtk_plugin_manager_new ();
64 -+ manager = peas_gtk_plugin_manager_new (NULL);
65 - gtk_widget_show_all (GTK_WIDGET (manager));
66 - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (totem->plugins))),
67 - manager, TRUE, TRUE, 0);
68 ---
69 -cgit v0.8.3.4
70
71 diff --git a/media-video/totem/totem-2.91.6-r1.ebuild b/media-video/totem/totem-2.91.7.ebuild
72 similarity index 98%
73 rename from media-video/totem/totem-2.91.6-r1.ebuild
74 rename to media-video/totem/totem-2.91.7.ebuild
75 index d2aa72c..9402b09 100644
76 --- a/media-video/totem/totem-2.91.6-r1.ebuild
77 +++ b/media-video/totem/totem-2.91.7.ebuild
78 @@ -30,6 +30,7 @@ fi
79 # coherence plugin broken upstream
80 #
81 # FIXME: Automagic tracker-0.9.0
82 +# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
83 RDEPEND=">=dev-libs/glib-2.27.92
84 >=x11-libs/gdk-pixbuf-2.23.0
85 >=x11-libs/gtk+-2.99.3:3[introspection?]
86 @@ -145,8 +146,6 @@ src_prepare() {
87 # FIXME: File a bug for this
88 epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
89
90 - epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
91 -
92 if [[ ${PV} != 9999 ]]; then
93 intltoolize --force --copy --automake || die "intltoolize failed"
94 eautoreconf