rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity
38633124a1
NetworkManager/nm-applet-internal-buildfixes.patch
Daniel Drake 1321eb99eb Rebuild for libgnome-bluetooth.so.9
2011-11-26 10:10:00 -06:00

233 lines
9.4 KiB
Diff
Raw Blame History

Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/configure.ac
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
@@ -98,10 +98,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
glib-2.0 >= 2.16
- NetworkManager >= 0.9.2
- libnm-glib >= 0.9.2
- libnm-util >= 0.9.2
- libnm-glib-vpn >= 0.9.2
gmodule-export-2.0])
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@@ -167,8 +163,7 @@ case "${with_bluetooth}" in
AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gnome-bluetooth-1.0 >= 2.27.6
- libnm-util >= 0.9.2
- libnm-glib >= 0.9.2,
+ dbus-glib-1,
have_gbt=yes, have_gbt=no)
;;
esac
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
nm_connection_editor_CPPFLAGS = \
$(GTK_CFLAGS) \
$(NMA_CFLAGS) \
@@ -66,7 +70,10 @@ nm_connection_editor_LDADD = \
${top_builddir}/src/libnm-gtk/libnm-gtk.la \
$(GTK_LIBS) \
$(NMA_LIBS) \
- -lm
+ -lm \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
uidir = $(datadir)/nm-applet
ui_DATA = \
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
noinst_LTLIBRARIES = \
libgconf-helpers.la \
libgconf-helpers-test.la
@@ -23,7 +27,9 @@ libgconf_helpers_la_LIBADD = \
$(GTK_LIBS) \
$(NMA_LIBS) \
$(GCONF_LIBS) \
- $(GNOME_KEYRING_LIBS)
+ $(GNOME_KEYRING_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
#########################
# Test library
@@ -40,5 +46,7 @@ libgconf_helpers_test_la_CPPFLAGS = \
# no keyring or gconf libs since we'll override them
libgconf_helpers_test_la_LIBADD = \
- $(NMA_LIBS)
+ $(NMA_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
+ -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
noinst_PROGRAMS = test-upgrade
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am
@@ -6,6 +6,9 @@ INCLUDES = \
-I${top_builddir}/src/marshallers \
-I${top_srcdir}/src/utils \
-I${top_srcdir}/src/libnm-gtk \
+ -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib \
$(GNOME_BLUETOOTH_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS)
@@ -25,7 +28,9 @@ libnma_la_LIBADD = \
$(top_builddir)/src/marshallers/libmarshallers.la \
$(top_builddir)/src/utils/libutils.la \
$(top_builddir)/src/libnm-gtk/libnm-gtk.la \
- $(GNOME_BLUETOOTH_LIBS)
+ $(GNOME_BLUETOOTH_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
nm_applet_CPPFLAGS = \
$(GTK_CFLAGS) \
$(NMA_CFLAGS) \
@@ -72,7 +76,9 @@ nm_applet_LDADD = \
${top_builddir}/src/utils/libutils.la \
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
${top_builddir}/src/wireless-security/libwireless-security.la \
- ${top_builddir}/src/libnm-gtk/libnm-gtk.la
+ ${top_builddir}/src/libnm-gtk/libnm-gtk.la \
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am
@@ -1,5 +1,9 @@
SUBDIRS=. tests
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
noinst_LTLIBRARIES = libutils.la
libutils_la_SOURCES = \
@@ -17,3 +21,6 @@ libutils_la_CPPFLAGS = \
-I${top_srcdir}/src
libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS)
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
+ -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
noinst_PROGRAMS = test-utils
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
libwireless_security_la_SOURCES = \
wireless-security.h \
wireless-security.c \
@@ -40,7 +44,9 @@ libwireless_security_la_LIBADD = \
$(GTK_LIBS) \
$(NMA_LIBS) \
$(GCONF_LIBS) \
- ${top_builddir}/src/utils/libutils.la
+ ${top_builddir}/src/utils/libutils.la \
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
uidir = $(datadir)/nm-applet
ui_DATA = \
Index: NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am
===================================================================
--- NetworkManager-0.9.2.0.orig/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am
+++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am
@@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib
+
uidir = $(datadir)/libnm-gtk
ui_DATA = wifi.ui
@@ -36,7 +40,10 @@ libnm_gtk_la_LIBADD = \
$(NMA_LIBS) \
$(GNOME_KEYRING_LIBS) \
$(top_builddir)/src/marshallers/libmarshallers.la \
- $(top_builddir)/src/wireless-security/libwireless-security.la
+ $(top_builddir)/src/wireless-security/libwireless-security.la \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
-export-symbols-regex '^nma_.*'
Reference in New Issue View Git Blame Copy Permalink