[openjfx] 02/07: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 18 15:58:07 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx.
commit e5d27de32cf007e47630da744d862e45a5c14f84
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 18 14:27:14 2014 +0200
Refreshed the patches
---
debian/changelog | 6 ++++++
debian/patches/01-skip-verify-java.patch | 14 +++++++-------
debian/patches/02-use-system-libraries.patch | 22 +++++++++++-----------
debian/patches/03-buildflags.patch | 6 +++---
4 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 92e3f60..7788f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjfx (8u20-b26-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 18 Sep 2014 14:22:30 +0200
+
openjfx (8u5-b13-1) experimental; urgency=low
* Initial release (Closes: #748413)
diff --git a/debian/patches/01-skip-verify-java.patch b/debian/patches/01-skip-verify-java.patch
index 3cb1489..8d88c51 100644
--- a/debian/patches/01-skip-verify-java.patch
+++ b/debian/patches/01-skip-verify-java.patch
@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -904,7 +904,7 @@
- def buildNum = Integer.parseInt(jdkBuildNumber)
- def minBuildNum = Integer.parseInt(jfxBuildJdkBuildnumMin)
- if (buildNum < minBuildNum) {
-- fail("java build number ($buildNum) < minimum build number ($minBuildNum)")
-+ //fail("java build number ($buildNum) < minimum build number ($minBuildNum)")
+@@ -1020,7 +1020,7 @@
+ def buildNum = Integer.parseInt(jdkBuildNumber)
+ def minBuildNum = Integer.parseInt(jfxBuildJdkBuildnumMin)
+ if (buildNum < minBuildNum) {
+- fail("JDK build number ($buildNum) < minimum build number ($minBuildNum)")
++ //fail("JDK build number ($buildNum) < minimum build number ($minBuildNum)")
+ }
}
}
- }
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 1e7254a..0063d86 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
-@@ -998,12 +998,8 @@
+@@ -1115,12 +1115,8 @@
// closed gradle file instead.
if (!BUILD_CLOSED) {
repositories {
@@ -18,7 +18,7 @@ Forwarded: not-needed
}
}
}
-@@ -1011,7 +1007,7 @@
+@@ -1128,7 +1124,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"
}
-@@ -1124,12 +1120,12 @@
+@@ -1265,12 +1261,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
-@@ -1400,9 +1396,9 @@
+@@ -1550,9 +1546,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
-@@ -1481,7 +1477,7 @@
+@@ -1631,7 +1627,7 @@
}
dependencies {
compile BUILD_SRC, project(":base"), project(":graphics")
@@ -67,7 +67,7 @@ Forwarded: not-needed
}
}
-@@ -1581,7 +1577,7 @@
+@@ -1730,7 +1726,7 @@
}
dependencies {
@@ -76,7 +76,7 @@ Forwarded: not-needed
}
// When producing the jar, we need to relocate a few class files
-@@ -1754,13 +1750,13 @@
+@@ -1928,13 +1924,13 @@
classes << {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
@@ -92,8 +92,8 @@ Forwarded: not-needed
includeEmptyDirs = false
}
}
-@@ -2084,10 +2080,12 @@
- compileTargets { t ->
+@@ -2304,10 +2300,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"
+/*
@@ -105,7 +105,7 @@ Forwarded: not-needed
def webkitOutputDir = "$buildDir/${t.name}"
def webkitConfig = IS_DEBUG_NATIVE ? "Debug" : "Release"
-@@ -2095,11 +2093,13 @@
+@@ -2315,11 +2313,13 @@
def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
@@ -133,7 +133,7 @@ Forwarded: not-needed
}
@@ -81,11 +83,11 @@
- getConfigurations().add("antlr3");
+ getConfigurations().create("antlr3");
dependencies {
- compile group: "org.antlr", name: "antlr", version: "3.1.3"
diff --git a/debian/patches/03-buildflags.patch b/debian/patches/03-buildflags.patch
index bb279ad..83a2612 100644
--- a/debian/patches/03-buildflags.patch
+++ b/debian/patches/03-buildflags.patch
@@ -3,9 +3,9 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
-@@ -79,7 +79,9 @@
+@@ -53,7 +53,9 @@
commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
- IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : "-O2"].flatten()
+ IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
+ccFlags.addAll(["-fstack-protector", "--param=ssp-buffer-size=4", "-Wformat", "-Werror=format-security", "-D_FORTIFY_SOURCE=2"])
def linkFlags = ["-shared", commonFlags].flatten()
@@ -13,7 +13,7 @@ Forwarded: no
// Create $buildDir/linux_tools.properties file and load props from it
setupTools("linux_tools",
-@@ -209,7 +211,7 @@
+@@ -182,7 +184,7 @@
LINUX.iio.compiler = compiler
LINUX.iio.ccFlags = [ccFlags].flatten()
LINUX.iio.linker = linker
--
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