From 5f18cb50835147942aa612a878269439e6f1c03a Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 23 Jun 2016 11:46:23 +0200 Subject: [PATCH] qt5-webkit: use gstreamer1 Actually, you can just use one backend: gstreamer (0.10 or 1) or qtmultimedia (which in our case is gstreamer anyway). Also, qt5-webkit was using gstreamer0.10 while qt5-multimedia is using gstreamer1, so using both of them in the same application was not possible. Should fix #4360. --- srcpkgs/qt5-webkit/template | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index f65c206864..01c944f9d7 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -1,26 +1,24 @@ # Template file for 'qt5-webkit' pkgname=qt5-webkit version=5.6.1 -revision=2 +revision=3 build_style=qmake wrksrc=qtwebkit-opensource-src-${version} -hostmakedepends="bison flex gperf perl python ruby pkg-config gst-plugins-good qt5-qmake" -makedepends="libwebp-devel libxslt-devel libXcomposite-devel gst-plugins-base-devel sqlite-devel - qt5-declarative-devel qt5-location-devel qt5-multimedia-devel qt5-sensors-devel qt5-webchannel-devel" -depends="qt5>=5.6.0 gst-plugins-good" -nocross=yes -short_desc="A cross-platform application and UI framework (QT5) - WebKit2" +hostmakedepends="bison flex gperf perl python ruby pkg-config" +makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel + gst-plugins-base1-devel qt5-declarative-devel qt5-location-devel + qt5-sensors-devel qt5-webchannel-devel" +short_desc="A cross-platform application and UI framework (Qt5) - WebKit2 component" maintainer="Juan RP " license="GPL-3, LGPL-2.1" -homepage="http://qt.io" -distfiles="http://download.qt.io/community_releases/${version%.*}/${version}/qtwebkit-opensource-src-${version}.tar.xz" +homepage="https://www.qt.io/" +distfiles="https://download.qt.io/community_releases/${version%.*}/${version}/qtwebkit-opensource-src-${version}.tar.xz" checksum=f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa pre_configure() { # Generate headers syncqt.pl-qt5 -version 5.6.0 Source/sync.profile } - post_install() { # QMAKE_PRL_BUILD_DIR contains a reference the build dir; drop it find ${DESTDIR}/usr/lib -type f -name '*.prl' -exec \