[Pkg-kde-commits] rev 1389 - in branches/kde-3.4.0/packages/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-07-29 03:54:58 +0000 (Fri, 29 Jul 2005)
New Revision: 1389

Added:
   branches/kde-3.4.0/packages/kdebase/debian/patches/02_glibc-2.3.2_gcc-4.0_build.diff
Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
Log:
Build patch. No more need for glibc 2.3.5.


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-07-28 21:07:32 UTC (rev 1388)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-07-29 03:54:58 UTC (rev 1389)
@@ -14,6 +14,9 @@
     07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr
     is also now built and installed with kwin.
 
+  * Add a patch that allows kdebase to build with gcc 4.0 in conjunction with
+    glibc 2.3.2.
+
   * Tighten all package relations between packages in kdebase, preventing many
     instances of potentially harmful partial upgrades. In particular, ensure
     that kdm is upgraded along with kdebase-bin. (Closes: #312358)

Added: branches/kde-3.4.0/packages/kdebase/debian/patches/02_glibc-2.3.2_gcc-4.0_build.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/02_glibc-2.3.2_gcc-4.0_build.diff	2005-07-28 21:07:32 UTC (rev 1388)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/02_glibc-2.3.2_gcc-4.0_build.diff	2005-07-29 03:54:58 UTC (rev 1389)
@@ -0,0 +1,40 @@
+--- kde.orig/kioslave/nfs/mount_xdr.c
++++ kde.patched/kioslave/nfs/mount_xdr.c
+@@ -8,6 +8,17 @@
+ #include <arpa/inet.h>
+ 
+ #include "mount.h"
++
++#define IXDR_GET_LONG(buf)            ((long)IXDR_GET_U_INT32(buf))
++#define IXDR_PUT_LONG(buf, v)         ((long)IXDR_PUT_INT32(buf, (long)(v)))
++#define IXDR_GET_U_LONG(buf)          ((u_long)IXDR_GET_LONG(buf))
++#define IXDR_PUT_U_LONG(buf, v)       IXDR_PUT_LONG(buf, (long)(v))
++
++#define IXDR_GET_SHORT(buf)           ((short)IXDR_GET_LONG(buf))
++#define IXDR_GET_U_SHORT(buf)         ((u_short)IXDR_GET_LONG(buf))
++#define IXDR_PUT_SHORT(buf, v)        IXDR_PUT_LONG(buf, (long)(v))
++#define IXDR_PUT_U_SHORT(buf, v)      IXDR_PUT_LONG(buf, (long)(v))
++
+ /*
+  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+  * unrestricted use provided that this legend is included on all tape
+--- kde.orig/kioslave/nfs/nfs_prot_xdr.c
++++ kde.patched/kioslave/nfs/nfs_prot_xdr.c
+@@ -8,6 +8,17 @@
+ #include <arpa/inet.h>
+ 
+ #include "nfs_prot.h"
++
++#define IXDR_GET_LONG(buf)            ((long)IXDR_GET_U_INT32(buf))
++#define IXDR_PUT_LONG(buf, v)         ((long)IXDR_PUT_INT32(buf, (long)(v)))
++#define IXDR_GET_U_LONG(buf)          ((u_long)IXDR_GET_LONG(buf))
++#define IXDR_PUT_U_LONG(buf, v)       IXDR_PUT_LONG(buf, (long)(v))
++
++#define IXDR_GET_SHORT(buf)           ((short)IXDR_GET_LONG(buf))
++#define IXDR_GET_U_SHORT(buf)         ((u_short)IXDR_GET_LONG(buf))
++#define IXDR_PUT_SHORT(buf, v)        IXDR_PUT_LONG(buf, (long)(v))
++#define IXDR_PUT_U_SHORT(buf, v)      IXDR_PUT_LONG(buf, (long)(v))
++
+ /*
+  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+  * unrestricted use provided that this legend is included on all tape