diff --git a/srcpkgs/tuxguitar/patches/ld-library.patch b/srcpkgs/tuxguitar/patches/ld-library.patch
deleted file mode 100644
index 35b347c257..0000000000
--- a/srcpkgs/tuxguitar/patches/ld-library.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./build-scripts/common-resources/common-linux-swt/tuxguitar.sh	2018-08-03 13:48:57.000000000 +0200
-+++ -	2019-11-26 14:29:19.912761041 +0100
-@@ -18,6 +18,7 @@
- LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib
- LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
- LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/jni
-+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/tuxguitar
- LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
- ##CLASSPATH
- CLASSPATH=${CLASSPATH}:./lib/tuxguitar.jar
diff --git a/srcpkgs/tuxguitar/patches/nogcj.patch b/srcpkgs/tuxguitar/patches/nogcj.patch
deleted file mode 100644
index f7bfb510c9..0000000000
--- a/srcpkgs/tuxguitar/patches/nogcj.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -u -r build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml
---- build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml	2017-02-08 22:06:28.220720753 +0100
-@@ -22,8 +22,8 @@
- 		
- 		<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
- 		<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
--		<tuxguitar-alsa.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-alsa.jni.cflags>
--		<tuxguitar-alsa.jni.ldflags>-fPIC</tuxguitar-alsa.jni.ldflags>
-+		<tuxguitar-alsa.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-alsa.jni.cflags>
-+		<tuxguitar-alsa.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-alsa.jni.ldflags>
- 		<tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
- 		<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
- 		<tuxguitar-alsa.jni.library.name>tuxguitar-alsa-jni</tuxguitar-alsa.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml
---- build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml	2017-02-08 22:06:28.220720753 +0100
-@@ -22,8 +22,8 @@
- 		
- 		<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
- 		<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
--		<tuxguitar-alsa.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-alsa.jni.cflags>
--		<tuxguitar-alsa.jni.ldflags>-m32 -fPIC</tuxguitar-alsa.jni.ldflags>
-+		<tuxguitar-alsa.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-alsa.jni.cflags>
-+		<tuxguitar-alsa.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-alsa.jni.ldflags>
- 		<tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
- 		<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
- 		<tuxguitar-alsa.jni.library.name>tuxguitar-alsa-jni</tuxguitar-alsa.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml
---- build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml	2017-02-08 22:06:28.220720753 +0100
-@@ -22,8 +22,8 @@
- 		
- 		<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
- 		<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
--		<tuxguitar-alsa.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-alsa.jni.cflags>
--		<tuxguitar-alsa.jni.ldflags>-m64 -fPIC</tuxguitar-alsa.jni.ldflags>
-+		<tuxguitar-alsa.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-alsa.jni.cflags>
-+		<tuxguitar-alsa.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-alsa.jni.ldflags>
- 		<tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
- 		<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
- 		<tuxguitar-alsa.jni.library.name>tuxguitar-alsa-jni</tuxguitar-alsa.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml
---- build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml	2017-02-08 22:06:28.220720753 +0100
-@@ -24,8 +24,8 @@
- 		<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
- 		<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
- 		<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
--		<tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-fluidsynth.jni.cflags>
--		<tuxguitar-fluidsynth.jni.ldflags>-fPIC</tuxguitar-fluidsynth.jni.ldflags>
-+		<tuxguitar-fluidsynth.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-fluidsynth.jni.cflags>
-+		<tuxguitar-fluidsynth.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-fluidsynth.jni.ldflags>
- 		<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
- 		<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
- 		<tuxguitar-fluidsynth.jni.library.name>tuxguitar-fluidsynth-jni</tuxguitar-fluidsynth.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml
---- build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -24,8 +24,8 @@
- 		<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
- 		<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
- 		<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
--		<tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-fluidsynth.jni.cflags>
--		<tuxguitar-fluidsynth.jni.ldflags>-m32 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
-+		<tuxguitar-fluidsynth.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-fluidsynth.jni.cflags>
-+		<tuxguitar-fluidsynth.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
- 		<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
- 		<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
- 		<tuxguitar-fluidsynth.jni.library.name>tuxguitar-fluidsynth-jni</tuxguitar-fluidsynth.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml
---- build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -24,8 +24,8 @@
- 		<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
- 		<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
- 		<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
--		<tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-fluidsynth.jni.cflags>
--		<tuxguitar-fluidsynth.jni.ldflags>-m64 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
-+		<tuxguitar-fluidsynth.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-fluidsynth.jni.cflags>
-+		<tuxguitar-fluidsynth.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
- 		<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
- 		<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
- 		<tuxguitar-fluidsynth.jni.library.name>tuxguitar-fluidsynth-jni</tuxguitar-fluidsynth.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml
---- build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -24,8 +24,8 @@
- 		<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
- 		<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
- 		<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
--		<tuxguitar-jack.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-jack.jni.cflags>
--		<tuxguitar-jack.jni.ldflags>-fPIC</tuxguitar-jack.jni.ldflags>
-+		<tuxguitar-jack.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-jack.jni.cflags>
-+		<tuxguitar-jack.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-jack.jni.ldflags>
- 		<tuxguitar-jack.jni.ldlibs>`pkg-config --libs jack`</tuxguitar-jack.jni.ldlibs>
- 		<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
- 		<tuxguitar-jack.jni.library.name>tuxguitar-jack-jni</tuxguitar-jack.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml
---- build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -24,8 +24,8 @@
- 		<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
- 		<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
- 		<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
--		<tuxguitar-jack.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-jack.jni.cflags>
--		<tuxguitar-jack.jni.ldflags>-m32 -fPIC</tuxguitar-jack.jni.ldflags>
-+		<tuxguitar-jack.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-jack.jni.cflags>
-+		<tuxguitar-jack.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-jack.jni.ldflags>
- 		<tuxguitar-jack.jni.ldlibs>`pkg-config --libs jack`</tuxguitar-jack.jni.ldlibs>
- 		<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
- 		<tuxguitar-jack.jni.library.name>tuxguitar-jack-jni</tuxguitar-jack.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml
---- build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -24,8 +24,8 @@
- 		<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
- 		<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
- 		<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
--		<tuxguitar-jack.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-jack.jni.cflags>
--		<tuxguitar-jack.jni.ldflags>-m64 -fPIC</tuxguitar-jack.jni.ldflags>
-+		<tuxguitar-jack.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-jack.jni.cflags>
-+		<tuxguitar-jack.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-jack.jni.ldflags>
- 		<tuxguitar-jack.jni.ldlibs>`pkg-config --libs jack`</tuxguitar-jack.jni.ldlibs>
- 		<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
- 		<tuxguitar-jack.jni.library.name>tuxguitar-jack-jni</tuxguitar-jack.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml
---- build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -22,8 +22,8 @@
- 		
- 		<tuxguitar-oss.jni.path>${parent.relativePath}/TuxGuitar-oss/jni/</tuxguitar-oss.jni.path>
- 		<tuxguitar-oss.jni.cc>${tuxguitar.jni.cc}</tuxguitar-oss.jni.cc>
--		<tuxguitar-oss.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-oss.jni.cflags>
--		<tuxguitar-oss.jni.ldflags>-fPIC</tuxguitar-oss.jni.ldflags>
-+		<tuxguitar-oss.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-oss.jni.cflags>
-+		<tuxguitar-oss.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-oss.jni.ldflags>
- 		<tuxguitar-oss.jni.ldlibs></tuxguitar-oss.jni.ldlibs>
- 		<tuxguitar-oss.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-oss.jni.ldpath>
- 		<tuxguitar-oss.jni.library.name>tuxguitar-oss-jni</tuxguitar-oss.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml
---- build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -22,8 +22,8 @@
- 		
- 		<tuxguitar-oss.jni.path>${parent.relativePath}/TuxGuitar-oss/jni/</tuxguitar-oss.jni.path>
- 		<tuxguitar-oss.jni.cc>${tuxguitar.jni.cc}</tuxguitar-oss.jni.cc>
--		<tuxguitar-oss.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-oss.jni.cflags>
--		<tuxguitar-oss.jni.ldflags>-m32 -fPIC</tuxguitar-oss.jni.ldflags>
-+		<tuxguitar-oss.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-oss.jni.cflags>
-+		<tuxguitar-oss.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-oss.jni.ldflags>
- 		<tuxguitar-oss.jni.ldlibs></tuxguitar-oss.jni.ldlibs>
- 		<tuxguitar-oss.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-oss.jni.ldpath>
- 		<tuxguitar-oss.jni.library.name>tuxguitar-oss-jni</tuxguitar-oss.jni.library.name>
-diff -u -r build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml
---- build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
-+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml	2017-02-08 22:06:28.224054080 +0100
-@@ -22,8 +22,8 @@
- 		
- 		<tuxguitar-oss.jni.path>${parent.relativePath}/TuxGuitar-oss/jni/</tuxguitar-oss.jni.path>
- 		<tuxguitar-oss.jni.cc>${tuxguitar.jni.cc}</tuxguitar-oss.jni.cc>
--		<tuxguitar-oss.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-oss.jni.cflags>
--		<tuxguitar-oss.jni.ldflags>-m64 -fPIC</tuxguitar-oss.jni.ldflags>
-+		<tuxguitar-oss.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-oss.jni.cflags>
-+		<tuxguitar-oss.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-oss.jni.ldflags>
- 		<tuxguitar-oss.jni.ldlibs></tuxguitar-oss.jni.ldlibs>
- 		<tuxguitar-oss.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-oss.jni.ldpath>
- 		<tuxguitar-oss.jni.library.name>tuxguitar-oss-jni</tuxguitar-oss.jni.library.name>
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index c656407386..428ca30abc 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
-version=1.5.2
-revision=2
+version=1.5.3
+revision=1
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only"
 homepage="http://www.tuxguitar.com.ar/"
 distfiles="${SOURCEFORGE_SITE}/tuxguitar/tuxguitar-${version}-src.tar.gz"
-checksum=a9ade566752aa0ac72831a1cd0b18b85d302eca7934e2192ad875f51df755981
+checksum=e65ebacb70288e87c7339682f7d1ae81baea74334e6f4fdb34880daa999cc5e3
 
 case $XBPS_TARGET_MACHINE in
 	i686*) _arch="x86" ;;