Update jdks + idea

2018-04-19 08:49:44 -04:00
parent d6ff21dcb5
commit ad3e05cfeb
16 changed files with 195 additions and 254 deletions
--- a/src/jdk/PKGBUILD
+++ b/src/jdk/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Det <nimetonmaili g-mail>

 pkgname=jdk
-pkgver=9.0.4
+pkgver=10.0.1
 _major=${pkgver/.*}
-_build=11
-_hash=c2514751926b4512b076cc82f959763f
+_build=10
+_hash=fb4372174a714e6b8c52526dc134031e
+_jname=${pkgname}${_major}
 pkgrel=1
 pkgdesc="Oracle Java Development Kit"
 arch=('x86_64')
@@ -16,135 +17,108 @@ optdepends=('alsa-lib: for basic sound support'
            'gtk2: for Gtk+ look and feel (desktop)')
 provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
          "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
-          "java-openjfx=$_major")
-conflicts=("java-runtime-jre=$_major" "java-environment-jdk=$_major")
-
-# Variables
-DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
-_jname=${pkgname}${_major}
+          "java-openjfx=$_major" "$_jname")
+conflicts=("$_jname")
 _jvmdir=/usr/lib/jvm/java-$_major-$pkgname
- 
 backup=("etc/java-$_jname/management/jmxremote.access"
        "etc/java-$_jname/management/management.properties"
        "etc/java-$_jname/security/java.policy"
        "etc/java-$_jname/security/java.security"
        "etc/java-$_jname/security/javaws.policy"
-        "etc/java-$_jname/fontconfig.properties.src"
        "etc/java-$_jname/logging.properties"
        "etc/java-$_jname/net.properties"
-        "etc/java-$_jname/psfont.properties.ja"
-        "etc/java-$_jname/psfontj2d.properties"
        "etc/java-$_jname/sound.properties")
 options=('!strip') # JDK debug-symbols
 install=$pkgname.install
 source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/${pkgname}-${pkgver}_linux-x64_bin.tar.gz"
