summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2007-05-13 09:54:56 +0000
committerMichael Januszewski <spock@gentoo.org>2007-05-13 09:54:56 +0000
commitdc7e4e12bdad2078e1c1d8b003af5110fc2a12c5 (patch)
tree3420723a1f8d9ee8fd2c579e02d00ee1461339a9 /media-gfx
parentAdd patch from Josh Coalson for flac 1.1.3+ compatibility, closes bug #157707 (diff)
downloadgentoo-2-dc7e4e12bdad2078e1c1d8b003af5110fc2a12c5.tar.gz
gentoo-2-dc7e4e12bdad2078e1c1d8b003af5110fc2a12c5.tar.bz2
gentoo-2-dc7e4e12bdad2078e1c1d8b003af5110fc2a12c5.zip
Fix bug #178291.
(Portage version: 2.1.2.7)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/splashutils/ChangeLog6
-rw-r--r--media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch25
-rw-r--r--media-gfx/splashutils/splashutils-1.4.2.ebuild7
3 files changed, 35 insertions, 3 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index df9f47a8942c..9e37e79b3dcc 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/splashutils
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.93 2007/05/12 10:20:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.94 2007/05/13 09:54:56 spock Exp $
+
+ 13 May 2007; Michał Januszewski <spock@gentoo.org>
+ +files/splashutils-1.4.2-misc-strip.patch, splashutils-1.4.2.ebuild:
+ Fix bug #178291.
12 May 2007; Steve Dibb <beandog@gentoo.org> splashutils-1.4.2.ebuild:
amd64 stable, bug 178161
diff --git a/media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch b/media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch
new file mode 100644
index 000000000000..8cdb0bd403bb
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.4.2-misc-strip.patch
@@ -0,0 +1,25 @@
+diff --git a/misc/Makefile b/misc/Makefile
+index 7749b4a..bcb6ee7 100644
+--- a/misc/Makefile
++++ b/misc/Makefile
+@@ -1,15 +1,16 @@
+ SUBDIRS = fbtruetype kbd
+ LIB ?= lib
++STRIP = strip
+
+ all: fbres usleep
+
+-fbres:
++fbres:
+ $(CC) $(CFLAGS) $@.c -o $@
+- strip $@
++ $(STRIP) $@
+
+-usleep:
++usleep:
+ $(CC) $(CFLAGS) $@.c -o $@
+- strip $@
++ $(STRIP) $@
+
+ %:
+ @set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/media-gfx/splashutils/splashutils-1.4.2.ebuild b/media-gfx/splashutils/splashutils-1.4.2.ebuild
index 8ba10de18f02..3196c71a8a83 100644
--- a/media-gfx/splashutils/splashutils-1.4.2.ebuild
+++ b/media-gfx/splashutils/splashutils-1.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.2.ebuild,v 1.4 2007/05/12 10:20:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.2.ebuild,v 1.5 2007/05/13 09:54:56 spock Exp $
inherit eutils multilib toolchain-funcs
@@ -64,6 +64,9 @@ src_unpack() {
# helper.
rm ${S}/libs/zlib-${V_ZLIB}/Makefile
+ cd ${SM}
+ epatch ${FILESDIR}/${P}-misc-strip.patch
+
cd ${SG}
epatch ${FILESDIR}/${P}-rcabort.patch
@@ -116,7 +119,7 @@ src_compile() {
fi
cd ${SM}
- emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
+ emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
cd ${S}
./configure \