Upgrading to version 19.4.0.354.1759

5 files changed, 77 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d58f86c2f1db..29f90084d327 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,32 @@
 pkgbase = oracle-sqldeveloper
 	pkgdesc = A graphical tool for database development
-	pkgver = 19.2.1.247.2212
+	pkgver = 19.4.0.354.1759
 	pkgrel = 1
-	url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html
+	url = https://www.oracle.com/tools/downloads/sqldev-downloads.html
+	install = oracle-sqldeveloper.install
 	arch = any
 	license = custom:OTN
+	depends = bash
 	depends = java-environment>=8
 	depends = java-environment<=11
-	depends = bash
-	depends = perl
 	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-19.2.1.247.2212-no-jre.zip
+	source = manual://sqldeveloper-19.4.0.354.1759-no-jre.zip
 	source = oracle-sqldeveloper.desktop
 	source = oracle-sqldeveloper.sh
 	source = LICENSE
 	source = java_home.patch
-	md5sums = ec986f454d747b742830284e6cd46fb0
+	md5sums = b86f1f520b7ea5a4681371c79fe0ad28
 	md5sums = 1d17d18e10ab85dead0770e8840273b3
 	md5sums = 26c1dc933a9ab58a4245f4f351717645
 	md5sums = 71a4092467209c160d0f34abbc08e049
-	md5sums = fe446201cc0d5326ecb757c384c67232
+	md5sums = 26037c8c9c7a285896397c058188eed4
+	sha256sums = db1927abcd85d7af442053d4eabc2aa658b5a8fbaf261a36b93e1beabb8363c2
+	sha256sums = bd028a137c83ab3698a562e9a7ec4006fb396178ab4a6ebdbaa60c75b5c0974c
+	sha256sums = 43b16049fbf85740767c45f0387a7c5e6118b8876509a8f0bb621ed0b5576a25
+	sha256sums = 7b3a6fd8a1ade4427382ee36dc28432655902a0a68547b29c5ce089bd85fe3de
+	sha256sums = c3409397f49dbf7021ef6912ddac51d5aeddc5a5b748d9524b568d60f5ed6c6a
 
 pkgname = oracle-sqldeveloper
 
diff --git a/.gitignore b/.gitignore
index 958e49b5e326..cdde784afecb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-sqldeveloper*.zip
-pkg
-src
-*.pkg.tar*
+oracle-sqldeveloper-*.pkg.tar.zst
+oracle-sqldeveloper-*.pkg.tar.xz
+oracle-sqldeveloper-*.log
+PKGBUILD-namcap.log
+sqldeveloper-*.zip
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 13b427f6ee22..4a9772829c0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer:  Yan Doroshenko <yandoroshenko@protonmail.com>
+# Maintainer: Fredy García <frealgagu at gmail dot com>
+# Contributor: Yan Doroshenko <yandoroshenko@protonmail.com>
 # Contributor: G. Richard Bellamy <rbellamy@pteradigm.com>
 # Contributor: Hugo Osvaldo Barrera <hugo@barrera.io>
 # Contributor: ptk042 <ptk042@gmail.com>
@@ -6,44 +7,56 @@
 # Contributor: xduugu <xduugu@gmx.com>
 # Contributor: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: David Fuhr <david.fuhr@web.de>
-# what the heck
 
 pkgname=oracle-sqldeveloper
-pkgver=19.2.1.247.2212
+pkgver=19.4.0.354.1759
 pkgrel=1
 pkgdesc="A graphical tool for database development"
