rpms/kdepim/F-9 kdepim-3.5.9-metakit_64bit.patch, NONE, 1.1 kdepim.spec, 1.166, 1.167

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28768

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.9-metakit_64bit.patch 
Log Message:
metakit patch, fixes build on sparc64


kdepim-3.5.9-metakit_64bit.patch:

--- NEW FILE kdepim-3.5.9-metakit_64bit.patch ---
diff -up kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h.SIZEOF_LONG kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h
diff -up kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h.metakit_64bit kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h
--- kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h.metakit_64bit	2006-07-22 03:14:06.000000000 -0500
+++ kdepim-3.5.9/akregator/src/mk4storage/metakit/include/mk4.h	2008-06-05 12:59:32.000000000 -0500
@@ -9,6 +9,9 @@
 #ifndef __MK4_H__
 #define __MK4_H__
 
+// HACK, need SIZEOF_LONG def
+#include "config.h"
+
 //---------------------------------------------------------------------------
 //
 //  TITLE
@@ -100,9 +103,10 @@
 
     // and here's the other end of the scale...
 #if !defined (_WIN32) && !defined (q4_LONG64)
-#if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
-    defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || \
-    (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
+//#if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
+//    defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || \
+//    (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
+#if SIZEOF_LONG == 8
 #define q4_LONG64 1
 #endif
 #endif
diff -up kdepim-3.5.9/akregator/src/mk4storage/metakit/src/header.h.metakit_64bit kdepim-3.5.9/akregator/src/mk4storage/metakit/src/header.h
--- kdepim-3.5.9/akregator/src/mk4storage/metakit/src/header.h.metakit_64bit	2005-09-10 03:23:37.000000000 -0500
+++ kdepim-3.5.9/akregator/src/mk4storage/metakit/src/header.h	2008-06-05 12:38:02.000000000 -0500
@@ -139,11 +139,12 @@ extern void f4_memmove(void* d, const vo
 
 typedef unsigned char t4_byte;  // create typedefs for t4_byte, etc.
 
-#if SIZEOF_LONG == 8
-typedef int t4_i32;             // longs are 64b, so int must be 32b
-#else
-typedef long t4_i32;            // longs aren't 64b, so they are 32b
-#endif
+// omit, handled in mk4.h below
+//#if SIZEOF_LONG == 8
+//typedef int t4_i32;             // longs are 64b, so int must be 32b
+//#else
+//typedef long t4_i32;            // longs aren't 64b, so they are 32b
+//#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // Include header files which contain additional os/cpu/ide/fw specifics


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdepim.spec	4 Jun 2008 22:30:45 -0000	1.166
+++ kdepim.spec	5 Jun 2008 19:58:20 -0000	1.167
@@ -35,9 +35,9 @@
 # script used to generate svn checkout Source0 above
 Source1: kdepim-enterprise-svn_checkout.sh
 
-Release: 10.%{ent_date}svn.ent%{?dist}
+Release: 10.%{ent_date}svn.ent%{?dist}.1
 %else
-Release: 10%{?dist}
+Release: 10%{?dist}.1
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 
@@ -49,6 +49,8 @@
 Patch2: kdepim-xdg_open.patch
 # patch by Dirk Müller from openSUSE to fix gnokii detection
 Patch6: kdepim-3.5.9-gnokii-no-libintl.patch
+# fix build on sparc64 (and potentially other 64bit platforms)
+Patch7: kdepim-3.5.9-metakit_64bit.patch
 
 ## upstream patches
 # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync@774532 \
@@ -170,6 +172,7 @@
 %patch2 -p1 -b .xdg_open
 
 %patch6 -p0 -b .gnokii
+%patch7 -p1 -b .metakit_64bit
 
 %if 0%{?fedora} > 8
 pushd kitchensync
@@ -305,6 +308,9 @@
 
 
 %changelog
+* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-10.1
+- metakit_64bit patch, fix build on sparc64
+
 * Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-10
 - reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)