summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2007-12-26 12:24:25 +0000
committerAlfredo Tupone <tupone@gentoo.org>2007-12-26 12:24:25 +0000
commit0d03109c81e40801dbb45eb2f7411b3280ed6b61 (patch)
treecafa552c0aee545075bed299cdde39259fefe5fe /games-puzzle/quadra
parentAdding some documentation (diff)
downloadgentoo-2-0d03109c81e40801dbb45eb2f7411b3280ed6b61.tar.gz
gentoo-2-0d03109c81e40801dbb45eb2f7411b3280ed6b61.tar.bz2
gentoo-2-0d03109c81e40801dbb45eb2f7411b3280ed6b61.zip
Fix for as-needed. Bug #203280
(Portage version: 2.1.3.19)
Diffstat (limited to 'games-puzzle/quadra')
-rw-r--r--games-puzzle/quadra/ChangeLog6
-rw-r--r--games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch11
-rw-r--r--games-puzzle/quadra/quadra-1.1.8.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index f7943674cd24..c8ebf9fda322 100644
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/quadra
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.16 2007/07/06 22:18:36 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.17 2007/12/26 12:24:24 tupone Exp $
+
+ 26 Dec 2007; Tupone Alfredo <tupone@gentoo.org>
+ +files/quadra-1.1.8-asneeded.patch, quadra-1.1.8.ebuild:
+ Fix for as-needed. Bug #203280 by Yang Zhao
06 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+files/quadra-1.1.8-gcc42.patch, quadra-1.1.8.ebuild:
diff --git a/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch b/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch
new file mode 100644
index 000000000000..f0e7422d1ba3
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch
@@ -0,0 +1,11 @@
+--- source/rules.mk.old 2007-12-26 13:03:26.000000000 +0100
++++ source/rules.mk 2007-12-26 13:04:00.000000000 +0100
+@@ -19,7 +19,7 @@
+ # $Id: quadra-1.1.8-asneeded.patch,v 1.1 2007/12/26 12:24:25 tupone Exp $
+
+ quadra: $(QUADRA_OBJECTS) skelton/lib/libugs_s.a
+- $(LINK.cc) -Lskelton/lib $(X_CFLAGS) $(X_LIBS) -lX11 -lXext -lXpm -lpng -ldl -lz -o $@ $^
++ $(LINK.cc) -Lskelton/lib $(X_CFLAGS) $(X_LIBS) -ldl -lz -o $@ $^ -lX11 -lXext -lXpm -lpng
+
+ quadra.res: $(shell cat resources.txt) resources.txt skelton/tools/wadder/wadder
+ skelton/tools/wadder/wadder ./ $@ resources.txt
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index dc045023c0a1..63c5d78cb649 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.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/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.16 2007/07/06 22:18:36 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.17 2007/12/26 12:24:24 tupone Exp $
inherit eutils games
@@ -26,6 +26,7 @@ src_unpack() {
"${FILESDIR}"/${P}-gcc3.patch \
"${FILESDIR}"/libpng-1.2.5.patch \
"${FILESDIR}"/${P}-amd64.patch \
+ "${FILESDIR}"/${P}-asneeded.patch \
"${FILESDIR}"/${P}-gcc42.patch
sed -i \
-e 's:-pedantic::' config/vars.mk \