summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-24 00:59:10 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-24 00:59:10 +0000
commit328659c836e171114a173e4de2cd4b44cf8339d5 (patch)
tree9566985487caf07eba26b33580bc3fad823f1002 /media-gfx
parentRevision bump; added some patches to fix the --enable-debug configure option,... (diff)
downloadgentoo-2-328659c836e171114a173e4de2cd4b44cf8339d5.tar.gz
gentoo-2-328659c836e171114a173e4de2cd4b44cf8339d5.tar.bz2
gentoo-2-328659c836e171114a173e4de2cd4b44cf8339d5.zip
Added patch to make unconditional the GNU stack marking (fixes executable stack on non-x86 systems).
(Portage version: 2.1_pre1)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/gwenview/ChangeLog7
-rw-r--r--media-gfx/gwenview/files/gwenview-1.3.1-noexecstack.patch18
-rw-r--r--media-gfx/gwenview/gwenview-1.3.1.ebuild4
3 files changed, 27 insertions, 2 deletions
diff --git a/media-gfx/gwenview/ChangeLog b/media-gfx/gwenview/ChangeLog
index 5b9c7c44224a..6701813c0653 100644
--- a/media-gfx/gwenview/ChangeLog
+++ b/media-gfx/gwenview/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/gwenview
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.32 2005/11/29 21:10:47 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.33 2005/12/24 00:59:10 flameeyes Exp $
+
+ 24 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +files/gwenview-1.3.1-noexecstack.patch, gwenview-1.3.1.ebuild:
+ Added patch to make unconditional the GNU stack marking (fixes executable
+ stack on non-x86 systems).
*gwenview-1.3.1 (29 Nov 2005)
diff --git a/media-gfx/gwenview/files/gwenview-1.3.1-noexecstack.patch b/media-gfx/gwenview/files/gwenview-1.3.1-noexecstack.patch
new file mode 100644
index 000000000000..c79912523583
--- /dev/null
+++ b/media-gfx/gwenview/files/gwenview-1.3.1-noexecstack.patch
@@ -0,0 +1,18 @@
+Index: gwenview-1.3.1/src/imageutils/asm_scale.S
+===================================================================
+--- gwenview-1.3.1.orig/src/imageutils/asm_scale.S
++++ gwenview-1.3.1/src/imageutils/asm_scale.S
+@@ -803,8 +803,11 @@ PR_(mimageScale_mmx_AARGBA):
+ popl %ebp
+ ret
+
+-.section .note.GNU-stack,"",@progbits
+-
+ SIZE(mimageScale_mmx_AARGBA)
+
+ #endif
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
++
diff --git a/media-gfx/gwenview/gwenview-1.3.1.ebuild b/media-gfx/gwenview/gwenview-1.3.1.ebuild
index 78416557ffef..7504373071f7 100644
--- a/media-gfx/gwenview/gwenview-1.3.1.ebuild
+++ b/media-gfx/gwenview/gwenview-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.3.1.ebuild,v 1.1 2005/11/29 21:10:47 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.3.1.ebuild,v 1.2 2005/12/24 00:59:10 flameeyes Exp $
inherit kde
@@ -18,6 +18,8 @@ IUSE="kipi"
DEPEND="kipi? ( >=media-plugins/kipi-plugins-0.1.0_beta2 )"
+PATCHES="${FILESDIR}/${P}-noexecstack.patch"
+
need-kde 3
pkg_setup(){