[openjfx] 02/10: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Jan 24 12:08:32 UTC 2017 

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

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

commit ac58004c27292cab617500ee3fcc75e63b11146a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 20 12:06:29 2017 +0100

    Refreshed the patches
---
 debian/changelog                                   |  8 ++++++++
 debian/patches/02-use-system-libraries.patch       |  2 +-
 ...07-disable-assembler-on-unsupported-archs.patch |  2 +-
 .../09-fix-conflicting-uchar32-typedef.patch       |  6 +++---
 debian/patches/10-javadoc-locale.patch             |  2 +-
 debian/patches/11-icu-dynamic-linking.patch        |  4 ++--
 debian/patches/12-generic-qmake-spec.patch         | 24 ----------------------
 debian/patches/fix-arm64-build.patch               | 12 ++++-------
 debian/patches/series                              |  1 -
 9 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a49d534..a25ec7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjfx (8u121-b13-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 Jan 2017 11:58:13 +0100
+
 openjfx (8u111-b14-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 4b9c7f6..c8ecc90 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
              }
          }
-@@ -2522,13 +2522,13 @@
+@@ -2533,13 +2533,13 @@
  
          def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
              println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
diff --git a/debian/patches/07-disable-assembler-on-unsupported-archs.patch b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
index 551a1e8..b3892b8 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
-@@ -325,6 +325,12 @@
+@@ -352,6 +352,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 986f33a..d6c812d 100644
--- a/debian/patches/09-fix-conflicting-uchar32-typedef.patch
+++ b/debian/patches/09-fix-conflicting-uchar32-typedef.patch
@@ -3,10 +3,10 @@ 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
-@@ -22,7 +22,7 @@
- #endif
+@@ -26,7 +26,7 @@
+ // #endif
  
- #ifndef __UMACHINE_H__
+ #ifndef __UMACHINE_H__ //XXX: recheck
 -typedef uint32_t UChar32;
 +typedef int32_t UChar32;
  #endif
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index 39d346a..c5db904 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);
-@@ -2769,6 +2770,7 @@
+@@ -2751,6 +2752,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 39a392b..e899a05 100644
--- a/debian/patches/11-icu-dynamic-linking.patch
+++ b/debian/patches/11-icu-dynamic-linking.patch
@@ -4,13 +4,13 @@ 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 -ldl
+-        LIBS += -Wl,-Bstatic -licui18n -licuuc -licudata -Wl,-Bdynamic
 +        LIBS += -licui18n -licuuc -licudata -ldl
      }
      solaris-cc {
diff --git a/debian/patches/12-generic-qmake-spec.patch b/debian/patches/12-generic-qmake-spec.patch
deleted file mode 100644
index 55b34ea..0000000
--- a/debian/patches/12-generic-qmake-spec.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Build using the qmake linux-g++ spec
-Author: Matthias Klose <doko at ubuntu.com>
-Forwarded: no
---- a/build.gradle
-+++ b/build.gradle
-@@ -2563,17 +2563,9 @@
-                         "QMAKE_LFLAGS"   : "-m64",
-                     ])
-                 } else if (t.name == "linux") {
--                    if (IS_64) {
-                         environment([
--                            "QMAKESPEC"      : "linux-g++-64",
-+                            "QMAKESPEC"      : "linux-g++",
-                         ])
--                    } else {
--                        environment([
--                            "QMAKESPEC"      : "linux-g++-32",
--                            "QMAKE_CFLAGS"   : "-m32",
--                            "QMAKE_LFLAGS"   : "-m32",
--                        ])
--                    }
-                 } else if (t.name.startsWith("arm")) {
-                     // ARM cross build
-                     def webkitProperties = project.rootProject.ext[t.upper].webkit
diff --git a/debian/patches/fix-arm64-build.patch b/debian/patches/fix-arm64-build.patch
index 17e32e0..ab57413 100644
--- a/debian/patches/fix-arm64-build.patch
+++ b/debian/patches/fix-arm64-build.patch
@@ -5,11 +5,9 @@ Description: Fix arm64 build
  Fix some other areas where disabling JIT doesn't work.
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
 Forwarded: no
-Index: b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-===================================================================
 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -164,6 +164,14 @@
+@@ -181,6 +181,14 @@
  #define WTF_CPU_ARM64 1
  #endif
  
@@ -24,8 +22,8 @@ Index: b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
  /* CPU(ARM) - ARM, any version*/
  #define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N)
  
-@@ -973,7 +981,7 @@
- #define WTF_USE_IMLANG_FONT_LINK2 1
+@@ -1032,7 +1040,7 @@
+ #define USE_IMLANG_FONT_LINK2 1
  #endif
  
 -#if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) || (COMPILER(GCC) && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM64))))
@@ -33,11 +31,9 @@ Index: b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
  #define ENABLE_COMPARE_AND_SWAP 1
  #endif
  
-Index: b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
-===================================================================
 --- a/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
 +++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
-@@ -1035,7 +1035,7 @@ TransformationMatrix TransformationMatri
+@@ -1035,7 +1035,7 @@
  // this = mat * this.
  TransformationMatrix& TransformationMatrix::multiply(const TransformationMatrix& mat)
  {
diff --git a/debian/patches/series b/debian/patches/series
index 28ab6a7..9108461 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@
 09-fix-conflicting-uchar32-typedef.patch
 10-javadoc-locale.patch
 11-icu-dynamic-linking.patch
-12-generic-qmake-spec.patch
 fix-arm64-build.patch
 fix-arm32-build.patch
 15-fix-javadoc-refererences.diff

-- 
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