-        "jconsole-$_jname.desktop"
-        "jmc-$_jname.desktop"
-        "jvisualvm-$_jname.desktop"
-        "policytool-$_jname.desktop")
-sha256sums=('90c4ea877e816e3440862cfa36341bc87d05373d53389ec0f2d54d4e8c95daa2'
-            '100fd0162a4be04371d9d53121bd511aeb0a230475497a8c19ed0cff20915efc'
-            'e4059de8ec0dee1a5eabd1d67a053509aa0009ba6e08739b11140c26f2fcc55a'
-            '1f74cc627bd6a934681fe2d453058c21794d1435205c501f7fecdaf2c94f5485'
-            'ff6684d7d5c26cc805e6f3918284a95b48223db4f37956f35a344373a2931aa4')
+        "jconsole.desktop"
+        "jmc.desktop"
+        "policytool.desktop")
+sha256sums=('ae8ed645e6af38432a56a847597ac61d4283b7536688dbab44ab536199d1e5a4'
+            '3ea717825268a66837380c9ca2b076f02a3298d2df48c3450152fdaf1d0dbc6e'
+            '365b33b197e6be65ad746e5ed864428e45ae1e24dba53aa7d9c71de0644cf4e2'
+            '5dfde6ee531056571d9601d47fbb4a3e56062e4d611667a56ba7931ec7948b36')
+            
+DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')

 package() {
-    cd $pkgname-$pkgver
+  cd $pkgname-$pkgver

-    msg2 "Creating directory structure..."
-    install -d "$pkgdir"/etc/.java/.systemPrefs
-    install -d "$pkgdir"/usr/lib/jvm/java-$_major-$pkgname/bin
-    install -d "$pkgdir"/usr/lib/mozilla/plugins
-    install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname
+  msg2 "Creating directory structure..."
+  install -d "$pkgdir"/etc/.java/.systemPrefs
+  install -d "$pkgdir"/usr/lib/jvm/java-$_major-$pkgname/bin
+  install -d "$pkgdir"/usr/lib/mozilla/plugins
+  install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname

-    msg2 "Removing redundancies..."
-    rm -r lib/desktop/icons/HighContrast
-    rm -r lib/desktop/icons/HighContrastInverse
-    rm -r lib/desktop/icons/LowContrast
-    rm    lib/fontconfig.*.bfc
-    rm    lib/fontconfig.*.properties.src
+  msg2 "Removing redundancies..."
+  rm -r lib/desktop/icons/HighContrast
+  rm -r lib/desktop/icons/HighContrastInverse
+  rm -r lib/desktop/icons/LowContrast
+  rm  lib/fontconfig.*.bfc
+  rm  lib/fontconfig.*.properties.src

-    msg2 "Moving contents..."
-    mv * "$pkgdir"/$_jvmdir
+  msg2 "Moving contents..."
+  mv * "$pkgdir"/$_jvmdir

-    # Cd to the new playground
-    cd "$pkgdir"/$_jvmdir
+  # Cd to the new playground
+  cd "$pkgdir"/$_jvmdir

-    # Create a placeholder 'jre' link
-    ln -s . jre
+  msg2 "Fixing directory structure..."
+  # Create a placeholder 'jre' link
+  ln -s . jre

-    msg2 "Fixing directory structure..."
-    # Suffix .desktops + icon (sun-jcontrol.png -> sun-jcontrol-$_jname.png)
-    for i in $(find lib/desktop/ -type f); do
-        rename -- "." "-$_jname." $i
-    done
+  # Fix bundled .desktops
+  sed -e "s|Exec=|Exec=$_jvmdir/bin/|" \
+      -e "s|.png|-$_jname.png|" \
+      -i lib/desktop/applications/*

-    # Link missing icons
-    for i in $(find lib/desktop/icons/ -name "sun-jcontrol-$_jname.png" -type f); do
-        ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/java}"
-        ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/javaws}"
-    done
+  # Move .desktops + icons to /usr/share
+  mv lib/desktop/* "$pkgdir"/usr/share/
+  install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/

-    # Fix .desktop's
-    sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \
-        -e "s|Name=JavaWS|Name=JavaWS $_major|" \
-        -e "s|Comment=Java|Comment=Java $_major|" \
-        -e "s|Exec=|Exec=$_jvmdir/bin/|" \
-        -e "s|.png|-$_jname.png|" \
-    -i lib/desktop/applications/*
+  # Suffix .desktops + icon (sun-jcontrol.png -> sun-jcontrol-$_jname.png)
+  for i in $(find "$pkgdir"/usr/share/ -type f); do
+    rename -- "." "-$_jname." $i
+  done

-    # Move .desktops + icons to /usr/share
-    mv lib/desktop/* "$pkgdir"/usr/share/
-    install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
+  # Write versions to .desktops + .install
+  sed -i "s/<version>/$_major/" "$pkgdir"/usr/share/applications/* "$startdir"/$pkgname.install

-    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/conf -> /etc
-    for old_usr_path in $(find conf/ -type f); do
-        # New location
-        new_etc_path="/etc/java-$_jname/${old_usr_path/conf\/}"
+  # Link missing icons
+  for i in $(find "$pkgdir"/usr/share/icons/ -name "sun-jcontrol-$_jname.png" -type f); do
+    ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/java}"
+    ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/javaws}"
+  done

-        # Move /link
-        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
-        ln -sf "$new_etc_path" "$old_usr_path"
-    done
+  # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/conf -> /etc
+  for sub_path in $(find conf/ -type f); do
+    # New location
+    new_etc_path="/etc/java-$_jname/${sub_path/conf\/}"

-    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/lib -> /etc
-    for new_etc_path in ${backup[@]}; do
-        # Old location
-        old_usr_path="lib/${new_etc_path#*$_jname/}"
+    # Move & link
+    install -Dm644 "$sub_path" "$pkgdir/$new_etc_path"
+    ln -sf "$new_etc_path" "$sub_path"
+  done

-        # Move/link
-        if [[ -f $old_usr_path ]]; then
-            install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
-            ln -sf "/$new_etc_path" "$old_usr_path"
-        fi
-    done
+  # Link NPAPI plugin
+  ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so

-    # Link NPAPI plugin
-    ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so
+  # Replace JKS keystore with 'ca-certificates-java'
+  ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts

-    # Replace JKS keystore with 'ca-certificates-java'
-    ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
+  # Move & link licenses
+  mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
+  ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname

-    # Move/link licenses
-    mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
-    ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
-
-    # msg2 "Enabling Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy..."
-    # # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
-    # # things like 256-bit AES. Enabled by default in OpenJDK:
-    # # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
-    # # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
-    # sed -i "s/crypto.policy=limited/crypto.policy=unlimited/" "$pkgdir"/etc/java-$_jname/security/java.security
-
-    msg2 "Enabling copy+paste in unsigned applets..."
-    # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
-    # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
-    # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
-    _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy)
-    sed "$_line a\\\\n \
-        // (AUR) Allow unsigned applets to read system clipboard, see:\n \
-        // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \
-        // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
-        permission java.awt.AWTPermission \"accessClipboard\";" \
+  msg2 "Enabling copy+paste in unsigned applets..."
+  # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
+  # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
+  # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
+  _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy)
+  sed "$_line a\\\\n \
+    // (AUR) Allow unsigned applets to read system clipboard, see:\n \
+    // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \
+    // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
+    permission java.awt.AWTPermission \"accessClipboard\";" \
    -i "$pkgdir"/etc/java-$_jname/security/java.policy
 }
--- a/src/jdk/jconsole-jdk9.desktop
+++ b/src/jdk/jconsole-jdk9.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/jconsole
-Icon=sun-java-jdk9
+Exec=/usr/lib/jvm/java-<version>-jdk/bin/jconsole
+Icon=sun-java-jdk<version>
 Name=Java Monitoring and Management Console
 StartupNotify=true
 Terminal=false
--- a/src/jdk/jdk.install
+++ b/src/jdk/jdk.install
@@ -1,4 +1,5 @@
-THIS_JAVA='java-9-jdk'
+VERSION='10'
+THIS_JAVA='java-${VERSION}-jdk'
 NAME='JDK'

 all_off="$(tput sgr0)"
@@ -39,7 +40,7 @@ post_install() {

    note2 "Since Oracle Java 9, some Qt 5 applications (such as the reader apps Zeal and
          GoldenDict) will crash due to the existance of the Java NPAPI plugin symlink
-          (/usr/lib/mozilla/plugins/libnpjp2-jdk9.so).
+          (/usr/lib/mozilla/plugins/libnpjp2-jdk${VERSION}.so).
          
          See: 
          - https://github.com/zealdocs/zeal/issues/802
--- a/src/jdk/jmc-jdk9.desktop
+++ b/src/jdk/jmc-jdk9.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/jmc
-Icon=sun-java-jdk9
+Exec=/usr/lib/jvm/java-<version>-jdk/bin/jmc
+Icon=sun-java-jdk<version>
 Name=Java Mission Control
 StartupNotify=true
 Terminal=false
--- a/src/jdk/jvisualvm-jdk9.desktop
+++ b/src/jdk/jvisualvm-jdk9.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/jvisualvm
-GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=sun-java-jdk9
-Name=Java VisualVM
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
--- a/src/jdk/policytool-jdk9.desktop
+++ b/src/jdk/policytool-jdk9.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jdk/bin/policytool
-Icon=sun-java-jdk9
+Exec=/usr/lib/jvm/java-<version>-jdk/bin/policytool
+Icon=sun-java-jdk<version>
 Name=Java Policy Settings
 StartupNotify=true
 Terminal=false