Upgrading to version 21.2.0.187.1842

3 files changed, 23 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 418e11f42c0d..d8b993395aee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = oracle-sqldeveloper
 	pkgdesc = A graphical tool for database development
-	pkgver = 20.4.1.407.0006
+	pkgver = 21.2.0.187.1842
 	pkgrel = 1
 	url = https://www.oracle.com/tools/downloads/sqldev-downloads.html
 	install = oracle-sqldeveloper.install
@@ -13,26 +13,25 @@ pkgbase = oracle-sqldeveloper
 	optdepends = ksh
 	optdepends = java8-openjfx: Required to run the application with JDK8
 	optdepends = java11-openjfx: Required to run the application with JDK11
-	source = manual://sqldeveloper-20.4.1.407.0006-no-jre.zip
+	source = manual://sqldeveloper-21.2.0.187.1842-no-jre.zip
 	source = oracle-sqldeveloper.desktop
 	source = oracle-sqldeveloper.sh
 	source = LICENSE
 	source = java_home.patch
-	md5sums = 041709f01de2c6d176f37132089b61b8
+	md5sums = 71ac27674ab8552ae0a54553447c84ee
 	md5sums = 1d17d18e10ab85dead0770e8840273b3
 	md5sums = 26c1dc933a9ab58a4245f4f351717645
 	md5sums = 71a4092467209c160d0f34abbc08e049
-	md5sums = f321debd62e5da652ba1eba22937f2b2
-	sha1sums = df90320a3a6e15df90fafb9d0c603317f3a68b84
+	md5sums = f732d162c751dc096bbe0e0f96b78754
+	sha1sums = b3ab14aa27576524028212d62c73faf39efa016e
 	sha1sums = 056bef8e3caa25e62c1395346c34f8a83c532aa8
 	sha1sums = f33177179a2c6ea8b3fa8db5465dc36cf4317b1b
 	sha1sums = 524dfbd8baf17e348d529a831abf639029c56c7b
-	sha1sums = 593f81ab897ea7e15985b73c1ddff1a3717d02a4
-	sha256sums = 941135b2de75ffd27ef277b7e4538de4d8bdc4050dd2a87af05ce31b2bb7d95f
+	sha1sums = f78dd599d2804dedabccf6e1746aa9bb27c2b7ee
+	sha256sums = 56447ca178c7667603aba21e3b8399db086c2b528b87dab1c6eedd13c6dda28b
 	sha256sums = bd028a137c83ab3698a562e9a7ec4006fb396178ab4a6ebdbaa60c75b5c0974c
 	sha256sums = 43b16049fbf85740767c45f0387a7c5e6118b8876509a8f0bb621ed0b5576a25
 	sha256sums = 7b3a6fd8a1ade4427382ee36dc28432655902a0a68547b29c5ce089bd85fe3de
-	sha256sums = 9b617ac2b83358a1e71dd98ddd618d4b0bae6584a8645359ef54cdcc6bc1ff55
+	sha256sums = 81f46da274adb392ed2c7118d7cae0030521134b9db1d10313ff1df6486fe8b2
 
 pkgname = oracle-sqldeveloper
-
diff --git a/PKGBUILD b/PKGBUILD
index d08410903a68..d9ca98249244 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor: David Fuhr <david.fuhr@web.de>
 
 pkgname=oracle-sqldeveloper
-pkgver=20.4.1.407.0006
+pkgver=21.2.0.187.1842
 pkgrel=1
 pkgdesc="A graphical tool for database development"
 arch=("any")
