[Pkg-kde-commits] rev 2229 - trunk/packages/kdemultimedia/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-12 20:57:37 +0000 (Sat, 12 Nov 2005)
New Revision: 2229

Modified:
   trunk/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff
   trunk/packages/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff
Log:
Resync. The noexecstack patch was misapplied upstream, so that
it doesn't work and we still need hours.


Modified: trunk/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff	2005-11-12 20:56:36 UTC (rev 2228)
+++ trunk/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff	2005-11-12 20:57:37 UTC (rev 2229)
@@ -1,6 +1,6 @@
 --- kde.orig/mpeglib/configure.in.in
 +++ kde.patched/mpeglib/configure.in.in
-@@ -197,12 +197,6 @@
+@@ -144,12 +144,6 @@
  AC_MSG_RESULT($OS_TYPE)
  
  INTELCPPFLAG=

Modified: trunk/packages/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff	2005-11-12 20:56:36 UTC (rev 2228)
+++ trunk/packages/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff	2005-11-12 20:57:37 UTC (rev 2229)
@@ -1,6 +1,6 @@
 --- kde.orig/mpeglib/lib/mpegplay/mmxidct_asm.S
 +++ kde.patched/mpeglib/lib/mpegplay/mmxidct_asm.S
-@@ -735,3 +735,4 @@
+@@ -736,3 +736,4 @@
  
  #endif