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

Add more fPIC bits

Browse Source
This commit is contained in:
Daniel Williams 2007-08-31 01:39:20 +00:00
parent f11d3ac207
commit 328d731512
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NetworkManager-0.7.0-ppp-manager-fpic.patch
View File

@ -1,5 +1,15 @@
--- NetworkManager-0.7.0/src/ppp-manager/Makefile.am.fpic 2007-08-30 19:41:49.000000000 -0400 --- NetworkManager-0.7.0/libnm-util/Makefile.am.fpic 2007-08-30 21:17:33.000000000 -0400
+++ NetworkManager-0.7.0/src/ppp-manager/Makefile.am 2007-08-30 19:42:00.000000000 -0400 +++ NetworkManager-0.7.0/libnm-util/Makefile.am 2007-08-30 21:18:12.000000000 -0400
@@ -5,6 +5,7 @@ lib_LTLIBRARIES=libnm-util.la
libnm_util_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
+ -fPIC \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
--- NetworkManager-0.7.0/src/ppp-manager/Makefile.am.fpic 2007-08-30 14:45:45.000000000 -0400
+++ NetworkManager-0.7.0/src/ppp-manager/Makefile.am 2007-08-30 19:43:20.000000000 -0400
@@ -33,7 +33,7 @@ nm_pppd_plugin_so_SOURCES = \ @@ -33,7 +33,7 @@ nm_pppd_plugin_so_SOURCES = \
nm-pppd-plugin.h \ nm-pppd-plugin.h \
nm-ppp-status.h nm-ppp-status.h

2
NetworkManager.spec
View File

@ -22,6 +22,7 @@ Source1: nm-applet-%{version}.svn129.tar.gz
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch2: NetworkManager-0.7.0-missing-includes.patch Patch2: NetworkManager-0.7.0-missing-includes.patch
Patch3: NetworkManager-0.7.0-ppp-manager-fpic.patch Patch3: NetworkManager-0.7.0-ppp-manager-fpic.patch
Patch4: nm-applet-0.7.0-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig PreReq: chkconfig
@ -125,6 +126,7 @@ NetworkManager functionality from applications that use glib.
# unpack the applet # unpack the applet
tar -xzf %{SOURCE1} tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix %patch1 -p1 -b .buildfix
%patch4 -p1 -b .fixes
%build %build
# Even though we don't require named, we still build with it # Even though we don't require named, we still build with it

33
nm-applet-0.7.0-fixes.patch Normal file
View File

@ -0,0 +1,33 @@
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.h.fixes 2007-08-30 21:24:02.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.h 2007-08-30 21:24:12.000000000 -0400
@@ -26,6 +26,8 @@
#include <config.h>
#endif
+#include <string.h>
+
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include <glade/glade.h>
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/menu-items.c.fixes 2007-08-30 21:21:14.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/menu-items.c 2007-08-30 21:21:57.000000000 -0400
@@ -228,7 +228,7 @@ nm_network_menu_item_set_ssid (NMNetwork
guint32
nm_network_menu_item_get_strength (NMNetworkMenuItem * item)
{
- g_return_if_fail (item != NULL);
+ g_return_if_fail (item != NULL, 0);
return item->int_strength;
}
@@ -249,8 +249,8 @@ const guchar *
nm_network_menu_item_get_hash (NMNetworkMenuItem * item,
guint32 * length)
{
- g_return_if_fail (item != NULL);
- g_return_if_fail (length != NULL);
+ g_return_if_fail (item != NULL, NULL);
+ g_return_if_fail (length != NULL, NULL);
*length = item->hash_len;
return item->hash;