[packages/icedtea8] Strip our make -Otarget; split icedtea vs openjdk patches
arekm
arekm at pld-linux.org
Wed Feb 11 21:46:31 CET 2026
commit f3a1dbc51121ab3d4dd01ec5debcf88ad23c9872
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Feb 11 21:46:04 2026 +0100
Strip our make -Otarget; split icedtea vs openjdk patches
build.patch | 45 +++++++++++----------------------------------
icedtea8-gcc.patch | 34 ++++++++++++++++++++++++++++++++++
icedtea8.spec | 4 +++-
3 files changed, 48 insertions(+), 35 deletions(-)
---
diff --git a/icedtea8.spec b/icedtea8.spec
index 7d57d44..59f124a 100644
--- a/icedtea8.spec
+++ b/icedtea8.spec
@@ -51,12 +51,13 @@ Source10: make-cacerts.sh
# 0-99 patches for the IcedTea files
Patch0: %{name}-x32-ac.patch
Patch1: %{name}-heimdal.patch
+Patch2: build.patch
# 100-... patches applied to the extracted sources
Patch100: %{name}-libpath.patch
Patch101: %{name}-x32.patch
Patch102: openjdk-heimdal.patch
Patch103: atomic.patch
-Patch104: build.patch
+Patch104: %{name}-gcc.patch
URL: https://icedtea.classpath.org/wiki/
BuildRequires: alsa-lib-devel
BuildRequires: ant
@@ -455,6 +456,7 @@ Przykłady dla OpenJDK.
%setup -qn icedtea-%{version}
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
# patches to applied to the extracted sources
install -d pld-patches
diff --git a/build.patch b/build.patch
index 62f4def..4987a62 100644
--- a/build.patch
+++ b/build.patch
@@ -1,34 +1,11 @@
---- openjdk/jdk/src/share/bin/splashscreen_stubs.c~ 2026-01-28 16:47:44.000000000 +0100
-+++ openjdk/jdk/src/share/bin/splashscreen_stubs.c 2026-02-11 11:56:49.553207830 +0100
-@@ -61,11 +61,11 @@ typedef char* (*SplashGetScaledImageName
- #define INVOKEV(name) _INVOKE(name, ,;)
-
- int DoSplashLoadMemory(void* pdata, int size) {
-- INVOKE(SplashLoadMemory, NULL)(pdata, size);
-+ INVOKE(SplashLoadMemory, 0)(pdata, size);
- }
-
- int DoSplashLoadFile(const char* filename) {
-- INVOKE(SplashLoadFile, NULL)(filename);
-+ INVOKE(SplashLoadFile, 0)(filename);
- }
-
- void DoSplashInit(void) {
-@@ -87,4 +87,4 @@ void DoSplashSetScaleFactor(float sca
- char* DoSplashGetScaledImageName(const char* fileName, const char* jarName,
- float* scaleFactor) {
- INVOKE(SplashGetScaledImageName, NULL)(fileName, jarName, scaleFactor);
--}
-\ No newline at end of file
-+}
---- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c~ 2026-01-28 16:47:44.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2026-02-11 12:17:20.966127812 +0100
-@@ -2690,7 +2690,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
- RELEASE_ARRAYS(env, data, NULL);
- }
-
--static void freeArray(void** arr, jint size) {
-+static void freeArray(UINT8** arr, jint size) {
- int i;
- if (arr != NULL) {
- for (i = 0; i < size; i++) {
+--- icedtea-3.38.0/Makefile.am~ 2026-02-01 00:30:54.000000000 +0100
++++ icedtea-3.38.0/Makefile.am 2026-02-11 21:40:55.734424823 +0100
+@@ -543,7 +543,7 @@ ICEDTEA_UNSET = \
+ JAVA_HOME= \
+ JDK_HOME= \
+ OS= \
+- MAKEFLAGS=$(patsubst -j%,,$(patsubst --job%,,$(MAKEFLAGS)))
++ MAKEFLAGS=$(patsubst -O%,,$(patsubst -j%,,$(patsubst --job%,,$(MAKEFLAGS))))
+
+ ICEDTEA_ENV = \
+ ${ICEDTEA_COMMON_ENV} \
diff --git a/icedtea8-gcc.patch b/icedtea8-gcc.patch
new file mode 100644
index 0000000..62f4def
--- /dev/null
+++ b/icedtea8-gcc.patch
@@ -0,0 +1,34 @@
+--- openjdk/jdk/src/share/bin/splashscreen_stubs.c~ 2026-01-28 16:47:44.000000000 +0100
++++ openjdk/jdk/src/share/bin/splashscreen_stubs.c 2026-02-11 11:56:49.553207830 +0100
+@@ -61,11 +61,11 @@ typedef char* (*SplashGetScaledImageName
+ #define INVOKEV(name) _INVOKE(name, ,;)
+
+ int DoSplashLoadMemory(void* pdata, int size) {
+- INVOKE(SplashLoadMemory, NULL)(pdata, size);
++ INVOKE(SplashLoadMemory, 0)(pdata, size);
+ }
+
+ int DoSplashLoadFile(const char* filename) {
+- INVOKE(SplashLoadFile, NULL)(filename);
++ INVOKE(SplashLoadFile, 0)(filename);
+ }
+
+ void DoSplashInit(void) {
+@@ -87,4 +87,4 @@ void DoSplashSetScaleFactor(float sca
+ char* DoSplashGetScaledImageName(const char* fileName, const char* jarName,
+ float* scaleFactor) {
+ INVOKE(SplashGetScaledImageName, NULL)(fileName, jarName, scaleFactor);
+-}
+\ No newline at end of file
++}
+--- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c~ 2026-01-28 16:47:44.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2026-02-11 12:17:20.966127812 +0100
+@@ -2690,7 +2690,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
+ RELEASE_ARRAYS(env, data, NULL);
+ }
+
+-static void freeArray(void** arr, jint size) {
++static void freeArray(UINT8** arr, jint size) {
+ int i;
+ if (arr != NULL) {
+ for (i = 0; i < size; i++) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea8.git/commitdiff/f3a1dbc51121ab3d4dd01ec5debcf88ad23c9872
More information about the pld-cvs-commit
mailing list