[openjfx] 02/03: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Oct 22 23:17:29 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 0fc8fecfbc660e0fcb68428587fe152c02f19f06
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 23 00:24:34 2017 +0200

    Refreshed the patches
---
 debian/changelog                                   |  8 ++++
 debian/patches/02-use-system-libraries.patch       | 16 -------
 ...07-disable-assembler-on-unsupported-archs.patch |  2 +-
 debian/patches/08-disable-sse2.patch               | 11 -----
 debian/patches/10-javadoc-locale.patch             |  2 +-
 .../19-disable-webkit-sampling-profiler.patch      |  8 ++--
 debian/patches/20-fix-ppc-build.patch              | 17 --------
 debian/patches/21-gcc7-compatibility.patch         | 49 ++++++++--------------
 debian/patches/23-webcore-linker-flags.patch       | 18 ++++----
 debian/patches/25-webkit-debug-level.patch         |  8 ++--
 .../patches/26-disable-webkit-jit-for-armv4.patch  |  2 +-
 debian/patches/fix-arm32-build.patch               | 28 ++++---------
 debian/patches/fix-arm64-build.patch               |  2 +-
 debian/patches/series                              |  1 -
 14 files changed, 56 insertions(+), 116 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 632bf10..ce2516f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjfx (8u151-b12-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release:
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 22 Oct 2017 22:59:45 +0200
+
 openjfx (8u141-b14-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index c8ecc90..3293294 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -37,22 +37,6 @@ Forwarded: not-needed
                  includeEmptyDirs = false
              }
          }
-@@ -2533,13 +2533,13 @@
- 
-         def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
-             println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
--
-+/*
-             def dependencyFile = configurations.webkit.filter(
-                     { File f -> f.getName().contains(classifier) }
-                 ).getSingleFile()
-             ant.unzip(src:  dependencyFile,
-                       dest: webkitOutputDir)
--
-+*/
-             exec {
-                 workingDir("$projectDir/src/main/native")
-                 commandLine("perl", "Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
 @@ -82,6 +82,7 @@
diff --git a/debian/patches/07-disable-assembler-on-unsupported-archs.patch b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
index 5a83289..2b387f4 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
-@@ -352,6 +352,12 @@
+@@ -360,6 +360,12 @@
  #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
  #endif
  
diff --git a/debian/patches/08-disable-sse2.patch b/debian/patches/08-disable-sse2.patch
index ece17e7..d3e1979 100644
--- a/debian/patches/08-disable-sse2.patch
+++ b/debian/patches/08-disable-sse2.patch
@@ -62,14 +62,3 @@ Forwarded: no
  	PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
  	PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
  
---- a/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
-+++ b/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
-@@ -2037,7 +2037,7 @@
-     # Compiler options to keep floating point values consistent
-     # between 32-bit and 64-bit architectures.
-     determineArchitecture();
--    if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
-+    if ($architecture eq "i686" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
-         $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
-     }
- 
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index c5db904..30daf97 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);
-@@ -2751,6 +2752,7 @@
+@@ -2724,6 +2725,7 @@
      options.windowTitle("${javadocTitle}")
      options.header("${javadocHeader}")
      options.bottom("${javadocBottom}")
diff --git a/debian/patches/19-disable-webkit-sampling-profiler.patch b/debian/patches/19-disable-webkit-sampling-profiler.patch
index d711bd8..ade64c5 100644
--- a/debian/patches/19-disable-webkit-sampling-profiler.patch
+++ b/debian/patches/19-disable-webkit-sampling-profiler.patch
@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/modules/web/src/main/native/Source/cmake/WebKitFeatures.cmake
 +++ b/modules/web/src/main/native/Source/cmake/WebKitFeatures.cmake
-@@ -171,7 +171,7 @@
-     WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_TIMING "Toggle Resource Timing support" PRIVATE OFF)
+@@ -163,7 +163,7 @@
+     WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" PRIVATE OFF)
      WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_USAGE "Toggle resource usage support" PRIVATE OFF)
      WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
 -    WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE ON)
 +    WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE OFF)
-     WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" PRIVATE OFF)
      WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" PRIVATE OFF)
-     WEBKIT_OPTION_DEFINE(ENABLE_SHADOW_DOM "Toggle shadow dom" PRIVATE OFF)
+     WEBKIT_OPTION_DEFINE(ENABLE_SMOOTH_SCROLLING "Toggle smooth scrolling" PRIVATE OFF)
+     WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" PRIVATE OFF)
diff --git a/debian/patches/20-fix-ppc-build.patch b/debian/patches/20-fix-ppc-build.patch
deleted file mode 100644
index 9884f73..0000000
--- a/debian/patches/20-fix-ppc-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fixes a build failure on ppc
-Origin: backport, http://trac.webkit.org/changeset/198919/webkit
-Bug: https://bugs.webkit.org/show_bug.cgi?id=156015
---- a/modules/web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ b/modules/web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -86,7 +86,11 @@
-     }
- 
-     ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
-+#if CPU(PPC)
-+    thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
-+#else
-     thread->suspendedMachineContext = userContext->uc_mcontext;
-+#endif
- 
-     // Allow suspend caller to see that this thread is suspended.
-     // sem_post is async-signal-safe function. It means that we can call this from a signal handler.
diff --git a/debian/patches/21-gcc7-compatibility.patch b/debian/patches/21-gcc7-compatibility.patch
index 59c911c..106e2a5 100644
--- a/debian/patches/21-gcc7-compatibility.patch
+++ b/debian/patches/21-gcc7-compatibility.patch
@@ -1,54 +1,41 @@
 Description: Fixes the compilation errors with GCC 7
 Origin: backport, http://trac.webkit.org/changeset/217601/webkit
