aboutsummaryrefslogtreecommitdiff
path: root/unmaintained
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-05-31 22:57:41 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2020-05-31 23:08:17 +0200
commit510eb0d8b8ec99e760d5a7d7697aab6ca23c1435 (patch)
tree0219401db11d770bb1cc9bc542606133714018fe /unmaintained
parentc5a57d1195e86a867135f0bdbaa05e9f462db563 (diff)
downloadalpine_aports-510eb0d8b8ec99e760d5a7d7697aab6ca23c1435.tar.bz2
alpine_aports-510eb0d8b8ec99e760d5a7d7697aab6ca23c1435.tar.xz
alpine_aports-510eb0d8b8ec99e760d5a7d7697aab6ca23c1435.zip
unmaintained/openjfx11: move from testing
* Disabled on all arches * Still requires python2
Diffstat (limited to 'unmaintained')
-rw-r--r--unmaintained/openjfx11/APKBUILD267
-rw-r--r--unmaintained/openjfx11/configure-ant-home.patch11
-rw-r--r--unmaintained/openjfx11/crosscompile.patch224
-rw-r--r--unmaintained/openjfx11/disable-architecture-verification.patch23
-rw-r--r--unmaintained/openjfx11/disable-assembler-on-unsupported-archs.patch19
-rw-r--r--unmaintained/openjfx11/disable-jit-for-non-x86.patch21
-rw-r--r--unmaintained/openjfx11/disable-sse2.patch60
-rw-r--r--unmaintained/openjfx11/disable-webkit-sampling-profiler.patch15
-rw-r--r--unmaintained/openjfx11/fix-arm32-build.patch91
-rw-r--r--unmaintained/openjfx11/fix-arm64-build.patch21
-rw-r--r--unmaintained/openjfx11/gcc-no-error.patch31
-rw-r--r--unmaintained/openjfx11/scenebuilder.bin15
-rw-r--r--unmaintained/openjfx11/use-system-icu.patch39
-rw-r--r--unmaintained/openjfx11/webcore-linker-flags.patch16
-rw-r--r--unmaintained/openjfx11/webkit-debug-level.patch16
15 files changed, 869 insertions, 0 deletions
diff --git a/unmaintained/openjfx11/APKBUILD b/unmaintained/openjfx11/APKBUILD
new file mode 100644
index 0000000000..9c6af5ec16
--- /dev/null
+++ b/unmaintained/openjfx11/APKBUILD
@@ -0,0 +1,267 @@
1# Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
2# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
3pkgname=openjfx11
4pkgver=11.0.4_p1
5_pkgver=${pkgver/_p/+}
6pkgrel=1
7pkgdesc="Open JavaFX 11"
8url="https://hg.openjdk.java.net/openjfx/11-dev/rt"
9arch="" # fails on aarch64&ppc64le and hangs then
10# openjdk11 is not yet available on 32 bit arches
11license="GPL-2.0-with-classpath-exception"
12depends="$pkgname-gtk3" # for the virtual openjfx11 package
13makedepends="binutils-gold
14 cmake
15 ninja
16 python2
17 gperf
18 openjdk11-jdk
19 alsa-lib-dev
20 ffmpeg-dev
21 freetype-dev
22 gtk+2.0-dev
23 gtk+3.0-dev
24 icu-dev
25 ruby-dev
26 sqlite-dev"
27subpackages="$pkgname-media:_media
28 $pkgname-web:_web
29 $pkgname-jmods:_jmods:noarch
30 $pkgname-src:_src:noarch
31 $pkgname-doc:_doc:noarch
32 $pkgname-gtk2:_gtk2
33 $pkgname-gtk3:_gtk3
34 $pkgname-libs:_libs
35 $pkgname-base:_base:noarch
36 $pkgname-scenebuilder:_scenebuilder:noarch
37 $pkgname-dev:_dev:noarch"
38source="openjfx-$_pkgver.tar.bz2::http://hg.openjdk.java.net/openjfx/11-dev/rt/archive/$_pkgver.tar.bz2
39 https://archive.apache.org/dist/ant/binaries/apache-ant-1.8.2-bin.zip
40
41 configure-ant-home.patch
42 crosscompile.patch
43 disable-architecture-verification.patch
44 disable-assembler-on-unsupported-archs.patch
45 disable-jit-for-non-x86.patch
46 disable-sse2.patch
47 disable-webkit-sampling-profiler.patch
48 fix-arm32-build.patch
49 fix-arm64-build.patch
50 gcc-no-error.patch
51 use-system-icu.patch
52 webcore-linker-flags.patch
53 webkit-debug-level.patch
54
55 scenebuilder.bin"
56builddir="$srcdir/rt-$_pkgver"
57
58_ant_home="$srcdir/apache-ant-1.8.2/"
59_java_home="/usr/lib/java/openjfx11"
60
61sonameprefix="$pkgname:"
62ldpath="$_java_home/lib"
63
64prepare() {
65 default_prepare
66
67 # Create build properties
68 cat >gradle.properties <<EOF
69PROMOTED_BUILD_NUMBER=${_pkgver##*+}
70COMPANY_NAME=Alpine
71HUDSON_JOB_NAME=abuild
72RELEASE_SUFFIX=-alpine
73COMPILE_WEBKIT=true
74COMPILE_MEDIA=true
75# non standard, alpine patched properties
76ANT_HOME=$_ant_home
77EXTRA_CXXFLAGS=$CXXFLAGS
78EXTRA_LDFLAGS=$LDFLAGS
79PKG_CONFIG_PATH=$PKG_CONFIG_PATH
80PKG_CONFIG_SYSROOT_DIR=$PKG_CONFIG_SYSROOT_DIR
81CC=${CC:-gcc}
82CXX=${CXX:-g++}
83AR=${AR:-ar}
84EOF
85
86 # use system provided library for icu
87 rm -rf modules/javafx.web/src/main/native/Source/ThirdParty/icu
88
89 # make gradle wrapper executable
90 chmod +x ./gradlew
91}
92
93build() {
94 ./gradlew publicExportsStandaloneLinux
95}
96
97check() {
98 ./gradlew check -x :web:test
99}
100
101package() {
102 mkdir -p "$pkgdir/$_java_home/apps"
103 cp -r build/artifacts/javafx-sdk-11*/* "$pkgdir/$_java_home"
104 cp -r build/artifacts/javafx-jmods-11*/ "$pkgdir/$_java_home/jmods"
105 cp -r build/artifacts/javafx-docs-11*/ "$pkgdir/$_java_home/api"
106 cp apps/scenebuilder/SceneBuilderApp/dist/SceneBuilderApp.jar "$pkgdir/$_java_home/apps"
107 cp apps/scenebuilder/SceneBuilderKit/dist/SceneBuilderKit.jar "$pkgdir/$_java_home/apps"
108}
109
110_jmods() {
111 pkgdesc="$pkgdesc (jmods)"
112 depends=""
113 _fromroot="$pkgdir/$_java_home"
114 _toroot="$subpkgdir/$_java_home"
115
116 mkdir -p "$_toroot"
117 mv "$_fromroot/jmods" "$_toroot"
118}
119
120_src() {
121 pkgdesc="$pkgdesc (src)"
122 depends=""
123 _fromroot="$pkgdir/$_java_home"
124 _toroot="$subpkgdir/$_java_home"
125
126 mkdir -p "$_toroot/lib"
127 mv "$_fromroot/lib/src.zip" "$_toroot/lib/src.zip"
128}
129
130_doc() {
131 pkgdesc="$pkgdesc (Documentation)"
132 depends=""
133 _fromroot="$pkgdir/$_java_home"
134 _toroot="$subpkgdir/$_java_home"
135
136 mkdir -p "$_toroot"
137 mv "$_fromroot/api" "$_toroot"
138}
139
140_gtk2() {
141 pkgdesc="$pkgdesc (GTK 2)"
142 depends="$pkgname-base"
143 _fromroot="$pkgdir/$_java_home"
144 _toroot="$subpkgdir/$_java_home"
145
146 mkdir -p "$_toroot/lib"
147 mv "$_fromroot/lib/libglassgtk2.so" "$_toroot/lib"
148}
149
150_gtk3() {
151 pkgdesc="$pkgdesc (GTK 3)"
152 depends="$pkgname-base"
153 _fromroot="$pkgdir/$_java_home"
154 _toroot="$subpkgdir/$_java_home"
155
156 mkdir -p "$_toroot/lib"
157 mv "$_fromroot/lib/libglassgtk3.so" "$_toroot/lib"
158}
159
160_scenebuilder() {
161 pkgdesc="$pkgdesc (SceneBuilder)"
162 depends="$pkgname-gtk3 $pkgname-web dbus"
163 _fromroot="$pkgdir/$_java_home"
164 _toroot="$subpkgdir/$_java_home"
165
166 mkdir -p "$_toroot/lib"
167 mv \
168 "$_fromroot/apps/SceneBuilderApp.jar" \
169 "$_fromroot/apps/SceneBuilderKit.jar" \
170 "$_toroot/lib"
171
172 mkdir -p "$_toroot/bin"
173 install -m 0755 "$srcdir/scenebuilder.bin" "$_toroot/bin/scenebuilder"
174
175 mkdir -p "$subpkgdir/usr/bin"
176 ln -s "$_java_home/bin/scenebuilder" "$subpkgdir/usr/bin/scenebuilder11"
177}
178
179_web() {
180 pkgdesc="$pkgdesc (web)"
181 depends="$pkgname-media"
182 _fromroot="$pkgdir/$_java_home"
183 _toroot="$subpkgdir/$_java_home"
184
185 mkdir -p "$_toroot/lib"
186 mkdir -p "$_toroot/jmods"
187 mkdir -p "$_toroot/legal"
188 mv \
189 "$_fromroot"/lib/libjfxwebkit.so \
190 "$_fromroot"/lib/javafx.web.jar \
191 "$_toroot/lib"
192 mv \
193 "$_fromroot"/jmods/javafx.web.jmod \
194 "$_toroot/jmods"
195 mv \
196 "$_fromroot/legal/javafx.web" \
197 "$_toroot/legal"
198}
199
200_media() {
201 pkgdesc="$pkgdesc (media)"
202 depends="$pkgname-libs"
203 _fromroot="$pkgdir/$_java_home"
204 _toroot="$subpkgdir/$_java_home"
205
206 mkdir -p "$_toroot/lib"
207 mkdir -p "$_toroot/jmods"
208 mkdir -p "$_toroot/legal"
209
210 mv \
211 "$_fromroot"/lib/libavplugin.so \
212 "$_fromroot"/lib/libgstreamer-lite.so \
213 "$_fromroot"/lib/libjfxmedia.so \
214 "$_fromroot"/lib/libfxplugins.so \
215 "$_fromroot"/lib/javafx.media.jar \
216 "$_toroot/lib"
217 mv \
218 "$_fromroot"/jmods/javafx.media.jmod \
219 "$_toroot/jmods"
220 mv \
221 "$_fromroot/legal/javafx.media" \
222 "$_toroot/legal/"
223}
224
225_libs() {
226 pkgdesc="$pkgdesc (libs)"
227 depends=""
228 _fromroot="$pkgdir/$_java_home"
229 _toroot="$subpkgdir/$_java_home"
230
231 mkdir -p "$_toroot/lib"
232 mv "$_fromroot"/lib/*.so "$_toroot/lib"
233}
234
235_base() {
236 pkgdesc="$pkgdesc (base)"
237 depends="$pkgname-libs openjdk11-jre"
238 _fromroot="$pkgdir/$_java_home"
239 _toroot="$subpkgdir/$_java_home"
240
241 mkdir -p "$_toroot"
242 mv "$_fromroot/legal" "$_toroot"
243 mv "$_fromroot/lib" "$_toroot"
244}
245
246_dev() {
247 pkgdesc="$pkgdesc (development)"
248 depends="$pkgname-jmods $pkgname-src $pkgname-doc $pkgname-media $pkgname-web $pkgname-scenebuilder"
249 mkdir -p "$subpkgdir"
250}
251
252sha512sums="10068828bf3f63782d734ccad3f385a9b092905fcd71caa6052fcbceb8108706f85c6e47ddb43aceea2dc84a7b8d8ef6ea91d820faa484b03c2cfff61b230bc1 openjfx-11.0.4+1.tar.bz2
253b10a420f65dc47b609fd3b7b0fae5b0bd1ddfa6a52cad41bc729c03f7ff82a79092ec81a24cdae363b8b6ec05061267e3cc48a0e14e097d07757bc021cb5619b apache-ant-1.8.2-bin.zip
254076efe734b42bf2ff5979693590710cbebff58bcd789645e3cf7646381fe18b3b9057d20e3491785f6ef690a06094ab3fe7dea5ae8c9eb3fe1e38940e4ece181 configure-ant-home.patch
2557356cb3139f8dd779e2531d16008bb08ccdac2add3f60f956a592a1de32005d2becc95895d8c9e49bd6ac94f13f93add1e9652987f07fc91aa15ed761f34f0ec crosscompile.patch
25633a3e4067347a51f5a8dacd3827e6108aefce1dd6a8b39847b1af4652834ffc36d69622023f18cd6cad73c7a3e2e65b51cf14e57f96bf4152385838f82f99646 disable-architecture-verification.patch
257c508a813d8c21151396fd385b6807f757236d0ddb0e33db21368c61c554f845c01326c774eb515a52b098ec51c55f77d1b9c185fba8f6dd0bd4aaf2b32e09880 disable-assembler-on-unsupported-archs.patch
25871226d10a94bf08eefc64b58d577490a1f98316574daf3142e33c2eec0ea714487cbf6e6eb6eda13c76bd56186cf5d7f894482470c3abdfc2849841149924b1b disable-jit-for-non-x86.patch
259f9d8396d94cd8776ed81298d6139ccdfc98fa2fb99591b2998a6f79038be5656f2a7f8eb8610ee60dc4327476147400e8184eafef5598dabeaf5eed97adc290c disable-sse2.patch
2603d443a7216b5f0df3eca1ceb7da9cb973f17d015707cad0203972dee8af1422c3204bd77af36571ded0827a56a21f2f355bb657c1e2ff42da2780667bc8cb995 disable-webkit-sampling-profiler.patch
261fd29cad92fa81f65d018b8319432fa665960ac2dba43433e186a001ece488447b34bcc63f8a8d75e0bfebef63a4745d2a54b01024b1423ba17d8445b25619893 fix-arm32-build.patch
2623f7ec35437b94e8773541b8cfbf99c2225540572b0c2ba50a954824aba9ad374085fb1b3532ff7bb53a02346b9b5ef7804acf980016815c56acdf587f6559613 fix-arm64-build.patch
2639a1c3270786adcf2d7d3f21ff1fc08fbff86ef8175f39eee9b58a7ae4f7923565b25ed5a11721669be89518b1568ab45f7e3b046a91884a2962b37178caa55a5 gcc-no-error.patch
2641ad39f3d53ab52696f8ec6c1039afa494949de1c261dd3c0f9f68372860da2a9c601b09c92b61c9099b399c7589f7f2e313bf93aabaabde0e294ddb7eec60b92 use-system-icu.patch
2652b8ec3bae8c93e5b6154988a5a7ac53477b7e86eea00d11cbd5ac1aaa5c87ddeaba239a65423549da29647f839c15d0f25126128f8fa619ea11ae907be646b44 webcore-linker-flags.patch
266232aebbd13e2e3291d1ae2bc0df282ade5e861e17fce9aaf378ea930655137a2f3fd6e8b43b1ffbc9c3fcc5b21ec36129bdff1070253d6642162e099b32fc171 webkit-debug-level.patch
2673e37adab75b12c4628cb8b43ef5ae83efdf29d1b4721ff5e1c8f89ea44b53837e4a596be7139a24a3d6d631dcc44ba0050212fba5be8bf19d5a3db6441610d90 scenebuilder.bin"
diff --git a/unmaintained/openjfx11/configure-ant-home.patch b/unmaintained/openjfx11/configure-ant-home.patch
new file mode 100644
index 0000000000..5bb975126c
--- /dev/null
+++ b/unmaintained/openjfx11/configure-ant-home.patch
@@ -0,0 +1,11 @@
1--- old/build.gradle
2+++ new/build.gradle
3@@ -764,7 +764,7 @@
4 List<String> params // parameters (usually -Dxxx=yyy)
5 ) {
6 // Try to use ANT_HOME
7- String antHomeEnv = System.getenv("ANT_HOME")
8+ String antHomeEnv = "$ANT_HOME"
9 String antHome = antHomeEnv != null ? cygpath(antHomeEnv) : null;
10 String ant = (antHome != null && !antHome.equals("")) ? "$antHome/bin/ant" : "ant";
11
diff --git a/unmaintained/openjfx11/crosscompile.patch b/unmaintained/openjfx11/crosscompile.patch
new file mode 100644
index 0000000000..4711890f1a
--- /dev/null
+++ b/unmaintained/openjfx11/crosscompile.patch
@@ -0,0 +1,224 @@
1--- old/build.gradle
2+++ new/build.gradle
3@@ -3175,6 +3175,12 @@
4 processResources.dependsOn copyDTtoPackager
5 }
6
7+def pkgConfigEnv = [
8+ PKG_CONFIG_PATH: "$PKG_CONFIG_PATH",
9+ PKG_CONFIG_SYSROOT_DIR: "$PKG_CONFIG_SYSROOT_DIR"
10+]
11+
12+
13 project(":media") {
14 configurations {
15 media
16@@ -3280,6 +3286,7 @@
17
18 doLast {
19 exec {
20+ environment(pkgConfigEnv)
21 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}")
22 args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}",
23 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia",
24@@ -3309,6 +3316,7 @@
25 enabled = IS_COMPILE_MEDIA
26 doLast {
27 exec {
28+ environment(pkgConfigEnv)
29 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite")
30 args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite",
31 IS_64 ? "ARCH=x64" : "ARCH=x32", "CC=${mediaProperties.compiler}",
32@@ -3327,6 +3335,7 @@
33
34 doLast {
35 exec {
36+ environment(pkgConfigEnv)
37 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins")
38 args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins",
39 IS_64 ? "ARCH=x64" : "ARCH=x32",
40@@ -3455,6 +3464,7 @@
41 }
42 exec {
43 workingDir("$libavDir")
44+ environment(pkgConfigEnv)
45 commandLine("make")
46 }
47 }
48@@ -3523,6 +3533,7 @@
49 }
50 exec {
51 workingDir("$libavDir")
52+ environment(pkgConfigEnv)
53 commandLine("make")
54 }
55 }
56@@ -3594,6 +3605,7 @@
57 }
58 exec {
59 workingDir("$libavDir")
60+ environment(pkgConfigEnv)
61 commandLine("make")
62 }
63 }
64@@ -3628,6 +3640,7 @@
65 File dir = file(libavDir)
66 if (dir.exists()) {
67 exec {
68+ environment(pkgConfigEnv)
69 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
70 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
71 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
72@@ -3642,6 +3655,7 @@
73 File dir = file(libavDir)
74 if (dir.exists()) {
75 exec {
76+ environment(pkgConfigEnv)
77 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
78 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
79 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
80@@ -3656,6 +3670,7 @@
81 File dir = file(libavDir)
82 if (dir.exists()) {
83 exec {
84+ environment(pkgConfigEnv)
85 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
86 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
87 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
88@@ -3667,6 +3682,7 @@
89 } else {
90 // Building fxavcodec plugin (libav plugin)
91 exec {
92+ environment(pkgConfigEnv)
93 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
94 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
95 "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
96@@ -3865,7 +3881,7 @@
97 exec {
98 workingDir("$webkitOutputDir")
99 commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
100- environment(["WEBKIT_OUTPUTDIR" : webkitOutputDir])
101+ environment(["WEBKIT_OUTPUTDIR" : webkitOutputDir, "CC" : CC, "CXX" : CXX, "AR" : AR])
102 }
103
104 exec {
105@@ -3911,6 +3927,9 @@
106 "JAVA_HOME" : JDK_HOME,
107 "WEBKIT_OUTPUTDIR" : webkitOutputDir,
108 "PYTHONDONTWRITEBYTECODE" : "1",
109+ "CC" : CC,
110+ "CXX" : CXX,
111+ "AR" : AR
112 ])
113
114 def targetCpuBitDepthSwitch = ""
115--- old/buildSrc/linux.gradle
116+++ new/buildSrc/linux.gradle
117@@ -55,11 +55,13 @@
118 commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
119 "-ffunction-sections", "-fdata-sections",
120 IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
121+ccFlags.addAll(ext.EXTRA_CXXFLAGS.split(" "))
122 def ccFlagsGTK3 = ccFlags
123 //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
124 def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
125 "-z", "relro",
126 "-Wl,--gc-sections"].flatten()
127+linkFlags.addAll(ext.EXTRA_LDFLAGS.split(" "))
128
129 if (IS_DEBUG_NATIVE) {
130 linkFlags += "-g"
131@@ -78,11 +80,17 @@
132 def gtk3LinkFlags = [ ];
133 LINUX.buildGTK3 = true
134
135+def pkgConfigEnv = [
136+ PKG_CONFIG_PATH: "$PKG_CONFIG_PATH",
137+ PKG_CONFIG_SYSROOT_DIR: "$PKG_CONFIG_SYSROOT_DIR"
138+]
139+
140 // Create $buildDir/linux_tools.properties file and load props from it
141 setupTools("linux_gtk2",
142 { propFile ->
143 ByteArrayOutputStream results1 = new ByteArrayOutputStream();
144 exec {
145+ environment(pkgConfigEnv)
146 commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-2.0", "gthread-2.0", "xtst")
147 setStandardOutput(results1);
148 }
149@@ -90,6 +98,7 @@
150
151 ByteArrayOutputStream results3 = new ByteArrayOutputStream();
152 exec {
153+ environment(pkgConfigEnv)
154 commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst")
155 setStandardOutput(results3);
156 }
157@@ -111,6 +120,7 @@
158 { propFile ->
159 ByteArrayOutputStream results2 = new ByteArrayOutputStream();
160 exec {
161+ environment(pkgConfigEnv)
162 commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-3.0", "gthread-2.0", "xtst")
163 setStandardOutput(results2);
164 ignoreExitValue(true)
165@@ -119,6 +129,7 @@
166
167 ByteArrayOutputStream results4 = new ByteArrayOutputStream();
168 exec {
169+ environment(pkgConfigEnv)
170 commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-3.0", "gthread-2.0", "xtst")
171 setStandardOutput(results4);
172 ignoreExitValue(true)
173@@ -145,6 +156,7 @@
174 { propFile ->
175 ByteArrayOutputStream results = new ByteArrayOutputStream();
176 exec {
177+ environment(pkgConfigEnv)
178 commandLine "${toolchainDir}pkg-config", "--cflags", "pangoft2"
179 standardOutput = results
180 }
181@@ -152,6 +164,7 @@
182
183 results = new ByteArrayOutputStream();
184 exec {
185+ environment(pkgConfigEnv)
186 commandLine "${toolchainDir}pkg-config", "--libs", "pangoft2"
187 standardOutput = results
188 }
189@@ -176,6 +189,7 @@
190 { propFile ->
191 ByteArrayOutputStream results = new ByteArrayOutputStream();
192 exec {
193+ environment(pkgConfigEnv)
194 commandLine "${toolchainDir}pkg-config", "--cflags", "freetype2"
195 standardOutput = results
196 }
197@@ -183,6 +197,7 @@
198
199 results = new ByteArrayOutputStream();
200 exec {
201+ environment(pkgConfigEnv)
202 commandLine "${toolchainDir}pkg-config", "--libs", "freetype2"
203 standardOutput = results
204 }
205@@ -200,8 +215,8 @@
206 }
207 )
208
209-def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "${toolchainDir}gcc";
210-def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "${toolchainDir}g++";
211+def compiler = ext.CC;
212+def linker = ext.CXX;
213
214 LINUX.glass = [:]
215 LINUX.glass.variants = ["glass", "glassgtk2"]
216@@ -337,7 +352,7 @@
217 LINUX.media = [:]
218 LINUX.media.compiler = compiler
219 LINUX.media.linker = linker
220-LINUX.media.ar = "${toolchainDir}ar"
221+LINUX.media.ar = ext.AR
222
223 LINUX.webkit = [:]
224 LINUX.webkit.compiler = compiler
diff --git a/unmaintained/openjfx11/disable-architecture-verification.patch b/unmaintained/openjfx11/disable-architecture-verification.patch
new file mode 100644
index 0000000000..456598adf1
--- /dev/null
+++ b/unmaintained/openjfx11/disable-architecture-verification.patch
@@ -0,0 +1,23 @@
1Description: Disable the architecture verification which is limited to i386 and amd64
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/06-disable-architecture-verification.patch
5--- a/build.gradle
6+++ b/build.gradle
7@@ -302,6 +302,7 @@
8 // at present building on PI is not supported, but we would only need to make
9 // some changes on assumptions on what should be built (like SWT / Swing) and
10 // such and we could probably make it work.
11+/*
12 if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("Unsupported build OS ${OS_NAME}")
13 if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
14 fail("Unknown and unsupported build architecture: $OS_ARCH")
15@@ -310,6 +311,7 @@
16 } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
17 fail("Unknown and unsupported build architecture: $OS_ARCH")
18 }
19+*/
20
21
22 // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
23
diff --git a/unmaintained/openjfx11/disable-assembler-on-unsupported-archs.patch b/unmaintained/openjfx11/disable-assembler-on-unsupported-archs.patch
new file mode 100644
index 0000000000..3e2d534a89
--- /dev/null
+++ b/unmaintained/openjfx11/disable-assembler-on-unsupported-archs.patch
@@ -0,0 +1,19 @@
1Description: Disable assembler in WebKit on unsupported architectures
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/07-disable-assembler-on-unsupported-archs.patch
5--- old/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
6+++ new/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
7@@ -357,6 +357,12 @@
8 #endif
9 #endif
10
11+#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4)
12+#define ENABLE_ASSEMBLER 0
13+#define ENABLE_JIT 0
14+#define ENABLE_YARR_JIT 0
15+#endif
16+
17 /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
18 virtual memory, not to choose a GUI toolkit ==== */
19
diff --git a/unmaintained/openjfx11/disable-jit-for-non-x86.patch b/unmaintained/openjfx11/disable-jit-for-non-x86.patch
new file mode 100644
index 0000000000..f6d9a3359a
--- /dev/null
+++ b/unmaintained/openjfx11/disable-jit-for-non-x86.patch
@@ -0,0 +1,21 @@
1Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/disable-jit-for-non-x86.patch
2--- old/build.gradle
3+++ new/build.gradle
4@@ -3897,11 +3897,17 @@
5 cmakeArgs = " $cmakeArgs -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
6 } else if (t.name == "linux") {
7 cmakeArgs = " $cmakeArgs -DCMAKE_SYSTEM_NAME=Linux"
8+ /*
9 if (IS_64) {
10 cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=x86_64"
11 } else {
12 cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=i586"
13 }
14+ */
15+ if ( OS_ARCH != "amd64" && OS_ARCH != "i386" ) {
16+ cmakeArgs = "$cmakeArgs -DENABLE_JIT=OFF"
17+ }
18+ cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=$OS_ARCH"
19 // TODO: Use cflags and ldflags from all platforms
20 def cFlags = webkitProperties.ccFlags?.join(' ') ?: ''
21 def lFlags = webkitProperties.linkFlags?.join(' ') ?: ''
diff --git a/unmaintained/openjfx11/disable-sse2.patch b/unmaintained/openjfx11/disable-sse2.patch
new file mode 100644
index 0000000000..db99780c60
--- /dev/null
+++ b/unmaintained/openjfx11/disable-sse2.patch
@@ -0,0 +1,60 @@
1Description: Enable SSE2 on i386 and amd64 CPUs only
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/08-disable-sse2.patch
5--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
6+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
7@@ -23,13 +23,16 @@
8 -Wformat-security \
9 -fstack-protector \
10 -Werror=implicit-function-declaration \
11- -msse2 \
12 -fbuiltin \
13 -DHAVE_STDINT_H \
14 -DLINUX \
15 -DGST_DISABLE_LOADSAVE \
16 -DGSTREAMER_LITE \
17 -ffunction-sections -fdata-sections
18+
19+ifneq (,$(filter $(CARCH), x86 x86_64))
20+ CFLAGS += -msse2
21+endif
22
23 ifeq ($(BUILD_TYPE), Release)
24 CFLAGS += -Os
25--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
26+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
27@@ -20,7 +20,6 @@
28 -Wformat-security \
29 -fstack-protector \
30 -Werror=implicit-function-declaration \
31- -msse2 \
32 -fbuiltin \
33 -DHAVE_STDINT_H \
34 -DLINUX \
35@@ -31,6 +30,10 @@
36 -DGST_DISABLE_GST_DEBUG \
37 -DGSTREAMER_LITE \
38 -ffunction-sections -fdata-sections
39+
40+ifneq (,$(filter $(CARCH), x86 x86_64))
41+ CFLAGS += -msse2
42+endif
43
44 ifeq ($(BUILD_TYPE), Release)
45 CFLAGS += -Os
46--- old/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
47+++ new/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
48@@ -42,8 +42,11 @@
49 -Wformat-security \
50 -fstack-protector \
51 -Werror=implicit-function-declaration \
52- -msse2 \
53 -DGSTREAMER_LITE
54+
55+ifneq (,$(filter $(CARCH), x86 x86_64))
56+ CFLAGS += -msse2
57+endif
58
59 PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
60 PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
diff --git a/unmaintained/openjfx11/disable-webkit-sampling-profiler.patch b/unmaintained/openjfx11/disable-webkit-sampling-profiler.patch
new file mode 100644
index 0000000000..86285f8d75
--- /dev/null
+++ b/unmaintained/openjfx11/disable-webkit-sampling-profiler.patch
@@ -0,0 +1,15 @@
1Description: Disables the sampling profiler in WebKit (fails to build on arm64)
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: not-needed
4Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/19-disable-webkit-sampling-profiler.patch
5--- old/modules/javafx.web/src/main/native/Source/cmake/WebKitFeatures.cmake
6+++ new/modules/javafx.web/src/main/native/Source/cmake/WebKitFeatures.cmake
7@@ -163,7 +163,7 @@
8 WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" PRIVATE OFF)
9 WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_USAGE "Toggle resource usage support" PRIVATE OFF)
10 WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
11- WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE ON)
12+ WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE OFF)
13 WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" PRIVATE OFF)
14 WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_WORKER "Toggle ServiceWorker support" PRIVATE OFF)
15 WEBKIT_OPTION_DEFINE(ENABLE_SMOOTH_SCROLLING "Toggle smooth scrolling" PRIVATE ON)
diff --git a/unmaintained/openjfx11/fix-arm32-build.patch b/unmaintained/openjfx11/fix-arm32-build.patch
new file mode 100644
index 0000000000..df529fde7f
--- /dev/null
+++ b/unmaintained/openjfx11/fix-arm32-build.patch
@@ -0,0 +1,91 @@
1Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/fix-arm32-build.patch
2--- old/buildSrc/linux.gradle
3+++ new/buildSrc/linux.gradle
4@@ -46,10 +46,6 @@
5 "-fstack-protector",
6 "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
7
8-if (!IS_64) {
9- commonFlags += "-m32"
10-}
11-
12 // Specify the compilation parameters and link parameters
13 def ccFlags = [
14 commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
15@@ -287,20 +283,12 @@
16 LINUX.launcher.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
17 LINUX.launcher.linker = linker
18 LINUX.launcher.linkFlags = ["-ldl"]
19-if (!IS_64) {
20- LINUX.launcher.ccFlags += "-m32"
21- LINUX.launcher.linkFlags += "-m32"
22-}
23
24 LINUX.launcherlibrary = [:]
25 LINUX.launcherlibrary.compiler = compiler
26 LINUX.launcherlibrary.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98", "-ffunction-sections", "-fdata-sections"]
27 LINUX.launcherlibrary.linker = linker
28 LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"]
29-if (!IS_64) {
30- LINUX.launcherlibrary.ccFlags += "-m32"
31- LINUX.launcherlibrary.linkFlags += "-m32"
32-}
33
34 LINUX.iio = [:]
35 LINUX.iio.nativeSource = [
36--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
37+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
38@@ -63,11 +63,6 @@
39 LDFLAGS += $(shell pkg-config --libs libavcodec libavformat)
40 endif
41
42-ifeq ($(ARCH), x32)
43- CFLAGS += -m32
44- LDFLAGS += -m32
45-endif
46-
47 SOURCES = av/fxavcodecplugin.c \
48 av/avelement.c \
49 av/decoder.c \
50--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
51+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
52@@ -54,11 +54,6 @@
53 -z relro \
54 -static-libgcc -static-libstdc++ -Wl,--gc-sections
55
56-ifeq ($(ARCH), x32)
57- CFLAGS += -m32
58- LDFLAGS += -m32
59-endif
60-
61 SOURCES = fxplugins.c \
62 progressbuffer/progressbuffer.c \
63 progressbuffer/hlsprogressbuffer.c \
64--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
65+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
66@@ -79,11 +79,6 @@
67 -z relro \
68 -static-libgcc -static-libstdc++ -Wl,--gc-sections
69
70-ifeq ($(ARCH), x32)
71- CFLAGS += -m32
72- LDFLAGS += -m32
73-endif
74-
75 SOURCES = \
76 gstreamer/gst/gst.c \
77 gstreamer/gst/gstallocator.c \
78--- old/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
79+++ new/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
80@@ -74,11 +74,6 @@
81 CFLAGS += -g -Wall -D_DEBUG
82 endif
83
84-ifeq ($(ARCH), x32)
85- CFLAGS += -m32
86- LDFLAGS += -m32
87-endif
88-
89 CPP_SOURCES = \
90 jni/com_sun_media_jfxmedia_logging_Logger.cpp \
91 jni/JavaBandsHolder.cpp \
diff --git a/unmaintained/openjfx11/fix-arm64-build.patch b/unmaintained/openjfx11/fix-arm64-build.patch
new file mode 100644
index 0000000000..5add350ff3
--- /dev/null
+++ b/unmaintained/openjfx11/fix-arm64-build.patch
@@ -0,0 +1,21 @@
1From: Iain Lane <iain.lane@canonical.com>
2Description: Fix arm64 build
3 Add AArch64 support in Platform.h
4 Don't use COMPARE_AND_SWAP on arm64; it produces invalid asm.
5 Fix some other areas where disabling JIT doesn't work.
6Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
7Forwarded: no
8Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/fix-arm64-build.patch
9--- old/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
10+++ new/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
11@@ -146,7 +146,9 @@
12 #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
13 #define WTF_CPU_ARM64 1
14 #define WTF_CPU_KNOWN 1
15-
16+#if defined(__AARCH64BE__)
17+#define WTF_CPU_BIG_ENDIAN 1
18+#endif
19 #if defined(__arm64e__)
20 #define WTF_CPU_ARM64E 1
21 #endif
diff --git a/unmaintained/openjfx11/gcc-no-error.patch b/unmaintained/openjfx11/gcc-no-error.patch
new file mode 100644
index 0000000000..46eacc7add
--- /dev/null
+++ b/unmaintained/openjfx11/gcc-no-error.patch
@@ -0,0 +1,31 @@
1The compilation with GCC 8.2 produces a lot of warnings which are treated as errors by default.
2Let the warnings be warnings and pretend we don't care.
3--- old/buildSrc/linux.gradle
4+++ new/buildSrc/linux.gradle
5@@ -234,7 +234,7 @@
6 LINUX.glass.glass = [:]
7 LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
8 LINUX.glass.glass.compiler = compiler
9-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
10+LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Wno-error"].flatten()
11 LINUX.glass.glass.linker = linker
12 LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten()
13 LINUX.glass.glass.lib = "glass"
14@@ -242,7 +242,7 @@
15 LINUX.glass.glassgtk2 = [:]
16 LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles()
17 LINUX.glass.glassgtk2.compiler = compiler
18-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
19+LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Wno-error"].flatten()
20 LINUX.glass.glassgtk2.linker = linker
21 LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten()
22 LINUX.glass.glassgtk2.lib = "glassgtk2"
23@@ -250,7 +250,7 @@
24 LINUX.glass.glassgtk3 = [:]
25 LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles()
26 LINUX.glass.glassgtk3.compiler = compiler
27-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten()
28+LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Wno-error"].flatten()
29 LINUX.glass.glassgtk3.linker = linker
30 LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten()
31 LINUX.glass.glassgtk3.lib = "glassgtk3"
diff --git a/unmaintained/openjfx11/scenebuilder.bin b/unmaintained/openjfx11/scenebuilder.bin
new file mode 100644
index 0000000000..ff44a99a34
--- /dev/null
+++ b/unmaintained/openjfx11/scenebuilder.bin
@@ -0,0 +1,15 @@
1#!/bin/sh
2
3_prog=$(readlink $0)
4_bindir=$(dirname $_prog)
5_basedir=$(dirname $_bindir)
6_classpath=$_basedir/lib/SceneBuilderApp.jar:$_basedir/lib/SceneBuilderKit.jar
7_modules="javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web"
8
9exec /usr/bin/java \
10 -cp "$_classpath" \
11 --module-path $_basedir/lib \
12 --add-modules=$_modules \
13 com.oracle.javafx.scenebuilder.app.SceneBuilderApp \
14 $@
15
diff --git a/unmaintained/openjfx11/use-system-icu.patch b/unmaintained/openjfx11/use-system-icu.patch
new file mode 100644
index 0000000000..5717f0c971
--- /dev/null
+++ b/unmaintained/openjfx11/use-system-icu.patch
@@ -0,0 +1,39 @@
1This patch disables usage of the bundled icu library as alpine
2already has 63.1
3This saves about 30 MB on the final jfxwebkit.so
4--- old/modules/javafx.web/src/main/native/Source/PlatformJava.cmake
5+++ new/modules/javafx.web/src/main/native/Source/PlatformJava.cmake
6@@ -1,4 +1,3 @@
7 add_subdirectory(ThirdParty/sqlite)
8-add_subdirectory(ThirdParty/icu)
9 add_subdirectory(ThirdParty/libxml)
10 add_subdirectory(ThirdParty/libxslt)
11--- old/modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
12+++ new/modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
13@@ -18,7 +18,7 @@
14 #if PLATFORM(JAVA) && OS(WINDOWS)
15 typedef wchar_t UChar;
16 #else
17-typedef uint16_t UChar;
18+//typedef uint16_t UChar;
19 #endif
20
21 // #ifdef UChar32
22@@ -26,7 +26,7 @@
23 // #endif
24
25 #ifndef __UMACHINE_H__ //XXX: recheck
26-typedef uint32_t UChar32;
27+//typedef uint32_t UChar32;
28 #endif
29
30 #define U_MASK(x) ((uint32_t)1<<(x))
31--- old/modules/javafx.web/src/main/native/Tools/CMakeLists.txt
32+++ new/modules/javafx.web/src/main/native/Tools/CMakeLists.txt
33@@ -48,6 +48,3 @@
34 add_subdirectory(TestWebKitAPI)
35 endif ()
36
37-if (PORT STREQUAL "Java")
38- add_subdirectory(DumpRenderTree/java)
39-endif ()
diff --git a/unmaintained/openjfx11/webcore-linker-flags.patch b/unmaintained/openjfx11/webcore-linker-flags.patch
new file mode 100644
index 0000000000..6e34ada923
--- /dev/null
+++ b/unmaintained/openjfx11/webcore-linker-flags.patch
@@ -0,0 +1,16 @@
1Description: Use the gold linker with memory saving options to avoid build failures caused by lack of RAM
2Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no
4Bug-Debian: https://bugs.debian.org/857464
5Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/23-webcore-linker-flags.patch
6--- old/modules/javafx.web/src/main/native/Source/WebCore/PlatformJava.cmake
7+++ new/modules/javafx.web/src/main/native/Source/WebCore/PlatformJava.cmake
8@@ -314,7 +314,7 @@
9 set_target_properties(JFXWebKit PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
10 set(JFXWebKit_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-macosx")
11 elseif (UNIX)
12- set_target_properties(JFXWebKit PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
13+ set_target_properties(JFXWebKit PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
14 set(JFXWebKit_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-vers")
15 elseif (WIN32)
16 # Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
diff --git a/unmaintained/openjfx11/webkit-debug-level.patch b/unmaintained/openjfx11/webkit-debug-level.patch
new file mode 100644
index 0000000000..08d12692a6
--- /dev/null
+++ b/unmaintained/openjfx11/webkit-debug-level.patch
@@ -0,0 +1,16 @@
1Description: Use the -g1 debugging level instead of -g when compiling WebKit
2 to reduce the memory used and avoid build failures caused by lack of RAM.
3Author: Emmanuel Bourg <ebourg@apache.org>
4Forwarded: not-needed
5Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/25-webkit-debug-level.patch
6--- a/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
7+++ b/modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
8@@ -89,6 +89,7 @@
9
10 if (COMPILER_IS_GCC_OR_CLANG)
11 WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-strict-aliasing)
12+ WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-g1)
13
14 # clang-cl.exe impersonates cl.exe so some clang arguments like -fno-rtti are
15 # represented using cl.exe's options and should not be passed as flags, so
16