qt5-qtwebengine sync with qt5-qtbase

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qt5-qtwebengine sync with qt5-qtbase
From: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Date: Mon, 17 Jun 2019 16:07:06 +0000
Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Mon Jun 17 18:07:06 2019 +0200
Changeset:	b0b592be22034fa71e2f378649e820c8eed9c52b

Modified Files:
	qt5-qtwebengine/Makefile
	qt5-qtwebengine/PLIST
	qt5-qtwebengine/distinfo
	qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn
Added Files:
	qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf
	qt5-qtwebengine/patches/patch-src_3rdparty_gn_build_build_mac.ninja.template
Removed Files:
	qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gn_bootstrap_build_mac.ninja.template

Log Message:
qt5-qtwebengine sync with qt5-qtbase

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b0b592be22034fa71e2f378649e820c8eed9c52b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt5-qtwebengine/Makefile                           |  7 ++-
 qt5-qtwebengine/PLIST                              |  2 +
 qt5-qtwebengine/distinfo                           | 13 ++---
 .../patches/patch-mkspecs_features_platform.prf    | 62 ++++++++++++++++++++++
 ..._3rdparty_chromium_build_toolchain_mac_BUILD.gn | 14 ++---
 ...ium_tools_gn_bootstrap_build_mac.ninja.template | 13 -----
 ...-src_3rdparty_gn_build_build_mac.ninja.template | 13 +++++
 7 files changed, 96 insertions(+), 28 deletions(-)

diffs:
diff --git a/qt5-qtwebengine/Makefile b/qt5-qtwebengine/Makefile
index 73c8628ffa..81580fd249 100644
--- a/qt5-qtwebengine/Makefile
+++ b/qt5-qtwebengine/Makefile
@@ -27,8 +27,10 @@ LDFLAGS+=	-Wl,-no-keep-memory -Wl-reduce-memory
 .endif
 
 CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/icu/android/patch_locale.sh
+CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/icu/cast/patch_locale.sh
 CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/icu/source/configure
 CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/protobuf/post_process_dist.sh
+CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/sqlite/src/configure
 CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/buildit/build_llvm
 CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal
 CHECK_PORTABILITY_SKIP+=	src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal.in
@@ -56,13 +58,13 @@ post-install:
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/libvpx/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
 # alsa pulseaudio
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .endif
@@ -77,4 +79,5 @@ PYTHON_VERSIONS_ACCEPTED=	27
 #.include "../../lang/ruby/buildlink3.mk"
 #BUILDLINK_DEPMETHOD.${RUBY_BASE}=	build
 .include "../../mk/curses.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt5-qtwebengine/PLIST b/qt5-qtwebengine/PLIST
index 48d96a5493..88dad9d946 100644
--- a/qt5-qtwebengine/PLIST
+++ b/qt5-qtwebengine/PLIST
@@ -1 +1,3 @@
 @comment $NetBSD$
+lib/pkgconfig/Qt5WebEngine.pc
+lib/pkgconfig/Qt5WebEngineWidgets.pc
diff --git a/qt5-qtwebengine/distinfo b/qt5-qtwebengine/distinfo
index 57315597c9..24f8aa54e8 100644
--- a/qt5-qtwebengine/distinfo
+++ b/qt5-qtwebengine/distinfo
@@ -1,8 +1,9 @@
 $NetBSD: distinfo,v 1.9 2017/04/26 10:27:43 wiz Exp $
 
