[Frugalware-git] frugalware-current: lgeneral-1.2-1-i686 * version bump * changed m8r (krix->Devil505) * removed useless patch * added 3 patches from gentoo * converted data tarball hosted on our server, the cinversion can't work into chroot

Devil505 devil505linux at gmail.com
Sun Mar 20 14:13:04 CET 2011


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4788245d0c3aaf1a53c05df06fa2e4d765e1db4a

commit 4788245d0c3aaf1a53c05df06fa2e4d765e1db4a
Author: Devil505 <devil505linux at gmail.com>
Date:   Sun Mar 20 14:10:10 2011 +0100

lgeneral-1.2-1-i686
* version bump
* changed m8r (krix->Devil505)
* removed useless patch
* added 3 patches from gentoo
* converted data tarball hosted on our server, the cinversion can't work into chroot

diff --git a/source/games-extra/lgeneral/01-gcc4-fix.patch b/source/games-extra/lgeneral/01-gcc4-fix.patch
deleted file mode 100644
index af6d21c..0000000
--- a/source/games-extra/lgeneral/01-gcc4-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur lgeneral-1.2beta-9.orig/src/misc.h lgeneral-1.2beta-9/src/misc.h
---- lgeneral-1.2beta-9.orig/src/misc.h	2005-11-25 22:20:53.254856500 +0100
-+++ lgeneral-1.2beta-9/src/misc.h	2005-11-25 22:21:17.976401500 +0100
-@@ -45,6 +45,8 @@
- /* return maximum */
- #define MAXIMUM( a, b ) ((a>b)?a:b)
-
-+#define NDEBUG 1
-+
- /* compile time assert */
- #ifndef NDEBUG
- #  define COMPILE_TIME_ASSERT( x ) do { switch (0) {case 0: case x:;} } while(0)
diff --git a/source/games-extra/lgeneral/FrugalBuild b/source/games-extra/lgeneral/FrugalBuild
index 3a87a90..16c6c63 100644
--- a/source/games-extra/lgeneral/FrugalBuild
+++ b/source/games-extra/lgeneral/FrugalBuild
@@ -1,42 +1,54 @@
# Compiling Time: 0.17 SBU
-# Maintainer: Christian Hamar alias krix <krics at linuxforum.hu>
+# Maintainer: Devil505 <devil505linux at gmail.com>
+# Contributor: Christian Hamar alias krix <krics at linuxforum.hu>

