diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2010-07-05 19:42:56 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2010-07-06 00:21:14 +0200 |
| commit | cd57b12e081713178b90ef26e78d83335c740285 (patch) | |
| tree | 780431d870d747115201c067ba6972555a0b9777 /recipes/supertux | |
| parent | d1f40ae1d1c9c168688eb8882e1ef200efbed399 (diff) | |
supertux: fix installation(will not overwrite just-created) and bump PR
data/Makefile.am has some duplicated entries which causes that kind of failure:
...usr/bin/install: will not overwrite just-created
`.../image/usr/share/supertux/sounds/bigjump.wav' with `sounds/bigjump.wav'
So in the patch we just remove the duplicated entries
Diffstat (limited to 'recipes/supertux')
| -rw-r--r-- | recipes/supertux/files/install-no-overwrite.patch | 13 | ||||
| -rw-r--r-- | recipes/supertux/supertux-qvga_0.1.3.bb | 3 | ||||
| -rw-r--r-- | recipes/supertux/supertux_0.1.2.bb | 3 | ||||
| -rw-r--r-- | recipes/supertux/supertux_0.1.3.bb | 3 |
4 files changed, 19 insertions, 3 deletions
diff --git a/recipes/supertux/files/install-no-overwrite.patch b/recipes/supertux/files/install-no-overwrite.patch new file mode 100644 index 0000000000..41e448663b --- /dev/null +++ b/recipes/supertux/files/install-no-overwrite.patch @@ -0,0 +1,13 @@ +Index: supertux-0.1.3/data/Makefile.am +=================================================================== +--- supertux-0.1.3.orig/data/Makefile.am 2010-07-04 22:53:15.209949507 +0200 ++++ supertux-0.1.3/data/Makefile.am 2010-07-04 22:53:51.490637559 +0200 +@@ -2,8 +2,6 @@ + supertux.strf \ + $(wildcard *.txt) \ + CREDITS \ +- $(wildcard sounds/*.wav) \ +- images/icon.xpm \ + $(wildcard images/*.png) \ + $(wildcard images/*.xpm) \ + $(wildcard images/background/*.png) \ diff --git a/recipes/supertux/supertux-qvga_0.1.3.bb b/recipes/supertux/supertux-qvga_0.1.3.bb index aad255b5a9..d34e5d91d4 100644 --- a/recipes/supertux/supertux-qvga_0.1.3.bb +++ b/recipes/supertux/supertux-qvga_0.1.3.bb @@ -4,7 +4,7 @@ SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libsdl-gfx imagemagick-native pngcrush-native" -PR = "r0.20" +PR = "r0.21" APPIMAGE = "${WORKDIR}/supertux.png" APPDESKTOP = "${WORKDIR}/supertux.desktop" @@ -13,6 +13,7 @@ PACKAGES_prepend = " ${PN}-levels-bonus1 ${PN}-levels-bonus2 " SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \ # file://supertux-qvga-gfx.tar.bz2 \ + file://install-no-overwrite.patch \ file://supertux-smallsize-data.tar.bz2 \ file://gp2x.patch \ file://img-resize.sh \ diff --git a/recipes/supertux/supertux_0.1.2.bb b/recipes/supertux/supertux_0.1.2.bb index 4d88eefa50..8a337e32da 100644 --- a/recipes/supertux/supertux_0.1.2.bb +++ b/recipes/supertux/supertux_0.1.2.bb @@ -3,13 +3,14 @@ in a style similar to the original SuperMario games." SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r4" +PR = "r5" APPIMAGE = "${WORKDIR}/supertux.png" APPDESKTOP = "${WORKDIR}/supertux.desktop" SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2;name=archive \ http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;name=patch \ + file://install-no-overwrite.patch \ file://supertux.png" export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" diff --git a/recipes/supertux/supertux_0.1.3.bb b/recipes/supertux/supertux_0.1.3.bb index 0006a2b8b0..e859cce1db 100644 --- a/recipes/supertux/supertux_0.1.3.bb +++ b/recipes/supertux/supertux_0.1.3.bb @@ -3,7 +3,7 @@ in a style similar to the original SuperMario games." SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" APPIMAGE = "${WORKDIR}/supertux.png" APPDESKTOP = "${WORKDIR}/supertux.desktop" @@ -11,6 +11,7 @@ APPDESKTOP = "${WORKDIR}/supertux.desktop" SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \ # http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz \ file://supertux.png \ + file://install-no-overwrite.patch \ file://supertux.desktop \ " |