summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2013-08-18 12:25:52 +0000
committerAlfredo Tupone <tupone@gentoo.org>2013-08-18 12:25:52 +0000
commitabbfcdc8a75bda51260df43ec86b7c1a7304f6a9 (patch)
tree5a5477575dce37b7812709a7b6e3cb3b3b9d8763 /games-fps
parentStable for amd64, wrt bug #449624 (diff)
downloadhistorical-abbfcdc8a75bda51260df43ec86b7c1a7304f6a9.tar.gz
historical-abbfcdc8a75bda51260df43ec86b7c1a7304f6a9.tar.bz2
historical-abbfcdc8a75bda51260df43ec86b7c1a7304f6a9.zip
Should fix underlink. Bug #481444
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64 Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/tremulous/ChangeLog6
-rw-r--r--games-fps/tremulous/Manifest22
-rw-r--r--games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch9
3 files changed, 19 insertions, 18 deletions
diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
index 1af51bd8c5af..729196f27c1c 100644
--- a/games-fps/tremulous/ChangeLog
+++ b/games-fps/tremulous/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-fps/tremulous
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.25 2013/02/07 22:07:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.26 2013/08/18 12:25:43 tupone Exp $
+
+ 18 Aug 2013; Alfredo Tupone <tupone@gentoo.org>
+ files/tremulous-1.1.0-ldflags.patch:
+ Should fix underlink. Bug #481444 by Torsten Kaiser
07 Feb 2013; Ulrich Müller <ulm@gentoo.org> tremulous-1.1.0-r4.ebuild:
Move Creative Commons licenses to shorter names.
diff --git a/games-fps/tremulous/Manifest b/games-fps/tremulous/Manifest
index dbecf2e413f4..2a5d33c45193 100644
--- a/games-fps/tremulous/Manifest
+++ b/games-fps/tremulous/Manifest
@@ -1,29 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX tremulous-1.1.0-ldflags.patch 872 SHA256 1ef7c7b246be38aedb7dcb26bd871fd019cd63aebea606fbeff2b8ef3d17b5f3 SHA512 2e4a14f7073c8db319ea18e160a7b5419e978bda77e5713dbfe23a2d26f331c18921a5f52941b99d1df3587c8b57fb3a46986319b6cf4416947f45148fe5177a WHIRLPOOL 745582d3cef50f8a845c008757d302276e38c63433e8a202383b40c3580f5291b00bf3a5bc9ef3c64e184563664b2539c20c7d1e6779d5e1bf606d2a37d59721
+AUX tremulous-1.1.0-ldflags.patch 1133 SHA256 164be2aaac3ba06a157051b8b664725787a4406322f3fc1296e8b370a0c01693 SHA512 ac5baf49c98e872329c6b529697863c473cae9945bbf937eee59c6a39e8ba9205f719a500bd4e88396f0ecd83d5aaca18c91698cdaa22d5b1f320db99b411e6a WHIRLPOOL 119e62446daba3534f1a292dc4d635370c34f7f32672c9d6907c4ad3e9a009b011b639732bf867eea940477c03f361eafb2ef52975ccbc691c68e91722e22438
AUX tremulous-1.1.0-system_jpeg-2.patch 5161 SHA256 077f70aaf03c581991ff682be7dab9ab80cabc925df75582273e34f15fcbc6b1 SHA512 d6aeda3da3ec5b4eb94ddb813c35f466a0a5ba112ea8fb2d676b09c4220c8670631cdae323007238111c6c07e3a3cb11ed314c1f43aaeab08ba307bd2f8b867e WHIRLPOOL 02abecf3238c9243035e9c9712f343a3d3a2fad6ae1231686022b00c6245c2b24cd5e348b14c89eb743ff66579347ef0a48b1b0d42344931fda2df96c4493ab3
AUX tremulous-1.1.0-system_jpeg.patch 5913 SHA256 57ffe4237e18aa97c16eb603f11b5907533a584985fb84a24116a5cbe2522515 SHA512 448d48de1d728cda4d3a61a49068f1f3a6dcdbad9ec58218f00f21468d40b929a65024cc430873fe8afcbfc462dd5d106cad398de8f668cbabe93f1f8ba3a292 WHIRLPOOL adf51b53f00df55dc22df5eeeb1f1965c2dd53464c729f0e3fafc6823fe8a38aabef345fc60c9d89681a886c5d3509e4d65318916375a986d0efcdb21fde36a7
DIST tremulous-1.1.0.zip 105821907 SHA256 c7bb66f55abc88932edee16c253e5d37f90dded2ce29cf6cb15ad4f78e378987 SHA512 bcbd0ddc876bdf8dcff2e01b212ef4a56cb73b58b6a4ea17d9ca778be9fe63c9984aaaf893d235a7fc3b2ed3a8b58632defa7d66fc4daaa84231b62a1f0d9cbc WHIRLPOOL 756710d10e8e19a04b7bb73a5acb756efb69b6f8531adb8d3049456b3df6c5cb1c27c930a5c640314849120427c985291c0c95772821cfb34b390036e589f5d7
DIST tremulous-gentoopatches-1.1.0-r5.zip 372877 SHA256 c03f22b49b65d8f7acae18981f3c87eac0f17a44c3916282eaa10afe232ca12b SHA512 c2235c26f5f5c3b8144030ecb8837beab086e56ff8194c3d94d77edca3c3212066db5113021e2c18fdc509d6937bdbebf92687698ddaa6a4dfa74f4fba109638 WHIRLPOOL 9309fa9045daf2109990418af7279137b38d8d2d7913cd94f131a7cbaba26d8cb81e9d736d10dd7d7939477923a1bc712460d1bddc2bec5b1437f368785f23d2
DIST vms-1.1.t971.pk3 495308 SHA256 bb2f57e5c2dd725e095f0e92a9dfe5fb99f8ba84344618087828d0f5dced797e SHA512 869c0926465c0f56e30daf4b1a2c2432191585e499d982b8a2cfee83e88b5e10b507967dd3f901fae97e45e6156dcdfff6809108de2b909e90edb9856f0cf510 WHIRLPOOL 0c467d6c49684eb1cd5f6b96428ca9ecfb1035b13084d0116039bd244c58ce28d14ea01ff076779bf36b4d59ede5c55c10ac5cbd499ee64e5d2feddfe54250a1
EBUILD tremulous-1.1.0-r4.ebuild 2848 SHA256 cacc8fc0d98e9221d3791f10b398b6269c324f9aec9f9e2486638ab8f8192ef8 SHA512 c8d7f440bad4d7a59431f36b2360d3c172f48b235174f2a09a46ef7d5b65860824e23f58f8b2ec25e17d2f3579829f73095cf457268d8d6c71b219397070da86 WHIRLPOOL 39c956ab700d0b020df0771bdb0859ea7fec4e365a72bb990d89edd2ff0a9a913602f48309fe7b6de637c031f7e3a396aae3c7dd67988546a6170beb964e5abd
-MISC ChangeLog 3825 SHA256 a29a01edcdaca41f644ace5175b3025a50c6f8c0c97e3c0587d3e39abe347434 SHA512 182d319cb7518c327f61f565e710c21442834a0ae45c5684aead3b7d141a63c569c72ceeed04eeaf03ec453659f3c8d67f46a7db5a6f0afd2e7e0516612e0b77 WHIRLPOOL 6e8d467432c91aa19cd15402009bdc199bc5ef4bf264e0022d4ff029fbadd924eef7cf6cdd270b47d84384bded5e76cd29cca0bfc5668df683ea196a1e1cd093
+MISC ChangeLog 3972 SHA256 7acd6718d9ad0e018f64d974b65d7848033afaf175c36c1582c5b33a31a3f0ce SHA512 fc08c4e38e4d58ef7dde63607a028b1525575a9488f14ad690db8c61f1bed9e78decec95942f150ee317c6697137ab1fa995c6c78aa1ff95b42d4871e3214e1f WHIRLPOOL 7a5055fc8ca9695dfdc29f9e301921acb60d509429834c791d5dc96bb8d7245114939e162eaaff26e79175fc97037480a94f0b17a0d7052e567dface059dc66d
MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCAAGBQJRFCaoAAoJEDxpGckxwJCBX2oP/1TP33ICQoB1kqc0rx5IVHu1
-eiUff6RTU8Tx8LUx/dXzxbcM4plbzDrIcIt/Hkvyv55ti8wF6j23PxrkdOE8kP5k
-k5Vsqe7dK6idPjMCaWcsN51ETiXaJA0n/wEqzHEK6ZcAe1JHqZSZFLQC7wWwh5/O
-Ccn/ANKCnofWHQCy/1voJ3tmBG0V8AofvguWq3+m99l9+1ZI/tj0dMhqZSpN1tAv
-VbA6QuwqCYhrEvR6KbEdXyJrz/XPU+Tzb9esh1KGCuMog+woImMPIykwUV0RzGuu
-jKyy9SqfXUiu/UdJRc+QGENdfy63twRB82f7PwENJ300mRef3hJulw2tX+MmZyD8
-kC+4Lnm1Qulnu7J4o5pbo49hT2psHHsMiqT+E5veBAuM4JvdZp3DJ3Qo6AakWKQf
-QddMbJvVf+NewjincZC2bal4WKlB3WFtOxw6/H5oEiEe3PjJqK1Fr/L1LGbKCPgN
-qmioMsaznVBdj56a1Y9lYLu3XbaBrPHfGC9RiGmQH5OhBUjR1qUwg6b9dN/EO6K2
-tw3jIK2l27wpHNp5kRtBWjIbCPVOULxASpDh7FIYc+A/q91Sl5I9Az/zxQbIJ4xk
-bWUy/LkojVyLDS7frdkrMHXdayA2tKDTTKNwUDP/wwyntSw9nCSm80uKrW2VtmWH
-SgFwLuqO1E/ZwhSzYuhx
-=US1E
+iEYEAREIAAYFAlIQvUwACgkQIY77eQFFFC1lpwCgw6/0ZyJElBhHB6lajeBVqCfA
+qaYAn3e/ELJxksj92hQtn82aj7fBORAH
+=poUw
-----END PGP SIGNATURE-----
diff --git a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
index 3a3582a9aef4..4c728fc7c5fc 100644
--- a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
+++ b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
@@ -9,7 +9,14 @@
ifeq ($(USE_SDL),1)
CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1074,8 +1074,8 @@
+@@ -1069,13 +1069,13 @@
+
+ $(B)/tremulous.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
+ @echo "LD $@"
+- @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
+- $(LDFLAGS) $(LIBSDLMAIN)
++ @$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
++ $(LDLIBS) $(LIBSDLMAIN)
$(B)/tremulous-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
@echo "LD $@"