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 | fdef9305dd0bffb595e4442c35979323a0357b86 (patch) | |
| tree | 9052f23c414c00bfe94b46825ad8c7fe3105ce13 /games-strategy/dunelegacy | |
| parent | [bump] dev-perl/Moo-1.0.3 (diff) | |
| download | gentoo-2-fdef9305dd0bffb595e4442c35979323a0357b86.tar.gz gentoo-2-fdef9305dd0bffb595e4442c35979323a0357b86.tar.bz2 gentoo-2-fdef9305dd0bffb595e4442c35979323a0357b86.zip | |
improve patch form
(Portage version: 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/files/dunelegacy-0.96.2-build.patch | 46 |
2 files changed, 13 insertions, 39 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/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)]) |