SOURCES: gnome-applet-phone-manager-asneeded.patch (NEW) - added

aredridel aredridel at pld-linux.org
Tue Aug 22 04:00:12 CEST 2006


Author: aredridel                    Date: Tue Aug 22 02:00:12 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- added

---- Files affected:
SOURCES:
   gnome-applet-phone-manager-asneeded.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/gnome-applet-phone-manager-asneeded.patch
diff -u /dev/null SOURCES/gnome-applet-phone-manager-asneeded.patch:1.1
--- /dev/null	Tue Aug 22 04:00:12 2006
+++ SOURCES/gnome-applet-phone-manager-asneeded.patch	Tue Aug 22 04:00:06 2006
@@ -0,0 +1,74 @@
+diff -Nru gnome-phone-manager-0.7.orig/libegg/libegg/iconlist/Makefile.am gnome-phone-manager-0.7/libegg/libegg/iconlist/Makefile.am
+--- gnome-phone-manager-0.7.orig/libegg/libegg/iconlist/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/libegg/libegg/iconlist/Makefile.am	2006-05-11 20:21:39.863014500 +0300
+@@ -11,8 +11,8 @@
+ noinst_LTLIBRARIES = libeggiconlist.la
+ 
+ libeggiconlist_la_LIBADD = \
+-	$(EGG_LIBS) \
+-	$(top_builddir)/libegg/util/libeggutil.la
++	$(top_builddir)/libegg/util/libeggutil.la \
++	$(EGG_LIBS)
+ 
+ libeggiconlist_la_SOURCES = \
+   eggiconlist.c
+diff -Nru gnome-phone-manager-0.7.orig/libegg/libegg/tray/Makefile.am gnome-phone-manager-0.7/libegg/libegg/tray/Makefile.am
+--- gnome-phone-manager-0.7.orig/libegg/libegg/tray/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/libegg/libegg/tray/Makefile.am	2006-05-11 20:21:11.909267500 +0300
+@@ -11,8 +11,8 @@
+ noinst_LTLIBRARIES = libeggtray.la
+ 
+ libeggtray_la_LIBADD = \
+-	$(EGG_TRAY_LIBS) \
+-	$(top_builddir)/libegg/util/libeggutil.la
++	$(top_builddir)/libegg/util/libeggutil.la \
++	$(EGG_TRAY_LIBS)
+ 
+ libeggtray_la_SOURCES = \
+   eggtrayicon.c		\
+diff -Nru gnome-phone-manager-0.7.orig/libgsm/Makefile.am gnome-phone-manager-0.7/libgsm/Makefile.am
+--- gnome-phone-manager-0.7.orig/libgsm/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/libgsm/Makefile.am	2006-05-11 20:19:29.078841000 +0300
+@@ -17,10 +17,10 @@
+ 	phonemgr-marshal.c phonemgr-marshal.h
+ 
+ glibgsmtest_SOURCES = glibgsmtest.c
+-glibgsmtest_LDADD = $(LIBGSM_LIBS) libgsmwrap.la
++glibgsmtest_LDADD = libgsmwrap.la $(LIBGSM_LIBS)
+ 
+ gnokii_identify_SOURCES = gnokii-identify.c
+-gnokii_identify_LDADD = $(LIBGSM_LIBS) libgsmwrap.la
++gnokii_identify_LDADD = libgsmwrap.la $(LIBGSM_LIBS)
+ 
+ phones_DATA = phones.xml
+ phonesdir = $(datadir)/$(PACKAGE)
+diff -Nru gnome-phone-manager-0.7.orig/src/Makefile.am gnome-phone-manager-0.7/src/Makefile.am
+--- gnome-phone-manager-0.7.orig/src/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/src/Makefile.am	2006-05-11 20:34:07.925765500 +0300
+@@ -22,9 +27,9 @@
+ 	$(CLA_FILES)
+ 
+ gnome_phone_manager_LDADD = \
+-	$(PHONEMGR_LIBS) \
+ 	../libegg/libegg/tray/libeggtray.la \
+-	../libgsm/libgsmwrap.la
++	../libgsm/libgsmwrap.la \
++	$(PHONEMGR_LIBS)
+ 
+ EXTRA_DIST = gnome-phone-manager.desktop.in
+ 
+diff -Nru gnome-phone-manager-0.7.orig/configure.in gnome-phone-manager-0.7/configure.in
+--- gnome-phone-manager-0.7.orig/configure.in	2006-05-05 16:16:24.000000000 +0300
++++ gnome-phone-manager-0.7/configure.in	2006-05-11 20:43:41.553615000 +0300
+@@ -54,6 +54,11 @@
+ 	gmodule-2.0
+ )
+ 
++# --as-needed cannot work with this because pkg-config --libs gnome-bluetooth
++# returns "-lgnomebt -lbtctl"; gnomebt library has all the symbols this package needs
++# but as UNDEF! The following line solve the problem.
++PHONEMGR_LIBS="-lbtctl ${PHONEMGR_LIBS}"
++
+ AC_SUBST(PHONEMGR_CFLAGS)
+ AC_SUBST(PHONEMGR_LIBS)
+ 
================================================================


More information about the pld-cvs-commit mailing list