Date: Friday, January 20, 2012 @ 13:18:06 Author: andyrtr Revision: 147009
upgpkg: java7-openjdk 7.b147_2.0-6 libtiff/libpng rebuild; fix source urls, add some missing makedeps Modified: java7-openjdk/trunk/PKGBUILD ----------+ PKGBUILD | 60 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-20 17:00:22 UTC (rev 147008) +++ PKGBUILD 2012-01-20 18:18:06 UTC (rev 147009) @@ -30,19 +30,19 @@ license=('custom') options=('!emptydirs') makedepends=('jdk7-openjdk' 'libxp' 'libxslt' - 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' + '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 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz - ${_url}/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz - ${_url}/corba/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz - ${_url}/jaxp/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz - ${_url}/jaxws/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz - ${_url}/jdk/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz - ${_url}/langtools/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz - ${_url}/hotspot/${_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 @@ -51,25 +51,15 @@ 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' - '02f31f5e31a12414adab36c5c6e95a8c' - '382fee08ce3b78271cefd8bed0563f63' - 'e3e212704d3911a519095b7c28894e9e' - 'ebed93ff644684a91cb2be7accc0ff84' - '523f7d111b2c18374b38157e3c539911' - '5c5910970244cf22b92c54ceec076075' - '4138cfbde475d28ff69001fd89298650' + '4c34ddf70124ea90c79201c1afede3e3' + '8f8d222d0a6d363d06b40576da5f1ea2' + '4abf34372e34cccd74ad337e487ed790' + 'f2f40590a83889b8aa1d4631b705092d' + 'd3beed0118bbd93d4651af762eb748c7' + 'c8617700b4bd6cd5de1257bc36509bed' + 'f10b711b0c784df8707808d9d0f52abd' 'ee1afda124d5927345014ab382ef581e' 'f7e7a212e50abb56a6ef1a2b1bd27405' 'c195c4865b84d9e2e0fd71ac6d88eadb' @@ -80,6 +70,16 @@ '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 @@ -123,7 +123,7 @@ --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ --enable-pulse-java \ --enable-nss \ - --with-rhino --enable-system-png + --with-rhino #--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 @@ -148,11 +148,11 @@ 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 @@ -264,7 +264,7 @@ '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')