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

[Adeodato Simó]

Author: dato-guest
Date: 2005-03-06 13:29:46 +0100 (Sun, 06 Mar 2005)
New Revision: 718

Added:
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff
Modified:
   branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
Log:
Re-introduce patches/10_dont-define-__64.diff.


Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-03-06 12:16:58 UTC (rev 717)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-03-06 12:29:46 UTC (rev 718)
@@ -14,10 +14,6 @@
   * Add the following build-dependencies: libgstreamer-plugins0.8-dev,
     libltdl3-dev, libtheora-dev. Require libspeex-dev at (>> 1.1.5).
 
-  * Removed patches (applied upstream):
-    - 10_dont-define-__64.diff (introduced because of #270502. Upstream now
-      checks the arch worsize and defines __u64 accordingly).
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  3 Mar 2005 06:13:03 +0100
 
 kdemultimedia (4:3.3.2-1) unstable; urgency=low

Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff	2005-03-06 12:16:58 UTC (rev 717)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff	2005-03-06 12:29:46 UTC (rev 718)
@@ -0,0 +1,18 @@
+--- kdemultimedia-orig/mpeglib/lib/input/cdromAccess.cpp
++++ kdemultimedia-patched/mpeglib/lib/input/cdromAccess.cpp
+@@ -25,6 +25,7 @@
+ #ifdef OS_Linux
+   #include <linux/version.h>
+   #include <sys/types.h>
++  #if 0 /* Remove to avoid build problems on alpha and ia64, #270502, #226371 */
+   #ifndef __u64
+   #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
+   #include <bits/wordsize.h>
+@@ -35,6 +36,7 @@
+   #endif 
+   #endif
+   #endif
++  #endif /* 0 */
+   #include "cdromAccess_Linux.cpp"
+ #endif
+