-SHA1 (qtwebengine-everywhere-src-5.11.1.tar.xz) = cbea98f39b064ad4f656b76086f88d5ee5269f75
-RMD160 (qtwebengine-everywhere-src-5.11.1.tar.xz) = 783d24997f0a802fc2763cf3f183672fad79e84a
-SHA512 (qtwebengine-everywhere-src-5.11.1.tar.xz) = 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
-Size (qtwebengine-everywhere-src-5.11.1.tar.xz) = 233633572 bytes
-SHA1 (patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn) = a8f779d78d8e5ea22c60851d0ec724b356a28e34
-SHA1 (patch-src_3rdparty_chromium_tools_gn_bootstrap_build_mac.ninja.template) = 637fa297a90b33f22e13e5f692f4841ed3b45a2d
+SHA1 (qtwebengine-everywhere-src-5.12.3.tar.xz) = 124f0b285d5ea56dabfcbc6b6e190800dd0f7995
+RMD160 (qtwebengine-everywhere-src-5.12.3.tar.xz) = df2468bd8bc486c1a419c9f175c7b750e5005973
+SHA512 (qtwebengine-everywhere-src-5.12.3.tar.xz) = 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
+Size (qtwebengine-everywhere-src-5.12.3.tar.xz) = 249275648 bytes
+SHA1 (patch-mkspecs_features_platform.prf) = 55733f4af349c7922663d51555c4699a37ea407b
+SHA1 (patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn) = bccf18157158105130e1d1452ab6851476926ac7
+SHA1 (patch-src_3rdparty_gn_build_build_mac.ninja.template) = 0abc7a94ddc1006d3bcdf15e1a57b925f274a8dd
diff --git a/qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf b/qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf
new file mode 100644
index 0000000000..90a2ee72c6
--- /dev/null
+++ b/qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf
@@ -0,0 +1,62 @@
+$NetBSD$
+
+--- mkspecs/features/platform.prf.orig	2019-06-17 15:45:18.000000000 +0000
++++ mkspecs/features/platform.prf
+@@ -11,56 +11,11 @@ defineTest(isQtMinimum) {
+ 
+ defineTest(isPlatformSupported) {
+   QT_FOR_CONFIG += gui-private
+-  linux {
+     if(!gcc:!clang)|intel_icc {
+-      skipBuild("Qt WebEngine on Linux requires clang or GCC.")
++      skipBuild("Qt WebEngine requires clang or GCC.")
+       return(false)
+     }
+     gcc:!clang:!isGCCVersionSupported(): return(false)
+-  } else:win32 {
+-    winrt {
+-      skipBuild("WinRT is not supported.")
+-      return(false)
+-    }
+-    isBuildingOnWin32() {
+-      skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.")
+-    }
+-    !msvc|intel_icl {
+-      skipBuild("Qt WebEngine on Windows requires MSVC.")
+-      return(false)
+-    }
+-    !isMinWinSDKVersion(10, 16299): {
+-      skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.16299 or newer.")
+-      return(false)
+-    }
+-    !qtConfig(webengine-winversion) {
+-         skipBuild("Needs Visual Studio 2017 or higher")
+-         return(false)
+-    }
+-  } else:osx {
+-    # FIXME: Try to get it back down to 8.2 for building on OS X 10.11
+-    !isMinXcodeVersion(8, 3, 3) {
+-      skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.")
+-      return(false)
+-    }
+-    !clang|intel_icc {
+-        skipBuild("Qt WebEngine on macOS requires Clang.")
+-        return(false)
+-    }
+-    # We require macOS 10.12 (darwin version 16.0.0) or newer.
+-    darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
+-    lessThan(darwin_major_version, 16) {
+-      skipBuild("Building Qt WebEngine requires macOS version 10.12 or newer.")
+-      return(false)
+-    }
+-    !isMinOSXSDKVersion(10, 12): {
+-      skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+-      return(false)
+-    }
+-  } else {
+-    skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
+-    return(false)
+-  }
+ 
+   # QMAKE doesn't set c++14 for MSVC2017, so only test for gcc and clang (which pretends to be gcc)
+   gcc:!contains(QT_CONFIG, c++14) {
diff --git a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn
index 7f96edc64f..bbedb3417d 100644
--- a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn
+++ b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn
@@ -2,14 +2,14 @@ $NetBSD$
 
 Use system libtool; avoid picking devel/libtool-base.
 
---- src/3rdparty/chromium/build/toolchain/mac/BUILD.gn.orig	2017-06-10 18:43:04.000000000 +0000
+--- src/3rdparty/chromium/build/toolchain/mac/BUILD.gn.orig	2019-04-04 15:55:59.000000000 +0000
 +++ src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
-@@ -218,7 +218,7 @@ template("mac_toolchain") {
-     tool("alink") {
-       script =
-           rebase_path("//build/toolchain/mac/filter_libtool.py", root_build_dir)
--      command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script libtool -static {{arflags}} -o {{output}} {{inputs}}"
-+      command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script /usr/bin/libtool -static {{arflags}} -o {{output}} {{inputs}}"
+@@ -247,7 +247,7 @@ template("mac_toolchain") {
+       # corrupted by this process. Don't use spaces for source files or labels.
+       rspfile = "{{output}}.rsp"
+       rspfile_content = "{{inputs_newline}}"
+-      command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script libtool -static {{arflags}} -o {{output}} -filelist $rspfile"
++      command = "$env_wrapper rm -f {{output}} && TOOL_VERSION=${tool_versions.filter_libtool} python $script /usr/bin/libtool -static {{arflags}} -o {{output}} -filelist $rspfile"
        description = "LIBTOOL-STATIC {{output}}"
        outputs = [
          "{{output_dir}}/{{target_output_name}}{{output_extension}}",
diff --git a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gn_bootstrap_build_mac.ninja.template b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gn_bootstrap_build_mac.ninja.template
deleted file mode 100644
index 75c67bab07..0000000000
--- a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gn_bootstrap_build_mac.ninja.template
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/3rdparty/chromium/tools/gn/bootstrap/build_mac.ninja.template.orig	2017-06-09 20:18:47.000000000 +0000
-+++ src/3rdparty/chromium/tools/gn/bootstrap/build_mac.ninja.template
-@@ -11,7 +11,7 @@ rule cxx
-   deps = gcc
- 
- rule alink_thin
--  command = rm -f $out && libtool -static -o $out $in
-+  command = rm -f $out && /usr/bin/libtool -static -o $out $in
-   description = AR $out
- 
- rule link
diff --git a/qt5-qtwebengine/patches/patch-src_3rdparty_gn_build_build_mac.ninja.template b/qt5-qtwebengine/patches/patch-src_3rdparty_gn_build_build_mac.ninja.template
new file mode 100644
index 0000000000..31407e4f63
--- /dev/null
+++ b/qt5-qtwebengine/patches/patch-src_3rdparty_gn_build_build_mac.ninja.template
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/3rdparty/gn/build/build_mac.ninja.template.orig	2017-06-09 20:18:47.000000000 +0000
++++ src/3rdparty/gn/build/build_mac.ninja.template
+@@ -11,7 +11,7 @@ rule cxx
+   deps = gcc
+ 
+ rule alink_thin
+-  command = rm -f $out && libtool -static -o $out $in
++  command = rm -f $out && /usr/bin/libtool -static -o $out $in
+   description = AR $out
+ 
+ rule link
Prev by Date: doomlegacy: Remove (imported as games/doomlegacy)
Next by Date: py-ggplot: removed; already in base
Previous by Thread: doomlegacy: Remove (imported as games/doomlegacy)
Next by Thread: py-ggplot: removed; already in base
Indexes:
Home | Main Index | Thread Index | Old Index