/[pkgs]/devel/NetworkManager/nm-applet-internal-buildfixes.patch
ViewVC logotype

Contents of /devel/NetworkManager/nm-applet-internal-buildfixes.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.14 - (show annotations) (download) (as text)
Wed Aug 26 20:32:30 2009 UTC (2 months, 4 weeks ago) by dcbw
Branch: MAIN
CVS Tags: F-12-split, NetworkManager-0_7_996-3_git20090921_fc12, NetworkManager-0_7_996-2_git20090921_fc12, NetworkManager-0_7_996-4_git20091002_fc13, NetworkManager-0_7_996-5_git20091021_fc13, NetworkManager-0_7_996-1_git20090826_fc12, NetworkManager-0_7_996-7_git20091113_fc13, NetworkManager-0_7_996-3_git20090928_fc12, HEAD
Changes since 1.13: +40 -40 lines
File MIME type: text/x-patch 
* Wed Aug 26 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-1.git20090826
- nm: IPv6 zeroconf support and fixes
- nm: port to polkit (rh #499965)
- nm: fixes for ehea devices (rh #511304) (rh #516591)
- nm: work around PPP bug causing bogus nameservers for mobile broadband connections
- editor: fix segfault with "Unlisted" plans in the mobile broadband assistant
1 diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac
2 --- NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
3 +++ NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac 2009-07-28 13:11:39.261718877 -0400
4 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
5 PKG_CHECK_MODULES(NMA,
6 [dbus-glib-1 >= 0.74
7 glib-2.0 >= 2.16
8 - NetworkManager >= 0.7.996
9 - libnm-glib >= 0.7.996
10 - libnm-util >= 0.7.996
11 - libnm-glib-vpn >= 0.7.996
12 gtk+-2.0 >= 2.14
13 libglade-2.0
14 gmodule-export-2.0
15 @@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
16 dnl Check for gnome-bluetooth
17 PKG_CHECK_MODULES(GNOME_BLUETOOTH,
18 gconf-2.0
19 - gnome-bluetooth-1.0 >= 2.27.6
20 - libnm-util
21 - libnm-glib,
22 + gnome-bluetooth-1.0 >= 2.27.6,
23 have_gbt=yes, have_gbt=no)
24 AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
25
26 diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am
27 --- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
28 +++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
29 @@ -1,5 +1,9 @@
30 bin_PROGRAMS = nm-connection-editor
31
32 +INCLUDES = -I${top_srcdir}/../include \
33 + -I${top_srcdir}/../libnm-util \
34 + -I${top_srcdir}/../libnm-glib
35 +
36 nm_connection_editor_CPPFLAGS = \
37 $(NMA_CFLAGS) \
38 -DICONDIR=\""$(datadir)/icons"\" \
39 @@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
40 ${top_builddir}/src/wireless-security/libwireless-security.la \
41 ${top_builddir}/src/utils/libutils.la \
42 ${top_builddir}/src/marshallers/libmarshallers.la \
43 - $(NMA_LIBS)
44 + $(NMA_LIBS) \
45 + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
46 + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
47 + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
48
49 gladedir = $(datadir)/nm-applet
50 glade_DATA = \
51 diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am
52 --- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
53 +++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
54 @@ -1,3 +1,7 @@
55 +INCLUDES = -I${top_srcdir}/../include \
56 + -I${top_srcdir}/../libnm-util \
57 + -I${top_srcdir}/../libnm-glib
58 +
59 noinst_LTLIBRARIES = libgconf-helpers.la
60
61 libgconf_helpers_la_SOURCES = \
62 @@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \
63 libgconf_helpers_la_LIBADD = \
64 $(NMA_LIBS) \
65 ${top_builddir}/src/marshallers/libmarshallers.la \
66 - ${top_builddir}/src/utils/libutils.la
67 + ${top_builddir}/src/utils/libutils.la \
68 + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
69 + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
70
71 diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am
72 --- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
73 +++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
74 @@ -6,6 +6,9 @@ INCLUDES = \
75 -DLOCALEDIR="\"$(datadir)/locale\"" \
76 -I$(top_srcdir)/src/gconf-helpers/ \
77 -I$(top_builddir) \
78 + -I${top_srcdir}/../include \
79 + -I${top_srcdir}/../libnm-util \
80 + -I${top_srcdir}/../libnm-glib \
81 $(GNOME_BLUETOOTH_CFLAGS) \
82 $(WARN_CFLAGS)
83
84 @@ -14,7 +17,11 @@ plugin_LTLIBRARIES = libnma.la
85
86 libnma_la_SOURCES = network-manager-applet.c
87 libnma_la_LDFLAGS = -module -avoid-version
88 -libnma_la_LIBADD = $(top_builddir)/src/gconf-helpers/libgconf-helpers.la $(GNOME_BLUETOOTH_LIBS)
89 +libnma_la_LIBADD = \
90 + $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
91 + $(GNOME_BLUETOOTH_LIBS) \
92 + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
93 + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
94 endif
95
96 EXTRA_DIST = network-manager-applet.c
97 diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am
98 --- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
99 +++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
100 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
101
102 bin_PROGRAMS = nm-applet
103
104 +INCLUDES = -I${top_srcdir}/../include \
105 + -I${top_srcdir}/../libnm-util \
106 + -I${top_srcdir}/../libnm-glib
107 +
108 nm_applet_CPPFLAGS = \
109 $(NMA_CFLAGS) \
110 $(NOTIFY_CFLAGS) \
111 @@ -54,7 +58,9 @@ nm_applet_LDADD = \
112 ${top_builddir}/src/marshallers/libmarshallers.la \
113 ${top_builddir}/src/utils/libutils.la \
114 ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
115 - ${top_builddir}/src/wireless-security/libwireless-security.la
116 + ${top_builddir}/src/wireless-security/libwireless-security.la \
117 + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
118 + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
119
120 gladedir = $(datadir)/nm-applet
121 glade_DATA = applet.glade keyring.png
122 diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am
123 --- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
124 +++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
125 @@ -1,3 +1,7 @@
126 +INCLUDES = -I${top_srcdir}/../include \
127 + -I${top_srcdir}/../libnm-util \
128 + -I${top_srcdir}/../libnm-glib
129 +
130 noinst_LTLIBRARIES = libutils.la
131
132 libutils_la_SOURCES = \
133 @@ -18,4 +22,7 @@ libutils_la_CPPFLAGS = \
134 -I${top_srcdir}/src/gconf-helpers \
135 -I${top_srcdir}/src
136
137 -libutils_la_LIBADD = $(NMA_LIBS)
138 +libutils_la_LIBADD = $(NMA_LIBS) \
139 + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
140 + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
141 +
142 diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am
143 --- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
144 +++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
145 @@ -1,5 +1,9 @@
146 noinst_LTLIBRARIES = libwireless-security.la
147
148 +INCLUDES = -I${top_srcdir}/../include \
149 + -I${top_srcdir}/../libnm-util \
150 + -I${top_srcdir}/../libnm-glib
151 +
152 libwireless_security_la_SOURCES = \
153 wireless-security.h \
154 wireless-security.c \
155 @@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
156 libwireless_security_la_LIBADD = \
157 $(NMA_LIBS) \
158 ${top_builddir}/src/utils/libutils.la \
159 - ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
160 + ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
161 + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
162 + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
163
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2