Update from aur

2017-11-25 21:32:19 -05:00
parent 3861d23ae2
commit 80f46f9b25
61 changed files with 857 additions and 295 deletions
--- a/src/jdk/PKGBUILD
+++ b/src/jdk/PKGBUILD
@@ -1,17 +1,14 @@
 # Maintainer: Det <nimetonmaili g-mail>
-# Based on jre: https://aur.archlinux.org/packages/jre/

 pkgname=jdk
-_major=8
-_minor=144
-_build=b01
-_hash=090f390dda5b47b9b721c7dfaa008135
-pkgver=${_major}u${_minor}
+pkgver=9.0.1
+_major=${pkgver/.*}
+_build=11
 pkgrel=1
 pkgdesc="Oracle Java Development Kit"
-arch=('i686' 'x86_64')
-url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
-license=('custom')
+arch=('x86_64')
+url="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
+license=('custom:Oracle')
 depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
 optdepends=('alsa-lib: for basic sound support'
            'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
@@ -19,49 +16,39 @@ optdepends=('alsa-lib: for basic sound support'
 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}
 _jvmdir=/usr/lib/jvm/java-$_major-$pkgname
-
-backup=("etc/java-$_jname/amd64/jvm.cfg"
-        "etc/java-$_jname/images/cursors/cursors.properties"
-        "etc/java-$_jname/management/jmxremote.access"
+ 
+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/content-types.properties"
-        "etc/java-$_jname/flavormap.properties"
        "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")
-[[ $CARCH = i686 ]] && backup[0]="etc/java-$_jname/i386/jvm.cfg"
 options=('!strip') # JDK debug-symbols
 install=$pkgname.install
-source=("http://download.oracle.com/otn-pub/java/jce/$_major/jce_policy-$_major.zip"
+source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${pkgname}-${pkgver}_linux-x64_bin.tar.gz"
        "jconsole-$_jname.desktop"
        "jmc-$_jname.desktop"
        "jvisualvm-$_jname.desktop"
        "policytool-$_jname.desktop")
-source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-i586.tar.gz")
-source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-x64.tar.gz")
-md5sums=('b3c7031bc65c28c2340302065e7d00d3'
-         'b4f0da18e03f7a9623cb073b65dde6c1'
-         '8f0ebcead2aecad67fbd12ef8ced1503'
-         'a4a21b064ff9f3c3f3fdb95edf5ac6f3'
-         '98245ddb13914a74f0cc5a028fffddca')
-md5sums_i686=('13d771707f326b02e2497c99e0a2ca37')
-md5sums_x86_64=('2d59a3add1f213cd249a67684d4aeb83')
-## Alternative mirror, if your local one is throttled:
-#source_x86_64=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/$pkgname-$pkgver-linux-x64.gz")
+sha256sums=('2cdaf0ff92d0829b510edd883a4ac8322c02f2fc1beae95d048b6716076bc014'
+            '100fd0162a4be04371d9d53121bd511aeb0a230475497a8c19ed0cff20915efc'
+            'e4059de8ec0dee1a5eabd1d67a053509aa0009ba6e08739b11140c26f2fcc55a'
+            '1f74cc627bd6a934681fe2d453058c21794d1435205c501f7fecdaf2c94f5485'
+            'ff6684d7d5c26cc805e6f3918284a95b48223db4f37956f35a344373a2931aa4')

 package() {
-    cd ${pkgname}1.${_major}.0_${_minor}
+    cd $pkgname-$pkgver

    msg2 "Creating directory structure..."
    install -d "$pkgdir"/etc/.java/.systemPrefs
@@ -70,20 +57,11 @@ package() {
    install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname

    msg2 "Removing redundancies..."
-    rm    db/bin/*.bat
-    rm    db/3RDPARTY
-    rm    db/LICENSE
-    rm -r jre/lib/desktop/icons/HighContrast/
-    rm -r jre/lib/desktop/icons/HighContrastInverse/
-    rm -r jre/lib/desktop/icons/LowContrast/
-    rm    jre/lib/fontconfig.*.bfc
-    rm    jre/lib/fontconfig.*.properties.src
-    rm -r jre/plugin/
-    rm    jre/*.txt
-    rm    jre/COPYRIGHT
-    rm    jre/LICENSE
-    rm    jre/README
-    rm    man/ja
+    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
@@ -91,66 +69,71 @@ package() {
    # Cd to the new playground
    cd "$pkgdir"/$_jvmdir

-    msg2 "Fixing directory structure..."
-    # Replace duplicate binaries in bin/ with links to jre/bin/
-    for i in $(ls jre/bin/); do
-        ln -sf "$_jvmdir/jre/bin/$i" "bin/$i"
-    done
+    # Create a placeholder 'jre' link
+    ln -s . jre

-    # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png)
-    for i in $(find jre/lib/desktop/ -type f); do
+    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 .desktop paths
-    sed -e "s|Exec=|Exec=$_jvmdir/jre/bin/|" \
+    # 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
+
+    # 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 jre/lib/desktop/applications/*
+    -i lib/desktop/applications/*

    # Move .desktops + icons to /usr/share
-    mv jre/lib/desktop/* "$pkgdir"/usr/share/
+    mv lib/desktop/* "$pkgdir"/usr/share/
    install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/

-    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/jre/lib -> /etc
+    # 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\/}"
+
+        # 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/lib -> /etc
    for new_etc_path in ${backup[@]}; do
        # Old location
-        old_usr_path="jre/lib/${new_etc_path#*$_jname/}"
+        old_usr_path="lib/${new_etc_path#*$_jname/}"

-        # Move
-        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
-        ln -sf "/$new_etc_path" "$old_usr_path"
+        # 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
-    case "$CARCH" in
-        i686)   ln -sf $_jvmdir/jre/lib/i386/libnpjp2.so  "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
-        x86_64) ln -sf $_jvmdir/jre/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
-    esac
+    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 jre/lib/security/cacerts
-
-    # Suffix man pages
-    for i in $(find man/ -type f); do
-        mv "$i" "${i/.1}-$_jname.1"
-    done
-
-    # Move man pages
-    mv man/ja_JP.UTF-8/ man/ja
-    mv man/ "$pkgdir"/usr/share
+    ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts

    # Move/link licenses
-    mv db/NOTICE COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
+    mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
    ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname

-    msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..."
-    # 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
-    install -m644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/*.jar jre/lib/security/
-    install -Dm644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/README.txt \
-                   "$pkgdir"/usr/share/doc/$pkgname/README_-_Java_JCE_Unlimited_Strength.txt
+    # 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:
--- a/src/jdk/jconsole-jdk9.desktop
+++ b/src/jdk/jconsole-jdk9.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-9-jdk/bin/jconsole
+Icon=sun-java-jdk9
+Name=Java Monitoring and Management Console
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
--- a/src/jdk/jdk.install
+++ b/src/jdk/jdk.install
@@ -1,4 +1,4 @@
-THIS_JAVA='java-8-jdk'
+THIS_JAVA='java-9-jdk'
 NAME='JDK'

 all_off="$(tput sgr0)"
@@ -10,6 +10,10 @@ note() {
    printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n"
 }

+note2() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
 post_install() {
    default=$(archlinux-java get)
    case ${default} in
@@ -32,6 +36,14 @@ post_install() {
    if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then
        update-ca-trust
    fi
+
+    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).
+          
+          See: 
+          - https://github.com/zealdocs/zeal/issues/802
+          - https://bbs.archlinux.org/viewtopic.php?id=231222"
 }

 post_upgrade() {
--- a/src/jdk/jmc-jdk9.desktop
+++ b/src/jdk/jmc-jdk9.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-9-jdk/bin/jmc
+Icon=sun-java-jdk9
+Name=Java Mission Control
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Development;Java;
--- a/src/jdk/jvisualvm-jdk9.desktop
+++ b/src/jdk/jvisualvm-jdk9.desktop
@@ -0,0 +1,9 @@
+[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
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/lib/jvm/java-9-jdk/bin/policytool
+Icon=sun-java-jdk9
+Name=Java Policy Settings
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Settings;Java;