[Pkg-kde-commits] rev 2124 - people/chrsmrtn/packages/gwenview/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-10-26 16:27:16 +0000 (Wed, 26 Oct 2005)
New Revision: 2124

Modified:
   people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff
Log:
Steal yet more backported patches.


Modified: people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff	2005-10-26 12:53:34 UTC (rev 2123)
+++ people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff	2005-10-26 16:27:16 UTC (rev 2124)
@@ -111,12 +111,25 @@
  : KDialogBase(
 --- gwenview.orig/NEWS
 +++ gwenview.patched/NEWS
-@@ -1,3 +1,8 @@
+@@ -1,3 +1,10 @@
 +2005.xx.xx - v1.3.1
-+- Fixes:
-+ - Fix compilation with GCC 4.1
-+ - Fix MMX configure check with GCC 4.x.
++ - Fixes:
++  - Fix compilation with GCC 4.1
++  - Fix MMX configure check with GCC 4.x.
++  - Make sure Gwenview libs do not require an executable stack.
++    (Patch by Christopher Martin)
 +
  2005.09.11 - v1.3.0
  - Fixes:
   - Keyboard shortcuts for file operations now work even if no image is selected.
+--- gwenview.orig/src/imageutils/asm_scale.S
++++ gwenview.patched/src/imageutils/asm_scale.S
+@@ -803,6 +803,8 @@
+ 	popl %ebp
+ 	ret
+ 
++.section	.note.GNU-stack,"", at progbits
++
+ SIZE(mimageScale_mmx_AARGBA)
+ 
+ #endif