summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-03-19 08:04:07 +0000
committerJustin Lecher <jlec@gentoo.org>2012-03-19 08:04:07 +0000
commitd9f2bc96486432c7ef2a5a407a57c24175fea603 (patch)
treeba61a28de2438ca9a8c5c15dc8cb84c0ad49f402 /gnome-extra/synapse/files
parentCleaned old (diff)
downloadgentoo-2-d9f2bc96486432c7ef2a5a407a57c24175fea603.tar.gz
gentoo-2-d9f2bc96486432c7ef2a5a407a57c24175fea603.tar.bz2
gentoo-2-d9f2bc96486432c7ef2a5a407a57c24175fea603.zip
Version Bump, clean backport of patches against underlinking and unconditional linking, #403345
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/synapse/files')
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch18
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch13
2 files changed, 12 insertions, 19 deletions
diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
index 5073bbc38fac..dc16a09b2e2c 100644
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
+++ b/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
@@ -1,16 +1,12 @@
- src/ui/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
-index 3790ed2..78686ee 100644
---- a/src/ui/Makefile.am
-+++ b/src/ui/Makefile.am
-@@ -42,7 +42,7 @@ synapse_LDADD = \
+=== modified file 'src/ui/Makefile.am'
+--- src/ui/Makefile.am 2012-03-18 19:55:48 +0000
++++ src/ui/Makefile.am 2012-03-18 19:57:30 +0000
+@@ -40,6 +40,7 @@
$(top_builddir)/src/core/libsynapsecore.la \
$(top_builddir)/src/plugins/libplugins.la \
$(top_builddir)/src/tile-view/libtileview.la \
-- $(NULL)
-+ $(NULL) -lm
++ -lm
+ $(NULL)
if HAVE_INDICATOR
- synapse_VALAFLAGS += --pkg appindicator-0.1 -D HAVE_INDICATOR
+
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
index d2ccfca58a61..22ce69928f76 100644
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
+++ b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
@@ -1,11 +1,7 @@
- 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 = \
+=== modified file 'src/ui/Makefile.am'
+--- src/ui/Makefile.am 2012-03-18 19:11:23 +0000
++++ src/ui/Makefile.am 2012-03-18 19:55:48 +0000
+@@ -11,7 +11,6 @@
--pkg gdk-x11-2.0 \
--pkg gio-2.0 \
--pkg gio-unix-2.0 \
@@ -13,3 +9,4 @@ index 3790ed2..c9df5a2 100644
--pkg gee-1.0 \
--pkg json-glib-1.0 \
--pkg unique-1.0 \
+