pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qt5-qtwebengine: Little bit fix this package
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun Oct 27 12:19:54 2019 +0100
Changeset: bf8131e6a9c449caf1d05fbb6e9e862553a3e44e
Modified Files:
qt5-qtwebengine/Makefile
qt5-qtwebengine/distinfo
qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf
Added Files:
qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ffmpeg_configure
Log Message:
qt5-qtwebengine: Little bit fix this package
The blocker is lack of NetBSD support in Chromium.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf8131e6a9c449caf1d05fbb6e9e862553a3e44e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qt5-qtwebengine/Makefile | 6 +++---
qt5-qtwebengine/distinfo | 11 ++++++-----
qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf | 4 ++--
...atch-src_3rdparty_chromium_third__party_ffmpeg_configure | 13 +++++++++++++
4 files changed, 24 insertions(+), 10 deletions(-)
diffs:
diff --git a/qt5-qtwebengine/Makefile b/qt5-qtwebengine/Makefile
index 81580fd249..574888c505 100644
--- a/qt5-qtwebengine/Makefile
+++ b/qt5-qtwebengine/Makefile
@@ -7,9 +7,9 @@ COMMENT= Qt5 WebEngine module
BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
-USE_TOOLS+= bison flex pkg-config sed
+USE_TOOLS+= bison flex pkg-config sed gmake
-BUILD_TARGET= sub-src
+#BUILD_TARGET= sub-src
MAKE_ENV+= QTDIR=${QTDIR}
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
INSTALLATION_DIRS+= lib/pkgconfig
@@ -74,7 +74,7 @@ post-install:
.include "../../x11/qt5-qtsensors/buildlink3.mk"
.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_ACCEPTED= 27
+#PYTHON_VERSIONS_ACCEPTED= 27
.include "../../lang/python/tool.mk"
#.include "../../lang/ruby/buildlink3.mk"
#BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
diff --git a/qt5-qtwebengine/distinfo b/qt5-qtwebengine/distinfo
index 24f8aa54e8..cc99936a53 100644
--- a/qt5-qtwebengine/distinfo
+++ b/qt5-qtwebengine/distinfo
@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.9 2017/04/26 10:27:43 wiz Exp $
-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 (qtwebengine-everywhere-src-5.13.1.tar.xz) = 163f9927d5f0357a5e551f4eb929568cd6d3de32
+RMD160 (qtwebengine-everywhere-src-5.13.1.tar.xz) = 7292ac710a22ea7d50dcea3fd171ef5b273787fe
+SHA512 (qtwebengine-everywhere-src-5.13.1.tar.xz) = c2700df3e4290a80703164c73c390f8a5780e354dc36d270493e9e8b329f84e6e6ec5351faab3dc1bf72414da4b2aa83de4002b46d54806fc2a7a59645cd2151
+Size (qtwebengine-everywhere-src-5.13.1.tar.xz) = 256985764 bytes
+SHA1 (patch-mkspecs_features_platform.prf) = 35064b39bd7714a79a80cc37549a90fabfa711e5
SHA1 (patch-src_3rdparty_chromium_build_toolchain_mac_BUILD.gn) = bccf18157158105130e1d1452ab6851476926ac7
+SHA1 (patch-src_3rdparty_chromium_third__party_ffmpeg_configure) = 3105fa58a6164d6edcfeebe10d5d304928895922
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
index 90a2ee72c6..9ed386b504 100644
--- a/qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf
+++ b/qt5-qtwebengine/patches/patch-mkspecs_features_platform.prf
@@ -1,6 +1,6 @@
$NetBSD$
---- mkspecs/features/platform.prf.orig 2019-06-17 15:45:18.000000000 +0000
+--- mkspecs/features/platform.prf.orig 2019-08-19 08:19:35.000000000 +0000
+++ mkspecs/features/platform.prf
@@ -11,56 +11,11 @@ defineTest(isQtMinimum) {
@@ -22,7 +22,7 @@ $NetBSD$
- skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.")
- }
- !msvc|intel_icl {
-- skipBuild("Qt WebEngine on Windows requires MSVC.")
+- skipBuild("Qt WebEngine on Windows requires MSVC or Clang (MSVC mode).")
- return(false)
- }
- !isMinWinSDKVersion(10, 16299): {
diff --git a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ffmpeg_configure b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ffmpeg_configure
new file mode 100644
index 0000000000..be22d22221
--- /dev/null
+++ b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ffmpeg_configure
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/3rdparty/chromium/third_party/ffmpeg/configure.orig 2019-08-09 13:46:06.000000000 +0000
++++ src/3rdparty/chromium/third_party/ffmpeg/configure
+@@ -4852,7 +4852,7 @@ elif enabled mips; then
+ disable mipsdsp
+ disable mipsdspr2
+ # When gcc version less than 5.3.0, add -fno-expensive-optimizations flag.
+- if [ $cc == gcc ]; then
++ if [ $cc = gcc ]; then
+ gcc_version=$(gcc -dumpversion)
+ if [ "$(echo "$gcc_version 5.3.0" | tr " " "\n" | sort -rV | head -n 1)" == "$gcc_version" ]; then
+ expensive_optimization_flag=""
Home |
Main Index |
Thread Index |
Old Index