| 1 |
hasufell 13/09/30 12:13:05 |
| 2 |
|
| 3 |
Added: liquidwar6-0.0.13_beta-paths.patch |
| 4 |
liquidwar6-0.0.13_beta-ldconfig.patch |
| 5 |
liquidwar6-0.0.13_beta-libpng-1.6.patch |
| 6 |
Log: |
| 7 |
initial import wrt #388441 based on Samuel Bauers ebuilds |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: liquidwar6-0.0.13_beta-paths.patch |
| 18 |
=================================================================== |
| 19 |
commit e204ce228f5aafc7efd2c09fb4b0bfefe9708dfe |
| 20 |
Author: hasufell <hasufell@g.o> |
| 21 |
Date: Mon Sep 30 00:19:48 2013 +0200 |
| 22 |
|
| 23 |
make paths modifiable |
| 24 |
|
| 25 |
diff --git a/configure.ac b/configure.ac |
| 26 |
index 334b96e..d846210 100644 |
| 27 |
--- a/configure.ac |
| 28 |
+++ b/configure.ac |
| 29 |
@@ -698,6 +698,20 @@ else |
| 30 |
fi |
| 31 |
AC_SUBST(VALGRIND_CFLAGS) |
| 32 |
|
| 33 |
+AC_ARG_WITH([iconsdir], |
| 34 |
+ [AS_HELP_STRING([--with-iconsdir=DIR], |
| 35 |
+ [path where icons get installed (default: $datadir/icons/hicolor/48x48/apps)])], |
| 36 |
+ [ICONSDIR="$withval"], |
| 37 |
+ [ICONSDIR='$(datadir)/pixmaps']) |
| 38 |
+AC_SUBST(ICONSDIR) |
| 39 |
+ |
| 40 |
+AC_ARG_WITH([desktopdir], |
| 41 |
+ [AS_HELP_STRING([--with-desktopdir=DIR], |
| 42 |
+ [path where desktop files get installed (default: $datadir/applications)])], |
| 43 |
+ [DESKTOPDIR="$withval"], |
| 44 |
+ [DESKTOPDIR='$(datadir)/applications']) |
| 45 |
+AC_SUBST(DESKTOPDIR) |
| 46 |
+ |
| 47 |
if test x${USE_INCLUDED_LIBINTL} = xyes ; then |
| 48 |
LW6_LIBINTL_LDFLAGS= |
| 49 |
LW6_LIBINTL_LDADD=${LTLIBINTL} |
| 50 |
diff --git a/data/icon/Makefile.am b/data/icon/Makefile.am |
| 51 |
index b4d5ae4..f9b738c 100644 |
| 52 |
--- a/data/icon/Makefile.am |
| 53 |
+++ b/data/icon/Makefile.am |
| 54 |
@@ -19,6 +19,6 @@ |
| 55 |
# Contact author : ufoot@×××××.org |
| 56 |
|
| 57 |
pkgdata_DATA = liquidwar6.png liquidwar6.xpm |
| 58 |
-pkgdatadir = $(datadir)/pixmaps |
| 59 |
+pkgdatadir = $(ICONSDIR) |
| 60 |
EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns |
| 61 |
|
| 62 |
diff --git a/pkg/Makefile.am b/pkg/Makefile.am |
| 63 |
index 37f73ee..1980369 100644 |
| 64 |
--- a/pkg/Makefile.am |
| 65 |
+++ b/pkg/Makefile.am |
| 66 |
@@ -19,7 +19,7 @@ |
| 67 |
# Contact author : ufoot@×××××.org |
| 68 |
|
| 69 |
pkgdata_DATA = liquidwar6.desktop |
| 70 |
-pkgdatadir = $(datadir)/applications |
| 71 |
+pkgdatadir = $(DESKTOPDIR) |
| 72 |
EXTRA_DIST = $(pkgdata_DATA) liquidwar6.spec liquidwar6d |
| 73 |
|
| 74 |
distclean-local: |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.1 games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch?rev=1.1&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch?rev=1.1&content-type=text/plain |
| 82 |
|
| 83 |
Index: liquidwar6-0.0.13_beta-ldconfig.patch |
| 84 |
=================================================================== |
| 85 |
commit b69515e24f9ea066a7e393fa7b364e0701a8f58c |
| 86 |
Author: hasufell <hasufell@g.o> |
| 87 |
Date: Mon Sep 30 00:11:04 2013 +0200 |
| 88 |
|
| 89 |
don't run ldconfig |
| 90 |
|
| 91 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 92 |
index da78107..a0961b8 100644 |
| 93 |
--- a/src/Makefile.am |
| 94 |
+++ b/src/Makefile.am |
| 95 |
@@ -55,7 +55,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u |
| 96 |
SUBDIRS = lib |
| 97 |
|
| 98 |
install-exec-local: |
| 99 |
- if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root |
| 100 |
if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@; ln -s @PACKAGE_TARNAME@-@PACKAGE_VERSION@ $(DESTDIR)$(bindir)/liquidwar6; fi |
| 101 |
|
| 102 |
uninstall-local: |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
1.1 games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch |
| 107 |
|
| 108 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch?rev=1.1&view=markup |
| 109 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch?rev=1.1&content-type=text/plain |
| 110 |
|
| 111 |
Index: liquidwar6-0.0.13_beta-libpng-1.6.patch |
| 112 |
=================================================================== |
| 113 |
commit 0246d8e24c49e2ed12c183f0cde08d2e16b4c299 |
| 114 |
Author: hasufell <hasufell@g.o> |
| 115 |
Date: Mon Sep 30 00:10:54 2013 +0200 |
| 116 |
|
| 117 |
allow building with libpng-1.6 |
| 118 |
|
| 119 |
diff --git a/configure.ac b/configure.ac |
| 120 |
index 2a8cba9..334b96e 100644 |
| 121 |
--- a/configure.ac |
| 122 |
+++ b/configure.ac |
| 123 |
@@ -47,7 +47,7 @@ LW6_CODENAME="Blackbeard" |
| 124 |
AC_SUBST(LW6_CODENAME) |
| 125 |
|
| 126 |
dnl Headers, some are optional |
| 127 |
-AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) |
| 128 |
+AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) |
| 129 |
|
| 130 |
AM_MISSING_PROG(PERL, perl, ${missing_dir}) |
| 131 |
AM_MISSING_PROG(AWK, awk, ${missing_dir}) |
| 132 |
@@ -319,7 +319,8 @@ AC_CHECK_HEADER(libpng12/png.h, HAVE_LIBPNG12_PNG_H=1) |
| 133 |
AC_CHECK_HEADER(libpng13/png.h, HAVE_LIBPNG13_PNG_H=1) |
| 134 |
AC_CHECK_HEADER(libpng14/png.h, HAVE_LIBPNG14_PNG_H=1) |
| 135 |
AC_CHECK_HEADER(libpng15/png.h, HAVE_LIBPNG15_PNG_H=1) |
| 136 |
-if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1; then |
| 137 |
+AC_CHECK_HEADER(libpng16/png.h, HAVE_LIBPNG16_PNG_H=1) |
| 138 |
+if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1 || test x${HAVE_LIBPNG16_PNG_H} = x1; then |
| 139 |
if test x${HAVE_LIBPNG12_PNG_H} = x1; then |
| 140 |
LIBPNG_1X_H=libpng12/png.h |
| 141 |
fi |
| 142 |
@@ -332,9 +333,12 @@ if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || tes |
| 143 |
if test x${HAVE_LIBPNG15_PNG_H} = x1; then |
| 144 |
LIBPNG_1X_H=libpng15/png.h |
| 145 |
fi |
| 146 |
+ if test x${HAVE_LIBPNG16_PNG_H} = x1; then |
| 147 |
+ LIBPNG_1X_H=libpng16/png.h |
| 148 |
+ fi |
| 149 |
else |
| 150 |
AC_MSG_ERROR([ |
| 151 |
-*** Liquid War 6 needs libpng 1.2 1.3 1.4 or 1.5 (http://www.libpng.org/pub/png/libpng.html) |
| 152 |
+*** Liquid War 6 needs libpng 1.2 1.3 1.4 1.5 or 1.6 (http://www.libpng.org/pub/png/libpng.html) |
| 153 |
]) |
| 154 |
fi |
| 155 |
AC_SUBST(LIBPNG_1X_H) |
Archives