summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-04-20 13:32:30 +0000
committerTimo Teräs <timo.teras@iki.fi>2023-11-06 16:49:54 +0200
commit7ae7f6539c13596e9757a312c2213fe0e396c8aa (patch)
treedd8fe19a859a25ecf9ec3537e39ff671e2eac766
parent7166fec9f6f8620c0f43015b783897eb6008df56 (diff)
community/openjdk8: fix int-conversion
(cherry picked from commit 0477a16f8ca6b3e5a0d658194984a10fb75c9f98)
-rw-r--r--community/openjdk8/APKBUILD4
-rw-r--r--community/openjdk8/icedtea-int-conversion.patch16
2 files changed, 19 insertions, 1 deletions
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index f54dd4be663..5040ffdc36e 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -6,7 +6,7 @@ _icedteaver=3.27.0
# pkgver is <JDK version>.<JDK update>.<JDK build>
# Check https://icedtea.classpath.org/wiki/Main_Page when updating!
pkgver=8.372.07
-pkgrel=0
+pkgrel=1
pkgdesc="OpenJDK 8 provided by IcedTea"
provider_priority=8
url="https://icedtea.classpath.org/"
@@ -95,6 +95,7 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.x
icedtea-jdk-musl.patch
icedtea-jdk-includes.patch
icedtea-jdk-close-fds.patch
+ icedtea-int-conversion.patch
icedtea-autoconf-config.patch
icedtea-jdk-disable-vfork.patch
icedtea-JDK-6515172_0_revert-jdk8-version.patch
@@ -437,6 +438,7 @@ b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec8
3b01de971f64f082d3e289cf337e635ef001381e8ca427a77baa9c52c7ba423889f57665779ca5b3c8bcefb8feacbea31dfaac580c969a4f061439069ee34aae icedtea-jdk-musl.patch
974fb54532b7e7d738f4278187fc6bd9f9b2d99866b94f68a617ee4911c89a3b8cc41ecfdcaefecf9157492d006b1844b6b0b41ac4209d84f9e8d13c9e485dd3 icedtea-jdk-includes.patch
26d33ea5c55f89beebb0c05cc520e839439285f80d8ffca66ee9ef833ba65332dd7848de0b1a7e040d2eed494410d446729db72b09d8a23b6eea55749b8f6f54 icedtea-jdk-close-fds.patch
+4fcad23d533d6a1fd5526223cb76330aebbbbab3766c43a5b6d5d8cc9c729381d153cced81aae2666798c82e90e10e193db33207b357e01fb5ebd0b686263394 icedtea-int-conversion.patch
662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167 icedtea-autoconf-config.patch
c70fee8f1a10c155494ab9c6e55e979d8a3e23f12358ffe9de2029ae15feff361957f1aa43af43c90ecf00523f92e3333b40311a8d0c132ebd456486cb85ed8a icedtea-jdk-disable-vfork.patch
2dfcb699b89c20ac573397a538fb89d13ecf95219044e95fcfd83f368e61c6e6c1ee85af0c9836afc4e1520a8c5a16d62acc7768aa38ce3ad6520d7492d2b232 icedtea-JDK-6515172_0_revert-jdk8-version.patch
diff --git a/community/openjdk8/icedtea-int-conversion.patch b/community/openjdk8/icedtea-int-conversion.patch
new file mode 100644
index 00000000000..1ff37c73c80
--- /dev/null
+++ b/community/openjdk8/icedtea-int-conversion.patch
@@ -0,0 +1,16 @@
+--- openjdk/jdk/src/share/bin/splashscreen_stubs.c
++++ openjdk/jdk/src/share/bin/splashscreen_stubs.c
+@@ -61,11 +61,11 @@
+ #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) {