Move flags into patch, also respect CPPFLAGS

3 files changed, 34 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31e4ffdcb6a1..a03f043e25d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = goonies
 	pkgdesc = Remake of Konami's The Goonies for the MSX
 	pkgver = 1.4.1528
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.braingames.getput.com/goonies
 	arch = i686
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = goonies
 	source = http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz
 	source = goonies.patch
 	sha256sums = 9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799
-	sha256sums = 841f8e5d8d93958f358443b929b15ba036e463b68e948e6147a3bd5c7cf29a5f
+	sha256sums = b04dbeef39ea2ce09a00aba1f01ab30ffe42a4e57710999ebe7d2b63cb6d6d1e
 
 pkgname = goonies
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c5207898731..62464c1f8bfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=goonies
 pkgver=1.4.1528
-pkgrel=4
+pkgrel=5
 pkgdesc="Remake of Konami's The Goonies for the MSX"
 arch=('i686' 'x86_64')
 license=('unknown')
@@ -11,26 +11,20 @@ depends=('sdl_image' 'sdl_mixer' 'glu')
 source=("http://braingames.jorito.net/goonies/downloads/$pkgname.src_$pkgver.tgz"
         goonies.patch)
 sha256sums=('9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799'
-            '841f8e5d8d93958f358443b929b15ba036e463b68e948e6147a3bd5c7cf29a5f')
+            'b04dbeef39ea2ce09a00aba1f01ab30ffe42a4e57710999ebe7d2b63cb6d6d1e')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # fix compile errors and bin path
-  patch -p0 < ../goonies.patch
-
-  sed -i "s/-g3 -O3/$CFLAGS/" build/linux/Makefile
-  sed -i "/LDFLAGS =/s/$/ $LDFLAGS/" build/linux/Makefile
+  # fix compile errors, bin path, flags
+  patch -p1 -i ../goonies.patch
 }
 
 build() {
   cd $pkgname-$pkgver
-
   make
 }
 
 package() {
   cd $pkgname-$pkgver
-
   make PREFIX="$pkgdir"/usr install
 }
diff --git a/goonies.patch b/goonies.patch
index 4a8d24466689..a4fe02efe2d1 100644
--- a/goonies.patch
+++ b/goonies.patch
@@ -1,5 +1,6 @@
---- build/linux/Makefile 2009-03-12 11:05:30.000000000 +0100
-+++ build/linux/Makefile 2016-12-04 15:27:46.029273929 +0100
+diff -ru --no-dereference goonies-1.4.1528-orig/build/linux/Makefile goonies-1.4.1528/build/linux/Makefile
+--- goonies-1.4.1528-orig/build/linux/Makefile	2017-09-15 16:03:14.354828140 +0200
++++ goonies-1.4.1528/build/linux/Makefile	2017-09-15 16:03:40.794490393 +0200
 @@ -3,9 +3,9 @@
  PREFIX = /usr
  EXTRADIR = ./build/linux
@@ -12,16 +13,34 @@
  ICNDIR = $(PREFIX)/share/pixmaps
  APPDIR = $(PREFIX)/share/applications
  
-@@ -56,7 +56,7 @@
+@@ -56,9 +56,9 @@
  	$(SRC)/Symbol.o			$(SRC)/TheGooniesApp.o \
  	$(SRC)/TheGoonies.o		$(SRC)/Vector.o
  
 -CC = gcc
+-CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
+-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
 +CC = g++
- CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
- LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
++CXXFLAGS += -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
++LIBS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
  RM = rm -f
-@@ -83,12 +83,16 @@
+ CP = cp -r
+ MD = mkdir -p
+@@ -69,11 +69,10 @@
+ all: $(EXE)
+ 
+ %.o: %.cpp
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ $(EXE): $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+-	@$(STRIP) $@
++	$(CC) $(LIBS) $(LDFLAGS) $^ -o $@
+ 	@$(ECHO) " o If there are no errors, the game compiled succesfully"
+ 
+ clean:
+@@ -83,12 +82,16 @@
  install: all
  	@$(ECHO) " o Creating install directory $(BINDIR)"
  	@$(MD) "$(BINDIR)"
@@ -41,9 +60,9 @@
  	@$(CHMOD) 755 "$(STARTUP)"
  	@$(ECHO) " o Creating application menu entry"
  	@$(MD) "$(ICNDIR)"
-
---- src/auxiliar.cpp 2016-06-07 17:01:08.277920131 +0200
-+++ src/auxiliar.cpp 2016-06-07 17:01:33.940781580 +0200
+diff -ru --no-dereference goonies-1.4.1528-orig/src/auxiliar.cpp goonies-1.4.1528/src/auxiliar.cpp
+--- goonies-1.4.1528-orig/src/auxiliar.cpp	2017-09-15 16:03:14.254829415 +0200
++++ goonies-1.4.1528/src/auxiliar.cpp	2017-09-15 16:03:19.948090140 +0200
 @@ -94,7 +94,7 @@
  
      if (tmp == 0 ||