Merge branch 'master' into zfs

1 files changed, 65 insertions, 59 deletions

diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD
index 36b624e8a..45f739573 100644
--- a/user/qt5-qtwebkit/APKBUILD
+++ b/user/qt5-qtwebkit/APKBUILD
@@ -1,72 +1,78 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qt5-qtwebkit
-_pkgname=qtwebkit-opensource-src
-pkgver=5.9.1
-pkgrel=4
-pkgdesc="Qt 5 - WebKit components"
-url="https://www.qt.io/"
+_realname=$pkgname
+#qtwebkit
+pkgver=5.212.0_git20191114
+_realver=$(printf '%s' "$pkgver" | sed 's/_/-/')
+pkgrel=0
+pkgdesc="Open source Web browser engine"
+url="https://github.com/qtwebkit/qtwebkit"
 arch="all"
-options="!check"
-license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
-depends=""
-depends_dev="qt5-qtdeclarative-dev gstreamer-dev gst-plugins-base-dev
-	libxslt-dev mesa-dev icu-dev libxext-dev glib-dev libxcomposite-dev
-	libxrender-dev
-	"
-makedepends="$depends_dev bison flex fontconfig-dev gperf libjpeg-turbo-dev
-	libpng-dev libwebp-dev pcre-dev qt5-qtbase-dev ruby sqlite-dev zlib-dev"
+options="!check"  # Tests fail (surprise), require X11.
+license="LGPL-2.1+ AND BSD-3-Clause AND Others"
+depends="gst-plugins-base"
+depends_dev="qt5-qtbase-dev"
+makedepends="$depends_dev ninja sqlite-dev icu-dev ruby perl bison flex gperf
+	libxml2-dev libxslt-dev libjpeg-turbo-dev libpng-dev zlib-dev glib-dev
+	gstreamer-dev fontconfig-dev qt5-qtsensors-dev qt5-qtpositioning-dev
+	qt5-qtdeclarative-dev qt5-qtwebchannel-dev libxcomposite-dev cmake
+	libxrender-dev gst-plugins-base-dev hyphen-dev libexecinfo-dev
+	ruby-dev glib-dev libgcrypt-dev libtasn1-dev"
 subpackages="$pkgname-dev"
-source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz
-	pic.patch
-	fix-rpath.patch
-	fix-execinfo.patch
-	0001-Add-ARM-64-support.patch
+#source="https://github.com/qtwebkit/qtwebkit/releases/download/$_realname-$_realver/$_realname-$_realver.tar.xz
+source="https://distfiles.adelielinux.org/source/$_realname-$_realver.tar.xz
+	bug-931.patch
+	cmake.patch
+	ppc-llint.patch
 	"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-prepare() {
-	default_prepare
-	# remove some bundled
-	mkdir Source/ThirdParty/orig
-	mv Source/ThirdParty/gtest/ \
-		Source/ThirdParty/qunit/ \
-		Source/ThirdParty/orig/
-	syncqt.pl -version $pkgver Source/sync.profile
-}
+builddir="$srcdir"/$_realname-$_realver
 
 build() {
-	local _maybe_smaller=""
-	cd "$builddir"
-
-	# On 32-bit x86, ld.bfd will run out of memory if debugging information
-	# is built.  See https://sourceware.org/bugzilla/show_bug.cgi?id=23470
-	# for more information.
-	case "$CARCH" in
-		pmmx)  _maybe_smaller="QMAKE_CXXFLAGS_DEBUG+=-g0"
-	esac
-
-	qmake $_maybe_smaller
-
-	# /usr/include/fortify/stdlib.h:20:25: fatal error: stdlib.h: No such file or directory
-	# see: http://stackoverflow.com/questions/37218953/isystem-on-a-system-include-directory-causes-errors
-	# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71090
-	# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-	qmake Source/JavaScriptCore/LLIntOffsetsExtractor.pro -o \
-		Source/JavaScriptCore/Makefile.LLIntOffsetsExtractor
-	sed -i 's:-isystem /usr/include ::' \
-		Source/JavaScriptCore/Makefile.LLIntOffsetsExtractor
-
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	# We can enable the JIT when it is stable on all Tier 1 platforms:
+	# pmmx (ensure no SSE)
+	# ppc
+	# ppc64
+	#
+	# DONE:
+	# aarch64
+	# armv7
+	# x86_64
+	#
+	# https://github.com/qtwebkit/qtwebkit/issues/930 
+	#	-DENABLE_MEDIA_SOURCE=ON \
+	#	-DENABLE_VIDEO=ON \
+	#	-DENABLE_WEB_AUDIO=ON \
+	#	-DUSE_GSTREAMER=ON \
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DENABLE_JIT=OFF \
+		-DENABLE_PRINT_SUPPORT=ON \
+		-DENABLE_QT_WEBCHANNEL=ON \
+		-DPORT=Qt \
+		-DUSE_SYSTEM_MALLOC=ON \
+		-DUSE_WOFF2=OFF \
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
+check() {
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
 package() {
-	cd "$builddir"
-	make install INSTALL_ROOT="$pkgdir"
-	sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5  qtwebkit-opensource-src-5.9.1.tar.xz
-9a62a5e7af91c44311b517608262f88b5bc607e75dc5878dd08b0a0872ec03fb7a566df0a41413f7e60beb1b9880e24f084b90c38ed50d4219ec2ad6af9bd62f  pic.patch
-00d59c0cdb58ae8e7cf6bc3d03f133697e74c267ccebe12238bcdc274d4c90210b82c2d8bdf0e949cd43da13a4fd8a4c35fb54a00ed5102a4ac4d23aa002d0fe  fix-rpath.patch
-f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f  fix-execinfo.patch
-af5097d44f73de156ca31a5423136301dfc12ae693e20c4702bf3f1c6e16395f3912e9268582480ba3177021f37d4cae3b84d4b23eeb063fdc40f2444d3b34c8  0001-Add-ARM-64-support.patch"
+sha512sums="ec009773953b9f3e2c0e47072cd678f7044b16219c85879a6031c109c7b2b84f426564bb673ccaafa0bcc3f7a656e3cb0d8e3be28d3bbfb401adcd1a6b8b9edd  qt5-qtwebkit-5.212.0-git20191114.tar.xz
+85adb979eb5d58ccab85d07d6a6db470b34bdb6fd8af2eef04ce268da41a596b4a19295c97dca1201daf4a51ca9e183bb27dd36b9b12b0e149224793d1c190a9  bug-931.patch
+4ee26787bf01f3067fae51e1942b72d783629b13fe13ffcfba9329bbea823de7b751905f01c71c6c498164cb41a33765debce375a034dde83e3f784d6e549ada  cmake.patch
+0b358e4df16e8792c995a385386bfe9e197e23854f30129b504d3ba851cdfab3a2adef462a6ae3a775ec01d02cd67ef404259491339336c6ce896d7940597c95  ppc-llint.patch"