[openjfx] 03/05: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 3371a80c6937319448f81d049ddffb34606678aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 26 11:15:30 2016 +0200

    Refreshed the patches
---
 debian/changelog                             | 4 +++-
 debian/patches/02-use-system-libraries.patch | 2 +-
 debian/patches/10-javadoc-locale.patch       | 2 +-
 debian/patches/11-icu-dynamic-linking.patch  | 6 +++---
 debian/patches/12-generic-qmake-spec.patch   | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efbb03a..9078a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-openjfx (8u91-b14-2) UNRELEASED; urgency=medium
+openjfx (8u102-b14-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Fixed the build failure when building only the arch indep packages
     (Closes: #825276)
   * Improved the reproducibility:
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index e436e3d..d3428a2 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -37,7 +37,7 @@ Forwarded: not-needed
                  includeEmptyDirs = false
              }
          }
-@@ -2509,13 +2509,13 @@
+@@ -2522,13 +2522,13 @@
  
          def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
              println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index a864e3e..39d346a 100644
--- a/debian/patches/10-javadoc-locale.patch
+++ b/debian/patches/10-javadoc-locale.patch
@@ -11,7 +11,7 @@ Forwarded: no
          options.addBooleanOption("XDignore.symbol.file").setValue(true);
          options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
          options.addBooleanOption("javafx").setValue(true);
-@@ -2755,6 +2756,7 @@
+@@ -2769,6 +2770,7 @@
      options.windowTitle("${javadocTitle}")
      options.header("${javadocHeader}")
      options.bottom("${javadocBottom}")
diff --git a/debian/patches/11-icu-dynamic-linking.patch b/debian/patches/11-icu-dynamic-linking.patch
index 34780a2..39a392b 100644
--- a/debian/patches/11-icu-dynamic-linking.patch
+++ b/debian/patches/11-icu-dynamic-linking.patch
@@ -4,14 +4,14 @@ Forwarded: not-needed
 --- a/modules/web/src/main/native/Source/WebCore/TargetJava.pri
 +++ b/modules/web/src/main/native/Source/WebCore/TargetJava.pri
 @@ -229,9 +229,9 @@
-         # just for build debug: force verboce output from linker 
+         # just for build debug: force verboce output from linker
          QMAKE_LFLAGS +=  -Wl,--verbose
  
 -        # statically link with icu libraries in order to avoid version conflict
 +        # link with icu libraries
          QMAKE_LFLAGS += `pkg-config --libs-only-L icu-uc`
--        LIBS += -Wl,-Bstatic -licui18n -licuuc -licudata -Wl,-Bdynamic
-+        LIBS += -licui18n -licuuc -licudata
+-        LIBS += -Wl,-Bstatic -licui18n -licuuc -licudata -Wl,-Bdynamic -ldl
++        LIBS += -licui18n -licuuc -licudata -ldl
      }
      solaris-cc {
          QMAKE_LFLAGS += -M$$PWD/mapfile-vers
diff --git a/debian/patches/12-generic-qmake-spec.patch b/debian/patches/12-generic-qmake-spec.patch
index d24102b..55b34ea 100644
--- a/debian/patches/12-generic-qmake-spec.patch
+++ b/debian/patches/12-generic-qmake-spec.patch
@@ -3,7 +3,7 @@ Author: Matthias Klose <doko at ubuntu.com>
 Forwarded: no
 --- a/build.gradle
 +++ b/build.gradle
-@@ -2550,17 +2550,9 @@
+@@ -2563,17 +2563,9 @@
                          "QMAKE_LFLAGS"   : "-m64",
                      ])
                  } else if (t.name == "linux") {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git