Handle quilt having already applied patches

3 files changed, 25 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c7b192f9b04..a9988d5c877f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tuxjdk
 	pkgver = 8.92.03
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/tuxjdk/tuxjdk
 	arch = i686
 	arch = x86_64
@@ -25,6 +25,7 @@ pkgbase = tuxjdk
 	source = jaxp-jdk8u92-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u92-b14.tar.gz
 	source = langtools-jdk8u92-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u92-b14.tar.gz
 	source = nashorn-jdk8u92-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u92-b14.tar.gz
+	source = tuxjdk_quilt_script.patch
 	source = https://github.com/tuxjdk/tuxjdk/archive/8.92.03.tar.gz
 	sha256sums = 19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16
 	sha256sums = 287edac284f4b97f48a14fea331455c3807bcffd51612278decb0ac265303069
@@ -34,6 +35,7 @@ pkgbase = tuxjdk
 	sha256sums = 63eff7fe1f6a0dd7ec0c450724a403dcff986e026b5b9ae9ac46edc7222f798c
 	sha256sums = 374d12d1434172c775f0ecd944d0a903cd56264a4c9d5ef0be038715e47e67fd
 	sha256sums = 76a18e240a8498c8d2a3a261b7845c8062dbf85941425adcd96f9e879141b3e6
+	sha256sums = 23d22c21424785a7bc615a90a37fcdf03937704e95cf32eebd1d9c203486f6b0
 	sha256sums = 418a9b7fdec14947cb038df4fdf2371215b26130dc0dec2ba891a212f8806a3c
 
 pkgname = tuxjdk
diff --git a/PKGBUILD b/PKGBUILD
index 7b1162684129..f1ce3ce2db9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ _jdk_build=14
 _tuxjdk_ver=03
 pkgver=${_java_ver}.${_jdk_update}.${_tuxjdk_ver}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='https://github.com/tuxjdk/tuxjdk'
 license=('custom')
@@ -36,6 +36,7 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
         jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
         langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
         nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
+        tuxjdk_quilt_script.patch
         https://github.com/tuxjdk/tuxjdk/archive/${pkgver}.tar.gz)
 
 sha256sums=('19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16'
@@ -46,6 +47,7 @@ sha256sums=('19bc6028c18dd1993f734dc49991c181138e2e85ead42354d7236fb3c6169e16'
             '63eff7fe1f6a0dd7ec0c450724a403dcff986e026b5b9ae9ac46edc7222f798c'
             '374d12d1434172c775f0ecd944d0a903cd56264a4c9d5ef0be038715e47e67fd'
             '76a18e240a8498c8d2a3a261b7845c8062dbf85941425adcd96f9e879141b3e6'
+            '23d22c21424785a7bc615a90a37fcdf03937704e95cf32eebd1d9c203486f6b0'
             '418a9b7fdec14947cb038df4fdf2371215b26130dc0dec2ba891a212f8806a3c')
 
 case "${CARCH}" in
@@ -64,6 +66,9 @@ _nonheadless=(bin/policytool
               lib/${_JARCH}/libsplashscreen.so)
 
 prepare() {
+  cd "${srcdir}/${_tuxjdkdir}"
+  patch -p1 < "${srcdir}/tuxjdk_quilt_script.patch"
+
   cd "${srcdir}/jdk8u-${_repo_ver}"
 
   for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
diff --git a/tuxjdk_quilt_script.patch b/tuxjdk_quilt_script.patch
new file mode 100644
index 000000000000..7e5ae18f78a4
--- /dev/null
+++ b/tuxjdk_quilt_script.patch
@@ -0,0 +1,16 @@
+diff --git a/applyTuxjdk.sh b/applyTuxjdk.sh
+index e36181a..703f82b 100755
+--- a/applyTuxjdk.sh
++++ b/applyTuxjdk.sh
+@@ -26,7 +26,10 @@ sourceSetupEnv() {
+ sourceSetupEnv
+ 
+ echo "Applying quilt patches on current folder..."
+-if $QUILT push -a
++"$QUILT" push -a
++
++readonly result=$?
++if [ "$result" = 0 ] || [ "$result" = 2 ]
+ then
+   echo ''
+   echo 'Quilt patches applied.'