[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Sep 22 20:38:47 UTC 2011
Date: Thursday, September 22, 2011 @ 16:38:47
Author: andyrtr
Revision: 138427
some small cosmetic changes
Modified:
java7-openjdk/trunk/PKGBUILD
----------+
PKGBUILD | 122 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 60 insertions(+), 62 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-22 19:46:09 UTC (rev 138426)
+++ PKGBUILD 2011-09-22 20:38:47 UTC (rev 138427)
@@ -8,40 +8,34 @@
_openjdk_build=b147
_openjdk_date=27_jun_2011
_icedtea_ver=1.14
-_date=20110920
+_date=20110922
-_forest_openjdk_ver=3defd24c2671
-_forest_jdk_ver=80fe75968a0b
-_langtools_ver=fb7fb3071b64
-_hotspot_ver=1dd9b3d73b22
+# check "${srcdir}/icedtea7"/Makefile.am
+_CORBA_CHANGESET=616c760dc288
+_HOTSPOT_CHANGESET=1dd9b3d73b22
+_JAXP_CHANGESET=c40983d6ae70
+_JAXWS_CHANGESET=83db5e316798
+_JDK_CHANGESET=0cb15650412a
+_LANGTOOLS_CHANGESET=fb7fb3071b64
+_OPENJDK_CHANGESET=3defd24c2671
pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
pkgrel=1
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
-makedepends=('eclipse-ecj' 'libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'freetype2'
+makedepends=('eclipse-ecj' 'libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2'
'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=(icedtea7-${_date}-hg.tar.xz
- http://icedtea.classpath.org/download/drops/jdk7-jaf-2010_08_19.zip
- # openjdk.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_forest_openjdk_ver}.tar.gz
- # corba.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/616c760dc288.tar.gz
- http://icedtea.classpath.org/download/drops/jdk7-jaxws2_2_4-b03-2011_05_27.zip
- # jaxp.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/c40983d6ae70.tar.gz
- # jaxws.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/83db5e316798.tar.gz
- # jdk.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_forest_jdk_ver}.tar.gz
- # langtools.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_langtools_ver}.tar.gz
- # hotspot.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_hotspot_ver}.tar.gz
- # drops/jaxp145_01.zip
- http://icedtea.classpath.org/download/drops/jaxp145_01.zip
+ 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
+ http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz
+ http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz
+ http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz
+ http://icedtea.classpath.org/download/drops/{jdk7-jaf-2010_08_19.zip,jdk7-jaxws2_2_4-b03-2011_05_27.zip,jaxp145_01.zip}
fontconfig-paths.diff
fix_corba_cmds_path.diff
openjdk7_fix_jdk_cmds_path.diff
@@ -52,40 +46,40 @@
jre7-openjdk.profile.csh
jconsole.desktop
policytool.desktop)
+sha1sums=('e569c8a1265d30856caa646d101ce3e1e4a2a69f'
+ '51dafe7367732d58a5ee531f5840fe1ab9c9d2bf'
+ 'c246e4a01d11bdbe4fb23f1bd3819456d1446f52'
+ '8a286c9314f47f7bb6c59b8e8b4560db81019a83'
+ 'c0e7e9b99d4de220ef3346f3da942a4a39bb8b71'
+ '6a115a71c94b4de1ad4e9c00fe3994bc31acd943'
+ '29f8481fd98d709c72a81d5d742097455f38af7d'
+ 'a8a199fb4c908852a0afdd76937ad194191d20f7'
+ '63ea970dcf129fbbba39a132d8f71add19fbf1f0'
+ '539bcf80b9a86c97406a3c79e7d10684b213a4be'
+ '106db88c8e53abb1a064e83d41cc7acd16b7713c'
+ '00ae05d9c8679deb72c0a9008a670daafeb21565'
+ 'e551b40820393c4cab3a82154f51b55577644ba1'
+ 'fe04691f0a23f43a8d9017f7c5fccd4620bc9019'
+ 'ab22e135916786c181be66be39acd7954175bb9c'
+ 'b2dbb1a8a7264db229d6888467ed3f2799a007b0'
+ '344f7e911ab52e38f1ff237ed770bec362d79f79'
+ '683cbb342c8d3077b43b31be700864379c0aa54b'
+ '2a12035cc3e586131952cbb78d9885f6dc10d1b2'
+ '2e7827f47b9190dcc0697752b0f799caea872239'
+ '0bc35e5436f1663f5251b8f8c159a04088a09484')
#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-noextract=("jdk7-jaf-2010_08_19.zip"
- "${_forest_openjdk_ver}.tar.gz"
- "616c760dc288.tar.gz"
+noextract=("${_OPENJDK_CHANGESET}.tar.gz"
+ "${_CORBA_CHANGESET}.tar.gz"
+ "${_JAXP_CHANGESET}.tar.gz"
+ "${_JAXWS_CHANGESET}.tar.gz"
+ "${_JDK_CHANGESET}.tar.gz"
+ "${_LANGTOOLS_CHANGESET}.tar.gz"
+ "${_HOTSPOT_CHANGESET}.tar.gz"
+ "jdk7-jaf-2010_08_19.zip"
"jdk7-jaxws2_2_4-b03-2011_05_27.zip"
- "c40983d6ae70.tar.gz"
- "83db5e316798.tar.gz"
- "${_forest_jdk_ver}.tar.gz"
- "${_langtools_ver}.tar.gz"
- "${_hotspot_ver}.tar.gz"
- "jaxp145_01.zip")
-md5sums=('ef6f0078fe49cafaa5d9962e056843cd'
- '18d15dfd71117daadb332af003d08212'
- 'd089de63d3031ccb08b4d1a21d876ee0'
- '28ea16faf07532fd31a88b11d8d27fe2'
- '2f5b829ade70f67fe272d0b322e3e702'
- '147b1a3e68111c18d44aab307ac1efc4'
- '2d7fb6f6d8c49ef85c3fe924a2c9235b'
- '2c1cfa47adad60bc275fbe47bfb1c4d3'
- 'b22833c93b5485f4dde9ab1aa9cfc504'
- 'b8c8f766e64d4133ece5cf522e75c1be'
- '32394c780c8fb5e29775f623525993c0'
- 'ee1afda124d5927345014ab382ef581e'
- 'f7e7a212e50abb56a6ef1a2b1bd27405'
- 'c195c4865b84d9e2e0fd71ac6d88eadb'
- '203640d6e79e41b0065e016818c17ccd'
- 'fe39da48a62b1fdd8fc24de0e0c4b525'
- 'cdabafad0ec413d9a983888bf445a443'
- '612b0fec7e0943c37a6de77c43622007'
- '62443459da0cb28181feb260dc0e5ce7'
- '8e346f19a69b11b8dc4fcd8ea9d9d8f1'
- 'b6357228d29836504a90abe006d86e56')
+ "jaxp145_01.zip")
# source PKGBUILD && mksource
#makedepends+=('mercurial')
@@ -117,20 +111,22 @@
autoreconf --force --install
./configure \
+ --disable-bootstrap \
--disable-tests \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \
- --disable-bootstrap \
- --with-openjdk-src-zip=${srcdir}/${_forest_openjdk_ver}.tar.gz \
- --with-hotspot-src-zip=${srcdir}/${_hotspot_ver}.tar.gz \
- --with-corba-src-zip=${srcdir}/616c760dc288.tar.gz \
- --with-jaxp-src-zip=${srcdir}/c40983d6ae70.tar.gz \
- --with-jaxws-src-zip=${srcdir}/83db5e316798.tar.gz \
- --with-jdk-src-zip=${srcdir}/${_forest_jdk_ver}.tar.gz \
- --with-langtools-src-zip=${srcdir}/${_langtools_ver}.tar.gz \
+ --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 \
+ --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \
+ --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
+ --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
+ --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--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-pulse-java #--help
+
+#
# --enable-systemtap Enable inclusion of SystemTap trace support
# --enable-nss Enable inclusion of NSS security provider
@@ -155,6 +151,7 @@
'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)
install=jre7-openjdk.install
@@ -214,6 +211,7 @@
depends=('jre7-openjdk')
provides=('java-environment=7')
conflicts=('java-environment')
+ # replaces=('openjdk6')
backup=(etc/profile.d/jdk7-openjdk.sh)
_jvmdir=/usr/lib/jvm/java-7-openjdk
More information about the arch-commits
mailing list