[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Jan 20 16:16:53 UTC 2012
Date: Friday, January 20, 2012 @ 11:16:53
Author: andyrtr
Revision: 147007
prepare libpng rebuild and fix FS#27959
Modified:
java7-openjdk/trunk/PKGBUILD
----------+
PKGBUILD | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-20 16:11:11 UTC (rev 147006)
+++ PKGBUILD 2012-01-20 16:16:53 UTC (rev 147007)
@@ -24,12 +24,12 @@
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
'alsa-lib' 'apache-ant>=1.8.1' 'giflib'
'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`?
[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
@@ -124,7 +124,7 @@
--with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--enable-pulse-java \
--enable-nss \
- --with-rhino
+ --with-rhino --enable-system-png
#--help
# --enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed
@@ -144,7 +144,7 @@
optdepends=('libcups: needed for Java Mauve support - libmawt.so'
'fontconfig: needed for Java Mauve support - libmawt.so')
provides=('java-runtime=7')
- conflicts=('java-runtime')
+ conflicts=('java-runtime' 'openjdk6')
# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
backup=(etc/profile.d/jre.sh
etc/profile.d/jre.csh
@@ -267,7 +267,8 @@
'libpulse: for advanced sound support'
'gtk2: for the Gtk+ look and feel - desktop usage')
install=jre7-openjdk.install
-
+ conflicts=('openjdk6')
+
mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
# Link binaries into /usr/bin
pushd ${pkgdir}/${_jvmdir}/jre/bin
More information about the arch-commits
mailing list