[openjfx] 02/05: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Oct 4 10:58:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx.
commit 820bd1d7ab11c3f0a82218f4206669775b4157eb
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Sep 11 13:23:46 2015 +0200
Refreshed the patches
---
debian/changelog | 7 ++++++
debian/patches/01-skip-verify-java.patch | 2 +-
debian/patches/02-use-system-libraries.patch | 29 ++++++----------------
debian/patches/03-buildflags.patch | 4 +--
debian/patches/05-set-antlr-timeout.patch | 9 +++----
.../06-disable-architecture-verification.patch | 4 +--
...07-disable-assembler-on-unsupported-archs.patch | 2 +-
.../09-fix-conflicting-uchar32-typedef.patch | 17 +++----------
debian/patches/10-javadoc-locale.patch | 2 +-
debian/patches/series | 2 +-
10 files changed, 29 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 02f7857..66a6220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjfx (8u60-b27-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 07 Sep 2015 23:40:56 +0200
+
openjfx (8u40-b25-3) unstable; urgency=medium
* Fixed a build failure with antlr 3.5.2
diff --git a/debian/patches/01-skip-verify-java.patch b/debian/patches/01-skip-verify-java.patch
index 4327287..20a9422 100644
--- a/debian/patches/01-skip-verify-java.patch
+++ b/debian/patches/01-skip-verify-java.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1055,7 +1055,7 @@
+@@ -1059,7 +1059,7 @@
def buildNum = Integer.parseInt(jdkBuildNumber)
def minBuildNum = Integer.parseInt(jfxBuildJdkBuildnumMin)
if (buildNum < minBuildNum) {
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 8e00385..a05efee 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1144,12 +1144,8 @@
+@@ -1148,12 +1148,8 @@
// closed gradle file instead.
if (!BUILD_CLOSED) {
repositories {
@@ -18,7 +18,7 @@ Forwarded: not-needed
}
}
}
-@@ -1157,7 +1153,7 @@
+@@ -1161,7 +1157,7 @@
// By default all of our projects require junit for testing so we can just
// setup this dependency here.
dependencies {
@@ -27,7 +27,7 @@ Forwarded: not-needed
if (BUILD_CLOSED && DO_JCOV) {
testCompile name: "jcov"
}
-@@ -1295,12 +1291,12 @@
+@@ -1299,12 +1295,12 @@
dependencies {
compile project(":base"), BUILD_SRC
@@ -45,7 +45,7 @@ Forwarded: not-needed
}
// Create a single "native" task which will depend on all the individual native tasks for graphics
-@@ -1582,9 +1578,9 @@
+@@ -1594,9 +1590,9 @@
copy {
into libsDir
from f.getParentFile()
@@ -58,7 +58,7 @@ Forwarded: not-needed
includeEmptyDirs = false
}
// Have to rename the swt jar because it is some platform specific name but
-@@ -1665,7 +1661,7 @@
+@@ -1680,7 +1676,7 @@
}
dependencies {
compile BUILD_SRC, project(":base"), project(":graphics")
@@ -67,7 +67,7 @@ Forwarded: not-needed
}
}
-@@ -1781,7 +1777,7 @@
+@@ -1779,7 +1775,7 @@
}
dependencies {
@@ -76,7 +76,7 @@ Forwarded: not-needed
}
// When producing the jar, we need to relocate a few class files
-@@ -2044,13 +2040,13 @@
+@@ -2043,13 +2039,13 @@
classes << {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
@@ -92,20 +92,7 @@ Forwarded: not-needed
includeEmptyDirs = false
}
}
-@@ -2494,10 +2490,12 @@
- def targetProperties = project.rootProject.ext[t.upper]
- def classifier = (t.name != "linux" && t.name != "win") ? t.name :
- IS_64 ? "${t.name}-amd64" : "${t.name}-i586"
-+/*
- dependencies {
- webkit group: "com.sun.webkit", name: "webview-deps",
- version: "1.2", classifier: "$classifier", ext: "zip"
- }
-+*/
-
- def webkitOutputDir = "$buildDir/${t.name}"
- def webkitConfig = IS_DEBUG_NATIVE ? "Debug" : "Release"
-@@ -2505,11 +2503,13 @@
+@@ -2510,11 +2506,13 @@
def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
diff --git a/debian/patches/03-buildflags.patch b/debian/patches/03-buildflags.patch
index 9b133a3..a6207c0 100644
--- a/debian/patches/03-buildflags.patch
+++ b/debian/patches/03-buildflags.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
-@@ -55,7 +55,9 @@
+@@ -54,7 +54,9 @@
commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
@@ -13,7 +13,7 @@ Forwarded: no
// Create $buildDir/linux_tools.properties file and load props from it
setupTools("linux_tools",
-@@ -197,7 +199,7 @@
+@@ -196,7 +198,7 @@
LINUX.iio.compiler = compiler
LINUX.iio.ccFlags = [ccFlags].flatten()
LINUX.iio.linker = linker
diff --git a/debian/patches/05-set-antlr-timeout.patch b/debian/patches/05-set-antlr-timeout.patch
index 44a396a..b7f5c7c 100644
--- a/debian/patches/05-set-antlr-timeout.patch
+++ b/debian/patches/05-set-antlr-timeout.patch
@@ -1,11 +1,9 @@
Description: Increase the timeout for processing the ANTLR grammar. This fixes a build failure on slow machines.
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
-Index: openjfx-8u20-b26/buildSrc/build.gradle
-===================================================================
---- openjfx-8u20-b26.orig/buildSrc/build.gradle
-+++ openjfx-8u20-b26/buildSrc/build.gradle
-@@ -116,7 +116,7 @@ task generateGrammarSource(type: JavaExe
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -117,7 +117,7 @@
def grammars = fileTree(src).include("**/*.g")
main = "org.antlr.Tool"
classpath = configurations.antlr3
@@ -14,4 +12,3 @@ Index: openjfx-8u20-b26/buildSrc/build.gradle
// See RT-30955. This should be removed when JDK-8015656 is fixed
ignoreExitValue = true
}
-
diff --git a/debian/patches/06-disable-architecture-verification.patch b/debian/patches/06-disable-architecture-verification.patch
index d76fd64..d10e628 100644
--- a/debian/patches/06-disable-architecture-verification.patch
+++ b/debian/patches/06-disable-architecture-verification.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -693,6 +693,7 @@
+@@ -699,6 +699,7 @@
// at present building on PI is not supported, but we would only need to make
// some changes on assumptions on what should be built (like SWT / Swing) and
// such and we could probably make it work.
@@ -11,7 +11,7 @@ Forwarded: no
if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
-@@ -701,6 +702,7 @@
+@@ -707,6 +708,7 @@
} else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
}
diff --git a/debian/patches/07-disable-assembler-on-unsupported-archs.patch b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
index aad1718..551a1e8 100644
--- a/debian/patches/07-disable-assembler-on-unsupported-archs.patch
+++ b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -330,6 +330,12 @@
+@@ -325,6 +325,12 @@
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
diff --git a/debian/patches/09-fix-conflicting-uchar32-typedef.patch b/debian/patches/09-fix-conflicting-uchar32-typedef.patch
index 0d266ee..986f33a 100644
--- a/debian/patches/09-fix-conflicting-uchar32-typedef.patch
+++ b/debian/patches/09-fix-conflicting-uchar32-typedef.patch
@@ -3,23 +3,12 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
+++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
-@@ -21,7 +21,7 @@
- typedef uint16_t UChar;
+@@ -22,7 +22,7 @@
#endif
+ #ifndef __UMACHINE_H__
-typedef uint32_t UChar32;
+typedef int32_t UChar32;
+ #endif
#define U_MASK(x) ((uint32_t)1<<(x))
- #define USE_FAST_PATH(c, fast, slow) ((c) <= 0x7F ? fast((char)c) : slow(c))
---- a/modules/web/src/main/native/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
-@@ -31,7 +31,7 @@
- #include <wtf/unicode/UnicodeMacrosFromICU.h>
-
- typedef wchar_t UChar;
--typedef uint32_t UChar32;
-+typedef int32_t UChar32;
-
- namespace WTF {
- namespace Unicode {
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index ecd98d6..cedc697 100644
--- a/debian/patches/10-javadoc-locale.patch
+++ b/debian/patches/10-javadoc-locale.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -1210,6 +1210,7 @@
+@@ -1214,6 +1214,7 @@
} else {
options.links(JDK_DOCS);
}
diff --git a/debian/patches/series b/debian/patches/series
index 18ff096..9f7900b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,4 @@
08-disable-sse2.patch
09-fix-conflicting-uchar32-typedef.patch
10-javadoc-locale.patch
-gradle-2.x.patch
+#gradle-2.x.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git
More information about the pkg-java-commits
mailing list