2012-03-23 Jerry Guo <[email protected]> gnome-2-30-s11update S11U1_13
authoryanjing
Fri, 23 Mar 2012 11:05:09 +0000
branchgnome-2-30-s11update
changeset 22347 ba63da75fa10
parent 22346 9ddc3b763bc9
child 22348 c3d7e11dc4b3
2012-03-23 Jerry Guo <[email protected]> Add the patch for compile * base-specs/pidgin.spec: * patches/pidgin-17-compile-ifaddrs.diff: M base-specs/pidgin.spec M ChangeLog A patches/pidgin-17-compile-ifaddrs.diff
ChangeLog
base-specs/pidgin.spec
patches/pidgin-17-compile-ifaddrs.diff
--- a/ChangeLog	Fri Mar 23 08:24:41 2012 +0000
+++ b/ChangeLog	Fri Mar 23 11:05:09 2012 +0000
@@ -1,3 +1,9 @@
+2012-03-23  Jerry Guo  <[email protected]>
+
+        Add the patch for compile 
+	* base-specs/pidgin.spec:
+	* patches/pidgin-17-compile-ifaddrs.diff:
+
 2012-03-23  Jerry Guo  <[email protected]>
 
         Fix for 7154328
--- a/base-specs/pidgin.spec	Fri Mar 23 08:24:41 2012 +0000
+++ b/base-specs/pidgin.spec	Fri Mar 23 11:05:09 2012 +0000
@@ -49,6 +49,7 @@
 
 # date:2010-05-20 owner:hawklu type:bug d.o.o:16007
 Patch13:        pidgin-14-ifaddrs.diff
+Patch17:        pidgin-17-compile-ifaddrs.diff
 
 URL:		http://www.pidgin.im
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
@@ -99,6 +100,7 @@
 %patch9 -p1
 %patch11 -p1
 %patch13 -p1
+%patch17 -p1
 
 %build
 %ifos linux
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-17-compile-ifaddrs.diff	Fri Mar 23 11:05:09 2012 +0000
@@ -0,0 +1,14 @@
+diff -ur pidgin-2.10.2/configure.ac pidgin-2.10.2_new/configure.ac
+--- pidgin-2.10.2/configure.ac	2012-03-23 18:46:59.350544942 +0800
++++ pidgin-2.10.2_new/configure.ac	2012-03-23 18:43:18.814891844 +0800
+@@ -161,8 +161,8 @@
+ 		[AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lsnl $LIBS"], , , -lnsl)])
+ AC_CHECK_FUNCS(inet_ntop)
+ AC_CHECK_FUNCS(getifaddrs)
+-AC_CHECK_MEMBERS(struct ifaddrs.ifa_addr->ss_family,[],[],[[ #include <ifaddrs.h> 
+-#include <net/if.h> ]])
++#AC_CHECK_MEMBERS(struct ifaddrs.ifa_addr->ss_family,[],[],[[ #include <ifaddrs.h> 
++##include <net/if.h> ]])
+ dnl Check for socklen_t (in Unix98)
+ AC_MSG_CHECKING(for socklen_t)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[