[gnome-panel/f14/master: 1/3] fix linking

Matthias Clasen mclasen at fedoraproject.org
Thu Sep 30 16:32:59 UTC 2010


commit 7c55a87dee5250c1f972878e0468e215cec78c96
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Sep 30 12:30:00 2010 -0400

    fix linking

 gnome-panel-libs.patch |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 3c6e134..e2f08ff 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,6 +1,27 @@
+diff -up gnome-panel-2.32.0.2/applets/notification_area/Makefile.am.libs gnome-panel-2.32.0.2/applets/notification_area/Makefile.am
+--- gnome-panel-2.32.0.2/applets/notification_area/Makefile.am.libs	2010-09-30 12:29:17.884603002 -0400
++++ gnome-panel-2.32.0.2/applets/notification_area/Makefile.am	2010-09-30 12:29:43.690603003 -0400
+@@ -30,15 +30,15 @@ NOTIFICATION_AREA_SOURCES = main.c
+ 
+ NOTIFICATION_AREA_LDADD =				\
+ 	../../libpanel-applet/libpanel-applet-3.la	\
+-	$(X_LIBS)					\
+ 	$(NOTIFICATION_AREA_LIBS)			\
+ 	$(LIBPANEL_APPLET_LIBS)				\
++	$(X_LIBS)					\
+ 	libtray.la
+ 
+ testtray_SOURCES = testtray.c
+ testtray_LDADD =			\
+-	$(X_LIBS)			\
+ 	$(NOTIFICATION_AREA_LIBS)	\
++	$(X_LIBS)			\
+ 	libtray.la
+ 
+ if NOTIFICATION_AREA_INPROCESS
 diff -up gnome-panel-2.32.0.2/gnome-panel/Makefile.am.libs gnome-panel-2.32.0.2/gnome-panel/Makefile.am
---- gnome-panel-2.32.0.2/gnome-panel/Makefile.am.libs	2010-09-29 12:46:06.995194003 -0400
-+++ gnome-panel-2.32.0.2/gnome-panel/Makefile.am	2010-09-29 12:46:30.476194003 -0400
+--- gnome-panel-2.32.0.2/gnome-panel/Makefile.am.libs	2010-09-27 14:04:32.000000000 -0400
++++ gnome-panel-2.32.0.2/gnome-panel/Makefile.am	2010-09-30 12:27:42.928603001 -0400
 @@ -147,7 +147,8 @@ gnome_desktop_item_edit_SOURCES =	\
  
  gnome_desktop_item_edit_LDADD = 	\


More information about the scm-commits mailing list