-                  http://trac.webkit.org/changeset/211434/webkit
                   http://trac.webkit.org/changeset/218488/webkit
 --- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
 +++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-@@ -26,8 +26,10 @@
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+@@ -38,7 +38,9 @@
+ define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name")
  
- if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ if (COMPILER_IS_GCC_OR_CLANG)
 +    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
-     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing")
-     # set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing") #//XXX disable RTTI?
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
-     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing -fno-rtti")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
  endif ()
---- a/modules/web/src/main/native/Source/JavaScriptCore/runtime/JSArrayBufferView.h
-+++ b/modules/web/src/main/native/Source/JavaScriptCore/runtime/JSArrayBufferView.h
-@@ -162,7 +162,7 @@
-     bool isNeutered() { return hasArrayBuffer() && !vector(); }
-     void neuter();
- 
--    void* vector()
-+    void* vector() const
-     {
-         return m_vector.getPredicated(
-             this,
 --- a/modules/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
 +++ b/modules/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-@@ -29,6 +29,7 @@
+@@ -28,6 +28,7 @@
  
  #include "InspectorFrontendRouter.h"
  #include "InspectorProtocolTypes.h"
 +#include <functional>
+ #include <wtf/DeprecatedOptional.h>
  #include <wtf/Optional.h>
  #include <wtf/RefCounted.h>
- #include <wtf/text/WTFString.h>
 --- a/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
 +++ b/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
-@@ -23,6 +23,7 @@
+@@ -22,6 +22,7 @@
  
- #include "ExceptionCode.h"
+ #include "ExceptionOr.h"
  #include "URLHash.h"
 +#include <functional>
+ #include <wtf/HashMap.h>
  #include <wtf/ListHashSet.h>
  #include <wtf/RefCounted.h>
- #include <wtf/RefPtr.h>
 --- a/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
 +++ b/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
  #include "CSSParserMode.h"
  #include "CachePolicy.h"
  #include "URL.h"
@@ -58,18 +45,18 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
  #include <wtf/RefCounted.h>
 --- a/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
 +++ b/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
-@@ -28,6 +28,7 @@
- 
- #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+@@ -27,6 +27,7 @@
  
+ #include "RenderTreeUpdater.h"
+ #include "ShadowRoot.h"
 +#include <functional>
  #include <wtf/HashMap.h>
  #include <wtf/HashSet.h>
  #include <wtf/Vector.h>
 --- a/modules/web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
 +++ b/modules/web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
-@@ -30,6 +30,7 @@
- #define NetscapePlugInStreamLoader_h
+@@ -29,6 +29,7 @@
+ #pragma once
  
  #include "ResourceLoader.h"
 +#include <functional>
@@ -85,4 +72,4 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
 +#include <functional>
  #include <wtf/Forward.h>
  
- namespace WTF {
+ #if ENABLE(CONTENT_EXTENSIONS)
diff --git a/debian/patches/23-webcore-linker-flags.patch b/debian/patches/23-webcore-linker-flags.patch
index a25631c..33f17af 100644
--- a/debian/patches/23-webcore-linker-flags.patch
+++ b/debian/patches/23-webcore-linker-flags.patch
@@ -4,12 +4,12 @@ Forwarded: no
 Bug-Debian: https://bugs.debian.org/857464
 --- a/modules/web/src/main/native/Source/WebCore/CMakeLists.txt
 +++ b/modules/web/src/main/native/Source/WebCore/CMakeLists.txt
-@@ -3809,7 +3809,7 @@
- if (APPLE)
-     set_target_properties(WebCore PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
- elseif (UNIX)
--    set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
-+    set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
- elseif (WIN32)
-     # Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
-     set_target_properties(WebCore PROPERTIES LINK_FLAGS "${CMAKE_BINARY_DIR}/WebCore/obj/version.res")
+@@ -3837,7 +3837,7 @@
+         set_target_properties(WebCore PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
+         add_custom_target(WebCore_map DEPENDS "${WEBCORE_DIR}/mapfile-macosx")
+     elseif (UNIX)
+-        set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
++        set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
+         add_custom_target(WebCore_map DEPENDS "${WEBCORE_DIR}/mapfile-vers")
+     elseif (WIN32)
+         # Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
diff --git a/debian/patches/25-webkit-debug-level.patch b/debian/patches/25-webkit-debug-level.patch
index a2e9f1e..6b14fa1 100644
--- a/debian/patches/25-webkit-debug-level.patch
+++ b/debian/patches/25-webkit-debug-level.patch
@@ -4,12 +4,12 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
 +++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-@@ -32,6 +32,8 @@
+@@ -43,6 +43,8 @@
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
-     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing -fno-rtti")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
 +    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g1")
 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g1")
  endif ()
  
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND CMAKE_GENERATOR STREQUAL "Ninja")
+ if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
diff --git a/debian/patches/26-disable-webkit-jit-for-armv4.patch b/debian/patches/26-disable-webkit-jit-for-armv4.patch
index 7c28b90..443d64f 100644
--- a/debian/patches/26-disable-webkit-jit-for-armv4.patch
+++ b/debian/patches/26-disable-webkit-jit-for-armv4.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
-@@ -759,6 +759,11 @@
+@@ -738,6 +738,11 @@
  #define ENABLE_JIT 1
  #endif
  
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
index 5db86bd..9f451fc 100644
--- a/debian/patches/fix-arm32-build.patch
+++ b/debian/patches/fix-arm32-build.patch
@@ -1,8 +1,6 @@
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -55,11 +55,6 @@ INCLUDES += $(shell pkg-config --cflags
+@@ -55,11 +55,6 @@
  LDFLAGS  += $(shell pkg-config --libs libavcodec libavformat)
  endif
  
@@ -14,11 +12,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefil
  SOURCES = av/fxavcodecplugin.c  \
            av/avelement.c        \
            av/decoder.c          \
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -45,11 +45,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
+@@ -45,11 +45,6 @@
  
  LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) 
  
@@ -30,11 +26,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefi
  SOURCES = fxplugins.c                        \
            progressbuffer/progressbuffer.c    \
            progressbuffer/hlsprogressbuffer.c \
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-@@ -70,11 +70,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
+@@ -70,11 +70,6 @@
  
  LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) 
  
@@ -46,11 +40,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/M
  SOURCES = \
       gstreamer/gst/gst.c                                             \
       gstreamer/gst/gstbin.c                                          \
-Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-===================================================================
 --- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
 +++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -67,11 +67,6 @@ CFLAGS  += $(shell dpkg-buildflags --get
+@@ -67,11 +67,6 @@
  CFLAGS  += $(shell dpkg-buildflags --get CFLAGS) -Wall
  LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  
@@ -62,11 +54,9 @@ Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
  CPP_SOURCES = \
          jni/com_sun_media_jfxmedia_logging_Logger.cpp           \
          jni/JavaBandsHolder.cpp 				\
-Index: b/buildSrc/linux.gradle
-===================================================================
 --- a/buildSrc/linux.gradle
 +++ b/buildSrc/linux.gradle
-@@ -48,10 +48,6 @@ def commonFlags = [
+@@ -48,10 +48,6 @@
  commonFlags.addAll("dpkg-buildflags --get CPPFLAGS  ".execute().text.trim().split(" "))
  commonFlags.addAll("dpkg-buildflags --get CXXFLAGS".execute().text.trim().split(" "))
  
@@ -77,7 +67,7 @@ Index: b/buildSrc/linux.gradle
  // Specify the compilation parameters and link parameters
  def ccFlags = [
          commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
-@@ -179,20 +175,12 @@ LINUX.launcher.compiler = compiler
+@@ -179,20 +175,12 @@
  LINUX.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
  LINUX.launcher.linker = linker
  LINUX.launcher.linkFlags = ["-ldl"]
@@ -100,9 +90,9 @@ Index: b/buildSrc/linux.gradle
  LINUX.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 --- a/build.gradle
 +++ b/build.gradle
-@@ -2568,9 +2568,6 @@
-                 } else if (t.name == "mac") {
-                     // Add any osx specific flags.
+@@ -2556,9 +2556,6 @@
+                     // JFX WebKit needs atleast 10.9 OSX
+                     cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
                  } else if (t.name == "linux") {
 -                    if (!IS_64) {
 -                        cmakeArgs = "-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
diff --git a/debian/patches/fix-arm64-build.patch b/debian/patches/fix-arm64-build.patch
index bc17b35..f9d4450 100644
--- a/debian/patches/fix-arm64-build.patch
+++ b/debian/patches/fix-arm64-build.patch
@@ -7,7 +7,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
 Forwarded: no
 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -179,6 +179,9 @@
+@@ -187,6 +187,9 @@
  /* CPU(ARM64) - Apple */
  #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
  #define WTF_CPU_ARM64 1
diff --git a/debian/patches/series b/debian/patches/series
index 9d45798..bfc3140 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,6 @@ fix-arm32-build.patch
 16-reproducible-build-timestamp.patch
 17-gcc-compatibility.patch
 19-disable-webkit-sampling-profiler.patch
-20-fix-ppc-build.patch
 21-gcc7-compatibility.patch
 22-JDK-8185792-accented-characters-support.patch
 23-webcore-linker-flags.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