diff options
| -rw-r--r-- | libre/java7-openjdk/PKGBUILD | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/libre/java7-openjdk/PKGBUILD b/libre/java7-openjdk/PKGBUILD index 9ca705701..d84796b39 100644 --- a/libre/java7-openjdk/PKGBUILD +++ b/libre/java7-openjdk/PKGBUILD @@ -7,13 +7,13 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk') pkgbase=java7-openjdk _java_ver=7 -_icedtea_ver=2.6.9 +_icedtea_ver=2.6.11 #pkgver() { # _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \ # | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/') # echo ${_java_ver}.u${_updatever}_${_icedtea_ver} #} -_updatever=131 +_updatever=151 pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver} pkgrel=1.parabola1 @@ -45,15 +45,15 @@ validpgpkeys=('5132579DD1540ED23E04C5A0CFDA0F9B35964222') # Andrew John Hughes # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357 -sha256sums=('8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea' +sha256sums=('20063c314535e4ed4b8099e497b880e4f346c85e7315a2573d0f398b973777c5' 'SKIP' - '444c7dcfbcc665b4bb73b7c8b8256ac4d55fdb614ebdc3684a34d5f274684421' - '48df47fac80597978951125fda10366b4f65b73b322abb80aefbe1ec58227989' - 'bf4e27af83fc88353986b906a0ac245658cf9d7b34629254e5e21b4aeff0621f' - 'a5d499825c2b7745b73b5e3596057013503bd1df3d60d04cd924e02b25313ca3' - '44feb033ad9ae3d4b10f6561f1743fe28a13bbcacd150f2f33f5ef116fece7c5' - '3eb33811bf1f8a56ae19078e35da835273e828293bc355b5b04a416bd3c6c96a' - 'd4ff2b6d44192a796af70e663b3ed2c7dd9e320729929ac650b4a1bc90ef329a' + '0d521feed6275102ba3b3ee394330fefe20463dd63caa7197c7fd93e132519fe' + 'ff818ceedd154fa4d55d38b50fccd6a19de242a592d9ffbed7368bc56c091b81' + 'a2642f8792edf7e40169ddafcd7a3c297e75b41f7c65fac2a84787376a65977d' + 'a299f434b48e5ed1e57085be5515ea1dbfbad971d08d386f070d653d2ea878be' + 'ce4eca8a320c7514a7ecaa513a2a9cbb82a74e0256c8ba277fa692debe952eb5' + '650a2d3881ba02ea10cbb6ddeef3888103fccaa904cb23517e07b3acd26d4c7f' + 'a6055f2eb2c6f159fdc20fc5268ffb27d6cb7959ed7af28ee8a0f862b5b6dbf8' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b') @@ -248,7 +248,9 @@ package_jre7-openjdk() { # Install desktop files. install -d -m755 "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications" + sed "s#_BINDIR_#${_jvmdir}/jre/bin#" \ + "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" \ + > "${pkgdir}/usr/share/applications/policytool.desktop" # link license install -d -m755 "${pkgdir}/usr/share/licenses" @@ -294,7 +296,9 @@ package_jdk7-openjdk() { # Install desktop files. install -d -m755 "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications" + sed "s#_BINDIR_#${_jvmdir}/bin#" \ + "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" \ + > "${pkgdir}/usr/share/applications/jconsole.desktop" # Temporarily fixing FS#35141 [ "$CARCH" != "armv7h" ] && chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar" |