From e6cd93b03b8622c70c4b4f339b8ef6d7c6e4b4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 19:55:07 +0200 Subject: [PATCH 01/23] qt: disable webkit The original version is to be replaced with qt-webkit{,-devel} using qtwebkit-2.3.4. --- srcpkgs/qt/template | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 333f57fa35f..e0845cc67c9 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.8.7 -revision=11 +revision=12 _distname=qt-everywhere-opensource-src patch_args="-Np1" wrksrc=${_distname}-${version} @@ -65,12 +65,7 @@ do_configure() { _opts+=" -graphicssystem raster" _opts+=" -openssl-linked" _opts+=" -xmlpatterns" - if [ "${_gccver%%.*}" -gt 5 ]; then - # webkit is broken with gcc-6.2.0 - _opts+=" -no-webkit" - else - _opts+=" -webkit" - fi + _opts+=" -no-webkit" _opts+=" -gtkstyle" _opts+=" -system-sqlite" _opts+=" -no-openvg" From 38bad67383688b7d690f0fafed46d314177f89d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 19:58:11 +0200 Subject: [PATCH 02/23] New package: qt-webkit-2.3.4 The idea to have a separate qt-webkit package which builds with gcc6 is taken from the Arch Linux team's efforts: https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/qtwebkit This addresses #4748 the unsolvable(?) problems when trying to build the shipped qtwebkit that comes with qt-4.7.8 with gcc6. --- common/shlibs | 2 +- srcpkgs/qt-webkit-devel | 1 + srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 +++++++ srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 +++++ srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 ++++ srcpkgs/qt-webkit/files/qwebview.patch | 21 +++++++ srcpkgs/qt-webkit/template | 64 ++++++++++++++++++++++ 7 files changed, 132 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/qt-webkit-devel create mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch create mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch create mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch create mode 100644 srcpkgs/qt-webkit/files/qwebview.patch create mode 100644 srcpkgs/qt-webkit/template diff --git a/common/shlibs b/common/shlibs index d1180e21776..cfe030ffe62 100644 --- a/common/shlibs +++ b/common/shlibs @@ -455,7 +455,7 @@ libQtSql.so.4 qt-4.5.3_1 libQtDeclarative.so.4 qt-4.5.3_1 libQtDesignerComponents.so.4 qt-designer-4.5.3_1 libQtDesigner.so.4 qt-designer-4.5.3_1 -libQtWebKit.so.4 qt-4.8.4_4 +libQtWebKit.so.4 qt-webkit-2.3.4_1 libsysfs.so.2 libsysfs-2.1.0_1 libsensors.so.4 libsensors-3.1.1_1 libcap-ng.so.0 libcap-ng-0.6.2_1 diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel new file mode 120000 index 00000000000..f3c82c42591 --- /dev/null +++ b/srcpkgs/qt-webkit-devel @@ -0,0 +1 @@ +qt-webkit \ No newline at end of file diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch new file mode 100644 index 00000000000..93a4dec73fa --- /dev/null +++ b/srcpkgs/qt-webkit/files/fix-execinfo.patch @@ -0,0 +1,20 @@ +--- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200 ++++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200 +@@ -58,7 +58,7 @@ + #include + #endif + +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID) + #include + #include + #include +@@ -242,7 +242,7 @@ + + void WTFGetBacktrace(void** stack, int* size) + { +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch new file mode 100644 index 00000000000..6e6215c7e25 --- /dev/null +++ b/srcpkgs/qt-webkit/files/fix-gcc6.patch @@ -0,0 +1,14 @@ +--- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500 ++++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500 +@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen + } + } + ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++ + void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) + { + JSGlobalData& globalData = exec->globalData(); + diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch new file mode 100644 index 00000000000..60c5d085fe0 --- /dev/null +++ b/srcpkgs/qt-webkit/files/fix-mallinfo.patch @@ -0,0 +1,11 @@ +--- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200 ++++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200 +@@ -31,7 +31,7 @@ + + namespace WebCore { + +-#if OS(LINUX) ++#if OS(LINUX) && defined(__GLIBC__) + static size_t mallocMemoryUsage(bool inuse) + { + // Return how much memory (in bytes) has been allocated on the system heap. diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch new file mode 100644 index 00000000000..f8aa8c3101b --- /dev/null +++ b/srcpkgs/qt-webkit/files/qwebview.patch @@ -0,0 +1,21 @@ +--- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 ++++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 +@@ -1,3 +1,6 @@ ++INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include ++LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib ++ + CONFIG += designer + win32|mac: CONFIG+= debug_and_release + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +--- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 ++++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 +@@ -2,9 +2,4 @@ + CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) +-contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt +-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview +-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template new file mode 100644 index 00000000000..e724dd61c45 --- /dev/null +++ b/srcpkgs/qt-webkit/template @@ -0,0 +1,64 @@ +# Template file for 'qt-webkit' +pkgname=qt-webkit +version=2.3.4 +revision=1 +_qtver=4.8.7 +wrksrc="qtwebkit-${version}" +create_wrksrc=yes +hostmakedepends="automake libtool bison flex gperf ruby pkg-config qt-qmake qt-designer" +makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel glib-devel fontconfig-devel \ + gst-plugins-base1-devel sqlite-devel libXrender-devel" +short_desc="Open source web browser engine (Qt4 port)" +maintainer="Juergen Buchmueller " +license="LGPL-2.1, GPL-3" +homepage="http://trac.webkit.org/wiki/QtWebKit" +distfiles=" + http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz + http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz" +checksum=" + c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca + e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0" +conflicts="qt<4.8.7_12" + +post_extract() { + patch -p1 < ${FILESDIR}/fix-gcc6.patch + patch -p1 < ${FILESDIR}/fix-execinfo.patch + patch -p1 < ${FILESDIR}/fix-mallinfo.patch + patch -p0 < ${FILESDIR}/qwebview.patch + mv qt-everywhere-opensource-src-${_qtver} .. +} + +do_configure() { + : +} + +do_build() { + local opts="--qt --prefix=/usr --no-webkit2" + case "$XBPS_TARGET_MACHINE" in + i686*) opts+=" --no-force-sse2" ;; + esac + export QTDIR=/usr + export PATH="/usr/lib/qt/bin:$PATH" + Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts} + cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + qmake + make ${makejobs} +} + +do_install() { + make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install + cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + make INSTALL_ROOT="${DESTDIR}" install +} + +qt-webkit-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + vmove usr/lib/*.prl + vmove usr/lib/pkgconfig + vmove usr/share/qt/mkspecs + } +} From bca03ca7c359a186710b873f403e360535934725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 21:10:57 +0200 Subject: [PATCH 03/23] calligra: revbump for new qt-webkit-devel --- srcpkgs/calligra/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index ee7d97703e3..43fa884d574 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,19 +1,20 @@ # Template file for 'calligra' pkgname=calligra version=2.9.11 -revision=2 +revision=3 build_style=cmake configure_args="-Wno-dev -DBUILD_active=OFF -DWITH_Soprano=OFF" hostmakedepends="cmake automoc4 perl pkg-config eigen" short_desc="Illustration application" maintainer="Juan RP " makedepends="vc phonon-devel libpng-devel sqlite-devel boost-devel exiv2-devel - qt-devel kdelibs-devel libressl-devel lcms2-devel libwpd-devel libwpg-devel - libwps-devel libodfgen-devel libvisio-devel libetonyek-devel fontconfig-devel - libXi-devel poppler-qt4-devel libgomp-devel glew-devel opencolorio-devel - fftw-devel libopenexr-devel libopenjpeg-devel gsl-devel libcurl-devel - libkdcraw-devel libokular-devel qca-devel kactivities-devel kdepimlibs-devel - marble-devel libmysqlclient-devel postgresql-libs-devel freetds-devel" + qt-devel qt-webkit-devel kdelibs-devel libressl-devel lcms2-devel libwpd-devel + libwpg-devel libwps-devel libodfgen-devel libvisio-devel libetonyek-devel + fontconfig-devel libXi-devel poppler-qt4-devel libgomp-devel glew-devel + opencolorio-devel fftw-devel libopenexr-devel libopenjpeg-devel gsl-devel + libcurl-devel libkdcraw-devel libokular-devel qca-devel kactivities-devel + kdepimlibs-devel marble-devel libmysqlclient-devel postgresql-libs-devel + freetds-devel" license="GPL-2" homepage="http://www.calligra-suite.org/" distfiles="http://download.kde.org/stable/${pkgname}-${version}/${pkgname}-${version}.tar.xz" From ef858a31b5f7f2e70cd2e31f813b62519f10dc13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 21:12:02 +0200 Subject: [PATCH 04/23] clementine: revbump for new qt-webkit-devel --- srcpkgs/clementine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 1650d5df964..f0650d28c1a 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,11 +1,11 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=3 +revision=4 build_style=cmake hostmakedepends="git cmake sparsehash pkg-config" makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel - qt-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel + qt-devel qt-webkit-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel taglib-devel crypto++-devel libspotify-devel libechonest-devel" depends="desktop-file-utils" From 18f52563ac693426d497b72aff788efee94ec8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 21:12:24 +0200 Subject: [PATCH 05/23] clipgrab: revbump for new qt-webkit-devel --- srcpkgs/clipgrab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template index f590efaaf6a..f3156a298c6 100644 --- a/srcpkgs/clipgrab/template +++ b/srcpkgs/clipgrab/template @@ -1,17 +1,17 @@ # Template file for 'clipgrab' pkgname=clipgrab version=3.6.1 -revision=1 +revision=2 build_style=qmake hostmakedepends="qt-qmake" -makedepends="qt-devel" +makedepends="qt-devel qt-webkit-devel" depends="ffmpeg desktop-file-utils" short_desc="A friendly downloader for YouTube and other sites" maintainer="Juan RP " license="GPL-3" homepage="https://www.clipgrab.org" distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz" -checksum=4cdf3964f8f208866356497d9f5ee5208b5d7902bcd1fe27ba4d79e7d3b2bade +checksum=a0878b4cda847472b9c37744e9d7de7068176974d0032d45df3391d7ec799666 configure_args=clipgrab.pro do_install() { From bc40fd45d52964a6b43443b704889e8ac3a8edb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 21:13:15 +0200 Subject: [PATCH 06/23] python-pyside: revbump for new qt-webkit-devel --- srcpkgs/python-pyside/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-pyside/template b/srcpkgs/python-pyside/template index 68fc7d4aa01..3f6be6cf821 100644 --- a/srcpkgs/python-pyside/template +++ b/srcpkgs/python-pyside/template @@ -1,12 +1,12 @@ # Template file for 'python-pyside' pkgname=python-pyside version=1.2.2 -revision=3 +revision=4 wrksrc="pyside-qt4.8+${version}" python_versions="2.7 3.4" hostmakedepends="cmake" makedepends="python-devel python3.4-devel libshiboken-python-devel - libshiboken-python3.4-devel qt-devel MesaLib-devel phonon-devel" + libshiboken-python3.4-devel qt-devel qt-webkit-devel MesaLib-devel phonon-devel" depends="python-shiboken" pycompile_module="PySide" short_desc="LGPL-licensed Python2 bindings for the Qt4 toolkit" @@ -29,7 +29,7 @@ do_build() { -DBUILD_TESTS=OFF" for pyver in $python_versions; do - args= + unset args if [ "$pyver" = "2.7" ]; then args="-DPYTHON_SUFFIX=-python2.7" fi From c3d3d7d3268813ab11715cb5d33d3f2a76f65e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 21:15:55 +0200 Subject: [PATCH 07/23] freecad: revbump for new qt-webkit-devel --- srcpkgs/freecad/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index 1b5ff353fc0..5989b1dc955 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.16 -revision=1 +revision=2 wrksrc="FreeCAD-${version}" build_style=cmake @@ -17,9 +17,9 @@ configure_args=" hostmakedepends="python swig pkg-config doxygen graphviz" -makedepends="python-devel oce-devel qt-devel coin3-devel eigen libxerces-c-devel - libspnav-devel libshiboken-python-devel libpyside-python-devel pyside-tools - python-matplotlib boost-python coin3-doc" +makedepends="python-devel oce-devel qt-devel qt-webkit-devel coin3-devel eigen + libxerces-c-devel libspnav-devel libshiboken-python-devel libpyside-python-devel + pyside-tools python-matplotlib boost-python coin3-doc" # qt-devel-tools, qt-plugin-sqlite: Help uses qt/assistant, its data in SQLite format depends="python-matplotlib python-pyside qt-devel-tools qt-plugin-sqlite python-pivy" From 07ab2f2afbdf45b8156d0eec221e2a1a6c7a119c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 21:19:02 +0200 Subject: [PATCH 08/23] gpsbabel: revbump for new qt-webkit-devel xlint --- srcpkgs/gpsbabel/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index 04d7d124c96..288d1c0e233 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -1,14 +1,14 @@ # Template file for 'gpsbabel' pkgname=gpsbabel version=1.5.3 -revision=2 +revision=3 build_style=gnu-configure maintainer="Philipp Hirsch " homepage="http://www.gpsbabel.org/" license="GPL-2" short_desc="Converts waypoints, tracks, and routes between popular GPS formats" hostmakedepends="perl docbook-xml xmlwf openjdk-jre offo-hyphenation" -makedepends="qt-devel libusb-compat-devel expat-devel libxslt-devel" +makedepends="qt-devel qt-webkit-devel libusb-compat-devel expat-devel libxslt-devel" depends="desktop-file-utils" distfiles="http://arch.p5n.pp.ru/~sergej/dl/${pkgname}-${version}.tar.gz" checksum=7599beb312488a96d8b8e646c357fbc122970522a7c9ae0a2777862a0ef39351 @@ -16,7 +16,7 @@ create_wrksrc=yes replaces="gpsbabel-gui>=0" -do_build(){ +do_build() { . /etc/profile.d/10_openjdk.sh make ${makejobs} make doc @@ -29,7 +29,7 @@ do_build(){ make ${makejobs} } -do_install(){ +do_install() { make install DESTDIR=${DESTDIR} vmkdir usr/share/doc/${pkgname} vcopy "README* AUTHORS COPYING gpsbabel.pdf gpsbabel-sample.ini guibabel style" usr/share/doc/${pkgname} From 618a67d4ef794965d28145a74dc53744bb430651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 21:26:37 +0200 Subject: [PATCH 09/23] kde-runtime: revbump for new qt-webkit-devel --- srcpkgs/kde-runtime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-runtime/template b/srcpkgs/kde-runtime/template index d9665841a99..b08e8c766e8 100644 --- a/srcpkgs/kde-runtime/template +++ b/srcpkgs/kde-runtime/template @@ -1,13 +1,13 @@ # Template file for 'kde-runtime' pkgname=kde-runtime version=4.14.3 -revision=4 +revision=5 build_style=cmake configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF DWITH_QNtrack=OFF -DWITH_NepomukCore=OFF" # XXX OpenSLP hostmakedepends="cmake automoc4 pkg-config" makedepends=" - boost-devel glib-devel libressl-devel qt-devel phonon-devel strigi-devel + boost-devel glib-devel libressl-devel qt-devel qt-webkit-devel phonon-devel strigi-devel libXt-devel attica-devel qca-devel liblzma-devel libssh-devel libgcrypt-devel libjpeg-turbo-devel libpng-devel exiv2-devel alsa-lib-devel samba-devel pulseaudio-devel libwebp-devel libcanberra-devel NetworkManager-devel From caf2ad62a9f0dac64bcd01f1cbcb5ebc27220cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 22:13:38 +0200 Subject: [PATCH 10/23] kdelibs: revbump for new qt-webkit-devel --- srcpkgs/kdelibs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template index 093cf49e0e7..c7daf92cca0 100644 --- a/srcpkgs/kdelibs/template +++ b/srcpkgs/kdelibs/template @@ -1,7 +1,7 @@ # Template file for 'kdelibs' pkgname=kdelibs version=4.14.3 -revision=3 +revision=4 short_desc="KDE core libraries" maintainer="Juan RP " license="GPL-2.0, LGPL-2.1, FDL" @@ -21,7 +21,7 @@ makedepends="libressl-devel libSM-devel libXext-devel libXScrnSaver-devel libpng-devel giflib-devel acl-devel enchant-devel jasper-devel liblzma-devel mit-krb5-devel avahi-libs-devel eudev-libudev-devel libxslt-devel polkit-qt-devel libdbusmenu-qt-devel attica-devel grantlee-devel qca-devel - libutempter-devel MesaLib-devel udisks2-devel + qt-webkit-devel libutempter-devel MesaLib-devel udisks2-devel libopenexr-devel media-player-info shared-mime-info shared-desktop-ontologies" depends="docbook-xsl media-player-info shared-mime-info shared-desktop-ontologies hicolor-icon-theme ca-certificates" From 78a3362a410812e10ed3239611ed17ba036454b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 22:14:25 +0200 Subject: [PATCH 11/23] k3b: revbump for new qt-webkit-devel --- srcpkgs/k3b/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index 186b2a04c62..7ccfac643af 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -2,11 +2,11 @@ pkgname=k3b _realversion=2.0.3 version=${_realversion}a -revision=2 +revision=3 build_style=cmake hostmakedepends="cmake qt-qmake automoc4 pkg-config" makedepends="kde-runtime-devel libcddb-devel libsamplerate-devel libmad-devel - ffmpeg-devel taglib-devel libmpcdec-devel libdvdread-devel libXft-devel + ffmpeg-devel taglib-devel libmpcdec-devel libdvdread-devel libXft-devel qt-webkit-devel kdelibs-devel phonon-devel libmusicbrainz5-devel lame-devel libkcddb-devel" short_desc="CD/DVD Kreator for Linux" maintainer="Enno Boland " From 26b9640bda33bf83f0c4f011bd1f605f0fc0ede2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 22:21:29 +0200 Subject: [PATCH 12/23] kde-workspace: revbump for new qt-webkit-devel --- srcpkgs/kde-workspace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index bdee9581de8..27f510fdd7c 100644 --- a/srcpkgs/kde-workspace/template +++ b/srcpkgs/kde-workspace/template @@ -4,7 +4,7 @@ _kappversion=15.04.1 pkgname=kde-workspace version=4.11.19 -revision=5 +revision=6 short_desc="Provides the interface and basic tools for the KDE workspace" maintainer="Juan RP " license="GPL-2, LGPL-2.1, FDL" @@ -21,7 +21,7 @@ configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc # XXX prison. hostmakedepends="cmake automoc4 pkg-config" makedepends="libressl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-devel - kdelibs-devel kactivities-devel xcb-util-keysyms-devel + qt-webkit-devel kdelibs-devel kactivities-devel xcb-util-keysyms-devel qimageblitz-devel xcb-util-image-devel xcb-util-renderutil-devel boost-devel libjpeg-turbo-devel libpng-devel libXcursor-devel libXi-devel libxkbfile-devel libXrandr-devel libXfixes-devel libSM-devel libXcomposite-devel libXdamage-devel From 0b68a15a6a1562b2d9db8d3765f67aa74de4b178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 22:52:10 +0200 Subject: [PATCH 13/23] kdepim: revbump for new qt-webkit-devel --- srcpkgs/kdepim/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kdepim/template b/srcpkgs/kdepim/template index 75be2c3cbde..b333b96e6ec 100644 --- a/srcpkgs/kdepim/template +++ b/srcpkgs/kdepim/template @@ -1,21 +1,21 @@ # Template file for 'kdepim' pkgname=kdepim version=4.14.3 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF" # XXX dblatex, prison hostmakedepends="cmake automoc4 pkg-config" makedepends=" - zlib-devel libressl-devel qt-devel phonon-devel kdelibs-devel - kdepimlibs-devel akonadi-devel grantlee-devel libkgapi-devel + zlib-devel libressl-devel qt-devel qt-webkit-devel phonon-devel + kdelibs-devel kdepimlibs-devel akonadi-devel grantlee-devel libkgapi-devel libsasl-devel libassuan-devel gpgme-devel boost-devel MesaLib-devel kdepim-runtime qjson-devel kactivities-devel kfilemetadata-devel baloo-devel" depends="kdepim-runtime>=${version}" short_desc="KDE PIM" maintainer="Juan RP " -license="GPL, LGPL, FDL" +license="GPL-2, LGPL-2.1, FDL" homepage="https://projects.kde.org/projects/kde/kdepimlibs" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" checksum=a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 From 97e49030cabc227ba4e8b3e4252511deba77ff72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 22:59:20 +0200 Subject: [PATCH 14/23] marble: revbump for new qt-webkit-devel --- srcpkgs/marble/template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/marble/template b/srcpkgs/marble/template index c779697f407..9f14b142eeb 100644 --- a/srcpkgs/marble/template +++ b/srcpkgs/marble/template @@ -3,25 +3,25 @@ pkgname=marble version=4.14.3 -revision=3 -maintainer="Carlo Dormeletti " +revision=4 +maintainer="Carlo Dormeletti " homepage="hhttps://marble.kde.org" license="GPL-3" short_desc="Virtual globe and world atlas" build_style=cmake hostmakedepends="cmake automoc4 pkg-config" -makedepends="libressl-devel qt-devel kdelibs-devel phonon-devel" +makedepends="libressl-devel qt-devel qt-webkit-devel kdelibs-devel phonon-devel" replaces="libmarble>=0" distfiles="http://download.kde.org/stable/${version}/src/marble-${version}.tar.xz" checksum="4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0" marble-devel_package() { - replaces="libmarble-devel>=0" - short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/share/apps/cmake - } + replaces="libmarble-devel>=0" + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/share/apps/cmake + } } From a59028e7443498da8bc3a63494b3383ca0c07202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 22:59:35 +0200 Subject: [PATCH 15/23] kdeplasma-addons: revbump for new qt-webkit-devel --- srcpkgs/kdeplasma-addons/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kdeplasma-addons/template b/srcpkgs/kdeplasma-addons/template index db909795b88..c94ede2f407 100644 --- a/srcpkgs/kdeplasma-addons/template +++ b/srcpkgs/kdeplasma-addons/template @@ -1,19 +1,19 @@ # Template file for 'kdeplasma-addons' pkgname=kdeplasma-addons version=4.14.3 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc -DWITH_Nepomuk=OFF" # XXX scim, marble. hostmakedepends="cmake automoc4 pkg-config" -makedepends="libressl-devel qt-devel phonon-devel strigi-devel qoauth-devel - kdelibs-devel kdepimlibs-devel +makedepends="libressl-devel qt-devel qt-webkit-devel phonon-devel + strigi-devel qoauth-devel kdelibs-devel kdepimlibs-devel kde-workspace-devel libkexiv2-devel libdbusmenu-qt-devel libXtst-devel attica-devel libXrender-devel eigen2 glib-devel ibus-devel qimageblitz-devel boost-devel qjson-devel MesaLib-devel marble-devel" short_desc="KDE Plasma Add-ons" maintainer="Juan RP " -license="GPL, LGPL, FDL" +license="GPL-2, LGPL-2.1, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" checksum=12d58e30362729473db208c0650676dac0fdae8b3f223ce92e8df41e3e928f24 From 3bcce0a4f209de78f1a69ce689c8d0f4370dc52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:05:10 +0200 Subject: [PATCH 16/23] kdevplatform: revbump for new qt-webkit-devel --- srcpkgs/kdevplatform/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdevplatform/template b/srcpkgs/kdevplatform/template index 9fd7c790ef4..32d926d0b16 100644 --- a/srcpkgs/kdevplatform/template +++ b/srcpkgs/kdevplatform/template @@ -1,14 +1,14 @@ # Template file for 'kdevplatform' pkgname=kdevplatform version=1.7.3 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev" hostmakedepends="qt-qmake automoc4 perl" -makedepends="kdelibs-devel qt-devel libressl-devel phonon-devel grantlee-devel - boost-devel subversion-devel apr-util-devel qjson-devel" +makedepends="kdelibs-devel qt-devel qt-webkit-devel libressl-devel phonon-devel + grantlee-devel boost-devel subversion-devel apr-util-devel qjson-devel" short_desc="Libraries for use by KDE development tools" maintainer="yopito " From 7e85c8c6fdb29531f774b6b6eb869441e74e25a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:05:23 +0200 Subject: [PATCH 17/23] kdevelop: revbump for new qt-webkit-devel --- srcpkgs/kdevelop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template index 94ba152e1b0..1f3d2881f55 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,14 +1,14 @@ # Template file for 'kdevelop' pkgname=kdevelop version=4.7.3 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev" hostmakedepends="qt-qmake automoc4 perl" -makedepends="kdelibs-devel qt-devel libressl-devel phonon-devel qjson-devel - kdevplatform-devel kde-workspace-devel okteta-devel boost-devel" +makedepends="kdelibs-devel qt-devel qt-webkit-devel libressl-devel phonon-devel + qjson-devel kdevplatform-devel kde-workspace-devel okteta-devel boost-devel" # kde-runtime provides khelpcenter, needed to display documentation depends="konsole kate kde-runtime" From 731ceb372f606a833c30c7d7687f512f5b27255d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:07:09 +0200 Subject: [PATCH 18/23] ktorrent: revbump for new qt-webkit-devel --- srcpkgs/ktorrent/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template index bc3dd43a3d1..ccc04dfbdd3 100644 --- a/srcpkgs/ktorrent/template +++ b/srcpkgs/ktorrent/template @@ -1,7 +1,7 @@ # Template file for 'ktorrent' pkgname=ktorrent version=4.3.1 -revision=1 +revision=2 short_desc="BitTorrent client based on the KDE platform" maintainer="Norbert Vegh " license="GPL-2" @@ -11,5 +11,5 @@ checksum=66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 build_style=cmake hostmakedepends="cmake automoc4" configure_args="-DKDE4_BUILD_TESTS=OFF" -makedepends="kdelibs-devel qt-devel gmp-devel qca-devel libressl-devel phonon-devel - libktorrent-devel kdepimlibs-devel boost-devel" +makedepends="kdelibs-devel qt-devel qt-webkit-devel gmp-devel qca-devel + libressl-devel phonon-devel libktorrent-devel kdepimlibs-devel boost-devel" From a236b9e14817eb583d31bcd24ddd8dfb32a1a8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:10:03 +0200 Subject: [PATCH 19/23] kvirc: revbump for new qt-webkit-devel --- srcpkgs/kvirc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template index ac305d6c1bb..8e58d061a28 100644 --- a/srcpkgs/kvirc/template +++ b/srcpkgs/kvirc/template @@ -1,11 +1,11 @@ # Template file for 'kvirc' pkgname=kvirc version=4.2.0 -revision=9 +revision=10 build_style=cmake configure_args="-DWANT_ENV_FLAGS=1" hostmakedepends="automoc4" -makedepends="zlib-devel qt-devel libressl-devel python-devel kdelibs-devel perl" +makedepends="zlib-devel qt-devel qt-webkit-devel libressl-devel python-devel kdelibs-devel perl" short_desc="Qt-based IRC client" maintainer="Andrea Brancaleoni " license="GPL-2" From 10be490c17e01c3a7af1ab3b463ef623fa7dfb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:12:12 +0200 Subject: [PATCH 20/23] libkgapi: revbump for new qt-webkit-devel --- srcpkgs/libkgapi/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template index b10aba61ba0..b5c1c4d3c68 100644 --- a/srcpkgs/libkgapi/template +++ b/srcpkgs/libkgapi/template @@ -1,13 +1,13 @@ # Template file for 'libkgapi' pkgname=libkgapi version=2.1.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="cmake automoc4 pkg-config" -makedepends="boost-devel qt-devel phonon-devel kdelibs-devel kdepimlibs-devel qjson-devel" -short_desc="A KDE-based library for accessing various Google services via their public API" +makedepends="boost-devel qt-devel qt-webkit-devel phonon-devel kdelibs-devel kdepimlibs-devel qjson-devel" +short_desc="KDE-based library for accessing various Google services" maintainer="Juan RP " -license="GPL, LGPL, FDL" +license="GPL-2, LGPL-2.1, FDL" homepage="https://projects.kde.org/projects/extragear/libs/libkgapi" distfiles="http://download.kde.org/stable/${pkgname}/${version}/src/${pkgname}-${version}.tar.bz2" checksum=2d7dcaf5033acac381ea456b7320784898617cdc502587313bd8b653855d02cb From ea71502bb31ef2345d84e5ebadb149d09774725b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:18:02 +0200 Subject: [PATCH 21/23] python-PyQt4: revbump for new qt-webkit-devel --- srcpkgs/python-PyQt4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-PyQt4/template b/srcpkgs/python-PyQt4/template index 48b9d5955d0..5fad492d3bf 100644 --- a/srcpkgs/python-PyQt4/template +++ b/srcpkgs/python-PyQt4/template @@ -1,11 +1,11 @@ # Template file for 'python-PyQt4' pkgname=python-PyQt4 version=4.11.4 -revision=3 +revision=4 wrksrc="PyQt-x11-gpl-${version}" hostmakedepends="pkg-config" makedepends="python-devel python3.4-devel python-sip-devel python3.4-sip-devel - qt-devel dbus-devel python-dbus-devel MesaLib-devel phonon-devel" + qt-devel qt-webkit-devel dbus-devel python-dbus-devel MesaLib-devel phonon-devel" depends="python-sip" pycompile_module="PyQt4" short_desc="Python2 bindings for the Qt4 toolkit" From 3a69ae21912d1d71868cfc74f53eb9a27f33cb48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:20:01 +0200 Subject: [PATCH 22/23] quassel: revbump for new qt-webkit-devel --- srcpkgs/quassel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/quassel/template b/srcpkgs/quassel/template index 634a91e5be1..99724ad73ed 100644 --- a/srcpkgs/quassel/template +++ b/srcpkgs/quassel/template @@ -1,13 +1,13 @@ # Template file for 'quassel' pkgname=quassel version=0.12.4 -revision=1 +revision=2 build_style=cmake _desc="Modern, cross-platform, distributed graphical IRC client" short_desc="${_desc} - standalone client" maintainer="Toyam Cox " hostmakedepends="pkg-config" -makedepends="zlib-devel qt-devel libdbusmenu-qt-devel phonon-devel qca-devel" +makedepends="zlib-devel qt-devel qt-webkit-devel libdbusmenu-qt-devel phonon-devel qca-devel" _common_deps="desktop-file-utils" depends="${_common_deps} qt-plugin-sqlite quassel-client-shared>=${version}_${revision}" license="GPL-3" From d988d09362833f0602b63170a6d19180f12283c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 17 Sep 2016 23:23:42 +0200 Subject: [PATCH 23/23] tomahawk: revbump for new qt-webkit-devel --- srcpkgs/tomahawk/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index ee5fe21b2d9..172974d3335 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=5 +revision=6 build_style=cmake build_options="upower hatchet kde xmpp" desc_option_hatchet="Enable support for http://hatchet.is" @@ -16,9 +16,9 @@ configure_args="-DBUILD_RELEASE=ON \ $(vopt_if kde '-DWITH_KDE4=ON' '-DWITH_KDE4=OFF') \ $(vopt_if upower '-DWITH_UPOWER=ON' '-DWITH_UPOWER=OFF')" hostmakedepends="pkg-config akonadi-devel" -makedepends="boost-devel qt-devel qjson-devel taglib-devel sparsehash gnutls-devel - qca-devel Lucene++-devel attica-devel quazip-devel qtkeychain-devel - phonon-devel liblastfm-devel libechonest-devel libressl-devel +makedepends="boost-devel qt-devel qt-webkit-devel qjson-devel taglib-devel + sparsehash gnutls-devel qca-devel Lucene++-devel attica-devel quazip-devel + qtkeychain-devel phonon-devel liblastfm-devel libechonest-devel libressl-devel $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel) $(vopt_if kde kde-baseapps-devel) $(vopt_if kde telepathy-qt-devel)" depends="virtual?phonon-backend qt-plugin-sqlite $(vopt_if xmpp qca-ossl)"