summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-02-15 18:47:58 +0000
committerJustin Lecher <jlec@gentoo.org>2012-02-15 18:47:58 +0000
commitcb89d095cf838c2d6f94a6108b7bbd6992f397ee (patch)
treebe080e65fb5d6e7404ab849f325a315ecbab2e1f /gnome-extra
parentMarked ~x64-macos (diff)
downloadgentoo-2-cb89d095cf838c2d6f94a6108b7bbd6992f397ee.tar.gz
gentoo-2-cb89d095cf838c2d6f94a6108b7bbd6992f397ee.tar.bz2
gentoo-2-cb89d095cf838c2d6f94a6108b7bbd6992f397ee.zip
Fix build without zeitgeist support, #403345
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/synapse/ChangeLog6
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch15
-rw-r--r--gnome-extra/synapse/synapse-0.2.8.2.ebuild8
3 files changed, 25 insertions, 4 deletions
diff --git a/gnome-extra/synapse/ChangeLog b/gnome-extra/synapse/ChangeLog
index 2a152878a68a..55442c793e6a 100644
--- a/gnome-extra/synapse/ChangeLog
+++ b/gnome-extra/synapse/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/synapse
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/ChangeLog,v 1.12 2012/02/14 19:35:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/ChangeLog,v 1.13 2012/02/15 18:47:58 jlec Exp $
+
+ 15 Feb 2012; Justin Lecher <jlec@gentoo.org> synapse-0.2.8.2.ebuild,
+ +files/synapse-0.2.8.2-zeitgeist.patch:
+ Fix build without zeitgeist support, #403345
14 Feb 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
ayatana is now global per http://archives.gentoo.org/gentoo-
diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
new file mode 100644
index 000000000000..d2ccfca58a61
--- /dev/null
+++ b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
@@ -0,0 +1,15 @@
+ src/ui/Makefile.am | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
+index 3790ed2..c9df5a2 100644
+--- a/src/ui/Makefile.am
++++ b/src/ui/Makefile.am
+@@ -11,7 +11,6 @@ synapse_VALAFLAGS = \
+ --pkg gdk-x11-2.0 \
+ --pkg gio-2.0 \
+ --pkg gio-unix-2.0 \
+- --pkg zeitgeist-1.0 \
+ --pkg gee-1.0 \
+ --pkg json-glib-1.0 \
+ --pkg unique-1.0 \
diff --git a/gnome-extra/synapse/synapse-0.2.8.2.ebuild b/gnome-extra/synapse/synapse-0.2.8.2.ebuild
index ec9a3f2fbda1..ff28200c62a8 100644
--- a/gnome-extra/synapse/synapse-0.2.8.2.ebuild
+++ b/gnome-extra/synapse/synapse-0.2.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.8.2.ebuild,v 1.4 2012/02/12 18:18:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.8.2.ebuild,v 1.5 2012/02/15 18:47:58 jlec Exp $
EAPI=4
@@ -36,14 +36,16 @@ RDEPEND="
plugins? ( net-libs/rest )
zeitgeist? (
dev-libs/libzeitgeist
- gnome-extra/zeitgeist[fts]
+ gnome-extra/zeitgeist
+ gnome-extra/zeitgeist-extensions[fts]
)"
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig"
PATCHES=(
- "${FILESDIR}"/synapse-0.2.8.2-underlinking.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${P}-zeitgeist.patch
)
pkg_preinst() {