pkgname=lgeneral
-pkgver=1.2beta_12
+pkgver=1.2
origver=${pkgver/_/-}
pkgrel=1
pkgdesc="LGeneral is a turn-based strategy engine heavily inspired by Panzer General."
Finclude sourceforge
url="http://lgames.sourceforge.net/index.php?project=LGeneral"
depends=('sdl_mixer')
+makedepends=('gettext')
groups=('games-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://lgames.sourceforge.net/downloads.php | grep 'http.*lgeneral-.*\.tar\.gz' | sed -e 's/.*lgeneral-\(.*\)\.tar\.gz.*/\1/' | sed -e 's/-/_/'"
-source=($source  ${source/$pkgname-$origver.tar.gz/pg-data.tar.gz} \
-	01-gcc4-fix.patch)
-sha1sums=('ed4ea01ee36a47bb78221862978addf36de580d3' \
-	  '2f7a63f0a8efc3215e5e61ec6b513b7d8ee3c32b' \
-	  '8439f52f73512ab6bc63949a14443bb9fa80259f')
+source=($source  \
+    http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname-data/$pkgname-data.tar.gz \
+    lgeneral-1.2-as-needed.patch \
+	lgeneral-1.2-build.patch \
+    lgeneral-1.2-make-382.patch)
+sha1sums=('dc7d90e90bf9ff85ab35ed5c2b78072d7e716ad6' \
+          '3caec15d545372d214793a580afcc1d039640816' \
+          '1007f8ed65729d64034111674b337d78c79e3df9' \
+          'e4a74c96064619afabd3937687b77feb31839728' \
+          '2ce71c111c6e090f12cac95cf577b8f561a9d8a3')

-# NOTE: You must build this package NOT in chroot!
+_F_desktop_name="LGeneral"
+_F_desktop_desc="Panzer General style strategy game"
+_F_desktop_icon=$pkgname
+_F_desktop_categories="Game;StrategyGame"

-build()
-{
-	Fcd $pkgname-$origver
-	Fpatchall
-	Fautoconfize
+build() {
+	Fcd
+	cp /usr/share/gettext/config.rpath . || Fdie
+	rm -f missing || Fdie
+	Fautoreconf
+	Fbuild

-	# Needed for Panzer General data files population
-	cp -pPR $Fsrcdir/$pkgname-$origver $Fsrcdir/temp || Fdie
-
-	Fmake --localstatedir=/var/games/$pkgname --enable-sdl-mixer --disable-dependency-tracking
-	Fmakeinstall
+	# menu stuff
+	Finstallrel 644 ${pkgname}48.png usr/share/pixmaps/$pkgname.png
+	Fdesktop2
+
+    # Data
+	Fcp lgeneral-data/gfx usr/share/games/lgeneral/
+	Fcp lgeneral-data/maps usr/share/games/lgeneral/
+	Fcp lgeneral-data/nations usr/share/games/lgeneral/
+	Fcp lgeneral-data/scenarios usr/share/games/lgeneral/
+	Fcp lgeneral-data/sounds usr/share/games/lgeneral/
+	Fcp lgeneral-data/units usr/share/games/lgeneral/
+}

-	# Populate Panzer General data files # What a braindead mode ...
-	cd $Fsrcdir/temp || Fdie
-	Fmake --datadir=$Fdestdir/usr/share --enable-sdl-mixer --disable-dependency-tracking

-	mkdir -p $Fsrcdir/temp/lgc-pg/share/games || Fdie
-	ln -s $Fsrcdir/temp/lgc-pg $Fsrcdir/temp/lgc-pg/share/games/lgeneral || Fdie
-	SDL_VIDEODRIVER=dummy $Fsrcdir/temp/lgc-pg/lgc-pg -s $Fsrcdir/pg-data -d $Fdestdir/usr/share/games/lgeneral || Fdie
-}
+# optimization OK
diff --git a/source/games-extra/lgeneral/lgeneral-1.2-as-needed.patch b/source/games-extra/lgeneral/lgeneral-1.2-as-needed.patch
new file mode 100644
index 0000000..9044dc4
--- /dev/null
+++ b/source/games-extra/lgeneral/lgeneral-1.2-as-needed.patch
@@ -0,0 +1,13 @@
+--- tools/ltrextract/Makefile.am.old    2009-02-12 09:48:37.000000000 +0100
++++ tools/ltrextract/Makefile.am        2009-02-12 09:50:36.000000000 +0100
+@@ -3,9 +3,8 @@
+
+ bin_PROGRAMS = ltrextract
+
+-LIBS = $(top_builddir)/util/libutil.a $(INTLLIBS)
+ AM_CFLAGS = -DLTREXTRACT -I$(LGENERAL_PATH) -I$(top_srcdir) -I$(top_srcdir)/util $(INTLINCLUDES)
+-ltrextract_LDFLAGS = -lm
++ltrextract_LDADD = $(top_builddir)/util/libutil.a $(INTLLIBS)
+ ltrextract_SOURCES = ltrextract.c util.c util.h \
+ 	terrain.c terrain.h map.c map.h nation.c nation.h \
+ 	unit_lib.c unit_lib.h scenario.c scenario.h campaign.c campaign.h \
diff --git a/source/games-extra/lgeneral/lgeneral-1.2-build.patch b/source/games-extra/lgeneral/lgeneral-1.2-build.patch
new file mode 100644
index 0000000..026a1be
--- /dev/null
+++ b/source/games-extra/lgeneral/lgeneral-1.2-build.patch
@@ -0,0 +1,22 @@
+--- configure.in.old	2010-11-30 22:46:20.190215458 -0500
++++ configure.in	2010-11-30 22:47:07.138144807 -0500
+@@ -11,9 +11,10 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_CC_C_O
+
+ dnl various CFLAGS
+-CFLAGS="$CFLAGS -g -Wall"
++CFLAGS="$CFLAGS -Wall"
+ #CFLAGS="-O0 -g -Wall"
+
+ dnl Checks for libraries.
+@@ -36,6 +37,7 @@
+ dnl L10n support
+ ALL_LINGUAS="en de"
+
++AC_GNU_SOURCE
+ AM_GNU_GETTEXT
+
+ XGETTEXTFLAGS=
diff --git a/source/games-extra/lgeneral/lgeneral-1.2-make-382.patch b/source/games-extra/lgeneral/lgeneral-1.2-make-382.patch
new file mode 100644
index 0000000..f4eed33
--- /dev/null
+++ b/source/games-extra/lgeneral/lgeneral-1.2-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/337610
+
+--- intl/Makefile.in
++++ intl/Makefile.in
+@@ -206,12 +206,12 @@
+ # The dependency for intlh.inst is different in gettext and all other
+ # packages.  Because we cannot you GNU make features we have to solve
+ # the problem while rewriting Makefile.in.
+- at GT_YES@intlh.inst: intlh.inst.in ../config.status
+- at GT_YES@	cd .. \
+- at GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+- at GT_YES@	  $(SHELL) ./config.status
+- at GT_NO@.PHONY: intlh.inst
+- at GT_NO@intlh.inst:
++intlh.inst: intlh.inst.in ../config.status
++	cd .. \
++	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
++	  $(SHELL) ./config.status
++.PHONY: intlh.inst
++intlh.inst:
+
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.


More information about the Frugalware-git mailing list