rpms/pidgin/devel pidgin-2.6.5-old-gcc.patch, NONE, 1.1 pidgin.spec, 1.107, 1.108

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19117

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.5-old-gcc.patch 
Log Message:
Fix build with old gcc versions (RHEL4)


pidgin-2.6.5-old-gcc.patch:
 gntaccount.c |    3 ++-
 gntdebug.c   |    3 ++-
 gntnotify.c  |    3 ++-
 gntplugin.c  |    3 ++-
 gntpounce.c  |    3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE pidgin-2.6.5-old-gcc.patch ---
diff -urN pidgin-2.6.5.orig/finch/gntaccount.c pidgin-2.6.5/finch/gntaccount.c
--- pidgin-2.6.5.orig/finch/gntaccount.c	2010-01-01 18:28:01.000000000 -0500
+++ pidgin-2.6.5/finch/gntaccount.c	2010-01-08 18:04:57.835401000 -0500
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <account.h>
 #include <accountopt.h>
diff -urN pidgin-2.6.5.orig/finch/gntdebug.c pidgin-2.6.5/finch/gntdebug.c
--- pidgin-2.6.5.orig/finch/gntdebug.c	2009-08-19 17:56:52.000000000 -0400
+++ pidgin-2.6.5/finch/gntdebug.c	2010-01-08 18:22:07.434605000 -0500
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -35,7 +37,6 @@
 
 #include "gntdebug.h"
 #include "finch.h"
-#include <internal.h>
 #include "notify.h"
 #include "util.h"
 
diff -urN pidgin-2.6.5.orig/finch/gntnotify.c pidgin-2.6.5/finch/gntnotify.c
--- pidgin-2.6.5.orig/finch/gntnotify.c	2009-08-19 17:56:52.000000000 -0400
+++ pidgin-2.6.5/finch/gntnotify.c	2010-01-08 18:54:17.812859000 -0500
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <util.h>
 
diff -urN pidgin-2.6.5.orig/finch/gntplugin.c pidgin-2.6.5/finch/gntplugin.c
--- pidgin-2.6.5.orig/finch/gntplugin.c	2009-08-19 17:56:52.000000000 -0400
+++ pidgin-2.6.5/finch/gntplugin.c	2010-01-08 19:39:48.233494000 -0500
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "debug.h"
 #include "notify.h"
diff -urN pidgin-2.6.5.orig/finch/gntpounce.c pidgin-2.6.5/finch/gntpounce.c
--- pidgin-2.6.5.orig/finch/gntpounce.c	2009-08-19 17:56:52.000000000 -0400
+++ pidgin-2.6.5/finch/gntpounce.c	2010-01-08 18:39:35.523268000 -0500
@@ -24,6 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- pidgin.spec	8 Jan 2010 21:02:20 -0000	1.107
+++ pidgin.spec	9 Jan 2010 01:06:52 -0000	1.108
@@ -98,7 +98,7 @@
 
 Name:		pidgin
 Version:	2.6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -130,7 +130,7 @@ Source1:	purple-fedora-prefs.xml
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-#Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
+Patch100: pidgin-2.6.5-old-gcc.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -392,7 +392,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-#%patch104 -p0 -b .msn_servconn_disconnect-crash
+%patch100 -p0 -b .old_gcc
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -640,10 +640,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Thu Jan  7 2010 Warren Togami <wtogami at redhat.com> - 2.6.5-1
+* Fri Jan  8 2010 Warren Togami <wtogami at redhat.com> - 2.6.5-2
 - 2.6.5
 - CVE-2010-0013
 - Other bug fixes
+- Fix build with old gcc versions (RHEL4)
 
 * Tue Dec  8 2009 Warren Togami <wtogami at redhat.com> - 2.6.4-4
 - temporarily disable evolution integration in F13 until it is fixed