From f392e7f75ceaebf874b4e5567666661f6199b58c Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 26 Jul 2010 22:28:04 +0200 Subject: aceofpenguins: update to version 1.3 * new game: spider * some fixes * renamed files folder to aceofpenguins Signed-off-by: Thomas Zimmermann --- .../aceofpenguins/fix-crosscompile.patch | 13 ++++++++++++ recipes/aceofpenguins/aceofpenguins/gcc4.patch | 23 ++++++++++++++++++++++ recipes/aceofpenguins/aceofpenguins_1.3.bb | 18 +++++++++++++++++ recipes/aceofpenguins/files/fix-crosscompile.patch | 13 ------------ recipes/aceofpenguins/files/gcc4.patch | 23 ---------------------- 5 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 recipes/aceofpenguins/aceofpenguins/fix-crosscompile.patch create mode 100644 recipes/aceofpenguins/aceofpenguins/gcc4.patch create mode 100644 recipes/aceofpenguins/aceofpenguins_1.3.bb delete mode 100644 recipes/aceofpenguins/files/fix-crosscompile.patch delete mode 100644 recipes/aceofpenguins/files/gcc4.patch (limited to 'recipes/aceofpenguins') diff --git a/recipes/aceofpenguins/aceofpenguins/fix-crosscompile.patch b/recipes/aceofpenguins/aceofpenguins/fix-crosscompile.patch new file mode 100644 index 0000000000..ff3ac0ffa8 --- /dev/null +++ b/recipes/aceofpenguins/aceofpenguins/fix-crosscompile.patch @@ -0,0 +1,13 @@ +diff -Nurd ace-1.2/lib/Makefile.am ace-1.2.new//lib/Makefile.am +--- ace-1.2/lib/Makefile.am 2010-02-18 12:21:30.000000000 +0100 ++++ ace-1.2.new//lib/Makefile.am 2010-02-18 12:21:30.000000000 +0100 +@@ -22,7 +22,7 @@ + ./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in images.c + + make-imglib : make-imglib.c +- $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz ++ $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -lpng -lz + + text2c : text2c.c +- $(BUILD_CC) $(srcdir)/text2c.c -o text2c -lpng -lz ++ $(BUILD_CC) $(srcdir)/text2c.c -o text2c $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -lpng -lz diff --git a/recipes/aceofpenguins/aceofpenguins/gcc4.patch b/recipes/aceofpenguins/aceofpenguins/gcc4.patch new file mode 100644 index 0000000000..431c44e933 --- /dev/null +++ b/recipes/aceofpenguins/aceofpenguins/gcc4.patch @@ -0,0 +1,23 @@ +--- ace-of-penguins-1.2.orig/games/golf.c ++++ ace-of-penguins-1.2/games/golf.c +@@ -31,7 +31,7 @@ + + Stack *deck, *discard, *stacks[7]; + +-static int table_width, table_height; ++int table_width, table_height; + + int supress_arrows = 0; + +--- ace-of-penguins-1.2.orig/games/solitaire.c ++++ ace-of-penguins-1.2/games/solitaire.c +@@ -337,7 +337,7 @@ + return something_moved; + } + +-static void ++void + check_for_end_of_game() + { + while (auto_move()); + diff --git a/recipes/aceofpenguins/aceofpenguins_1.3.bb b/recipes/aceofpenguins/aceofpenguins_1.3.bb new file mode 100644 index 0000000000..a371ae4312 --- /dev/null +++ b/recipes/aceofpenguins/aceofpenguins_1.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "The Ace of Penguins is a set of Unix/X solitaire games based on the ones available for Windows(tm) but with a number of enhancements that my wife says make my versions better :-) \ +The latest version includes clones of freecell, golf, mastermind, merlin, minesweeper, pegged, solitaire, taipei (with editor!), and thornq (by Martin Thornquist)." +AUTHOR = "dj@delorie.com" +HOMEPAGE = "http://www.delorie.com/store/ace/" +SECTION = "games" +DEPENDS = "libpng-native libpng zlib-native libxpm" +PR = "r0" + +SRC_URI = "\ + http://www.delorie.com/store/ace/ace-${PV}.tar.gz\ + file://fix-crosscompile.patch\ +" +SRC_URI[md5sum] = "1bd11ed270342ad78ff4822c06c6a762" +SRC_URI[sha256sum] = "4fb6ca9e1ff34e42d9498f06e2bccaa61f5650daf48774015468d5f75c5347d3" + +S = "${WORKDIR}/ace-${PV}" + +inherit autotools diff --git a/recipes/aceofpenguins/files/fix-crosscompile.patch b/recipes/aceofpenguins/files/fix-crosscompile.patch deleted file mode 100644 index ff3ac0ffa8..0000000000 --- a/recipes/aceofpenguins/files/fix-crosscompile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurd ace-1.2/lib/Makefile.am ace-1.2.new//lib/Makefile.am ---- ace-1.2/lib/Makefile.am 2010-02-18 12:21:30.000000000 +0100 -+++ ace-1.2.new//lib/Makefile.am 2010-02-18 12:21:30.000000000 +0100 -@@ -22,7 +22,7 @@ - ./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in images.c - - make-imglib : make-imglib.c -- $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz -+ $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -lpng -lz - - text2c : text2c.c -- $(BUILD_CC) $(srcdir)/text2c.c -o text2c -lpng -lz -+ $(BUILD_CC) $(srcdir)/text2c.c -o text2c $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -lpng -lz diff --git a/recipes/aceofpenguins/files/gcc4.patch b/recipes/aceofpenguins/files/gcc4.patch deleted file mode 100644 index 431c44e933..0000000000 --- a/recipes/aceofpenguins/files/gcc4.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ace-of-penguins-1.2.orig/games/golf.c -+++ ace-of-penguins-1.2/games/golf.c -@@ -31,7 +31,7 @@ - - Stack *deck, *discard, *stacks[7]; - --static int table_width, table_height; -+int table_width, table_height; - - int supress_arrows = 0; - ---- ace-of-penguins-1.2.orig/games/solitaire.c -+++ ace-of-penguins-1.2/games/solitaire.c -@@ -337,7 +337,7 @@ - return something_moved; - } - --static void -+void - check_for_end_of_game() - { - while (auto_move()); - -- cgit v1.2.3