@@ -30,25 +30,25 @@ source=(
   "java_home.patch"
 )
 md5sums=(
-  "041709f01de2c6d176f37132089b61b8"
+  "71ac27674ab8552ae0a54553447c84ee"
   "1d17d18e10ab85dead0770e8840273b3"
   "26c1dc933a9ab58a4245f4f351717645"
   "71a4092467209c160d0f34abbc08e049"
-  "f321debd62e5da652ba1eba22937f2b2"
+  "f732d162c751dc096bbe0e0f96b78754"
 )
 sha1sums=(
-  "df90320a3a6e15df90fafb9d0c603317f3a68b84"
+  "b3ab14aa27576524028212d62c73faf39efa016e"
   "056bef8e3caa25e62c1395346c34f8a83c532aa8"
   "f33177179a2c6ea8b3fa8db5465dc36cf4317b1b"
   "524dfbd8baf17e348d529a831abf639029c56c7b"
-  "593f81ab897ea7e15985b73c1ddff1a3717d02a4"
+  "f78dd599d2804dedabccf6e1746aa9bb27c2b7ee"
 )
 sha256sums=(
-  "941135b2de75ffd27ef277b7e4538de4d8bdc4050dd2a87af05ce31b2bb7d95f"
+  "56447ca178c7667603aba21e3b8399db086c2b528b87dab1c6eedd13c6dda28b"
   "bd028a137c83ab3698a562e9a7ec4006fb396178ab4a6ebdbaa60c75b5c0974c"
   "43b16049fbf85740767c45f0387a7c5e6118b8876509a8f0bb621ed0b5576a25"
   "7b3a6fd8a1ade4427382ee36dc28432655902a0a68547b29c5ce089bd85fe3de"
-  "9b617ac2b83358a1e71dd98ddd618d4b0bae6584a8645359ef54cdcc6bc1ff55"
+  "81f46da274adb392ed2c7118d7cae0030521134b9db1d10313ff1df6486fe8b2"
 )
 
 prepare() {
diff --git a/java_home.patch b/java_home.patch
index dc7cd50240db..fcc6713acf31 100644
--- a/java_home.patch
+++ b/java_home.patch
@@ -1,8 +1,8 @@
 diff --git a/ide/bin/launcher.sh b/ide/bin/launcher.sh
-index 4df8ad9..900ad73 100644
+index 8701dcb..330f03e 100644
 --- a/ide/bin/launcher.sh
 +++ b/ide/bin/launcher.sh
-@@ -937,18 +937,6 @@ GetDefaultJDK()
+@@ -961,22 +961,6 @@ GetDefaultJDK()
    #
    if [ -f "$tmpvar" ]
    then
@@ -10,14 +10,18 @@ index 4df8ad9..900ad73 100644
 -    do
 -        EchoIfVerbose "Found symlinked JDK, following symlink: $tmpvar"
 -        tmpvar2=`ls -ls "$tmpvar"`
+-        EchoIfVerbose "The long listing of $tmpvar: '$tmpvar2'"
 -        tmpvar2=`expr "$tmpvar2" : '.*-> \(.*\)$'`
+-        EchoIfVerbose "If we still have a symlink, follow it again: '$tmpvar2'"
 -        if [ `expr "$tmpvar2" : "\.\/"` -gt 0 -o `expr "$tmpvar2" : "\.\.\/"` -gt 0 -o `expr "$tmpvar2" : ".*/.*"` -le 0 ]
 -        then
 -          tmpvar="`dirname "$tmpvar"`/$tmpvar2"
+-          EchoIfVerbose "Calling dirname on symlink and appending '/$tmpvar2' resulting in '$tmpvar'"
 -        else
 -          tmpvar="$tmpvar2"
+-          EchoIfVerbose "Using '$tmpvar2' as-is"
 -        fi
 -    done
+     EchoIfVerbose "If it exists, truncate /bin/java ending of '$tmpvar', otherwise path becomes empty"
      tmpvar=`expr "$tmpvar" : '\(.*\)\/bin\/[^\/]*$'`
-     SetJavaHome "$tmpvar"
-     EchoIfVerbose "Found existing default JDK $tmpvar"
+     EchoIfVerbose "Found javahome: '$tmpvar'"