From ce3817d21c503b68d1caa35d69727ca78c1881aa Mon Sep 17 00:00:00 2001 From: Strahil Yordanov Date: Fri, 25 Oct 2019 11:18:04 +0700 Subject: development/openjdk7: Updated for version 7u231. Signed-off-by: Willy Sudiarto Raharjo --- development/openjdk7/openjdk7.SlackBuild | 84 +++++++++++++++++++++----------- development/openjdk7/openjdk7.info | 35 ++++++------- 2 files changed, 74 insertions(+), 45 deletions(-) (limited to 'development/openjdk7') diff --git a/development/openjdk7/openjdk7.SlackBuild b/development/openjdk7/openjdk7.SlackBuild index b0f74e19aa..ebb3769258 100644 --- a/development/openjdk7/openjdk7.SlackBuild +++ b/development/openjdk7/openjdk7.SlackBuild @@ -22,40 +22,67 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -function applySBoPatch() { - cat << EOF | patch -d ../icedtea-2.6.18/patches/boot pr64174.patch ---- pr64174.patch.orig 2019-05-26 07:15:48.030960856 +0300 -+++ pr64174.patch.new 2019-05-26 07:17:00.921955937 +0300 -@@ -1,8 +1,8 @@ - diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties - --- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:09:06.030312835 +0000 - +++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:10:07.527160626 +0000 --@@ -320,7 +320,7 @@ -- # LAO PEOPLE'S DEMOCRATIC REPUBLIC -+@@ -323,7 +323,7 @@ -+ # LAO PEOPLE'S DEMOCRATIC REPUBLIC (THE) - LA=LAK - # LATVIA - -LV=LVL;2013-12-31-22-00-00;EUR -@@ -10,7 +10,7 @@ - # LEBANON - LB=LBP - # LESOTHO --@@ -332,7 +332,7 @@ -+@@ -335,7 +335,7 @@ - # LIECHTENSTEIN - LI=CHF - # LITHUANIA +function createSBoPatch() { + cat << EOF > ${ICEDTEA}/patches/boot/optional.patch +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:57:14.258731932 +0300 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:59:48.600721516 +0300 +@@ -193,7 +193,7 @@ + if (!isPresent()) + return empty(); + else { +- return Optional.ofNullable(mapper.apply(value)); ++ return (Optional) Optional.ofNullable(mapper.apply(value)); + } + } + EOF } +function activateSBoPatch() { + cat << EOF | patch -d ${ICEDTEA} Makefile.in +--- Makefile.in.orig 2019-10-20 12:55:58.715494084 +0300 ++++ Makefile.in.new 2019-10-20 13:05:27.236455717 +0300 +@@ -154,7 +154,8 @@ + @USE_NON_NSS_CURVES_FALSE@am__append_14 = patches/rh1022017.patch + @DISABLE_BOOTSTRAP_TOOLS_FALSE@am__append_15 = \\ + @DISABLE_BOOTSTRAP_TOOLS_FALSE@ patches/boot/bootstrap-tools.patch \\ +-@DISABLE_BOOTSTRAP_TOOLS_FALSE@ patches/boot/ant-javac.patch ++@DISABLE_BOOTSTRAP_TOOLS_FALSE@ patches/boot/ant-javac.patch \\ ++@DISABLE_BOOTSTRAP_TOOLS_FALSE@ patches/boot/optional.patch + + @LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR_TRUE@am__append_16 = \\ + @LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR_TRUE@ patches/boot/jaxws-langtools-dependency.patch +EOF + + cat << EOF | patch -d ${ICEDTEA} Makefile.am +--- Makefile.am.orig 2019-10-20 12:56:24.622492335 +0300 ++++ Makefile.am 2019-10-20 13:18:31.666402780 +0300 +@@ -453,7 +453,8 @@ + if !DISABLE_BOOTSTRAP_TOOLS + ICEDTEA_BOOT_PATCHES += \\ + patches/boot/bootstrap-tools.patch \\ +- patches/boot/ant-javac.patch ++ patches/boot/ant-javac.patch \\ ++ patches/boot/optional.patch + endif + + if LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR +EOF + + ( + cd ${ICEDTEA} + aclocal + ) +} + PRGNAM=openjdk7 -VERSION=${VERSION:-7u221} +VERSION=${VERSION:-7u231} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} DVER=1.7.0_$(printf $VERSION | cut -du -f2) -ICEDTEA=icedtea-2.6.18 +ICEDTEA=icedtea-2.6.19 if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -89,6 +116,9 @@ cd $BUILD_DIR tar -xvf $CWD/${ICEDTEA}.tar.xz +createSBoPatch +activateSBoPatch + mkdir icedtea-build cd icedtea-build @@ -118,8 +148,6 @@ $( --with-langtools-src-zip="$CWD/langtools.tar.bz2" \ --with-hotspot-src-zip="$CWD/hotspot.tar.bz2" -applySBoPatch - JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make cd $PKG diff --git a/development/openjdk7/openjdk7.info b/development/openjdk7/openjdk7.info index c666a9d93a..d7091b5450 100644 --- a/development/openjdk7/openjdk7.info +++ b/development/openjdk7/openjdk7.info @@ -1,22 +1,23 @@ PRGNAM="openjdk7" -VERSION="7u221" +VERSION="7u231" HOMEPAGE="http://openjdk.java.net" -DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.18.tar.xz \ - http://icedtea.classpath.org/download/drops/icedtea7/2.6.18/openjdk.tar.bz2 \ - http://icedtea.classpath.org/download/drops/icedtea7/2.6.18/corba.tar.bz2 \ - http://icedtea.classpath.org/download/drops/icedtea7/2.6.18/jaxp.tar.bz2 \ - http://icedtea.classpath.org/download/drops/icedtea7/2.6.18/jaxws.tar.bz2 \ - http://icedtea.classpath.org/download/drops/icedtea7/2.6.18/jdk.tar.bz2 \ - http://icedtea.classpath.org/download/drops/icedtea7/2.6.18/langtools.tar.bz2 \ - http://icedtea.classpath.org/download/drops/icedtea7/2.6.18/hotspot.tar.bz2" -MD5SUM="8b1e1d3478ebe4b6b594ce6f5935b56a \ - 0dc85672fb7ce07f32489e6c9c695d36 \ - ff2de2b24a18964e6c7ae3d14a5569d2 \ - c44cfbf6a254a72be0e1e72c86ba69ec \ - 34437f68afd087dc72a4aeb20556c688 \ - 97091fe93a4fdd8d77f3bab4b2db2599 \ - 47927888e6531aaf9fdf791ae5b4927b \ - 3aaa59067e12ccb66e5d85a4c439b1d6" +DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.19.tar.xz \ + http://icedtea.classpath.org/download/drops/icedtea7/2.6.19/openjdk.tar.bz2 \ + http://icedtea.classpath.org/download/drops/icedtea7/2.6.19/corba.tar.bz2 \ + http://icedtea.classpath.org/download/drops/icedtea7/2.6.19/jaxp.tar.bz2 \ + http://icedtea.classpath.org/download/drops/icedtea7/2.6.19/jaxws.tar.bz2 \ + http://icedtea.classpath.org/download/drops/icedtea7/2.6.19/jdk.tar.bz2 \ + http://icedtea.classpath.org/download/drops/icedtea7/2.6.19/langtools.tar.bz2 \ + http://icedtea.classpath.org/download/drops/icedtea7/2.6.19/hotspot.tar.bz2" +MD5SUM="db3bb027663fdd7415ac2f11b68fce69 \ + 3e32e2864931f20c3c6f6e30edab8913 \ + f7ccf225b9dd698a7d261f0b5670b8d2 \ + 255a0ec8d3ebc246ad9197830770b6ec \ + 83e0e8e3d29fb1d993b67b589fc79ba7 \ + ab6e0442bd06f9c1df4dd5ff75a02f52 \ + 0062bd3e45d1670915f7fd24b3e6fd74 \ + 036db9762203b70355b4ebaa5f993740" + DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="apache-ant" -- cgit v1.2.3