Upstream replaced wrong distribution tarball; adapted patch

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

3 files changed, 22 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d30a65da095f..ff93b66c5846 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ng-jackspa
 	pkgdesc = A set of LADSPA plugin hosts for JACK with graphical and terminal user interfaces
 	pkgver = 1.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://git.tuxfamily.org/legip/ng-jackspa.git/
 	arch = i686
 	arch = x86_64
@@ -13,8 +13,8 @@ pkgbase = ng-jackspa
 	depends = qt4
 	source = ngjackspa-1.0.tar.gz::https://git.tuxfamily.org/legip/ng-jackspa.git/plain/ngjackspa-1.0.tar.gz?h=download
 	source = 0001-Makefile-do-not-disable-deprecated-glib-GTK-code.patch
-	sha256sums = 82cc502c7ca1c19f2581cc1a2a41645419ab9566d65c8c4c4c1d88467570cf6a
-	sha256sums = 0e240ab9d1703e55f2aef16bad93d7184f8b2ec3928535ff0423f433abf01de0
+	sha256sums = 4ec971f4aab03c8d8a63439bbabc220e36ee16cd0f29e89772066291daf13102
+	sha256sums = 9997bae7bd58bafa9fcd3e2b1f47a92687364fa83414feed4071063861b41637
 
 pkgname = ng-jackspa
 
diff --git a/0001-Makefile-do-not-disable-deprecated-glib-GTK-code.patch b/0001-Makefile-do-not-disable-deprecated-glib-GTK-code.patch
index 56f866a5cb3a..030c83b67511 100644
--- a/0001-Makefile-do-not-disable-deprecated-glib-GTK-code.patch
+++ b/0001-Makefile-do-not-disable-deprecated-glib-GTK-code.patch
@@ -1,21 +1,7 @@
-From 76e1c9f353e2168ae2eae1d09c2979e7547b0e1a Mon Sep 17 00:00:00 2001
-From: "G.raud" <graud@gmx.com>
-Date: Mon, 29 Jan 2018 09:53:14 +0100
-Subject: [PATCH] Makefile: do not disable deprecated glib/GTK code
-
-This change fixes the build of gjackspa against recent glib/glibmm
-(compiles with version 2.50.3).
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a5d5984..0e5139b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -54,12 +54,12 @@ PACKAGE_VERSION	= $(VERSION)
- # Remove the _g<SHA1> part from the $VERSION
- RPM_VERSION	= $(shell echo $(VERSION) | $(SED) -e 's/_g[0-9a-z]\+//')
+diff -uNr ngjackspa-1.0.orig/Makefile ngjackspa-1.0/Makefile
+--- ngjackspa-1.0.orig/Makefile	2013-07-07 08:49:29.000000000 +0200
++++ ngjackspa-1.0/Makefile	2018-01-31 15:24:08.623983438 +0100
+@@ -56,8 +56,8 @@
  
  CFLAGS ?= -Wall -Werror -g
  CXXFLAGS ?= $(CFLAGS)
@@ -26,11 +12,7 @@ index a5d5984..0e5139b 100644
  override LDFLAGS += -lm -ljack -ldl `pkg-config --libs glib-2.0` -g
  
  PROGS = njackspa gjackspa qjackspa jackspa-cli
- SCRIPTS =
- MODULES = jackspa.o control.o
-@@ -168,11 +168,11 @@ ChangeLog :
- 	> $@
- 
+@@ -170,7 +170,7 @@
  njackspa : njackspa.c curses.c $(COMMONS) $(MODULES)
  	$(CC) $(CFLAGS) -o $@ $< $(MODULES) $(LDFLAGS) -lncurses
  gjackspa : gjackspa.cpp $(COMMONS) $(MODULES)
@@ -39,8 +21,14 @@ index a5d5984..0e5139b 100644
  	  -o $@ $< $(MODULES) $(LDFLAGS) `pkg-config gtkmm-2.4 --libs`
  qjackspa : force $(QMAKE_MAKEFILE)
  	$(MAKE) -f $(QMAKE_MAKEFILE)
- jackspa-cli : jackspa-cli.c $(COMMONS) $(MODULES)
- 	$(CC) -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED $(CFLAGS) \
--- 
-2.11.0
-
+diff -uNr ngjackspa-1.0.orig/qjackspa.pro ngjackspa-1.0/qjackspa.pro
+--- ngjackspa-1.0.orig/qjackspa.pro	2013-07-07 08:49:29.000000000 +0200
++++ ngjackspa-1.0/qjackspa.pro	2018-01-31 15:24:30.582983191 +0100
+@@ -6,7 +6,6 @@
+ PKGCONFIG += glib-2.0
+ DEPENDPATH += .
+ INCLUDEPATH += .
+-DEFINES += G_DISABLE_DEPRECATED
+ LIBS += -ljack -ldl -lm
+ 
+ # Input
diff --git a/PKGBUILD b/PKGBUILD
index 0a9b3b43a345..e1d5ead5e003 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ng-jackspa
 pkgver=1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A set of LADSPA plugin hosts for JACK with graphical and terminal user interfaces"
 arch=('i686' 'x86_64')
 url="https://git.tuxfamily.org/legip/ng-jackspa.git/"
@@ -13,8 +13,8 @@ source=(
     "ngjackspa-${pkgver}.tar.gz::https://git.tuxfamily.org/legip/ng-jackspa.git/plain/ngjackspa-${pkgver}.tar.gz?h=download"
     '0001-Makefile-do-not-disable-deprecated-glib-GTK-code.patch'
 )
-sha256sums=('82cc502c7ca1c19f2581cc1a2a41645419ab9566d65c8c4c4c1d88467570cf6a'
-            '0e240ab9d1703e55f2aef16bad93d7184f8b2ec3928535ff0423f433abf01de0')
+sha256sums=('4ec971f4aab03c8d8a63439bbabc220e36ee16cd0f29e89772066291daf13102'
+            '9997bae7bd58bafa9fcd3e2b1f47a92687364fa83414feed4071063861b41637')
 
 
 prepare() {