From 189aaff49501d1c4e684e90790f0dd97a3809c9c Mon Sep 17 00:00:00 2001 From: Det Date: Sat, 11 Jul 2015 18:25:17 +0300 Subject: [PATCH] Remove the additional PKGBUILDs + update previous build info --- PKGBUILD | 4 +- PKGBUILD-jdk | 154 --------------------------------------------------- PKGBUILD-jre | 137 --------------------------------------------- 3 files changed, 2 insertions(+), 293 deletions(-) delete mode 100644 PKGBUILD-jdk delete mode 100644 PKGBUILD-jre diff --git a/PKGBUILD b/PKGBUILD index 860c4ec..15589f2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -28,8 +28,8 @@ md5sums_i686=('6547738530cb823611f3102ab089b547') md5sums_x86_64=('c7b027f756a87224843da74180ab25ac') ## Previous build (also see: /var/cache/pacman/pkg/google-chrome-dev-*): -#source_x86_64=('http://mirror.pcbeta.com/google/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_45.0.2453.0-1_amd64.deb') -#md5sums_x86_64=('c7b027f756a87224843da74180ab25ac') +#source_x86_64=('http://mirror.pcbeta.com/google/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_45.0.2438.3-1_amd64.deb') +#md5sums_x86_64=('04c18f5090c783e23884f211ddd927e4') package() { msg2 "Extracting the data.tar.xz..." diff --git a/PKGBUILD-jdk b/PKGBUILD-jdk deleted file mode 100644 index e69edf2..0000000 --- a/PKGBUILD-jdk +++ /dev/null @@ -1,154 +0,0 @@ -# Maintainer: Det -# Based on jre: https://aur.archlinux.org/packages/jre/ - -pkgname=jdk -_major=8 -_minor=45 -_build=b14 -pkgver=${_major}u${_minor} -pkgrel=1 -pkgdesc="Oracle Java Development Kit" -arch=('i686' 'x86_64') -url=http://www.oracle.com/technetwork/java/javase/downloads/index.html -license=('custom') -depends=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java-environment-common' - 'java-runtime-common' 'libx11' 'libxrender' 'libxslt' 'libxtst' 'shared-mime-info' 'xdg-utils') -optdepends=('alsa-lib: for basic sound support' - 'eclipse: to use "Oracle Java Mission Control" plugins in Eclipse' - 'gtk2: for Gtk+ look and feel (desktop)' - 'ttf-font: fonts') -makedepends=('pacman>=4.2.0') -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") - -# Variables -DLAGENTS=('http::/usr/bin/curl -LC - -b oraclelicense=a -O') -_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" - "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=("jconsole-$_jname.desktop" - "jmc-$_jname.desktop" - "jvisualvm-$_jname.desktop" - "policytool-$_jname.desktop") -source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$pkgname-$pkgver-linux-i586.tar.gz") -source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$pkgname-$pkgver-linux-x64.tar.gz") -md5sums=('b4f0da18e03f7a9623cb073b65dde6c1' - '8f0ebcead2aecad67fbd12ef8ced1503' - 'a4a21b064ff9f3c3f3fdb95edf5ac6f3' - '98245ddb13914a74f0cc5a028fffddca') -md5sums_i686=('e68241caf30cb81ae4e985be7218bb6d') -md5sums_x86_64=('1ad9a5be748fb75b31cd3bd3aa339cac') -## 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") - -package() { - cd ${pkgname}1.${_major}.0_${_minor} - - 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 db/bin/*.bat - 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 - - msg2 "Moving contents..." - mv * "$pkgdir"/$_jvmdir - - # 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 - - # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png) - for i in $(find jre/lib/desktop/ -type f); do - rename -- "." "-$_jname." $i - done - - # Fix .desktop paths - sed -e "s|Exec=|&$_jvmdir/jre/bin/|" \ - -e "s|.png|-$_jname.png|" \ - -i jre/lib/desktop/applications/* - - # Move .desktops + icons to /usr/share - mv jre/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 - for new_etc_path in ${backup[@]}; do - # Old location - old_usr_path="jre/lib/${new_etc_path#*$_jname/}" - - # Move - install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path" - ln -sf "/$new_etc_path" "$old_usr_path" - 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 - - # 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 - - # Move/link licenses - mv COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$pkgname/ - ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname - - 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 -} diff --git a/PKGBUILD-jre b/PKGBUILD-jre deleted file mode 100644 index 25312a3..0000000 --- a/PKGBUILD-jre +++ /dev/null @@ -1,137 +0,0 @@ -# Maintainer: Det -# Contributors: Charles Ghislain, Guillaume ALAUX, Daniel J Griffiths, Jason Chu, Geoffroy Carrier, -# Army, kfgz, Thomas Dziedzic, Dan Serban, jjacky, EasySly - -pkgname=jre -_major=8 -_minor=45 -_build=b14 -pkgver=${_major}u${_minor} -pkgrel=1 -pkgdesc="Oracle Java Runtime Environment" -arch=('i686' 'x86_64') -url=http://www.oracle.com/technetwork/java/javase/downloads/index.html -license=('custom') -depends=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java-runtime-common' - 'libxrender' 'libxtst' 'shared-mime-info' 'xdg-utils') -optdepends=('alsa-lib: for basic sound support' - 'gtk2: for Gtk+ look and feel (desktop)' - 'ttf-font: fonts') -makedepends=('pacman>=4.2.0') -provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" - "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major") - -# Variables -DLAGENTS=('http::/usr/bin/curl -LC - -b oraclelicense=a -O') -_jname=${pkgname}${_major} -_jvmdir=/usr/lib/jvm/java-$_major-$pkgname/jre - -backup=("etc/java-$_jname/amd64/jvm.cfg" - "etc/java-$_jname/images/cursors/cursors.properties" - "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" -install=$pkgname.install -source=("policytool-$_jname.desktop") -source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$pkgname-$pkgver-linux-i586.tar.gz") -source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$pkgname-$pkgver-linux-x64.tar.gz") -md5sums=('762729fa0faba8ff2b5a29c249c95079') -md5sums_i686=('def512ee71620662c7f4631bed7da183') -md5sums_x86_64=('58486d7b16d7b21fbea7374adc109233') -## 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") - -package() { - cd ${pkgname}1.${_major}.0_${_minor} - - msg2 "Creating directory structure..." - install -d "$pkgdir"/etc/.java/.systemPrefs - install -d "$pkgdir"/usr/lib/jvm/java-$_major-$pkgname/jre/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 - rm man/ja - rm -r plugin/ - - msg2 "Moving contents..." - mv * "$pkgdir"/$_jvmdir - - # Cd to the new playground - cd "$pkgdir"/$_jvmdir - - msg2 "Fixing directory structure..." - # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png) - for i in $(find lib/desktop/ -type f); do - rename -- "." "-$_jname." $i - done - - # Fix .desktop paths - sed -e "s|Exec=|&$_jvmdir/bin/|" \ - -e "s|.png|-$_jname.png|" \ - -i lib/desktop/applications/* - - # Move .desktops + icons to /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/lib -> /etc - for new_etc_path in ${backup[@]}; do - # Old location - 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" - done - - # Link NPAPI plugin - case "$CARCH" in - i686) ln -sf $_jvmdir/lib/i386/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;; - x86_64) ln -sf $_jvmdir/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;; - esac - - # Replace JKS keystore with 'ca-certificates-java' - ln -sf /etc/ssl/certs/java/cacerts 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 - - # Move/link licenses - mv COPYRIGHT LICENSE README *.txt "$pkgdir"/usr/share/licenses/java$_major-$pkgname/ - ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname - - 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 -}