diff options
Diffstat (limited to 'testing/java7-openjdk/PKGBUILD')
| -rw-r--r-- | testing/java7-openjdk/PKGBUILD | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD index 5d51ffaf5..e2e70cd57 100644 --- a/testing/java7-openjdk/PKGBUILD +++ b/testing/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146368 2012-01-09 20:15:28Z andyrtr $ +# $Id: PKGBUILD 148171 2012-01-30 18:47:32Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> @@ -24,26 +24,25 @@ _OPENJDK_CHANGESET=0a76e5390e68 _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' - 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' +makedepends=('jdk7-openjdk' 'libxp' 'libxslt' + 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`? [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive -#_url=http://icedtea.classpath.org/hg/icedtea7-forest/archive +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz - ${_url}/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz - ${_url}/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz - ${_url}/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz - ${_url}/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz - ${_url}/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz - ${_url}/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz - ${_url}/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz + ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz + ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz + ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz fontconfig-paths.diff fix_corba_cmds_path.diff openjdk7_fix_jdk_cmds_path.diff @@ -52,19 +51,9 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh - glibc2_15.diff) - -#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip - -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") + glibc2_15.diff) md5sums=('752721a037a625001fad7a5fc2013f60' - 'ffb12013564794e9abbffbbbd0c58502' + '4c34ddf70124ea90c79201c1afede3e3' '8f8d222d0a6d363d06b40576da5f1ea2' '4abf34372e34cccd74ad337e487ed790' 'f2f40590a83889b8aa1d4631b705092d' @@ -81,6 +70,16 @@ md5sums=('752721a037a625001fad7a5fc2013f60' '62443459da0cb28181feb260dc0e5ce7' 'a4293acadff03bdccbc9b412ad288549') +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +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") + _jvmdir=/usr/lib/jvm/java-7-openjdk [ "$CARCH" = "x86_64" ] && _JARCH=amd64 @@ -144,16 +143,16 @@ package_jre7-openjdk-headless() { 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 etc/java-7-openjdk/calendars.properties - etc/java-7-openjdk/content-types.properties + etc/java-7-openjdk/content-types.properties etc/java-7-openjdk/cursors/cursors.properties etc/java-7-openjdk/flavormap.properties etc/java-7-openjdk/fontconfig.bfc - etc/java-7-openjdk/fontconfig.properties + etc/java-7-openjdk/fontconfig.properties etc/java-7-openjdk/jvm.cfg etc/java-7-openjdk/logging.properties etc/java-7-openjdk/management/jmxremote.access @@ -265,9 +264,10 @@ package_jre7-openjdk() { 'alsa-lib: for basic sound support' 'giflib: for gif format support' 'libpulse: for advanced sound support' - 'gtk2: for the Gtk+ look and feel - desktop usage') + '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 |