Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2014-05-10 08:32:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2014-05-02 13:56:53.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2014-05-10 08:32:48.000000000 +0200
@@ -1,0 +2,35 @@
+Thu May 8 12:19:22 UTC 2014 - sch...@suse.de
+
+- java-1.7.0-openjdk-thread-stack-size.patch: increase default thread
+ stack size on powerpc
+
+-------------------------------------------------------------------
+Wed May 7 14:59:49 UTC 2014 - sch...@suse.de
+
+- java-1.7.0-openjdk-adlc-parser.patch: fix use of unintialized memory in
+ adlc parser
+
+-------------------------------------------------------------------
+Tue May 6 15:39:14 UTC 2014 - sleep_wal...@suse.cz
+
+- do not recommend systemtap even when available (bnc#876539)
+
+-------------------------------------------------------------------
+Sat May 3 16:08:10 UTC 2014 - sch...@suse.de
+
+- openjdk-7-src-b147-no-return-in-nonvoid.patch: remove duplicated hunks
+
+-------------------------------------------------------------------
+Fri May 2 13:38:04 UTC 2014 - fst...@suse.com
+
+- Add option to use internal lcms2 if the system one is too old
+
+-------------------------------------------------------------------
+Fri May 2 12:48:29 UTC 2014 - fst...@suse.com
+
+- Fix build with several bitrotten options
+- Restore option to build without systemtap
+ * allowing to build on SLE11 SP3
+- Add constraint for disk size of 6 GB
+
+-------------------------------------------------------------------
New:
----
java-1.7.0-openjdk-adlc-parser.patch
java-1.7.0-openjdk-thread-stack-size.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.7EWRUE/_old 2014-05-10 08:32:51.000000000 +0200
+++ /var/tmp/diff_new_pack.7EWRUE/_new 2014-05-10 08:32:51.000000000 +0200
@@ -23,7 +23,19 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %{ix86} x86_64 aarch64
-%define test_arches %{ix86} x86_64
+%global test_arches %{ix86} x86_64
+
+# Turn on/off some features depending on openSUSE version
+
+%ifarch %{jit_arches}
+%if 0%{?suse_version} >= 1130
+%global with_systemtap 1
+%else
+%global with_systemtap 0
+%endif
+%else
+%global with_systemtap 0
+%endif
%ifarch %arm
%bcond_without jamvm
@@ -45,6 +57,12 @@
%global with_pulseaudio 0
%endif
+%if 0%{?suse_version} >= 1220
+%global with_system_lcms 1
+%else
+%global with_system_lcms 0
+%endif
+
# Reduce build time from 27 hours to 12 hours by only running test
# suites on JIT architectures.
%ifarch %{test_arches}
@@ -108,6 +126,7 @@
%global jvmjardir %{_jvmjardir}/%{sdkdir}
%global jvmjarlink %{_jvmjardir}/%{sdklnk}
+%if %{with_systemtap}
# % ifarch %{jit_arches}
# Where to install systemtap tapset (links)
# We would like these to be in a package specific subdir,
@@ -121,6 +140,7 @@
%global tapsetroot %{_datadir}/systemtap
%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
# % endif
+%endif
# Prevent brp-java-repack-jars from being run.
%global __jar_repack 0
@@ -186,6 +206,12 @@
Patch106: java-1.7.0-openjdk-freetype-check-fix.patch
+# Fix use of unintialized memory in adlc parser
+Patch107: java-1.7.0-openjdk-adlc-parser.patch
+
+# Increase default thread stack size
+Patch108: java-1.7.0-openjdk-thread-stack-size.patch
+
# allow to create hs_pid.log in tmp (in 700 permissions) if working directory
is unwritable
Patch200: abrt_friendly_hs_log_jdk7.patch
@@ -225,13 +251,16 @@
BuildRequires: automake
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
+BuildRequires: fastjar
BuildRequires: giflib-devel
BuildRequires: jpackage-utils >= 1.7.5
BuildRequires: krb5-devel
BuildRequires: libjpeg-devel
BuildRequires: quilt
+%if %{with_system_lcms}
# since 2.4.1 release, newest lcms2 is needed
BuildRequires: liblcms2-devel >= 2.5
+%endif
BuildRequires: libpng-devel
%if %{with jamvm}
BuildRequires: libtool
@@ -246,6 +275,7 @@
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-proto-devel
+BuildRequires: xz
%if 0%{?suse_version} >= 1220
BuildRequires: xprop
%endif
@@ -293,7 +323,9 @@
%endif
#system tap
+%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel >= 1.0
+%endif
%if 0%{?suse_version} > 1110
#fixing RedHat bug #648499
@@ -339,7 +371,6 @@
%endif
Requires(pre): update-alternatives
-Recommends: systemtap >= 1.0
#require headless subvariant
Requires: %{name}-headless = %{version}-%{release}
@@ -403,8 +434,10 @@
Summary: JRE based on OpenJDK 7 and IcedTea 7 without X, audio and
video support
Group: Development/Languages/Java
+%if %{with_system_lcms}
# older lcms2 is known to have security issues, let's depends on fixed version
Requires: lcms2 >= 2.5
+%endif
# Require zoneinfo data provided by tzdata-java subpackage.
Requires: tzdata-java
Requires(pre): update-alternatives
@@ -583,6 +616,9 @@
%if %{with_pulseaudio}
--enable-pulse-java \
%endif
+%if %{with_systemtap}
+ --enable-systemtap \
+%endif
--enable-nss \
%if %{with zero}
--enable-zero \
@@ -595,7 +631,11 @@
%if 0%{?suse_version} <= 1110
--disable-system-gio \
%endif
+%if %{with_system_lcms}
--enable-system-lcms \
+%else
+ --disable-system-lcms \
+%endif
--with-openjdk-src-zip=%{SOURCE5} \
--with-corba-src-zip=%{SOURCE6} \
--with-jaxp-src-zip=%{SOURCE7} \
@@ -626,6 +666,7 @@
%ifnarch aarch64
qpatch -p0 %{PATCH106}
+qpatch -p0 %{PATCH108}
qpatch -p0 %{PATCH200}
%ifarch %{jit_arches}
@@ -634,6 +675,8 @@
%endif
%endif
+qpatch -p0 %{PATCH107}
+
qpatch -p0 -R %{PATCH404}
#SUSE specific fixes
@@ -745,6 +788,7 @@
popd
+%if %{with_systemtap}
# Install systemtap support files.
cp -a tapset $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}
@@ -752,6 +796,7 @@
RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
ln -sf $RELATIVE/*.stp .
popd
+%endif
pushd %{buildoutputdir}/j2sdk-image
@@ -1090,10 +1135,13 @@
%endif
%files
+%defattr(0644,root,root,0755)
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so
+%if %{with_pulseaudio}
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libpulse-java.so
+%endif
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so
@@ -1134,7 +1182,9 @@
%exclude %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
#belongs to full package
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so
+%if %{with_pulseaudio}
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libpulse-java.so
+%endif
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so
%ifarch %{ix86} %{arm}
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client
@@ -1205,11 +1255,13 @@
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
+%if %{with_systemtap}
%dir %{_datadir}/systemtap/tapset
%dir %{tapsetdir}
%dir %{_jvmdir}/%{sdkdir}/tapset
%{tapsetdir}/*
%{_jvmdir}/%{sdkdir}/tapset/*
+%endif
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.7EWRUE/_old 2014-05-10 08:32:51.000000000 +0200
+++ /var/tmp/diff_new_pack.7EWRUE/_new 2014-05-10 08:32:51.000000000 +0200
@@ -3,6 +3,9 @@
<physicalmemory>
<size unit="M">2048</size>
</physicalmemory>
+ <disk>
+ <size unit="G">6</size>
+ </disk>
</hardware>
<overwrite>
++++++ java-1.7.0-openjdk-adlc-parser.patch ++++++
--- openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
@@ -347,6 +347,7 @@ FrameForm::FrameForm() {
_return_value = NULL;
_c_return_value = NULL;
_interpreter_frame_pointer_reg = NULL;
+ _cisc_spilling_operand_name = NULL;
}
FrameForm::~FrameForm() {
++++++ java-1.7.0-openjdk-thread-stack-size.patch ++++++
Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
===================================================================
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
@@ -34,7 +34,7 @@
//
define_pd_global(bool, DontYieldALot, false);
-define_pd_global(intx, ThreadStackSize, 1664);
+define_pd_global(intx, ThreadStackSize, PPC_ONLY(2048) NOT_PPC(1664));
#ifdef _LP64
define_pd_global(intx, VMThreadStackSize, PPC_ONLY(1664) NOT_PPC(1024));
#else
++++++ java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch ++++++
--- /var/tmp/diff_new_pack.7EWRUE/_old 2014-05-10 08:32:51.000000000 +0200
+++ /var/tmp/diff_new_pack.7EWRUE/_new 2014-05-10 08:32:51.000000000 +0200
@@ -16,45 +16,4 @@
}
int SafeFetch32(int *adr, int errValue) {
---- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
-+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
-@@ -142,6 +142,7 @@ jboolean XShared_initIDs(JNIEnv *env, jb
- #endif /* MITSHM */
-
- #endif /* !HEADLESS */
-+return JNI_FALSE;
- }
-
-
-@@ -491,6 +492,7 @@ jboolean XShared_initSurface(JNIEnv *env
-
- return JNI_TRUE;
- #endif /* !HEADLESS */
-+return JNI_FALSE;
- }
-
-
---- openjdk/hotspot/src/share/vm/utilities/debug.hpp
-+++ openjdk/hotspot/src/share/vm/utilities/debug.hpp
-@@ -166,14 +166,14 @@
-
- // error reporting helper functions
- void report_vm_error(const char* file, int line, const char* error_msg,
-- const char* detail_msg = NULL);
--void report_fatal(const char* file, int line, const char* message);
-+ const char* detail_msg = NULL) __attribute__((noreturn));
-+void report_fatal(const char* file, int line, const char* message)
__attribute__((noreturn));
- void report_vm_out_of_memory(const char* file, int line, size_t size,
-- const char* message);
--void report_should_not_call(const char* file, int line);
--void report_should_not_reach_here(const char* file, int line);
--void report_unimplemented(const char* file, int line);
--void report_untested(const char* file, int line, const char* message);
-+ const char* message) __attribute__((noreturn));
-+void report_should_not_call(const char* file, int line)
__attribute__((noreturn));
-+void report_should_not_reach_here(const char* file, int line)
__attribute__((noreturn));
-+void report_unimplemented(const char* file, int line)
__attribute__((noreturn));
-+void report_untested(const char* file, int line, const char* message)
__attribute__((noreturn));
-
- void warning(const char* format, ...);
++++++ openjdk-7-src-b147-no-return-in-nonvoid.patch ++++++
--- /var/tmp/diff_new_pack.7EWRUE/_old 2014-05-10 08:32:51.000000000 +0200
+++ /var/tmp/diff_new_pack.7EWRUE/_new 2014-05-10 08:32:51.000000000 +0200
@@ -28,7 +28,7 @@
void os::Linux::init_thread_fpu_state(void) {
--- icedtea-2.3.2/openjdk/hotspot/src/share/vm/utilities/debug.hpp
2012-08-30 21:29:26.000000000 +0200
+++ icedtea-2.3.2/openjdk/hotspot/src/share/vm/utilities/debug.hpp
2012-09-06 00:27:08.074437225 +0200
-@@ -191,14 +191,14 @@
+@@ -206,14 +206,14 @@
// error reporting helper functions
void report_vm_error(const char* file, int line, const char* error_msg,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
