Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjfx for openSUSE:Factory checked in at 2022-02-22 21:18:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjfx (Old) and /work/SRC/openSUSE:Factory/.openjfx.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openjfx" Tue Feb 22 21:18:23 2022 rev:7 rq:956681 version:11.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/openjfx/openjfx.changes 2021-07-30 23:23:00.631581448 +0200 +++ /work/SRC/openSUSE:Factory/.openjfx.new.1958/openjfx.changes 2022-02-22 21:19:02.182295548 +0100 @@ -1,0 +2,87 @@ +Fri Feb 18 08:45:08 UTC 2022 - Fridrich Strba <[email protected]> + +- Update to upstream version 11.0.14, including October 2021 and + January 2022 CPU security fixes) + * Fixes of 11.0.13+2 + + JDK-8274107: Cherry pick GTK WebKit 2.32.4 changes + + JDK-8273732: Clarify review policies for clean backports in + JavaFX update releases + + JDK-8269374: Menu inoperable after setting stage to second + monitor + + JDK-8211362: Restrict export of libjpeg symbols from + libjavafx_iio.so + + JDK-8185447: The special high-contrast mode of JavaFX + Controls in Japanese environment do not work. + + JDK-8263760: Update gradle to version 7.0.1 8240336: JavaFX + build uses deprecated features that will be removed in + gradle 7 + + JDK-8262236: Configure Gradle checksum verification + + JDK-8220222: build.gradle does not specify clearly the + project dependencies + + JDK-8211308: Support HTTP/2 in WebView + + JDK-8267892: Add .gitattributes to repo + + JDK-8267858: Document that title property in WebEngine gets + updated asynchronously + + JDK-8267121: Illegal access to private "size" field of + ArrayList from build.gradle + + JDK-8265400: Update to gcc 10.3 on Linux + + JDK-8268718: [macos] Video stops, but audio continues to play + when stopTime is reached + + JDK-8231558: [macos] Platform.exit causes assertion error on + macOS 10.15 or later + + JDK-8268219: hlsprogressbuffer should provide PTS after + GStreamer update + + JDK-8267819: CoInitialize/CoUninitialize should be called on + same thread + + JDK-8266860: [macos] Incorrect duration reported for HLS live + streams + + JDK-8264737: JavaFX media stream stops playing after + reconnecting via Remote Desktop + + JDK-8271230: Remove obsolete test classes and data files from + 3DViewer sample + + JDK-8266462: Update copyright years of javafx.web native + sources in jfx11u + + JDK-8272329: Cherry pick GTK WebKit 2.32.3 changes + + JDK-8270479: WebKit 612.1 build fails with Visual Studio 2017 + + JDK-8268849: Update to 612.1 version of WebKit + + JDK-8269131: Update libxml2 to version 2.9.12 + + JDK-8269147: Update GStreamer to version 1.18.4 + + JDK-8268915: WebKit build fails with Xcode 12.5 + + JDK-8209086: Some javafx.web files are missing + GPLv2+Classpath copyright header + + JDK-8262396: Update Mesa 3-D Headers to version 21.0.3 + + JDK-8270992: Change JavaFX release version in jfx11u to + 11.0.13 + * Fixes of 11.0.14+3 + + JDK-8279396: Define version in .jcheck/conf + + JDK-8272638: Update copyright header for files modified in + 2021 + + JDK-8276490: Incorrect path for duplicate x and y values, + when path falls outside axis bound + + JDK-8276847: JSException: ReferenceError: Can't find + variable: IntersectionObserver + + JDK-8277133: Dragboard contents retrieved all over again + during a DND process on WebView + + JDK-8160597: IllegalArgumentException when we initiate drag + on Image + + JDK-8274929: Crash while reading specific clipboard content + + JDK-8275723: Crash on macOS 12 in GlassRunnable::dealloc + + JDK-8275138: WebView: UserAgent string is empty for first + request + + JDK-8263807: Button types of a DialogPane are set twice, + returns a wrong button + + JDK-8274413: FX: Update copyright year in docs, readme files + to 2022 + + JDK-8272546: Better TrueType font loading + + JDK-8275835: Change JavaFX release version in jfx11u to + 11.0.14 +- Modified patches: + * openjfx-gradle441.patch + + revert all recent gradle 7.0.1 changes + * 0001-Change-SWT-and-Lucene.patch + * openjfx-antlr.patch + * openjfx-nowerror.patch + * openjfx-rpm-build.patch + + rediff to changed context + +------------------------------------------------------------------- Old: ---- 11.0.12+4.tar.gz New: ---- 11.0.14+3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openjfx.spec ++++++ --- /var/tmp/diff_new_pack.4FuJNa/_old 2022-02-22 21:19:03.622295813 +0100 +++ /var/tmp/diff_new_pack.4FuJNa/_new 2022-02-22 21:19:03.626295814 +0100 @@ -1,7 +1,7 @@ # # spec file for package openjfx # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,22 @@ %global priority 2105 -%global build_number 4 +%global build_number 3 %global jfx_repo jfx11u Name: openjfx -Version: 11.0.12 +Version: 11.0.14 Release: 0 Summary: Rich client application platform for Java License: BSD-3-Clause AND GPL-2.0-only WITH Classpath-exception-2.0 URL: https://openjdk.java.net/projects/openjfx/ Source0: https://github.com/openjdk/%{jfx_repo}/archive/refs/tags/%{version}+%{build_number}.tar.gz -Patch0: 0000-Fix-wait-call-in-PosixPlatform.patch -Patch1: 0001-Change-SWT-and-Lucene.patch -Patch2: 0002-Allow-build-to-work-on-newer-gradles.patch +Patch0: openjfx-gradle441.patch +Patch1: 0000-Fix-wait-call-in-PosixPlatform.patch +Patch2: 0001-Change-SWT-and-Lucene.patch +Patch3: 0002-Allow-build-to-work-on-newer-gradles.patch Patch4: 0004-Fix-Compilation-Flags.patch Patch5: 0005-fxpackager-extract-jre-accept-symlink.patch -Patch100: openjfx-antlr.patch -Patch101: openjfx-gradle441.patch +Patch101: openjfx-antlr.patch Patch102: openjfx-nowerror.patch Patch103: openjfx-pango.patch Patch104: openjfx-architectures.patch @@ -57,7 +57,8 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xxf86vm) #!BuildRequires: gradle stringtemplate4 -#!BuildIgnore: gradle-bootstrap stringtemplate4-bootstrap +#!BuildIgnore: gradle-bootstrap +#!BuildIgnore: stringtemplate4-bootstrap %description JavaFX/OpenJFX is a set of graphics and media APIs that enables Java @@ -95,10 +96,10 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch100 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 @@ -124,20 +125,20 @@ rm -rf modules/javafx.media/src/main/native/gstreamer/3rd_party/glib rm -rf modules/javafx.media/src/main/native/gstreamer/gstreamer-lite -%mvn_package org.openjfx:::linux: +%{mvn_package} org.openjfx:::linux: %build -export SOURCE_DATE_EPOCH=$(date -r %{SOURCE0} +%s) +export SOURCE_DATE_EPOCH=$(date -r %{SOURCE0} +%%s) env | grep SOURCE_DATE_EPOCH gradle-local --no-daemon --offline sdk generatePomFileForMavenPublication generatePomFileForJavafxPublication javadoc jmod %install -%mvn_artifact modules/javafx.base/build/publications/javafx/pom-default.xml +%{mvn_artifact} modules/javafx.base/build/publications/javafx/pom-default.xml for i in base controls fxml graphics media swing web; do %pom_xpath_remove pom:project/pom:packaging modules/javafx.${i}/build/publications/maven/pom-default.xml %pom_xpath_set pom:classifier linux modules/javafx.${i}/build/publications/maven/pom-default.xml - %mvn_artifact modules/javafx.${i}/build/publications/maven/pom-default.xml build/publications/javafx.${i}.jar - %mvn_artifact org.openjfx:javafx-${i}::linux:%{version} build/publications/javafx.${i}-linux.jar + %{mvn_artifact} modules/javafx.${i}/build/publications/maven/pom-default.xml build/publications/javafx.${i}.jar + %{mvn_artifact} org.openjfx:javafx-${i}::linux:%{version} build/publications/javafx.${i}-linux.jar done %mvn_install -J build/javadoc ++++++ 0001-Change-SWT-and-Lucene.patch ++++++ --- /var/tmp/diff_new_pack.4FuJNa/_old 2022-02-22 21:19:03.658295820 +0100 +++ /var/tmp/diff_new_pack.4FuJNa/_new 2022-02-22 21:19:03.662295821 +0100 @@ -1,15 +1,15 @@ --- a/build.gradle +++ b/build.gradle -@@ -2548,7 +2548,7 @@ project(":swt") { +@@ -2586,7 +2586,7 @@ project(":swt") { commonModuleSetup(project, [ 'base', 'graphics' ]) dependencies { -- compile name: SWT_FILE_NAME +- implementation name: SWT_FILE_NAME + compile group: "org.eclipse.swt", name: "swt", version: "3.108.0" } classes { -@@ -4680,35 +4680,35 @@ compileTargets { t -> +@@ -4748,35 +4748,35 @@ compileTargets { t -> project(":apps") { // The apps build is Ant based, we will exec ant from gradle. @@ -71,7 +71,7 @@ compileTargets { t -> List<String> params = [] -@@ -4723,7 +4723,7 @@ project(":apps") { +@@ -4791,7 +4791,7 @@ project(":apps") { params << "-Drun.patch=@${rootProject.buildDir}/${RUNARGSFILE}" def appsJar = project.task("appsJar${t.capital}") { ++++++ 11.0.12+4.tar.gz -> 11.0.14+3.tar.gz ++++++ /work/SRC/openSUSE:Factory/openjfx/11.0.12+4.tar.gz /work/SRC/openSUSE:Factory/.openjfx.new.1958/11.0.14+3.tar.gz differ: char 12, line 1 ++++++ openjfx-antlr.patch ++++++ --- /var/tmp/diff_new_pack.4FuJNa/_old 2022-02-22 21:19:03.710295829 +0100 +++ /var/tmp/diff_new_pack.4FuJNa/_new 2022-02-22 21:19:03.714295831 +0100 @@ -1,12 +1,12 @@ --- a/build.gradle +++ b/build.gradle -@@ -2008,7 +2008,7 @@ project(":graphics") { +@@ -2019,7 +2019,7 @@ project(":graphics") { dependencies { stubCompile group: "junit", name: "junit", version: "4.8.2" - antlr group: "org.antlr", name: "antlr4", version: "4.7.2", classifier: "complete" + antlr group: "org.antlr", name: "antlr4", version: "4.7.2" + compile project(':base') } - project.ext.moduleSourcePath = defaultModuleSourcePath_GraphicsOne ++++++ openjfx-gradle441.patch ++++++ --- /var/tmp/diff_new_pack.4FuJNa/_old 2022-02-22 21:19:03.722295832 +0100 +++ /var/tmp/diff_new_pack.4FuJNa/_new 2022-02-22 21:19:03.726295832 +0100 @@ -1,6 +1,24 @@ --- a/build.gradle +++ b/build.gradle -@@ -1772,10 +1772,7 @@ allprojects { +@@ -1733,7 +1733,7 @@ void addJCov(p, test) { + "exclude=\"**.*Test\"," + + "file=build/reports/jcov/report.xml," + + "merge=merge"; +- test.jvmArgs("-javaagent:${p.configurations.testClasspath.files.find { it.name.startsWith('jcov') }}=$jcovJVMArgument"); ++ test.jvmArgs("-javaagent:${p.configurations.testCompile.files.find { it.name.startsWith('jcov') }}=$jcovJVMArgument"); + p.mkdir p.file("build/reports/jcov") + } + test.doLast { +@@ -1741,7 +1741,7 @@ void addJCov(p, test) { + if (reportFile.exists()) { + p.javaexec { + workingDir = p.file("build/reports/jcov") +- classpath = p.files(p.configurations.testClasspath.files.find { it.name.startsWith('jcov') }) ++ classpath = p.files(p.configurations.testCompile.files.find { it.name.startsWith('jcov') }) + main = "com.sun.tdk.jcov.Helper" + args = [ + "RepGen", +@@ -1771,10 +1771,7 @@ allprojects { repositories { ivy { url JFX_DEPS_URL @@ -12,7 +30,7 @@ artifact "[artifact]-[revision](-[classifier]).[ext]" artifact "[artifact].[ext]" } -@@ -1788,10 +1785,7 @@ allprojects { +@@ -1787,10 +1784,7 @@ allprojects { mavenCentral() ivy { url "https://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"; @@ -24,7 +42,7 @@ artifact "[artifact].[ext]" } } -@@ -1802,19 +1796,13 @@ allprojects { +@@ -1801,19 +1795,13 @@ allprojects { repositories { ivy { url libAVRepositoryURL @@ -46,7 +64,237 @@ artifact "[artifact].[ext]" } } -@@ -4351,7 +4339,6 @@ allprojects { +@@ -1854,9 +1842,9 @@ allprojects { + // By default all of our projects require junit for testing so we can just + // setup this dependency here. + dependencies { +- testImplementation group: "junit", name: "junit", version: "4.8.2" ++ testCompile group: "junit", name: "junit", version: "4.8.2" + if (BUILD_CLOSED && DO_JCOV) { +- testImplementation name: "jcov" ++ testCompile name: "jcov" + } + } + +@@ -1953,9 +1941,9 @@ project(":base") { + } + + dependencies { +- testImplementation group: "junit", name: "junit", version: "4.8.2" +- testImplementation sourceSets.main.output +- testImplementation sourceSets.shims.output ++ testCompile group: "junit", name: "junit", version: "4.8.2" ++ testCompile sourceSets.main.output ++ testCompile sourceSets.shims.output + } + + commonModuleSetup(project, [ 'base' ]) +@@ -2029,10 +2017,10 @@ project(":graphics") { + } + + dependencies { +- stubImplementation group: "junit", name: "junit", version: "4.8.2" ++ stubCompile group: "junit", name: "junit", version: "4.8.2" + + antlr group: "org.antlr", name: "antlr4", version: "4.7.2", classifier: "complete" +- implementation project(':base') ++ compile project(':base') + } + + project.ext.moduleSourcePath = defaultModuleSourcePath_GraphicsOne +@@ -2107,7 +2095,7 @@ project(":graphics") { + project.task("compileFullJava", type: JavaCompile, dependsOn: processShaders) { + description = "Compile all of the graphics java classes - main and shaders" + +- classpath = configurations.compileClasspath ++ classpath = configurations.compile + + source = project.sourceSets.main.java.srcDirs + source += "$buildDir/gensrc/java" +@@ -2274,7 +2262,7 @@ project(":graphics") { + executable = JAVA + workingDir = project.projectDir + main = settings.generator +- classpath = configurations.compileClasspath + configurations.antlr ++ classpath = configurations.compile + configurations.antlr + classpath += files(project.sourceSets.jslc.java.outputDir) + + classpath += files("${project.projectDir}/src/jslc/resources") +@@ -2363,7 +2351,7 @@ project(":graphics") { + executable = JAVA + workingDir = project.projectDir + main = "CompileJSL" +- classpath = configurations.compileClasspath + configurations.antlr ++ classpath = configurations.compile + configurations.antlr + classpath += files(project.sourceSets.jslc.java.outputDir) + classpath += files(project.sourceSets.jslc.resources) + classpath += files("$buildDir/classes/jsl-compilers/prism", +@@ -2418,7 +2406,7 @@ project(":graphics") { + } + if (allLibsPresent) return; + +- for (File f : [configurations.compileClasspath.files, configurations.antlr.files].flatten()) { ++ for (File f : [configurations.compile.files, configurations.antlr.files].flatten()) { + copy { + into libsDir + from f.getParentFile() +@@ -2461,10 +2449,10 @@ project(":controls") { + commonModuleSetup(project, [ 'base', 'graphics', 'controls' ]) + + dependencies { +- testImplementation project(":graphics").sourceSets.test.output +- testImplementation project(":base").sourceSets.test.output +- implementation project(':base') +- implementation project(':graphics') ++ testCompile project(":graphics").sourceSets.test.output ++ testCompile project(":base").sourceSets.test.output ++ compile project(':base') ++ compile project(':graphics') + } + + test { +@@ -2543,8 +2531,8 @@ project(":swing") { + } + + dependencies { +- implementation project(":base") +- implementation project(":graphics") ++ compile project(":base") ++ compile project(":graphics") + } + + test { +@@ -2599,7 +2587,7 @@ project(":swt") { + // Skip copy if file is present. + if (swtLib.exists()) return; + +- for (File f : configurations.compileClasspath.files) { ++ for (File f : configurations.compile.files) { + // Have to rename the swt jar because it is some platform specific name but + // for the sake of the IDEs we need to have a single stable name that works + // on every platform +@@ -2663,10 +2651,10 @@ project(":fxml") { + + + dependencies { +- testImplementation project(":graphics").sourceSets.test.output +- testImplementation project(":base").sourceSets.test.output +- implementation project(":base") +- implementation project(":graphics") ++ testCompile project(":graphics").sourceSets.test.output ++ testCompile project(":base").sourceSets.test.output ++ compile project(":base") ++ compile project(":graphics") + } + + test { +@@ -2756,9 +2744,9 @@ project(":fxpackager") { + } + + dependencies { +- antpluginImplementation group: "org.apache.ant", name: "ant", version: "1.8.2" ++ antpluginCompile group: "org.apache.ant", name: "ant", version: "1.8.2" + +- testImplementation project(":controls"), ++ testCompile project(":controls"), + group: "org.apache.ant", name: "ant", version: "1.8.2", + sourceSets.antplugin.output + } +@@ -3328,8 +3316,8 @@ project(":media") { + media name: "ffmpeg-3.3.3", ext: "tar.gz" + media name: "ffmpeg-4.0.2", ext: "tar.gz" + } +- implementation project(":base") +- implementation project(":graphics") ++ compile project(":base") ++ compile project(":graphics") + } + + compileJava.dependsOn updateCacheIfNeeded +@@ -3931,10 +3919,10 @@ project(":web") { + if (IS_COMPILE_WEBKIT) { + icu name: "icu4c-${icuVersion}-data-bin-l", ext: "zip" + } +- implementation project(":base") +- implementation project(":graphics") +- implementation project(":controls") +- implementation project(":media") ++ compile project(":base") ++ compile project(":graphics") ++ compile project(":controls") ++ compile project(":media") + } + + compileJava.dependsOn updateCacheIfNeeded +@@ -3943,8 +3931,8 @@ project(":web") { + from (project.file("$projectDir/src/test/resources/test/html")) { + include "**/archive-*.*" + } +- archiveFileName = "webArchiveJar.jar" +- destinationDirectory = file("$buildDir/testing/resources") ++ archiveName = "webArchiveJar.jar" ++ destinationDir = file("$buildDir/testing/resources") + } + + def gensrcDir = "${buildDir}/gensrc/java" +@@ -4122,7 +4110,7 @@ project(":web") { + def compileJavaDOMBindingTask = task("compileJavaDOMBinding${t.capital}", type: JavaCompile, + dependsOn: [compileJava, compileNativeTask, copyNativeTask]) { + destinationDir = file("$buildDir/classes/java/main") +- classpath = configurations.compileClasspath ++ classpath = configurations.compile + source = project.sourceSets.main.java.srcDirs + options.compilerArgs.addAll([ + '-implicit:none', +@@ -4140,8 +4128,8 @@ project(":web") { + + def drtClasses = "**/com/sun/javafx/webkit/drt/**" + task drtJar(type: Jar, dependsOn: compileJava) { +- archiveFileName = "drt.jar" +- destinationDirectory = file("$buildDir/test") ++ archiveName = "drt.jar" ++ destinationDir = file("$buildDir/test") + from "$buildDir/classes/java/main/javafx.web/" + include drtClasses + includeEmptyDirs = false +@@ -4182,10 +4170,10 @@ project(":systemTests") { + project.ext.moduleName = "systemTests" + + dependencies { +- testImplementation project(":graphics").sourceSets.test.output +- testImplementation project(":base").sourceSets.test.output +- testImplementation project(":controls").sourceSets.test.output +- testImplementation project(":swing").sourceSets.test.output ++ testCompile project(":graphics").sourceSets.test.output ++ testCompile project(":base").sourceSets.test.output ++ testCompile project(":controls").sourceSets.test.output ++ testCompile project(":swing").sourceSets.test.output + } + + def dependentProjects = [ 'base', 'graphics', 'controls', 'media', 'web', 'swing', 'fxml' ] +@@ -4240,8 +4228,8 @@ project(":systemTests") { + dependsOn compileTestapp1Java + enabled = IS_FULL_TEST + +- destinationDirectory = file("$buildDir/testapp1") +- archiveFileName = testapp1JarName ++ destinationDir = file("$buildDir/testapp1") ++ archiveName = testapp1JarName + includeEmptyDirs = false + from project.sourceSets.testapp1.java.outputDir + include("testapp/**") +@@ -4261,8 +4249,8 @@ project(":systemTests") { + dependsOn compileTestapp1Java + enabled = IS_FULL_TEST + +- destinationDirectory = file("$buildDir/testapp1") +- archiveFileName = "jar2.jar"; ++ destinationDir = file("$buildDir/testapp1") ++ archiveName = "jar2.jar"; + includeEmptyDirs = false + from project.sourceSets.testapp1.java.outputDir + include("pkg2/**") +@@ -4415,7 +4403,6 @@ allprojects { project.jar.enabled = false // and redirect the resources into the module @@ -54,7 +302,7 @@ project.processResources.destinationDir = project.moduleDir } -@@ -4385,7 +4372,6 @@ allprojects { +@@ -4449,7 +4436,6 @@ allprojects { project.sourceSets.shims.resources.srcDirs += project.sourceSets.main.resources.srcDirs // and redirect the resources into the module @@ -62,22 +310,121 @@ project.processShimsResources.destinationDir = project.moduleShimsDir compileTestJava.dependsOn(copyGeneratedShimsTask) +@@ -4710,8 +4696,8 @@ compileTargets { t -> + enabled = COMPILE_SWT + group = "Basic" + description = "Creates the javafx-swt.jar for the $t.name target" +- destinationDirectory = file("${project(":swt").buildDir}/libs") +- archiveFileName = "javafx-swt.jar" ++ destinationDir = file("${project(":swt").buildDir}/libs") ++ archiveName = "javafx-swt.jar" + includeEmptyDirs = false + from("${project(":swt").buildDir}/classes/java/main"); + include("**/javafx/embed/swt/**") +@@ -4731,9 +4717,7 @@ compileTargets { t -> + dependsOn(javafxSwtTask) + + doLast() { +- def destDir = javafxSwtTask.destinationDirectory.get() +- def afName = javafxSwtTask.archiveFileName.get() +- ant.jar (update: true, index: true, destfile: "${destDir}/${afName}") ++ ant.jar (update: true, index: true, destfile: "${javafxSwtTask.destinationDir}/${javafxSwtTask.archiveName}") + } + } + +@@ -4899,8 +4883,8 @@ compileTargets { t -> + zipsTask.dependsOn(zipSdkTask) + + def zipDocsTask = task("zipDocs$t.capital", type: Zip, dependsOn: zipSdkTask) { +- destinationDirectory = file("${bundlesDir}") +- archiveFileName = "${docsBundleName}.zip" ++ destinationDir = file("${bundlesDir}") ++ archiveName = "${docsBundleName}.zip" + includeEmptyDirs = false + from docsArtifactsDir + into "${docsBundleName}" +@@ -4908,8 +4892,8 @@ compileTargets { t -> + zipsTask.dependsOn(zipDocsTask) + + def zipJmodsTask = task("zipJmods$t.capital", type: Zip, dependsOn: zipDocsTask) { +- destinationDirectory = file("${bundlesDir}") +- archiveFileName = "${jmodsBundleName}.zip" ++ destinationDir = file("${bundlesDir}") ++ archiveName = "${jmodsBundleName}.zip" + includeEmptyDirs = false + from jmodsArtifactsDir + into "${jmodsBundleName}" +@@ -5180,8 +5164,8 @@ compileTargets { t -> + def dstModularJarDir = "${standaloneLibDir}" + def modularJarName = "${moduleName}.jar" + def modularJarTask = project.task("modularJarStandalone$t.capital", type: Jar, dependsOn: project.assemble) { +- destinationDirectory = file("${dstModularJarDir}") +- archiveFileName = modularJarName ++ destinationDir = file("${dstModularJarDir}") ++ archiveName = modularJarName + includeEmptyDirs = false + from srcClassesDir + } +@@ -5237,8 +5221,8 @@ compileTargets { t -> + // and the standalone sdk should be independent of one another, but seems + // better than the alternatives. + def zipSourceFilesTask = project.task("zipSourceFilesStandalone$t.capital", type: Zip, dependsOn: buildModulesTask) { +- destinationDirectory = file("${standaloneLibDir}") +- archiveFileName = standaloneSrcZipName ++ destinationDir = file("${standaloneLibDir}") ++ archiveName = standaloneSrcZipName + includeEmptyDirs = false + from modulesSrcDir + include "**/*.java" +@@ -5263,8 +5247,8 @@ compileTargets { t -> + + def modularEmptyPublicationJarName = "${moduleName}.jar" + def modularEmptyPublicationJarTask = project.task("moduleEmptyPublicationJar${t.capital}", type: Jar) { +- destinationDirectory = file("${dstModularJarDir}") +- archiveFileName = modularEmptyPublicationJarName ++ destinationDir = file("${dstModularJarDir}") ++ archiveName = modularEmptyPublicationJarName + manifest { + attributes( + 'Automatic-Module-Name':"${moduleName}Empty" +@@ -5274,8 +5258,8 @@ compileTargets { t -> + + def modularPublicationJarName = "${moduleName}-${t.name}.jar" + def modularPublicationJarTask = project.task("modularPublicationJar${t.capital}", type: Jar, dependsOn: modularEmptyPublicationJarTask) { +- destinationDirectory = file("${dstModularJarDir}") +- archiveFileName = modularPublicationJarName ++ destinationDir = file("${dstModularJarDir}") ++ archiveName = modularPublicationJarName + from srcLibsDir + from srcClassesDir + } +@@ -5695,8 +5679,8 @@ compileTargets { t -> + file("${rootProject.buildDir}/${jfxBundle}").delete() + } + +- archiveFileName = jfxBundle +- destinationDirectory = file("${rootProject.buildDir}") ++ archiveName = jfxBundle ++ destinationDir = file("${rootProject.buildDir}") + includeEmptyDirs = false + from "${bundledSdkDir}" + } --- a/build.properties +++ b/build.properties @@ -84,8 +84,8 @@ jfx.build.jdk.buildnum.min=46 # gradle/legal/gradle.md. # The jfx.gradle.version.min property defines the minimum version of gradle # that is supported. It must be <= jfx.gradle.version. --jfx.gradle.version=6.3 --jfx.gradle.version.min=5.3 +-jfx.gradle.version=7.0.1 +-jfx.gradle.version.min=6.3 +jfx.gradle.version=5.3 +jfx.gradle.version.min=4.8 # Toolchains - jfx.build.linux.gcc.version=gcc10.2.0-OL6.4+1.0 + jfx.build.linux.gcc.version=gcc10.3.0-OL6.4+1.0 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle -@@ -61,10 +61,7 @@ repositories { +@@ -60,10 +60,7 @@ repositories { if (buildClosed) { ivy { url jfxRepositoryURL @@ -89,4 +436,138 @@ artifact "[artifact]-[revision].[ext]" artifact "[artifact].[ext]" } +@@ -74,7 +71,7 @@ repositories { + } + + dependencies { +- testImplementation group: "junit", name: "junit", version: "4.8.2" ++ testCompile group: "junit", name: "junit", version: "4.8.2" + } + + // At the moment the ASM library shipped with Gradle that is used to +--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/CCTask.groovy ++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/CCTask.groovy +@@ -23,16 +23,15 @@ + * questions. + */ + +-import org.gradle.api.tasks.Input + import org.gradle.api.tasks.InputDirectory + import org.gradle.api.tasks.Optional + + class CCTask extends NativeCompileTask { +- @Input String compiler; +- @Optional @Input List<String> linkerOptions = new ArrayList<String>(); ++ String compiler; ++ @Optional List<String> linkerOptions = new ArrayList<String>(); + @Optional @InputDirectory File headers; +- @Optional @Input Closure eachOutputFile; // will be given a File and must return a File +- @Input boolean exe = false; ++ @Optional Closure eachOutputFile; // will be given a File and must return a File ++ @Optional boolean exe = false; + + protected File outputFile(File sourceFile) { + final String outFileName = sourceFile.getName().substring(0, sourceFile.getName().lastIndexOf(".")); +--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/CompileResourceTask.groovy ++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/CompileResourceTask.groovy +@@ -23,11 +23,9 @@ + * questions. + */ + +-import org.gradle.api.tasks.Input +- + class CompileResourceTask extends NativeCompileTask { +- @Input List<String> rcParams = new ArrayList<String>(); +- @Input String compiler; ++ List<String> rcParams = new ArrayList<String>(); ++ String compiler; + + protected File outputFile(File sourceFile) { + final String outFileName = sourceFile.getName().substring(0, sourceFile.getName().lastIndexOf(".")); +--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/ExportedSymbolsTask.groovy ++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/ExportedSymbolsTask.groovy +@@ -24,7 +24,6 @@ + */ + + import org.gradle.api.DefaultTask +-import org.gradle.api.tasks.Input + import org.gradle.api.tasks.InputDirectory + import org.gradle.api.tasks.Optional + import org.gradle.api.tasks.OutputFile +@@ -33,7 +32,7 @@ import org.gradle.api.tasks.TaskAction + class ExportedSymbolsTask extends DefaultTask { + @OutputFile File outputFile; + @InputDirectory File libDir; +- @Optional @Input List<String> excludes; ++ @Optional List<String> excludes; + + + @TaskAction void generateExportedSymbols() { +--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/JavaHeaderTask.groovy ++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/JavaHeaderTask.groovy +@@ -26,7 +26,6 @@ + import org.gradle.api.DefaultTask + import org.gradle.api.file.FileCollection + import org.gradle.api.file.FileTree +-import org.gradle.api.tasks.Input + import org.gradle.api.tasks.OutputDirectory + import org.gradle.api.tasks.TaskAction + import org.gradle.api.tasks.util.PatternFilterable +@@ -34,8 +33,8 @@ import org.gradle.api.tasks.util.PatternSet + + class JavaHeaderTask extends DefaultTask { + @OutputDirectory File output; +- @Input List sourceRoots = new ArrayList(); +- @Input FileCollection classpath; ++ List sourceRoots = new ArrayList(); ++ FileCollection classpath; + private final PatternFilterable patternSet = new PatternSet(); + + // @InputFiles public void setSource(Object source) { +--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/LinkTask.groovy ++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/LinkTask.groovy +@@ -24,18 +24,16 @@ + */ + + import org.gradle.api.DefaultTask +-import org.gradle.api.tasks.Input + import org.gradle.api.tasks.InputDirectory + import org.gradle.api.tasks.OutputFile + import org.gradle.api.tasks.TaskAction + + + class LinkTask extends DefaultTask { +- @Input List<String> linkParams = new ArrayList<String>(); ++ List<String> linkParams = new ArrayList<String>(); + @InputDirectory File objectDir; + @OutputFile File lib; +- @Input String linker; +- ++ String linker; + @TaskAction void compile() { + // Link & generate the library (.dll, .so, .dylib) + lib.getParentFile().mkdirs(); +--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy ++++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy +@@ -24,7 +24,6 @@ + */ + + import org.gradle.api.DefaultTask +-import org.gradle.api.tasks.Input + import org.gradle.api.tasks.InputFiles + import org.gradle.api.tasks.Optional + import org.gradle.api.tasks.OutputDirectory +@@ -39,9 +38,9 @@ import java.util.concurrent.Executors + import java.util.concurrent.Future + + class NativeCompileTask extends DefaultTask { +- @Optional @Input String matches; // regex for matching input files +- @Input List<String> params = new ArrayList<String>(); +- @Input List sourceRoots = new ArrayList(); ++ @Optional String matches; // regex for matching input files ++ List<String> params = new ArrayList<String>(); ++ List sourceRoots = new ArrayList(); + @OutputDirectory File output; + @InputFiles List<File> allFiles = []; + private final PatternFilterable patternSet = new PatternSet(); ++++++ openjfx-nowerror.patch ++++++ --- /var/tmp/diff_new_pack.4FuJNa/_old 2022-02-22 21:19:03.734295833 +0100 +++ /var/tmp/diff_new_pack.4FuJNa/_new 2022-02-22 21:19:03.738295835 +0100 @@ -9,7 +9,7 @@ if (!IS_64) { commonFlags += "-m32" -@@ -226,7 +226,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g +@@ -230,7 +230,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g LINUX.glass.glass = [:] LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles() LINUX.glass.glass.compiler = compiler @@ -18,7 +18,7 @@ LINUX.glass.glass.linker = linker LINUX.glass.glass.linkFlags = IS_STATIC_BUILD? linkFlags : [linkFlags, "-lX11", "-ldl"].flatten() LINUX.glass.glass.lib = "glass" -@@ -236,7 +236,7 @@ LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles() +@@ -240,7 +240,7 @@ LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles() LINUX.glass.glassgtk2.compiler = compiler LINUX.glass.glassgtk2.ccFlags = IS_STATIC_BUILD ? ["-fno-threadsafe-statics", cppFlags, gtk2CCFlags].flatten() : @@ -27,7 +27,7 @@ LINUX.glass.glassgtk2.linker = linker LINUX.glass.glassgtk2.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk2LinkFlags].flatten() LINUX.glass.glassgtk2.lib = "glassgtk2" -@@ -246,7 +246,7 @@ LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles() +@@ -250,7 +250,7 @@ LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles() LINUX.glass.glassgtk3.compiler = compiler LINUX.glass.glassgtk3.ccFlags = IS_STATIC_BUILD ? ["-fno-threadsafe-statics", cppFlags, gtk3CCFlags].flatten() : ++++++ openjfx-rpm-build.patch ++++++ --- /var/tmp/diff_new_pack.4FuJNa/_old 2022-02-22 21:19:03.750295837 +0100 +++ /var/tmp/diff_new_pack.4FuJNa/_new 2022-02-22 21:19:03.754295837 +0100 @@ -9,7 +9,7 @@ defineProperty("JDK_JMODS", cygpath(System.getenv("JDK_JMODS")) ?: cygpath(System.getenv("JDK_HOME") + "/jmods")) defineProperty("javaRuntimeVersion", System.getProperty("java.runtime.version")) -@@ -516,10 +516,10 @@ if (IS_MAC) { +@@ -517,10 +517,10 @@ if (IS_MAC) { // // The following properties should be left alone by developers and set only from Hudson. @@ -22,7 +22,7 @@ ext.IS_MILESTONE_FCS = Boolean.parseBoolean(MILESTONE_FCS) // The following properties define the product name for Oracle JDK and OpenJDK -@@ -554,8 +554,10 @@ if (jfxReleasePatchVersion == "0") { +@@ -555,8 +555,10 @@ if (jfxReleasePatchVersion == "0") { defineProperty("RELEASE_VERSION", relVer) defineProperty("RELEASE_VERSION_PADDED", "${jfxReleaseMajorVersion}.${jfxReleaseMinorVersion}.${jfxReleaseSecurityVersion}.${jfxReleasePatchVersion}") @@ -35,7 +35,7 @@ defineProperty("BUILD_TIMESTAMP", buildTimestamp) def relSuffix = "" def relOpt = "" -@@ -568,7 +570,7 @@ if (HUDSON_JOB_NAME == "not_hudson") { +@@ -569,7 +571,7 @@ if (HUDSON_JOB_NAME == "not_hudson") { defineProperty("RELEASE_SUFFIX", relSuffix) defineProperty("RELEASE_VERSION_SHORT", "${RELEASE_VERSION}${RELEASE_SUFFIX}") defineProperty("RELEASE_VERSION_LONG", "${RELEASE_VERSION_SHORT}+${PROMOTED_BUILD_NUMBER}${relOpt}")