-arch=('any')
-url="http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html"
-license=('custom:OTN')
-depends=('java-environment>=8' 'java-environment<=11' 'bash' 'perl')
-optdepends=('ksh'
-  'java8-openjfx: Required to run the application with JDK8'
-  'java11-openjfx: Required to run the application with JDK11')
-source=(manual://sqldeveloper-$pkgver-no-jre.zip
-        oracle-sqldeveloper.desktop
-        oracle-sqldeveloper.sh
-        LICENSE
-        java_home.patch)
-md5sums=('ec986f454d747b742830284e6cd46fb0'
-         '1d17d18e10ab85dead0770e8840273b3'
-         '26c1dc933a9ab58a4245f4f351717645'
-         '71a4092467209c160d0f34abbc08e049'
-         'fe446201cc0d5326ecb757c384c67232')
+arch=("any")
+url="https://www.oracle.com/tools/downloads/sqldev-downloads.html"
+license=("custom:OTN")
+depends=("bash" "java-environment>=8" "java-environment<=11")
+optdepends=(
+  "ksh"
+  "java8-openjfx: Required to run the application with JDK8"
+  "java11-openjfx: Required to run the application with JDK11"
+)
+install="${pkgname}.install"
+source=(
+  "manual://${pkgname#oracle-}-${pkgver}-no-jre.zip"
+  "${pkgname}.desktop"
+  "${pkgname}.sh"
+  "LICENSE"
+  "java_home.patch"
+)
+md5sums=(
+  "b86f1f520b7ea5a4681371c79fe0ad28"
+  "1d17d18e10ab85dead0770e8840273b3"
+  "26c1dc933a9ab58a4245f4f351717645"
+  "71a4092467209c160d0f34abbc08e049"
+  "26037c8c9c7a285896397c058188eed4"
+)
+sha256sums=(
+  "db1927abcd85d7af442053d4eabc2aa658b5a8fbaf261a36b93e1beabb8363c2"
+  "bd028a137c83ab3698a562e9a7ec4006fb396178ab4a6ebdbaa60c75b5c0974c"
+  "43b16049fbf85740767c45f0387a7c5e6118b8876509a8f0bb621ed0b5576a25"
+  "7b3a6fd8a1ade4427382ee36dc28432655902a0a68547b29c5ce089bd85fe3de"
+  "c3409397f49dbf7021ef6912ddac51d5aeddc5a5b748d9524b568d60f5ed6c6a"
+)
+
+prepare() {
+  cd "${srcdir}/${pkgname#oracle-}"
+  patch -Np1 -i "${srcdir}/java_home.patch"
+}
 
 package() {
-  cd "$srcdir/sqldeveloper"
+  cd "${srcdir}/${pkgname#oracle-}"
 
-  patch -Np1 < "$srcdir/java_home.patch"
   find . \( -iname "*.exe" -o -iname "*.dll" \) -exec rm -f "{}" +
-  find . -type f -exec install -Dm644 "{}" "$pkgdir/opt/oracle-sqldeveloper/{}" \;
-  chmod +x "$pkgdir/opt/$pkgname/sqldeveloper.sh"
+  find . -type f -exec install -Dm644 "{}" "${pkgdir}/opt/${pkgname}/{}" \;
+  chmod +x "${pkgdir}/opt/${pkgname}/${pkgname#oracle-}.sh"
 
-  install -Dm755 "$srcdir/$pkgname.sh"      "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/LICENSE"          "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  msg "To run the application you need to have java8-openjfx or java11-openjfx depending on the JDK version you will be using."
-  msg "You will need to set JAVA_HOME or run this package for the first time from the console to set the jdk path."
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/java_home.patch b/java_home.patch
index 7f5af19da3a2..5afb64e650d0 100644
--- a/java_home.patch
+++ b/java_home.patch
@@ -1,6 +1,8 @@
---- a/ide/bin/launcher.sh	2015-04-16 14:14:34.000000000 -0700
-+++ b/ide/bin/launcher.sh	2015-06-02 18:40:06.592117555 -0700
-@@ -673,18 +673,6 @@
+diff --git a/ide/bin/launcher.sh b/ide/bin/launcher.sh
+index da23d23..55c8e91 100644
+--- a/ide/bin/launcher.sh
++++ b/ide/bin/launcher.sh
+@@ -925,18 +925,6 @@ GetDefaultJDK()
    #
    if [ -f "$tmpvar" ]
    then
diff --git a/oracle-sqldeveloper.install b/oracle-sqldeveloper.install
new file mode 100644
index 000000000000..a2d391617e5c
--- /dev/null
+++ b/oracle-sqldeveloper.install
@@ -0,0 +1,8 @@
+post_install() {
+  printf "$(tput setaf 4)To run the application you need to have java8-openjfx or java11-openjfx depending on the JDK version you will be using.$(tput sgr0)\n"
+  printf "$(tput setaf 4)You will need to set JAVA_HOME or run this package for the first time from the console to set the jdk path.$(tput sgr0)\n"
+}
+
+post_upgrade() {
+  post_install
+}