[arch-commits] Commit in java7-openjdk/trunk (3 files)
Guillaume Alaux
guillaume at archlinux.org
Thu Oct 20 20:45:56 UTC 2011
Date: Thursday, October 20, 2011 @ 16:45:56
Author: guillaume
Revision: 140987
upgpkg: java7-openjdk 7.b147_2.0-2
Fixed #26531 - added dependency 'gsettings-desktop-schemas'
Modified:
java7-openjdk/trunk/PKGBUILD
java7-openjdk/trunk/jdk7-openjdk.profile
java7-openjdk/trunk/jre7-openjdk.install
----------------------+
PKGBUILD | 39 +++++++++++++++++++--------------------
jdk7-openjdk.profile | 2 +-
jre7-openjdk.install | 2 +-
3 files changed, 21 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-10-20 20:16:15 UTC (rev 140986)
+++ PKGBUILD 2011-10-20 20:45:56 UTC (rev 140987)
@@ -20,7 +20,7 @@
_OPENJDK_CHANGESET=0a76e5390e68
pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
@@ -28,8 +28,8 @@
'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib'
'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2')
source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
- http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz
+ http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
+ http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz
http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz
http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz
http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz
@@ -68,7 +68,7 @@
'f7e7a212e50abb56a6ef1a2b1bd27405'
'c195c4865b84d9e2e0fd71ac6d88eadb'
'203640d6e79e41b0065e016818c17ccd'
- 'fe39da48a62b1fdd8fc24de0e0c4b525'
+ 'b7b8996448c7b4fa7dd2d744488ed3bd'
'cdabafad0ec413d9a983888bf445a443'
'612b0fec7e0943c37a6de77c43622007'
'62443459da0cb28181feb260dc0e5ce7'
@@ -92,7 +92,7 @@
unset JAVA_HOME
unset CLASSPATH
# default is to build with first found java-environment found in our repos - is jdk7-openjdk
- [ -f /etc/profile.d/jdk7-openjdk.sh ] && . /etc/profile.d/jdk7-openjdk.sh
+ [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh
unset MAKEFLAGS
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
@@ -107,11 +107,11 @@
# autoreconf --force --install
./configure \
- --disable-bootstrap \
- --with-parallel-jobs="${MAKEFLAGS/-j}" \
+ --disable-bootstrap \
+ --with-parallel-jobs="${MAKEFLAGS/-j}" \
--disable-tests \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \
- --with-jdk-home=${JAVA_HOME} \
+ --with-jdk-home=${JAVA_HOME} \
--with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
--with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
--with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
@@ -120,16 +120,15 @@
--with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
--with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--enable-pulse-java \
-# --with-rhino #--help
+# --with-rhino #--help
#--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
#--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
#--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
-
-# --enable-systemtap Enable inclusion of SystemTap trace support
-# --enable-nss Enable inclusion of NSS security provider
-# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed
+# --enable-systemtap Enable inclusion of SystemTap trace support
+# --enable-nss Enable inclusion of NSS security provider
+# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed
make
}
@@ -142,14 +141,14 @@
package_jre7-openjdk() {
pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment"
depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
- 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
+ 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas')
optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
'alsa-lib: for sound'
'giflib: for gif format support')
provides=('java-runtime=7')
conflicts=('java-runtime')
# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
- backup=(etc/profile.d/jre7-openjdk.sh)
+ backup=(etc/profile.d/jre7.sh)
install=jre7-openjdk.install
_jvmdir=/usr/lib/jvm/java-7-openjdk
@@ -194,8 +193,8 @@
# Set some variables
install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh
- install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh
+ install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jre.sh
+ install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jre.csh
# Install license
install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
@@ -209,7 +208,7 @@
provides=('java-environment=7')
conflicts=('java-environment')
# replaces=('openjdk6')
- backup=(etc/profile.d/jdk7-openjdk.sh)
+ backup=(etc/profile.d/jdk7.sh)
_jvmdir=/usr/lib/jvm/java-7-openjdk
@@ -252,8 +251,8 @@
# Set some variables
install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh
- install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh
+ install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
+ install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
}
package_openjdk7-src() {
Modified: jdk7-openjdk.profile
===================================================================
--- jdk7-openjdk.profile 2011-10-20 20:16:15 UTC (rev 140986)
+++ jdk7-openjdk.profile 2011-10-20 20:45:56 UTC (rev 140987)
@@ -3,4 +3,4 @@
export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7-openjdk.sh
+# in /etc/profile.d/jre7.sh
Modified: jre7-openjdk.install
===================================================================
--- jre7-openjdk.install 2011-10-20 20:16:15 UTC (rev 140986)
+++ jre7-openjdk.install 2011-10-20 20:45:56 UTC (rev 140987)
@@ -5,7 +5,7 @@
fi
echo "when you use a non-reparenting window manager"
echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
- echo "/etc/profile.d/jre7-openjdk.sh"
+ echo "/etc/profile.d/jre7.sh"
# update-desktop-database -q
}
More information about the arch-commits
mailing list