From beba0edaf71f926b772387578086640dda3f837c Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 7 Jul 2019 09:21:46 +0200
Subject: [PATCH] neverball, bump after upstream patch got merged (#3969)

---
 ...recipe => neverball-1.6.1~20190706.recipe} |  7 +-
 .../patches/neverball-1.6.1~20190609.patchset | 83 -------------------
 2 files changed, 3 insertions(+), 87 deletions(-)
 rename games-puzzle/neverball/{neverball-1.6.1~20190609.recipe => neverball-1.6.1~20190706.recipe} (94%)
 delete mode 100644 games-puzzle/neverball/patches/neverball-1.6.1~20190609.patchset

diff --git a/games-puzzle/neverball/neverball-1.6.1~20190609.recipe b/games-puzzle/neverball/neverball-1.6.1~20190706.recipe
similarity index 94%
rename from games-puzzle/neverball/neverball-1.6.1~20190609.recipe
rename to games-puzzle/neverball/neverball-1.6.1~20190706.recipe
index 8b28367bd..73cf0c8da 100644
--- a/games-puzzle/neverball/neverball-1.6.1~20190609.recipe
+++ b/games-puzzle/neverball/neverball-1.6.1~20190706.recipe
@@ -7,12 +7,11 @@ HOMEPAGE="https://neverball.org"
 COPYRIGHT="2002-2019 The Neverball Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="cd7dfc9464e242f100dabe711863f3a943cec1d5"
+srcGitRev="3821fa506313b8a740b22947e9e694ab4d8ece98"
 SOURCE_URI="https://github.com/Neverball/neverball/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ee1b9ffb4c32d0e1c0993f5900c94bbc35d5b9e836e487c7a4aa71c547c1e87a"
+CHECKSUM_SHA256="f5accd8e63a2e20f99ca960b088ca8c51b69c93a26387bbd1ece3a2e5b63fe17"
 SOURCE_FILENAME="neverball-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="neverball-$srcGitRev"
-PATCHES="neverball-$portVersion.patchset"
 ADDITIONAL_FILES="
 	neverball.rdef.in
 	neverputt.rdef.in
@@ -67,7 +66,7 @@ BUILD_PREREQUIRES="
 PATCH()
 {
 	mv share/version.in.h share/version.h
-	sed -i 's/0.0.0/1.6.0/g' share/version.h
+	sed -i 's/0.0.0/1.6.1/g' share/version.h
 }
 
 BUILD()
diff --git a/games-puzzle/neverball/patches/neverball-1.6.1~20190609.patchset b/games-puzzle/neverball/patches/neverball-1.6.1~20190609.patchset
deleted file mode 100644
index c8c26e7c7..000000000
--- a/games-puzzle/neverball/patches/neverball-1.6.1~20190609.patchset
+++ /dev/null
@@ -1,83 +0,0 @@
-From 889b59fd59f497632247369f0b3ff4def3573050 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 7 Aug 2014 17:17:36 +0000
-Subject: haiku patch
-
-
-diff --git a/Makefile b/Makefile
-index b124cd0..fcff3cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,7 @@ $(info Will make a "$(BUILD)" build of Neverball $(VERSION).)
- 
- #------------------------------------------------------------------------------
- # Provide a target system hint for the Makefile.
--# Recognized PLATFORM values: darwin, mingw.
-+# Recognized PLATFORM values: darwin, mingw, haiku.
- 
- ifeq ($(shell uname), Darwin)
- 	PLATFORM := darwin
-@@ -21,6 +21,10 @@ ifeq ($(shell uname -o),Msys)
- 	PLATFORM := mingw
- endif
- 
-+ifeq ($(shell uname), Haiku)
-+	PLATFORM := haiku
-+endif
-+
- #------------------------------------------------------------------------------
- # Paths (packagers might want to set DATADIR and LOCALEDIR)
- 
-@@ -186,6 +190,15 @@ ifeq ($(PLATFORM),darwin)
- 	OGL_LIBS  := -framework OpenGL
- endif
- 
-+ifeq ($(PLATFORM),haiku)
-+	ifneq ($(ENABLE_NLS),0)
-+		INTL_LIBS := -lintl
-+	endif
-+
-+	TILT_LIBS :=
-+	OGL_LIBS  := -lGL
-+endif
-+
- BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
- 
- ifeq ($(PLATFORM),darwin)
-@@ -194,7 +207,7 @@ ifeq ($(PLATFORM),darwin)
- endif
- 
- OGG_LIBS := -lvorbisfile
--TTF_LIBS := -lSDL2_ttf
-+TTF_LIBS := -lSDL2_ttf -lfreetype
- 
- ALL_LIBS := $(HMD_LIBS) $(TILT_LIBS) $(INTL_LIBS) $(TTF_LIBS) \
- 	$(OGG_LIBS) $(SDL_LIBS) $(OGL_LIBS) $(BASE_LIBS)
--- 
-2.21.0
-
-
-From 8be8ffd64944344f76264a5b4f02de67c2ad76a5 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 18 Sep 2018 22:04:56 +1000
-Subject: Fix settings path
-
-
-diff --git a/Makefile b/Makefile
-index fcff3cf..20804dc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -40,6 +40,10 @@ ifneq ($(BUILD),release)
- 	USERDIR := $(USERDIR)-dev
- endif
- 
-+ifeq ($(PLATFORM),haiku)
-+	USERDIR := /config/settings/neverball
-+endif
-+
- #------------------------------------------------------------------------------
- # Optional flags (CFLAGS, CPPFLAGS, ...)
- 
--- 
-2.21.0
-