[java-1.8.0-openjdk/f21] updated to u20-b23 - adapted java-1.8.0-openjdk-accessible-toolkit.patch - adapted system-lcms.pat
jiri vanek
jvanek at fedoraproject.org
Wed Aug 27 13:26:54 UTC 2014
commit ff387059f3e41bc272eab906c09415e12a01b081
Author: Jiri Vanek <jvanek at redhat.com>
Date: Wed Aug 27 15:26:45 2014 +0200
updated to u20-b23
- adapted java-1.8.0-openjdk-accessible-toolkit.patch
- adapted system-lcms.patch
- removed patch8 set-active-window.patch
- removed patch9 javadoc-error-jdk-8029145.patch
- removed patch10 javadoc-error-jdk-8037484.patch
.gitignore | 2 +
generate_tarballs.sh | 5 +-
java-1.8.0-openjdk-accessible-toolkit.patch | 26 ++--
java-1.8.0-openjdk.spec | 24 ++--
javadoc-error-jdk-8029145.patch | 93 ---------------
javadoc-error-jdk-8037484.patch | 171 ---------------------------
set-active-window.patch | 77 ------------
sources | 2 +-
system-lcms.patch | 3 +-
9 files changed, 32 insertions(+), 371 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 606b199..66459fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@
/jdk8u-jdk8u5-b13.tar.xz
/jdk8u-jdk8u11-b12.tar.xz
/aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz
+/jdk8u-jdk8u20-b23.tar.xz
+/jdk8u-jdk8u40-b01.tar.xz
diff --git a/generate_tarballs.sh b/generate_tarballs.sh
index 577e98b..0c5930d 100755
--- a/generate_tarballs.sh
+++ b/generate_tarballs.sh
@@ -9,8 +9,9 @@ rm -f icedtea7.tar.gz
pushd icedtea7-${VERSION}
# desktop files
-mv jconsole.desktop ../jconsole.desktop.in
-mv policytool.desktop ../policytool.desktop.in
+#mv jconsole.desktop ../jconsole.desktop.in
+#mv policytool.desktop ../policytool.desktop.in
+# Icons were generally cloned fromicedtea, but now are mucvh more specific
# tapsets
mv tapset/hotspot{,-1.8.0}.stp.in || exit 1
diff --git a/java-1.8.0-openjdk-accessible-toolkit.patch b/java-1.8.0-openjdk-accessible-toolkit.patch
index c177305..bddd702 100644
--- a/java-1.8.0-openjdk-accessible-toolkit.patch
+++ b/java-1.8.0-openjdk-accessible-toolkit.patch
@@ -1,16 +1,16 @@
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
-@@ -871,7 +871,11 @@
- return null;
- }
- });
-- loadAssistiveTechnologies();
-+ try {
-+ loadAssistiveTechnologies();
-+ } catch ( AWTError error) {
-+ // ignore silently
-+ }
- } finally {
- // Make sure to always re-enable the JIT.
- java.lang.Compiler.enable();
+@@ -883,7 +883,11 @@
+ return null;
+ }
+ });
+- loadAssistiveTechnologies();
++ try {
++ loadAssistiveTechnologies();
++ } catch ( AWTError error) {
++ // ignore silently
++ }
+ }
+ return toolkit;
+ }
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 4fa32af..866e0ac 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -96,8 +96,8 @@
# Standard JPackage naming and versioning defines.
%global origin openjdk
-%global updatever 11
-%global buildver b12
+%global updatever 20
+%global buildver b23
%global aarch64_updatever 0
%global aarch64_buildver b128
# priority must be 6 digits in total
@@ -137,7 +137,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}
-Release: 19.%{buildver}%{?dist}
+Release: 1.%{buildver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -203,12 +203,6 @@ Patch5: multiple-pkcs11-library-init.patch
Patch6: disable-doclint-by-default.patch
# Include all sources in src.zip
Patch7: include-all-srcs.patch
-# Fix window activation in gnome-shell
-Patch8: set-active-window.patch
-# Fix javadoc. Backport from upstream.
-Patch9: javadoc-error-jdk-8029145.patch
-# More javadoc. Backport from upstream.
-Patch10: javadoc-error-jdk-8037484.patch
# Problem discovered with make 4.0
Patch11: hotspot-build-j-directive.patch
@@ -471,7 +465,6 @@ sh %{SOURCE12}
%patch202
%patch203
-
%patch1
%patch2
%patch3
@@ -479,9 +472,6 @@ sh %{SOURCE12}
%patch5
%patch6
%patch7
-%patch8
-%patch9
-%patch10
%patch11
%patch99
@@ -1350,6 +1340,14 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Wed Aug 27 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.20-1.b23
+- updated to u20-b23
+- adapted java-1.8.0-openjdk-accessible-toolkit.patch
+- adapted system-lcms.patch
+- removed patch8 set-active-window.patch
+- removed patch9 javadoc-error-jdk-8029145.patch
+- removed patch10 javadoc-error-jdk-8037484.patch
+
* Tue Aug 19 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.11-19.b12
- fixed desktop icons
- Icon set to java-1.8.0
diff --git a/sources b/sources
index 9a44096..a722ab5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-84eed2615ebcf518ad92c88c280ede9e jdk8u-jdk8u11-b12.tar.xz
+c7eb47971a705198266393c08529cd24 jdk8u-jdk8u20-b23.tar.xz
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
8c0436da8098f15c7bda2fa4f927e525 aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz
diff --git a/system-lcms.patch b/system-lcms.patch
index f8430f3..c098f3a 100644
--- a/system-lcms.patch
+++ b/system-lcms.patch
@@ -62,12 +62,13 @@ diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
LANG := C, \
-@@ -680,18 +680,18 @@
+@@ -680,19 +680,19 @@
LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
- LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm -llcms2, \
+ LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=lcms.dll" \
More information about the scm-commits
mailing list