diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-08-10 20:24:33 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-08-10 20:24:33 +0000 |
| commit | 8b78f07b025d8303b8569613960496d28f6bc385 (patch) | |
| tree | bff9618b79bc3165ad48f84197d7de1eb3dba4dd /games-strategy/dunelegacy | |
| parent | [bump] dev-perl/Moo-1.0.3 (diff) | |
| download | historical-8b78f07b025d8303b8569613960496d28f6bc385.tar.gz historical-8b78f07b025d8303b8569613960496d28f6bc385.tar.bz2 historical-8b78f07b025d8303b8569613960496d28f6bc385.zip | |
improve patch form
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'games-strategy/dunelegacy')
| -rw-r--r-- | games-strategy/dunelegacy/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/dunelegacy/Manifest | 18 | ||||
| -rw-r--r-- | games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch | 46 |
3 files changed, 22 insertions, 48 deletions
diff --git a/games-strategy/dunelegacy/ChangeLog b/games-strategy/dunelegacy/ChangeLog index bd1d956c9fd1..9f3616ec82f1 100644 --- a/games-strategy/dunelegacy/ChangeLog +++ b/games-strategy/dunelegacy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/dunelegacy # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/dunelegacy/ChangeLog,v 1.1 2012/08/09 20:44:51 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/dunelegacy/ChangeLog,v 1.2 2012/08/10 20:24:33 hasufell Exp $ + + 10 Aug 2012; Julian Ospald <hasufell@gentoo.org> + files/dunelegacy-0.96.2-build.patch: + improve patch form *dunelegacy-0.96.2 (09 Aug 2012) diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest index a6b7d3c37871..8b4acbfcd26e 100644 --- a/games-strategy/dunelegacy/Manifest +++ b/games-strategy/dunelegacy/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX dunelegacy-0.96.2-build.patch 2107 SHA256 ada1b355fadef7e63097966b1672f8184d3914175087a17f29ad00e8d3042c76 SHA512 1c0f14e1117c18d3019fe16fd2ae7ec9bac9d13c5db176f4227a145da8007f9ac613ab7e93269e45bc08a1ac6f56fd8894283b766fd2732ac83ad53a75d865de WHIRLPOOL b0a8fa37d984a96be767dfb8d232c013cee3ed28e329499daa7cf1236b998acb4464e1129f99a16981aee731743da794f8509151968f43b2372f696aa8c79006 +AUX dunelegacy-0.96.2-build.patch 1317 SHA256 8965d9275685b7014885cbd6245579d4c1c3f4bfd1594c9c9bd0babf7a2e78f9 SHA512 61eeb372f0e9bd140c63eab35bbf80c4a416dfae8d1c9e2127c6e80ce37dd1ae6f088f00ecbea32caef459bd5e7ab7cc18f43f7be9631db720b477365c330404 WHIRLPOOL 8bf5aaf527df3c810f24c4e6612c897006d8be076a2853b677d5aba3c4ff1f475808ba8ef2d68c9d137e4675ad769927be48fb0b7b8c82b325e910e2e8a87730 DIST dunelegacy-0.96.2-src.tar.bz2 1437524 SHA256 bdf27bdaa001f37db52ab4747bd563b48334db5df6e6e8314de85a0340649173 SHA512 49af1d74ea02c051b1c03393d1dc796eb1a81b402fa8a74643c308986a88ef25fe13dafded595f4144c8a83bf8fd51ad13c85c5c926fa13c436ecb08d6d9d7c1 WHIRLPOOL 47ca519e9de003c373a88fea22b198921f2ffebfaa4b068963fe68c3e06bf2370dfbf553e13f910a8c1cd084d16b5abc6369b93397220e377dcf840f544c835d EBUILD dunelegacy-0.96.2.ebuild 1042 SHA256 a2483c4c8041f3e383d64b22150e53326aeef5731a4accbbb73d7ae60136461c SHA512 0ce65f2808d7c3334782898af8fb839a14ddaf3e4b1ee8e7cb38f845a77144e522526433ad00dfc742940c6b6002a1bedbbe7b3b8e6d17185a208a87cd9a4b4e WHIRLPOOL 5a322eeeb958d73f704d02f22096c6631dda99897e6834f6c2d1b5b2b72b6209e763e47707f8c1a4be8e88201fb65d27aa9185a9ff84d2e1c92f0e53d48d7adb -MISC ChangeLog 410 SHA256 82db5e72e045acdbc443dd14cc885d808166ada607a193956a20233c4af93876 SHA512 e90370afd7dd625016b827ca4c3ad6aec09de179bc0e138a16aa0fc4c4d4ae8eac846673eeb228eb31f21ffb2e2aad223d15727a113708dcae2b37778e846b83 WHIRLPOOL 5bbda1d2c59f2525b257d4594f2c6d0b0f44d46fc452b2c58cbecbdbca774e095d19db21ddd76342dd3548099cf90d445f9e69e623e097d9354a6f342debf211 +MISC ChangeLog 522 SHA256 e8ceffdb50434651e7c53e91bea642c0ed17a128ce222ae0818b8ff307ad01d1 SHA512 99a41531adc684d6d77b3bc80f93f1fa07377bc33a590be25ae0569a6cdafc9f4b22084952cf7dbc036752429a62d1837bfdb7eeceffacfff678980229964f86 WHIRLPOOL e33b583bc062b0728b0b2731e956be89ce35236b0ddf24fe59fabbe0cf90f3a1ec612a19be64049698821ac0a5d8b94456f02811716ccfbb3198c99d0be9d7f8 MISC metadata.xml 1055 SHA256 4d31122e40133370f53dc4e1a7a3f2fea09e4afaaee1ffb8f44018f4976bc197 SHA512 cfa5777e71eed1527363d363d6c69cb35626448daa8c9bcd162cf3cbf5567386270080a98ab09a2001b36e9164023bc6063e06a94d6f51d692ce5e5f405d1380 WHIRLPOOL dbd1534f2f9053e251dc83be084d5cf9f79f0b4d5511d82b548f0c366c82d0f387735497b778118a0f87c15c1261db610f9d553c94025fe6f6b10e9bc11724d4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQJCAwAAoJEFpvPKfnPDWz89MH/jU8HvlYkYJg3V1OK7Ja0bwX -J4nVg69vZ7J7k+zhs4cQyyzSH6m9PRs5Sj9idq/R5o05dBJ8G4S8w6qwTwjKCBrv -yod7V2zRnjiqUUS/pexI8C3OSMRqV4lGUUpcuZzx/KrZjT0SMiWOG4svtmaF9Ffu -+/heTnDfF/O4PldP27KsQaVhY/HrnkfaueypOQA2cw0O53L2awYiHMni1D0eWBSN -HduR97xZxECFXItXBBoC2m7mGm7QlHCrtquGvXw7dhkfw6T8z++yIrgAp9sIYLVj -OrsAgMwB+88GuVchuhZ3r1ShoVId4GNVGOrNI6l2ZnBk8eJNJ1WayIYK5YcH3to= -=Trjs +iQEcBAEBCAAGBQJQJWzsAAoJEFpvPKfnPDWzCAEIAIAqIfl02Xy3v2sNPPk9mbQF +RAuGrq/xkALFk1WJ7w/gSmLOQ8bNYATPE8k+tr4AkLxcOf3mYntth0nPWfJZJQTz +pfi52hxOvUSZGGR8FHgqHaeY6QDYlMnZsf2timimhmpYO1NG3IUXhg3xEqzDhAy0 +x4NkjM1avecwSy4pbL7OwGTS14HNNrzIYIyb+QR5/cJJm/HILEcGhNseamz2nlWy +dGV/XLVqBK+Nk2eg4hTDCzVITgSsEdTtjrxkajeR77JdkbuoNFtWySemjmtxtdqD +uG8dnH4RJXoVPpDPPAsyf0D7pTNW9rSLjfg+5J8DCJ9Hs0bvu9cy0cpFnQ/9CC0= +=ngYl -----END PGP SIGNATURE----- diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch index 5d37d79d3f01..904dae74dbfb 100644 --- a/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch +++ b/games-strategy/dunelegacy/files/dunelegacy-0.96.2-build.patch @@ -6,7 +6,7 @@ Date: Thu Aug 9 18:57:40 2012 +0200 --- a/configure.ac +++ b/configure.ac -@@ -16,37 +16,11 @@ +@@ -16,38 +16,13 @@ AC_SUBST(dunelegacydatadir) @@ -31,48 +31,18 @@ Date: Thu Aug 9 18:57:40 2012 +0200 dnl Check for SDL library SDL_VERSION=1.2.0 -AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])) --CFLAGS="$CFLAGS $SDL_CFLAGS" --CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" --LIBS="$LIBS $SDL_LIBS" -- ++PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0 SDL_mixer]) + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + -dnl Check for SDL_mixer library. -AC_CHECK_LIB(SDL_mixer, - Mix_OpenAudio, - LIBS="$LIBS -lSDL_mixer", - AC_MSG_ERROR([*** SDL_mixer library not found!]) -) -+PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0 SDL_mixer]) -+AM_CFLAGS="$SDL_CFLAGS" -+AM_CXXFLAGS="$SDL_CFLAGS" - +- dnl enet defines AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)]) -@@ -71,4 +45,9 @@ - dunelegacydatadir='.' - fi - -+AC_SUBST([AM_CFLAGS]) -+AC_SUBST([AM_CXXFLAGS]) -+AC_SUBST([SDL_CFLAGS]) -+AC_SUBST([SDL_LIBS]) -+ - AC_OUTPUT(Makefile src/Makefile tests/Makefile) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -194,4 +194,6 @@ dunelegacy_SOURCES = AStarSearch.cpp\ - units/Trooper.cpp\
- $(NULL)
-
-+dunelegacy_LDADD = @SDL_LIBS@
-+
- AM_CPPFLAGS = -DDUNELEGACY_DATADIR='"$(dunelegacydatadir)"' -I$(top_srcdir)/include
---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -54,5 +54,6 @@ -
-
-
--runtests_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTESTSRC=\"$(srcdir)\" -I$(top_srcdir)/include
-+runtests_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTESTSRC=\"$(srcdir)\" -I$(top_srcdir)/include @SDL_CFLAGS@
-+runtests_LDADD = @SDL_LIBS@
- runtests_LDFLAGS = $(CPPUNIT_LIBS) -lcppunit
+ AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)]) |