[NetworkManager/f16] Add some forgotten patches

Daniel Williams dcbw at fedoraproject.org
Thu Nov 10 21:28:47 UTC 2011


commit acfd61543fb399ce58a2c6ceddc7c9ecec71b550
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Nov 10 15:28:32 2011 -0600

    Add some forgotten patches

 applet-ignore-deprecated.patch |   24 ++++++++++++++++++++++++
 nss-error.patch                |   15 +++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/applet-ignore-deprecated.patch b/applet-ignore-deprecated.patch
new file mode 100644
index 0000000..7b3cd6d
--- /dev/null
+++ b/applet-ignore-deprecated.patch
@@ -0,0 +1,24 @@
+diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4.depre NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4
+--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4.depre	2011-11-10 15:03:07.528830185 -0600
++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/m4/compiler_warnings.m4	2011-11-10 15:05:28.273070638 -0600
+@@ -7,7 +7,7 @@ if test "$GCC" = "yes" -a "$set_more_war
+ 	AC_MSG_RESULT(yes)
+ 	CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS"
+ 
+-	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
++	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wno-deprecated-declarations -Wno-error=deprecated-declarations \
+ 		      -Wdeclaration-after-statement -Wstrict-prototypes \
+ 		      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
+ 		      -fno-strict-aliasing; do
+diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.foo NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac
+--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.foo	2011-11-10 15:10:45.268107655 -0600
++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac	2011-11-10 15:10:51.902024720 -0600
+@@ -179,8 +179,6 @@ dnl
+ dnl Compiler flags
+ dnl
+ NM_COMPILER_WARNINGS
+-# Use --enable-maintainer-mode to disabled deprecated symbols
+-GNOME_MAINTAINER_MODE_DEFINES
+ 
+ 
+ AC_CONFIG_FILES([
diff --git a/nss-error.patch b/nss-error.patch
new file mode 100644
index 0000000..0a63148
--- /dev/null
+++ b/nss-error.patch
@@ -0,0 +1,15 @@
+diff -up NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo NetworkManager-0.9.2.0/libnm-util/crypto_nss.c
+--- NetworkManager-0.9.2.0/libnm-util/crypto_nss.c.foo	2011-11-10 12:40:14.365009479 -0600
++++ NetworkManager-0.9.2.0/libnm-util/crypto_nss.c	2011-11-10 12:40:48.787579140 -0600
+@@ -26,6 +26,11 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
++/* Work around NSS error:
++ * /usr/include/nss3/pkcs11n.h:365:26: error: "__GNUC_MINOR" is not defined [-Werror=undef]
++ */
++#define __GNUC_MINOR __GNUC_MINOR__
++
+ #include <prinit.h>
+ #include <nss.h>
+ #include <pk11pub.h>


More information about the scm-commits mailing list