From 7b06903a6a67f53ef4b31a4d42f352c464c57078 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 20 Apr 2019 11:11:41 +0200 Subject: [PATCH] lpairs, bump version (#3769) --- ...pairs-1.0.4.recipe => lpairs-1.0.5.recipe} | 25 +++--- ...s-1.0.4.patchset => lpairs-1.0.5.patchset} | 86 +++++++++---------- 2 files changed, 57 insertions(+), 54 deletions(-) rename games-puzzle/lpairs/{lpairs-1.0.4.recipe => lpairs-1.0.5.recipe} (71%) rename games-puzzle/lpairs/patches/{lpairs-1.0.4.patchset => lpairs-1.0.5.patchset} (58%) diff --git a/games-puzzle/lpairs/lpairs-1.0.4.recipe b/games-puzzle/lpairs/lpairs-1.0.5.recipe similarity index 71% rename from games-puzzle/lpairs/lpairs-1.0.4.recipe rename to games-puzzle/lpairs/lpairs-1.0.5.recipe index dece44d50..02aad03f5 100644 --- a/games-puzzle/lpairs/lpairs-1.0.4.recipe +++ b/games-puzzle/lpairs/lpairs-1.0.5.recipe @@ -3,12 +3,12 @@ DESCRIPTION="LPairs is a classical memory game. This means you have to \ find pairs of identical cards which will then be removed. Your time and \ tries needed will be counted but there is no highscore chart or limit to this." HOMEPAGE="http://lgames.sourceforge.net/" -COPYRIGHT="2001 Michael Speck" +COPYRIGHT="2001-2018 Michael Speck" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="http://sourceforge.net/projects/lgames/files/lpairs/lpairs-1.0.4.tar.gz" -CHECKSUM_SHA256="350237a51a5de6b2a557af687b4f16678056a0e8d8d96d7e395f6629481462c5" -PATCHES="lpairs-1.0.4.patchset" +REVISION="1" +SOURCE_URI="http://sourceforge.net/projects/lgames/files/lpairs/lpairs-$portVersion.tar.gz" +CHECKSUM_SHA256="57afe33d2a83229c3cff5efa6512fd2eeac4eacb92d37dd3070db6bbb024dc16" +PATCHES="lpairs-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -26,18 +26,22 @@ BUILD_REQUIRES=" devel:libsdl " BUILD_PREREQUIRES=" - cmd:make - cmd:g++ + cmd:aclocal + cmd:autoreconf + cmd:awk + cmd:bison + cmd:gcc cmd:ld cmd:libtoolize + cmd:make " if [ "$effectiveTargetArchitecture" == "x86_64" ] ; then -PATCHES="lpairs-1.0.4.patchset" +PATCHES="lpairs-$portVersion.patchset" fi BUILD() { - libtoolize --force --copy --install + autoreconf -vfi runConfigure ./configure --disable-nls --disable-dependency-tracking make $jobArgs @@ -47,8 +51,7 @@ INSTALL() { make install - rm -rf $dataDir/applications - rm -rf $dataDir/icons + rm -rf $dataDir/{applications,icons} addAppDeskbarSymlink $binDir/lpairs LPairs } diff --git a/games-puzzle/lpairs/patches/lpairs-1.0.4.patchset b/games-puzzle/lpairs/patches/lpairs-1.0.5.patchset similarity index 58% rename from games-puzzle/lpairs/patches/lpairs-1.0.4.patchset rename to games-puzzle/lpairs/patches/lpairs-1.0.5.patchset index 59e6cf248..26eea9cf7 100644 --- a/games-puzzle/lpairs/patches/lpairs-1.0.4.patchset +++ b/games-puzzle/lpairs/patches/lpairs-1.0.5.patchset @@ -1,27 +1,4 @@ -From 0861af061dad76b3fdb3aa6f34ce06d74273b1b3 Mon Sep 17 00:00:00 2001 -From: Markus Himmel -Date: Wed, 14 Jan 2015 19:19:28 +0000 -Subject: applying patch lpairs-1.0.4.patch - - -diff --git a/configure b/configure -index 4dcecb1..a1908af 100755 ---- a/configure -+++ b/configure -@@ -13034,7 +13034,7 @@ fi - localedir=$datadir/locale - locdir_flag="-DLOCALEDIR=\\\"$localedir\\\"" - --inst_dir=$datadir/games/lpairs -+inst_dir=$datadir/lpairs - inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\"" - - # Check whether --enable-install was given. --- -2.14.2 - - -From 4055056b9afda14cee1255e846d3fb4ffb52743d Mon Sep 17 00:00:00 2001 +From 84be8e3b3ba9af85e494098603c66252f8fccc6f Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Wed, 14 Jan 2015 19:36:34 +0000 Subject: Move config to LGames folder in user settings @@ -63,28 +40,51 @@ index 301878a..a786e39 100644 else strncpy(c_pth, p, sizeof(c_pth)-1); -- -2.14.2 +2.21.0 -From 51114168f60efd37ff3b7983535512cff43c3123 Mon Sep 17 00:00:00 2001 -From: Shiroko -Date: Fri, 29 Dec 2017 12:52:29 +0000 -Subject: Solved gcc2->gcc5 problem +From db68fe85f9006e1872df2d64adbabf15950173be Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Wed, 14 Jan 2015 19:19:28 +0000 +Subject: Don't use subfolder games in $dataDir -diff --git a/lpairs/sdl.c b/lpairs/sdl.c -index 5937097..e4779c4 100644 ---- a/lpairs/sdl.c -+++ b/lpairs/sdl.c -@@ -480,7 +480,7 @@ void hardware_cap() - /* - update rectangle (0,0,0,0)->fullscreen - */ --inline void refresh_screen(int x, int y, int w, int h) -+void refresh_screen(int x, int y, int w, int h) - { - SDL_UpdateRect(sdl.screen, x, y, w, h); - } +diff --git a/configure.in b/configure.in +index f412594..f6cb17d 100644 +--- a/configure.in ++++ b/configure.in +@@ -32,7 +32,7 @@ localedir=$datadir/locale + locdir_flag="-DLOCALEDIR=\\\"$localedir\\\"" + + dnl installation path +-inst_dir=$datadir/games/lpairs ++inst_dir=$datadir/lpairs + inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\"" + + AC_ARG_ENABLE( install, -- -2.14.2 +2.21.0 + + +From 0ca3eb5832a49036f72ec14a12dc16fc22828647 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 20 Apr 2019 09:58:05 +0200 +Subject: gcc2 doesn't like -Wno-unused-result + + +diff --git a/configure.in b/configure.in +index f6cb17d..61a432d 100644 +--- a/configure.in ++++ b/configure.in +@@ -17,7 +17,7 @@ AC_CHECK_LIB(m, main,, AC_MSG_ERROR(lib math is needed)) + + dnl check SDL version + AM_PATH_SDL(1.0.0,, AC_MSG_ERROR(lib SDL is needed)) +-CFLAGS="$CFLAGS $SDL_CFLAGS -Wno-unused-result" ++CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AM_PATH_SDL(1.1.5, CFLAGS="$CFLAGS -DSDL_1_1_5",) + +-- +2.21.0