rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix up applet build for bluetooth bits

Browse Source
This commit is contained in:
Daniel Williams 2009-07-28 16:58:04 +00:00
parent c01a268fc7
commit 3b35b5a0e7
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
nm-applet-internal-buildfixes.patch
View File

@ -1,7 +1,7 @@
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac 2009-04-05 08:31:12.000000000 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac 2009-07-28 12:56:51.657718622 -0400
@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA, PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74 [dbus-glib-1 >= 0.74
glib-2.0 >= 2.10 glib-2.0 >= 2.10
@ -12,9 +12,18 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buil
gtk+-2.0 >= 2.14 gtk+-2.0 >= 2.14
libglade-2.0 libglade-2.0
gmodule-export-2.0 gmodule-export-2.0
@@ -193,8 +189,6 @@ dnl Check for gnome-bluetooth
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gconf-2.0
gnome-bluetooth-1.0 >= 2.27.6
- libnm-util
- libnm_glib,
have_gbt=yes, have_gbt=no)
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor bin_PROGRAMS = nm-connection-editor
@ -25,7 +34,7 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-ed
nm_connection_editor_CPPFLAGS = \ nm_connection_editor_CPPFLAGS = \
$(NMA_CFLAGS) \ $(NMA_CFLAGS) \
-DICONDIR=\""$(datadir)/icons"\" \ -DICONDIR=\""$(datadir)/icons"\" \
@@ -70,7 +74,10 @@ nm_connection_editor_LDADD = \ @@ -66,7 +70,10 @@ nm_connection_editor_LDADD = \
${top_builddir}/src/utils/libutils.la \ ${top_builddir}/src/utils/libutils.la \
${top_builddir}/src/marshallers/libmarshallers.la \ ${top_builddir}/src/marshallers/libmarshallers.la \
$(NMA_LIBS) \ $(NMA_LIBS) \
@ -38,8 +47,8 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-ed
if NO_POLKIT_GNOME if NO_POLKIT_GNOME
nm_connection_editor_LDADD += \ nm_connection_editor_LDADD += \
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \ +INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-util \
@ -58,9 +67,9 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -4,6 +4,10 @@ NULL= @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet bin_PROGRAMS = nm-applet
@ -71,7 +80,7 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.b
nm_applet_CPPFLAGS = \ nm_applet_CPPFLAGS = \
$(NMA_CFLAGS) \ $(NMA_CFLAGS) \
$(NOTIFY_CFLAGS) \ $(NOTIFY_CFLAGS) \
@@ -57,7 +61,9 @@ nm_applet_LDADD = \ @@ -54,7 +58,9 @@ nm_applet_LDADD = \
${top_builddir}/src/marshallers/libmarshallers.la \ ${top_builddir}/src/marshallers/libmarshallers.la \
${top_builddir}/src/utils/libutils.la \ ${top_builddir}/src/utils/libutils.la \
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
@ -83,8 +92,8 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.b
gladedir = $(datadir)/nm-applet gladedir = $(datadir)/nm-applet
glade_DATA = applet.glade keyring.png glade_DATA = applet.glade keyring.png
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \ +INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-util \
@ -93,7 +102,7 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefil
noinst_LTLIBRARIES = libutils.la noinst_LTLIBRARIES = libutils.la
libutils_la_SOURCES = \ libutils_la_SOURCES = \
@@ -11,4 +15,7 @@ libutils_la_CPPFLAGS = \ @@ -18,4 +22,7 @@ libutils_la_CPPFLAGS = \
-I${top_srcdir}/src/gconf-helpers \ -I${top_srcdir}/src/gconf-helpers \
-I${top_srcdir}/src -I${top_srcdir}/src
@ -103,8 +112,8 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefil
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
+ +
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la noinst_LTLIBRARIES = libwireless-security.la
@ -115,7 +124,7 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-secu
libwireless_security_la_SOURCES = \ libwireless_security_la_SOURCES = \
wireless-security.h \ wireless-security.h \
wireless-security.c \ wireless-security.c \
@@ -38,5 +42,7 @@ libwireless_security_la_CPPFLAGS = \ @@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
libwireless_security_la_LIBADD = \ libwireless_security_la_LIBADD = \
$(NMA_LIBS) \ $(NMA_LIBS) \
${top_builddir}/src/utils/libutils.la \ ${top_builddir}/src/utils/libutils.la \