From a7d455c5e703e74cdcaa7d7e9bf193208a31df4e Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 23 Apr 2019 19:33:34 +0200 Subject: [PATCH] wizznic, bump version (#3772) --- .../wizznic/patches/wizznic-0.9.9.patchset | 59 --------------- .../patches/wizznic-1.0_build_380.patchset | 59 +++++++++++++++ games-puzzle/wizznic/wizznic-0.9.9.recipe | 56 --------------- .../wizznic/wizznic-1.0_build_380.recipe | 71 +++++++++++++++++++ 4 files changed, 130 insertions(+), 115 deletions(-) delete mode 100644 games-puzzle/wizznic/patches/wizznic-0.9.9.patchset create mode 100644 games-puzzle/wizznic/patches/wizznic-1.0_build_380.patchset delete mode 100644 games-puzzle/wizznic/wizznic-0.9.9.recipe create mode 100644 games-puzzle/wizznic/wizznic-1.0_build_380.recipe diff --git a/games-puzzle/wizznic/patches/wizznic-0.9.9.patchset b/games-puzzle/wizznic/patches/wizznic-0.9.9.patchset deleted file mode 100644 index 1ad03fbc5..000000000 --- a/games-puzzle/wizznic/patches/wizznic-0.9.9.patchset +++ /dev/null @@ -1,59 +0,0 @@ -From e79ecd9ea29e236288e30bf1a61fbc3404fb1edf Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Thu, 17 Jul 2014 15:46:58 +0200 -Subject: Remove -lm -lpthread. - - -diff --git a/Makefile b/Makefile -index 3b87807..e9270a2 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ DEFS = $(PUF) -DDATADIR="\"$(DATADIR)\"" - INCS = -I. -I/usr/include -I/usr/include/SDL - - LDFLAGS=$(CFLAGS) --LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lm -lz -lpthread -+LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lz - - #Are we compiling with gl? - ifneq ($(WITH_OPENGL),false) --- -1.8.3.4 - - -From 29e6ef655836fba865d2d9743400db28f8245655 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Thu, 17 Jul 2014 15:53:14 +0200 -Subject: Fix home dir search path. - - -diff --git a/userfiles.c b/userfiles.c -index fae8eae..0e5538b 100644 ---- a/userfiles.c -+++ b/userfiles.c -@@ -23,6 +23,10 @@ - #include - #include - -+#ifdef __HAIKU__ -+#include -+#endif -+ - static char* strConfDir; - static char* strEditLvlDir; - static char* strHsDir; -@@ -32,6 +36,11 @@ void initUserPaths() - #ifdef PER_USER_FILES - - //Generate directory string -+#ifdef __HAIKU__ -+ strConfDir = malloc(PATH_MAX); -+ if (find_path(initUserPaths, B_FIND_PATH_SETTINGS_DIRECTORY, "wizznic", -+ strConfDir, PATH_MAX) != B_OK) -+#endif - if(getenv("XDG_CONFIG_HOME") != NULL) - { - strConfDir = malloc( sizeof(char)*(strlen(getenv("XDG_CONFIG_HOME"))+strlen("/wizznic"))+1 ); --- -1.8.3.4 - diff --git a/games-puzzle/wizznic/patches/wizznic-1.0_build_380.patchset b/games-puzzle/wizznic/patches/wizznic-1.0_build_380.patchset new file mode 100644 index 000000000..3f0b9be87 --- /dev/null +++ b/games-puzzle/wizznic/patches/wizznic-1.0_build_380.patchset @@ -0,0 +1,59 @@ +From 86faaec84c099eb06e35dceb59b8ebb86ec9a389 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Thu, 17 Jul 2014 15:53:14 +0200 +Subject: Fix home dir search path. + + +diff --git a/src/userfiles.c b/src/userfiles.c +index dd3df6c..17d9458 100644 +--- a/src/userfiles.c ++++ b/src/userfiles.c +@@ -23,6 +23,10 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#endif ++ + static char* strConfDir; + static char* strEditLvlDir; + static char* strUsrPackDir; +@@ -33,6 +37,11 @@ void initUserPaths() + #ifdef PER_USER_FILES + + //Generate directory string ++#ifdef __HAIKU__ ++ strConfDir = malloc(PATH_MAX); ++ if (find_path(initUserPaths, B_FIND_PATH_SETTINGS_DIRECTORY, "wizznic", ++ strConfDir, PATH_MAX) != B_OK) ++#endif + if(getenv("XDG_CONFIG_HOME") != NULL) + { + strConfDir = malloc( sizeof(char)*(strlen(getenv("XDG_CONFIG_HOME"))+strlen("/wizznic"))+1 ); +-- +2.21.0 + + +From 899d969ae08783687ca213ded2cbae76a8ba14ea Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 20 Apr 2019 12:47:05 +0200 +Subject: Don't turn warnings into errors + + +diff --git a/Makefile.linux b/Makefile.linux +index 2fe5c44..44d3db7 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -33,7 +33,7 @@ ifneq ($(BUILD_NUMBER),) + endif + + INCS = -I. -I/usr/include -I/usr/include/SDL +-CFLAGS= -Wall -Wextra -Werror -std=c99 ++CFLAGS= -Wall -Wextra -std=c99 + ifeq ($(DEBUG),) + CFLAGS += -O3 + else +-- +2.21.0 + diff --git a/games-puzzle/wizznic/wizznic-0.9.9.recipe b/games-puzzle/wizznic/wizznic-0.9.9.recipe deleted file mode 100644 index cdbb4e8b9..000000000 --- a/games-puzzle/wizznic/wizznic-0.9.9.recipe +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY="A brick-matching puzzle-game" -DESCRIPTION=" -Wizznic! is a brick-matching puzzle-game, an improved version of Puzznic. - -The challenge is to clear each level of bricks by moving the bricks next to \ -each other, this sounds a lot easier than it is. The bricks are heavy, so you \ -can only push them, not lift them up." -HOMEPAGE="http://wizznic.sourceforge.net/" -COPYRIGHT="2011 Jimmy Christensen" -LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="http://sourceforge.net/projects/wizznic/files/Source%20Releases/wizznic-0.9.9-src.tar.bz2" -CHECKSUM_SHA256="2cf9462177474d7f5bfe95bbc21303ec7031ca86412b587b5e7d3ed531d5b16b" -SOURCE_DIR="wizznic-$portVersion-src" -PATCHES="wizznic-$portVersion.patchset" - -ARCHITECTURES="!x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - wizznic$secondaryArchSuffix = $portVersion - cmd:wizznic$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - lib:libsdl$secondaryArchSuffix - lib:libsdl_image$secondaryArchSuffix - lib:libsdl_mixer$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - devel:libpng$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:sdl_image$secondaryArchSuffix - devel:sdl_mixer$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:make - cmd:sdl_config$secondaryArchSuffix - " - -BUILD() -{ - DATADIR=$dataDir/wizznic/ BINDIR=$binDir/ WITH_OPENGL=false \ - CFLAGS=`sdl-config --cflags` make -} - -INSTALL() -{ - DATADIR=$dataDir/wizznic/ BINDIR=$binDir/ make install - addAppDeskbarSymlink $binDir/wizznic "WizzNic!" -} diff --git a/games-puzzle/wizznic/wizznic-1.0_build_380.recipe b/games-puzzle/wizznic/wizznic-1.0_build_380.recipe new file mode 100644 index 000000000..1265a0178 --- /dev/null +++ b/games-puzzle/wizznic/wizznic-1.0_build_380.recipe @@ -0,0 +1,71 @@ +SUMMARY="A brick-matching puzzle-game" +DESCRIPTION=" +Wizznic! is a brick-matching puzzle-game, an improved version of Puzznic. + +The challenge is to clear each level of bricks by moving the bricks next to \ +each other, this sounds a lot easier than it is. The bricks are heavy, so you \ +can only push them, not lift them up." +HOMEPAGE="http://wizznic.org/" +COPYRIGHT="2011-2016 Jimmy Christensen" +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="http://wizznic.org/download/0380/Wizznic_src_build_380.tar.bz2" +CHECKSUM_SHA256="5055626a14819e149b6c5343cb46acb83c5f480f566137fa7c32a23cb25fbf74" +SOURCE_DIR="Wizznic_src_build_380" +PATCHES="wizznic-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + wizznic$secondaryArchSuffix = $portVersion + cmd:wizznic$commandSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libsdl_image$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libpng16$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:libsdl_image$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + DATADIR=$dataDir/wizznic/ \ + BINDIR=$commandBinDir/ \ + WITH_OPENGL=false \ + CFLAGS=`sdl-config --cflags` make -f Makefile.linux +} + +INSTALL() +{ + DATADIR=$dataDir/wizznic/ \ + BINDIR=$commandBinDir/ \ + make -f Makefile.linux install + install -d $manDir/man6 + install -m 644 doc/wizznic.6 $manDir/man6 + addAppDeskbarSymlink $commandBinDir/wizznic "WizzNic!" +}