rev 5652 - in trunk/packages/kdebase/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2007-02-27 20:28:19 +0100 (Tue, 27 Feb 2007)
New Revision: 5652

Added:
   trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff
Modified:
   trunk/packages/kdebase/debian/changelog
Log:
Fix #410091. Compilation verified.

Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-02-26 20:45:29 UTC (rev 5651)
+++ trunk/packages/kdebase/debian/changelog	2007-02-27 19:28:19 UTC (rev 5652)
@@ -1,3 +1,14 @@
+kdebase (4:3.5.6.dfsg.1-3) experimental; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Correct false assumptions about the size of long always being 32bit. This
+    should fix nspluginviewer segfaults in some cases on 64bit arches
+    (Closes: #410091). Thanks to Matthias Dellweg for the bug analysis and the
+    patch.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Feb 2007 20:06:55 +0200
+
 kdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low
 
   +++ Changes by Sune Vuorela:

Added: trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff	2007-02-26 20:45:29 UTC (rev 5651)
+++ trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff	2007-02-27 19:28:19 UTC (rev 5652)
@@ -0,0 +1,38 @@
+--- kdebase/nsplugins/sdk/npapi.h	2007-02-27 20:26:32.000000000 +0200
++++ kdebase/nsplugins/sdk/npapi.h	2007-02-27 20:26:40.000000000 +0200
+@@ -8,6 +8,7 @@
+ #define _NPAPI_H_
+ 
+ #include "jri.h"                /* Java Runtime Interface */
++#include <sys/types.h>
+ 
+ #ifdef _WINDOWS
+ # ifndef XP_WIN
+@@ -55,23 +56,23 @@
+ /*----------------------------------------------------------------------*/
+ 
+ #ifndef _UINT16
+-typedef unsigned short uint16;
++typedef u_int16_t uint16;
+ #endif
+ #ifndef _UINT32
+ #if defined(__alpha)
+ typedef unsigned int uint32;
+ #else /* __alpha */
+-typedef unsigned long uint32;
++typedef u_int32_t uint32;
+ #endif /* __alpha */
+ #endif
+ #ifndef _INT16
+-typedef short int16;
++typedef int16_t int16;
+ #endif
+ #ifndef _INT32
+ #if defined(__alpha) || defined(_AIX)
+ typedef int int32;
+ #else /* __alpha || _AIX */
+-typedef long int32;
++typedef int32_t int32;
+ #endif /* __alpha || _AIX */
+ #endif
+