pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt5-qtwebengine: make it build until it fails because it doesn't know NetBSD



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Mar 27 16:23:33 2018 +0200
Changeset:	c556057c43bd09d9a3d04ecae3fc5ba261c9e286

Modified Files:
	qt5-qtwebengine/Makefile
	qt5-qtwebengine/distinfo
Removed Files:
	qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf

Log Message:
qt5-qtwebengine: make it build until it fails because it doesn't know NetBSD

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

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

diffstat:
 qt5-qtwebengine/Makefile                                  | 15 ++++++++-------
 qt5-qtwebengine/distinfo                                  |  8 ++++----
 .../patches/patch-mkspecs_features_functions.prf          | 13 -------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diffs:
diff --git a/qt5-qtwebengine/Makefile b/qt5-qtwebengine/Makefile
index f53601f9b8..408665277d 100644
--- a/qt5-qtwebengine/Makefile
+++ b/qt5-qtwebengine/Makefile
@@ -1,8 +1,9 @@
 # $NetBSD$
 
-DISTNAME=	qtwebengine-opensource-src-${QTVERSION}
+DISTNAME=	qtwebengine-everywhere-src-${QTVERSION}
 PKGNAME=	qt5-qtwebengine-${QTVERSION}
 COMMENT=	Qt5 WebEngine module
+MASTER_SITES+=	https://download.qt.io/archive/qt/5.10/5.10.1/submodules/
 
 BUILD_DEPENDS+=		gperf-[0-9]*:../../devel/gperf
 BUILD_DEPENDS+=		ninja-build-[0-9]*:../../devel/ninja-build
@@ -14,7 +15,7 @@ MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-.include "../../wip/qt5-qtbase/Makefile.common"
+.include "../../x11/qt5-qtbase/Makefile.common"
 
 #.if ${_USE_CWRAPPERS} == "yes"
 #BUILDLINK_TRANSFORM+=	R:${WRKSRC}/lib:${QTDIR}/lib
@@ -65,11 +66,11 @@ post-install:
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .endif
-.include "../../wip/qt5-qtdeclarative/buildlink3.mk"
-.include "../../wip/qt5-qtlocation/buildlink3.mk"
-.include "../../wip/qt5-qtmultimedia/buildlink3.mk"
-.include "../../wip/qt5-qtsensors/buildlink3.mk"
-.include "../../wip/qt5-qtwebchannel/buildlink3.mk"
+.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt5-qtlocation/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qtsensors/buildlink3.mk"
+.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY=		yes
 PYTHON_VERSIONS_ACCEPTED=	27
 .include "../../lang/python/tool.mk"
diff --git a/qt5-qtwebengine/distinfo b/qt5-qtwebengine/distinfo
index 9bf577087b..27a53603d0 100644
--- a/qt5-qtwebengine/distinfo
+++ b/qt5-qtwebengine/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.9 2017/04/26 10:27:43 wiz Exp $
 
-SHA1 (qtwebengine-opensource-src-5.9.1.tar.xz) = 5badcaf92e8a237967970b249652fb7067d2d476
-RMD160 (qtwebengine-opensource-src-5.9.1.tar.xz) = e72fdf99c99038c4f7e7dd85699c52ff00f6b459
-SHA512 (qtwebengine-opensource-src-5.9.1.tar.xz) = ad8feeede6dfc2879a84efe5bf1ae9a43db7e0182b084d2ebb7d7881ddb8e773f53a1a3fd60743fee894c27401110a31bab8ce7e86aa73fae896e796fb0533c8
-Size (qtwebengine-opensource-src-5.9.1.tar.xz) = 218066864 bytes
+SHA1 (qtwebengine-everywhere-src-5.10.1.tar.xz) = b1253958b8399f287a0497642d096de8554a5ae6
+RMD160 (qtwebengine-everywhere-src-5.10.1.tar.xz) = 02a127721700daa6ffc0778b743abbff8640318f
+SHA512 (qtwebengine-everywhere-src-5.10.1.tar.xz) = dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925
+Size (qtwebengine-everywhere-src-5.10.1.tar.xz) = 209844952 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
diff --git a/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf b/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf
deleted file mode 100644
index 73c1c4e83e..0000000000
--- a/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- mkspecs/features/functions.prf.orig	2017-06-23 06:29:46.000000000 +0000
-+++ mkspecs/features/functions.prf
-@@ -15,7 +15,7 @@ defineTest(isQtMinimum) {
- 
- defineTest(isPlatformSupported) {
-   QT_FOR_CONFIG += gui-private
--  linux {
-+  unix {
-     !gcc:!clang {
-       skipBuild("Qt WebEngine on Linux requires clang or GCC.")
-       return(false)


Home | Main Index | Thread Index | Old Index