diff options
| author | Bart Ribbers <bribbers@disroot.org> | 2020-02-20 16:12:31 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-02-24 19:18:43 -0300 |
| commit | 65f58742e6e669c7d0f5b23c0764f4f73661980b (patch) | |
| tree | 76a9004e9c481ced23debc121c304bdc24273ae4 | |
| parent | 76ca77d9ba8ee59f1a761b7d44252958584347bc (diff) | |
| download | aports-65f58742e6e669c7d0f5b23c0764f4f73661980b.tar.bz2 aports-65f58742e6e669c7d0f5b23c0764f4f73661980b.tar.xz | |
{community,testing}/qt: upgrade to 5.14.1
34 files changed, 309 insertions, 458 deletions
diff --git a/community/qt5-qtbase/APKBUILD b/community/qt5-qtbase/APKBUILD index 1857d637d9..3a1cfa6297 100644 --- a/community/qt5-qtbase/APKBUILD +++ b/community/qt5-qtbase/APKBUILD @@ -1,13 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtbase -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_p/-} _ver=${_ver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=2 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt5 - QtBase components" url="https://qt.io/developers/" arch="all" @@ -42,6 +41,7 @@ makedepends="$depends_dev pcre2-dev postgresql-dev unixodbc-dev + vulkan-headers xcb-util-dev xcb-util-image-dev xcb-util-keysyms-dev @@ -55,17 +55,18 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz + +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtbase-everywhere-src-$_v.tar.xz qt-musl-iconv-no-bom.patch " _qt5_prefix=/usr/lib/qt5 _qt5_datadir=/usr/share/qt5 -builddir="$srcdir"/$_pkgname-${_V%-*} +builddir="$srcdir"/qtbase-everywhere-src-${_v%-*} prepare() { default_prepare - cd "$builddir" + sed -i -e "s|-O2|$CXXFLAGS|" \ -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ @@ -73,8 +74,6 @@ prepare() { } build() { - local _arch - cd "$builddir" ./configure -confirm-license -opensource \ -archdatadir "$_qt5_prefix" \ -bindir "$_qt5_prefix"/bin \ @@ -114,21 +113,19 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install mkdir -p "$pkgdir"/usr/bin/ - for i in "$pkgdir"/$_qt5_prefix/bin/*; do + for i in "$pkgdir"/"$_qt5_prefix"/bin/*; do _name=${i##*/} case $_name in *.*) _dest="$pkgdir"/usr/bin/${_name%.*}-qt5.${_name##*.};; *) _dest="$pkgdir"/usr/bin/${_name%.*}-qt5;; esac - ln -s ../lib/qt5/bin/"${_name}" "$_dest" + ln -s ../lib/qt5/bin/"$_name" "$_dest" done } @@ -145,8 +142,12 @@ dev() { _mv_files usr/lib/qt5/mkspecs \ usr/lib/cmake \ usr/lib/qt5/bin \ - usr/bin \ - $(find usr/ -name '*.prl') + usr/bin + find usr/ -name '*.prl' | while read -r i + do + _mv_files "$i" + done + default_dev } @@ -199,9 +200,9 @@ x11() { usr/lib/qt5/plugins/printsupport* \ usr/lib/qt5/plugins/xcbglintegrations - scanelf -Rn usr/ | egrep '(libX|libQt5Gui|libGL)' && return 1 + scanelf -Rn usr/ | grep -E '(libX|libQt5Gui|libGL)' && return 1 return 0 } -sha512sums="9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 qtbase-everywhere-src-5.12.5.tar.xz +sha512sums="964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b qtbase-everywhere-src-5.14.1.tar.xz 7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444 qt-musl-iconv-no-bom.patch" diff --git a/community/qt5-qtcharts/APKBUILD b/community/qt5-qtcharts/APKBUILD index 763502c118..68067d692f 100644 --- a/community/qt5-qtcharts/APKBUILD +++ b/community/qt5-qtcharts/APKBUILD @@ -1,13 +1,12 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtcharts -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt5 - Support for rendering and displaying SVG" url="https://www.qt.io/developers/" arch="all" @@ -19,23 +18,20 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtcharts-everywhere-src-$_v.tar.xz" +builddir="$srcdir"/qtcharts-everywhere-src-${_v%-*} build() { - cd "$builddir" qmake-qt5 && make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="a3ba8c6a606430cd87f85661116dbb2692e0bb472f0a73310aca1950f4437563d04ee950437a48a399b1a4881dd264cd1e6fdd4f30b6c3110704ec48d1467da1 qtcharts-everywhere-src-5.12.5.tar.xz" +sha512sums="5cf2739a5bc67ed25cb6f39bd795447c1e37963d1f3726d37ad9a2894080db3329fd2c6b17937ad831db78f5099e7c3b4ecd02991a7a69eb482ab61877d54d0f qtcharts-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtconnectivity/APKBUILD b/community/qt5-qtconnectivity/APKBUILD index 5a9ed89053..161a870275 100644 --- a/community/qt5-qtconnectivity/APKBUILD +++ b/community/qt5-qtconnectivity/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtconnectivity -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="QT5 Connectivity Compontents" url="https://www.qt.io/developers/" arch="all" license="(LGPL-2.0-or-later OR GPL-3.0-only OR GPL-2.0-or-later) AND Qt-GPL-exception-1.0" -options="!check" #upstream does not provide check +options="!check" # upstream does not provide check makedepends="qt5-qtbase-dev" subpackages="$pkgname-dev" @@ -20,13 +19,13 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtconnectivity-everywhere-src-$_v.tar.xz" +builddir="$srcdir"/qtconnectivity-everywhere-src-${_v%-*} prepare() { default_prepare - cd "$builddir" + mkdir -p build } @@ -40,4 +39,4 @@ package() { cd "$builddir"/build make INSTALL_ROOT="$pkgdir" install } -sha512sums="96cdb27aa0e439094e3f1de0c7a680973c3ce2c65bbbff38affe25a3708c9e4e3c1c6a403d698303f77a5f261b44ac657e01a769b62a1565e0a8c64c8ac80bd5 qtconnectivity-everywhere-src-5.12.5.tar.xz" +sha512sums="bebffcda3949d798289fcbf8df99afe8fecb6bf410de3fca278f4290f561b75f667ac1f929e62ec423a56c3d80db06ce53d8992f360201e05ed6953af07ceb1a qtconnectivity-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtdeclarative/APKBUILD b/community/qt5-qtdeclarative/APKBUILD index 9d5cdee21e..cad246dd1b 100644 --- a/community/qt5-qtdeclarative/APKBUILD +++ b/community/qt5-qtdeclarative/APKBUILD @@ -1,30 +1,29 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtdeclarative -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_p/-} _ver=${_ver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=2 +pkgrel=0 pkgdesc="Qt5 - QtDeclarative component" url="https://www.qt.io/developers/" arch="all" # Broken on armhf, upstream bug report https://bugreports.qt.io/browse/QTBUG-65246 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -makedepends="qt5-qtbase-dev python3" +makedepends="qt5-qtbase-dev python3 vulkan-headers" subpackages="$pkgname-dev" case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_v.tar.xz +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtdeclarative-everywhere-src-$_v.tar.xz qt-musl-stackbottom.patch " _qt5_prefix=/usr/lib/qt5 -builddir="$srcdir/$_pkgname-${_v%-*}" +builddir="$srcdir/qtdeclarative-everywhere-src-${_v%-*}" build() { # HACK so calls to "python" get what we want @@ -47,5 +46,5 @@ package() { done } -sha512sums="026c5024c06e44b6e91099d1ee912f38017f314ae0125227010d25d733447c692299cc7c47edc1a4bf39366a9c9c9fe77d3a249905f2ae982d0725317d824b9b qtdeclarative-everywhere-src-5.12.5.tar.xz +sha512sums="70094d24a977a5ae4a3a11ee31e49234592faca1ec8195560977e7834778d1b1fdc2a30e555dc6c43c98cef2a39d5c1bf6351093c0f46b9b22b4127f3bebef58 qtdeclarative-everywhere-src-5.14.1.tar.xz 235091cc1da51c31165a99932c95543d999c0f21b2c6b4318306b647662d420f88d7270ec21db7417fe9f8d87bfa3e5f01b6465c3542da024dd1623ef0a87681 qt-musl-stackbottom.patch" diff --git a/community/qt5-qtgraphicaleffects/APKBUILD b/community/qt5-qtgraphicaleffects/APKBUILD index d9f60e6828..eb62386d2b 100644 --- a/community/qt5-qtgraphicaleffects/APKBUILD +++ b/community/qt5-qtgraphicaleffects/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtgraphicaleffects -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=1 +pkgrel=0 pkgdesc="Qt5 - QtGraphicalEffects component" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -19,7 +18,7 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtgraphicaleffects-everywhere-src-$_v.tar.xz" -builddir="$srcdir/$_pkgname-${_v%-*}" +builddir="$srcdir/qtgraphicaleffects-everywhere-src-${_v%-*}" build() { qmake-qt5 && make @@ -33,4 +32,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="489a308af5f56ff2b023375ddf705f8a1b15c0e1fb1ec3bc6e5f66a80b5863d63aa0e57a3aef025ab965694add8d71424123bca120ce8d8b8448e7218f7fc640 qtgraphicaleffects-everywhere-src-5.12.5.tar.xz" +sha512sums="82e3ba00d58137c81be333347970e9e7e8c3301d171792d1f362cff6d5badb7d8148b7748a54d5efd5332f315989f2838638a73d960a8ff3ef875683414880c8 qtgraphicaleffects-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtimageformats/APKBUILD b/community/qt5-qtimageformats/APKBUILD index 7d9e27eeb0..53e3affa76 100644 --- a/community/qt5-qtimageformats/APKBUILD +++ b/community/qt5-qtimageformats/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtimageformats -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt5 - QtImageFormats component" url="https://www.qt.io/developers/" arch="all" @@ -17,9 +16,9 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtimageformats-everywhere-src-$_v.tar.xz" +builddir="$srcdir"/qtimageformats-everywhere-src-${_v%-*} build() { qmake-qt5 && make @@ -33,4 +32,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="9fa76b7eec083596c45f68642b49dc88c2759a28cb9359935c3a64604082acea9adecee49bb0828cc587b86d469aec7169f8f72f83a15194c4fc10f0ca25fae0 qtimageformats-everywhere-src-5.12.5.tar.xz" +sha512sums="843c8288a79506d4f2ac9e318f9478d689045bd0de1c2d9a529b060bd44dc7823561baef290bc54ed6cc756027f1dcdb8f706a2bd122ec9aec18848e5d316555 qtimageformats-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtlocation/APKBUILD b/community/qt5-qtlocation/APKBUILD index 2a14bcba11..3111895a17 100644 --- a/community/qt5-qtlocation/APKBUILD +++ b/community/qt5-qtlocation/APKBUILD @@ -1,13 +1,12 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtlocation -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=2 +pkgrel=0 pkgdesc="Qt5 - Location component" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -23,7 +22,7 @@ esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtlocation-everywhere-src-$_v.tar.xz fix-build.patch" -builddir="$srcdir/$_pkgname-${_v%-*}" +builddir="$srcdir/qtlocation-everywhere-src-${_v%-*}" prepare() { default_prepare @@ -41,5 +40,5 @@ package() { cd "$builddir"/build make INSTALL_ROOT="$pkgdir" install } -sha512sums="fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc qtlocation-everywhere-src-5.12.5.tar.xz +sha512sums="5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8 qtlocation-everywhere-src-5.14.1.tar.xz eb19b97909b64a82d75732872573b25c626c924aec93dbbe9b1b27fd72354149aa0c4e2d3727a5a2519a7bee39cb6af60761ad40e29b4e7adeb89a300a710505 fix-build.patch" diff --git a/community/qt5-qtmultimedia/APKBUILD b/community/qt5-qtmultimedia/APKBUILD index 302a2f851e..c576dec1e3 100644 --- a/community/qt5-qtmultimedia/APKBUILD +++ b/community/qt5-qtmultimedia/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtmultimedia -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_p/-} _ver=${_ver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=2 +pkgrel=0 pkgdesc="Qt5 - Multimedia support" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev - alsa-lib-dev libxv-dev gstreamer-dev gst-plugins-base-dev" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev alsa-lib-dev libxv-dev + gstreamer-dev gst-plugins-base-dev" subpackages="$pkgname-dev" case $pkgver in @@ -22,7 +21,7 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtmultimedia-everywhere-src-$_v.tar.xz" -builddir="$srcdir/$_pkgname-${_v%-*}" +builddir="$srcdir/qtmultimedia-everywhere-src-${_v%-*}" build() { qmake-qt5 && make @@ -35,4 +34,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3 qtmultimedia-everywhere-src-5.12.5.tar.xz" +sha512sums="5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3 qtmultimedia-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtquickcontrols/APKBUILD b/community/qt5-qtquickcontrols/APKBUILD index 1a94a357dd..8587ebf32e 100644 --- a/community/qt5-qtquickcontrols/APKBUILD +++ b/community/qt5-qtquickcontrols/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtquickcontrols -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=2 +pkgrel=0 pkgdesc="Qt5 - module with set of QtQuick controls" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -19,7 +18,7 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtquickcontrols-everywhere-src-$_v.tar.xz" -builddir="$srcdir/$_pkgname-${_v%-*}" +builddir="$srcdir/qtquickcontrols-everywhere-src-${_v%-*}" build() { qmake-qt5 && make @@ -33,4 +32,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="4539a6ce1ee20f71f6bf48271bc3fe1125bd21899cf36142d1c3d41a68ba56211f27d6e4403c69e86bd4698c7c7c79bc60f2a78ef1b19c5eab5b8690d1a01037 qtquickcontrols-everywhere-src-5.12.5.tar.xz" +sha512sums="63157debfdab05f8fe141964c5a7d61373a422a7f46c01d1e5a7123998700790c63c8a5f1489c6fb25fd89c3065e1982605180568cf6a69835feeda441582be4 qtquickcontrols-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtquickcontrols2/APKBUILD b/community/qt5-qtquickcontrols2/APKBUILD index 95e4799c4a..4465436e25 100644 --- a/community/qt5-qtquickcontrols2/APKBUILD +++ b/community/qt5-qtquickcontrols2/APKBUILD @@ -1,13 +1,12 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtquickcontrols2 -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=1 +pkgrel=0 pkgdesc="Qt5 - module with set of QtQuick controls for embedded" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -23,7 +22,7 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtquickcontrols2-everywhere-src-$_v.tar.xz" -builddir="$srcdir/$_pkgname-${_v%-*}" +builddir="$srcdir/qtquickcontrols2-everywhere-src-${_v%-*}" prepare() { default_prepare @@ -41,4 +40,4 @@ package() { cd "$builddir"/build make INSTALL_ROOT="$pkgdir" install } -sha512sums="afbd742783d83eabf182031e218c2f611709cd66f2b4886317bd356ffff2afabe820e1f552f478a0c3f74daf6fd1f5256900448f5445b84792d6a71b42ccd20a qtquickcontrols2-everywhere-src-5.12.5.tar.xz" +sha512sums="c35a450e26f9afb79c237133d407442823fb6bb664c0d2c952b92f9084db85f0e7ba02bac9aca3aef45670fed7da34c7ef183297360cb13aee4260513b4393ee qtquickcontrols2-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtremoteobjects/APKBUILD b/community/qt5-qtremoteobjects/APKBUILD index b92867b74f..b0c8af70cd 100644 --- a/community/qt5-qtremoteobjects/APKBUILD +++ b/community/qt5-qtremoteobjects/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtremoteobjects -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt Remote Objects (QtRO) is an inter-process communication (IPC) module developed for Qt" url="https://www.qt.io/developers/" arch="all" license="(LGPL-2.0-or-later OR GPL-3.0-only OR GPL-2.0-or-later) AND Qt-GPL-exception-1.0" -options="!check" #upstream does not provide check +options="!check" # upstream does not provide check makedepends="qt5-qtbase-dev" subpackages="$pkgname-dev" @@ -20,13 +19,13 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtremoteobjects-everywhere-src-$_v.tar.xz" +builddir="$srcdir"/qtremoteobjects-everywhere-src-${_v%-*} prepare() { default_prepare - cd "$builddir" + mkdir -p build } @@ -37,7 +36,7 @@ build() { } check() { - cd "$builddir" + cd "$builddir"/build make check } @@ -45,4 +44,4 @@ package() { cd "$builddir"/build make INSTALL_ROOT="$pkgdir" install } -sha512sums="ed3314b1c66f9375bdc101029eaf730a630157ee41c094de2ff9cc5340c3c92a781dcb2b2cf0b8bbad8b19e566fb80f2d3b76e58624e990f90f23b8cdd21bd54 qtremoteobjects-everywhere-src-5.12.5.tar.xz" +sha512sums="0bbdc2b1d76cdc65e34f67c9c4cc1bfb8ec148e7b336f5a153a52258c2a06d5ccddfb43d10b7e5c6e04797ef2210ebf0039eae57635197f4d45e3b598d4a3ecc qtremoteobjects-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtscript/APKBUILD b/community/qt5-qtscript/APKBUILD index 14db234c76..02fcaddada 100644 --- a/community/qt5-qtscript/APKBUILD +++ b/community/qt5-qtscript/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtscript -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt5 - QtScript component" url="https://www.qt.io/developers/" arch="all" @@ -18,28 +17,25 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz + +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtscript-everywhere-src-$_v.tar.xz qtscript-everywhere-src-5.10.1-sgidefs.patch qtscript-s390x.patch " - -builddir="$srcdir"/$_pkgname-${_V%-*} +builddir="$srcdir"/qtscript-everywhere-src-${_v%-*} build() { - cd "$builddir" qmake-qt5 && make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install } -sha512sums="a422e47873ddf4c84adf00f51b721465acedfac535b0daeede63eac0d41c6f4f07d5a5f86513c86e981f3a0024020be03730670befab2a20cd4d6564c98d6c90 qtscript-everywhere-src-5.12.5.tar.xz +sha512sums="9f4fbb038319c93c03117f61380fc6d1064191f0b738de054c2cee2055e7ddbb06ce3d01855b22dc2284858569b4aebb4e838ac0c7432e123421d64909c1d8a4 qtscript-everywhere-src-5.14.1.tar.xz c89124fc940ceaa5cfc52c8f48b8eef17bba575a080fad3f27d61e3da98ab5cfd4bb6ffaae09ccae81f6f7644719fa28d38d4b7a7fe4cdb4268673c39627eb22 qtscript-everywhere-src-5.10.1-sgidefs.patch a0a22824954d35495d9d08c2b82d6eeeec26765760d417b8bc72c51e1753d4bb9f5e55d5289001d2d6071669a0bfd4f856fc3d0cf58b509bcbcd5211df35e482 qtscript-s390x.patch" diff --git a/community/qt5-qtsensors/APKBUILD b/community/qt5-qtsensors/APKBUILD index 17c1d738f6..3cfc76907d 100644 --- a/community/qt5-qtsensors/APKBUILD +++ b/community/qt5-qtsensors/APKBUILD @@ -1,13 +1,12 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtsensors -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=1 +pkgrel=0 pkgdesc="+The Qt Sensors API provides access to sensor hardware via QML and C++" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -22,7 +21,7 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtsensors-everywhere-src-$_v.tar.xz" -builddir="$srcdir/$_pkgname-${_v%-*}" +builddir="$srcdir/qtsensors-everywhere-src-${_v%-*}" prepare() { default_prepare @@ -40,4 +39,4 @@ package() { cd "$builddir"/build make INSTALL_ROOT="$pkgdir" install } -sha512sums="81ac74e4c0a3d1942393c9267bbcc50af0e04a6f163d566010d6053dc4c69a67395c3f4b7564a50ec84ac88a715edd002920be4e145e6bd23d082a021dee1e5a qtsensors-everywhere-src-5.12.5.tar.xz" +sha512sums="48113863561ca0e5ada249505f2e8dd20512c2591823f296e5a4aacbfadf24e221c7ef4564071a300aafb8dcd88e87bb27a864c4f36e534089084c347e2a7bed qtsensors-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtserialport/APKBUILD b/community/qt5-qtserialport/APKBUILD index 27ef243127..7dd2c9fb7d 100644 --- a/community/qt5-qtserialport/APKBUILD +++ b/community/qt5-qtserialport/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Denis Ryabyy <vv1r0x@gmail.com> # Maintainer: Denis Ryabyy <vv1r0x@gmail.com> pkgname=qt5-qtserialport -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_p/-} _ver=${_ver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} +_v=${_ver/rc/RC} pkgrel=0 pkgdesc="Qt5 - QtSerialPort module" url="http://wiki.qt.io/QtSerialPort" arch="all" -license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions" +license="(LGPL-2.0-or-later OR GPL-3.0-only OR GPL-2.0-or-later) AND Qt-GPL-exception-1.0" makedepends="qt5-qtbase-dev eudev-dev" subpackages="$pkgname-dev" @@ -20,23 +19,20 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_ver.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtserialport-everywhere-src-$_v.tar.xz" +builddir="$srcdir"/qtserialport-everywhere-src-${_v%-*} build() { - cd "$builddir" qmake-qt5 && make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install } -sha512sums="f3a5fb8c9a9513c16f52bd22b4fd4c6400819863237762f459d9f612ef2457447733cc8ed2bd645f182ab9eab6ddb5bcdbca2fbd67745def1a5fad1392087f4e qtserialport-everywhere-src-5.12.5.tar.xz" +sha512sums="89a48df4e31b6ea08b33ba1929b26001c2fc4dd815e7a1860e4a8c3d41437813cc9f0b13c5e2d64bf1357a5a81a619543264e013aa3ca2e5e2439e885ec270eb qtserialport-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtspeech/APKBUILD b/community/qt5-qtspeech/APKBUILD index 83b1b6189c..6483fb4e88 100644 --- a/community/qt5-qtspeech/APKBUILD +++ b/community/qt5-qtspeech/APKBUILD @@ -1,39 +1,35 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> -# Maintainer: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtspeech -_pkgname="${pkgname/qt5-/}-everywhere-src" -pkgver=5.12.5 +pkgver=5.14.1 pkgrel=0 pkgdesc="Qt module to make text to speech and speech recognition easy" url="https://qt.io" arch="all" -license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions" +license="(LGPL-2.0-or-later OR GPL-3.0-only OR GPL-2.0-or-later) AND Qt-GPL-exception-1.0" depends="qt5-qtmultimedia" makedepends="qt5-qtbase-dev" subpackages="$pkgname-dev" -builddir="$srcdir/$_pkgname-$pkgver" case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="http://download.qt.io/$_rel/qt/${pkgver%.*}/${pkgver}/submodules/$_pkgname-$pkgver.tar.xz" +source="http://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtspeech-everywhere-src-$pkgver.tar.xz" +builddir="$srcdir/qtspeech-everywhere-src-$pkgver" build() { - cd "$builddir" qmake-qt5 make } check() { - cd "$builddir" make check } package() { - cd "$builddir" INSTALL_ROOT="$pkgdir" make install } -sha512sums="2a1a2c86ee3b5501623bb0c2c8e5b6f96b353707fe0eb804629187899eca5952c665ef037c4257f635edf34ddea03bc686f472a4a346d9f8e2adc7479f640482 qtspeech-everywhere-src-5.12.5.tar.xz" +sha512sums="8249e374735a4a3de6b8795a5c09c9bc285eff8fc7e98e0a2446eb6b7306da1decd657bf92d5b8d195b042e7459097ce9129c8f6e4a23326f698c6e7010c46a1 qtspeech-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtsvg/APKBUILD b/community/qt5-qtsvg/APKBUILD index 13da6bcf51..96898cbb6d 100644 --- a/community/qt5-qtsvg/APKBUILD +++ b/community/qt5-qtsvg/APKBUILD @@ -1,13 +1,12 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtsvg -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt5 - Support for rendering and displaying SVG" url="https://www.qt.io/developers/" arch="all" @@ -19,23 +18,20 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz" +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtsvg-everywhere-src-$_v.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +builddir="$srcdir"/qtsvg-everywhere-src-${_v%-*} build() { - cd "$builddir" qmake-qt5 && make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="3d7f89d106b36c8a0fd04c6e6f0ccde0c50ced7192980ea7d9330ba73d9307559e60ed2b10c28481a419d19aaae6609bde9e1dd74ccedf340dacf0194a60429d qtsvg-everywhere-src-5.12.5.tar.xz" +sha512sums="022f2a4ddfb13e8b35746394f968b117b38bb805869cf3dd8f354d3e76b3e64e47414e9d12dcdb04bcf2162b520ee5521836d6ee4a6d1257e7f1e5ec565ca821 qtsvg-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qttools/APKBUILD b/community/qt5-qttools/APKBUILD index 6374478eb8..962275505a 100644 --- a/community/qt5-qttools/APKBUILD +++ b/community/qt5-qttools/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qttools -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt5 - QtTool components" url="https://www.qt.io/developers/" arch="all" @@ -18,7 +17,7 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qttools-everywhere-src-$_v.tar.xz assistant-qt5.desktop designer-qt5.desktop linguist-qt5.desktop @@ -26,7 +25,7 @@ source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname- " _qt5_prefix=/usr/lib/qt5 -builddir="$srcdir"/$_pkgname-${_V%-*} +builddir="$srcdir"/qttools-everywhere-src-${_v%-*} build() { qmake-qt5 && make @@ -37,7 +36,7 @@ package() { # -qt5 symlinks mkdir -p "$pkgdir"/usr/bin/ - for i in "$pkgdir"/$_qt5_prefix/bin/*; do + for i in "$pkgdir"/"$_qt5_prefix"/bin/*; do ln -s ../lib/qt5/bin/${i##*/} "$pkgdir"/usr/bin/${i##*/}-qt5 done @@ -62,7 +61,7 @@ package() { for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do size=$(echo ${icon##*/} | cut -d- -f2) install -p -m644 -D ${icon} \ - "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png + "$pkgdir"/usr/share/icons/hicolor/"$size"x"$size"/apps/linguist.png done } @@ -107,7 +106,7 @@ _dbusviewer() { usr/share/icons/hicolor/*/apps/qdbusviewer* } -sha512sums="e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c qttools-everywhere-src-5.12.5.tar.xz +sha512sums="59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30 qttools-everywhere-src-5.14.1.tar.xz d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2 assistant-qt5.desktop 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3 designer-qt5.desktop b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad linguist-qt5.desktop diff --git a/community/qt5-qttranslations/APKBUILD b/community/qt5-qttranslations/APKBUILD index c78afa91db..e3d589a2df 100644 --- a/community/qt5-qttranslations/APKBUILD +++ b/community/qt5-qttranslations/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qttranslations -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Qt5 - QtTranslations module" url="https://www.qt.io/developers/" arch="noarch" @@ -17,22 +16,19 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz" +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qttranslations-everywhere-src-$_v.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +builddir="$srcdir"/qttranslations-everywhere-src-${_v%-*} build() { - cd "$builddir" qmake-qt5 && make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="a2120add3b82fd84d44a064f08c5e781410c86dfd5eee39a01f44840063be5b4030c47989a2e6a413c4298d79b473f50968078a12793b9145d7ee8a722fd1698 qttranslations-everywhere-src-5.12.5.tar.xz" +sha512sums="e90a630fc1014543c3dd07379a7a4098664e25ec59e7c67ec8f9367e015a4351f8914954d3334ff44508a417cbd55a8dcf6f03c91aa75217fc723749726534d3 qttranslations-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtvirtualkeyboard/APKBUILD b/community/qt5-qtvirtualkeyboard/APKBUILD index 34096c41b2..c6b9c5fea4 100644 --- a/community/qt5-qtvirtualkeyboard/APKBUILD +++ b/community/qt5-qtvirtualkeyboard/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qt5-qtvirtualkeyboard -_pkgname="${pkgname/qt5-/}-everywhere-src" -pkgver=5.12.5 -pkgrel=2 +pkgver=5.14.1 +pkgrel=0 arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://www.qt.io/developers/" license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" @@ -11,7 +10,7 @@ pkgdesc="Virtual keyboard framework" depends_dev="qt5-qtsvg-dev" makedepends="$depends_dev hunspell-dev qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-dev" -builddir="$srcdir/$_pkgname-$pkgver" +builddir="$srcdir/qtvirtualkeyboard-everywhere-src-$pkgver" case $pkgver in *_beta*|*_rc*) _rel=development_releases;; @@ -39,4 +38,4 @@ package() { install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="e4581673451c40bf39b9793b0131bbad29e8a3f9db2d42adb23b48847bd674b6820717c051b76e506d4fd52e87c79b042533be85285a0cce9bcdc49cca964e66 qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz" +sha512sums="e9e6605590a83d394ed2cb37fffcaef0ae84cc09bfcf388b95c34aa686f4cc40e8f29fa5441a979cca71f5fdb9b53b777658c2d756226483f6104ce20517f42d qtvirtualkeyboard-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtwayland/03e8c91fc28b77c4f027b6c6d582b85878efae41.patch b/community/qt5-qtwayland/03e8c91fc28b77c4f027b6c6d582b85878efae41.patch deleted file mode 100644 index 7bcd572024..0000000000 --- a/community/qt5-qtwayland/03e8c91fc28b77c4f027b6c6d582b85878efae41.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 03e8c91fc28b77c4f027b6c6d582b85878efae41 Mon Sep 17 00:00:00 2001 -From: Johan Klokkhammer Helsing <johan.helsing@qt.io> -Date: Tue, 15 Oct 2019 09:51:43 +0200 -Subject: [PATCH] Client: Fix 100ms freeze when applications do not swap after - deliverUpdateRequest - -[ChangeLog][QPA plugin] Fixed a 100 ms freeze that would occur if applications -did not draw after receiving a deliverUpdateRequest(). - -QtQuick does this at the start of animations. This should get rid of those -backingstore warnings (and also remove a 100ms freeze before animations start -in those instances). - -Fixes: QTBUG-76813 -Change-Id: Id366bf4a14f402fa44530ae46e7b66d9988c14f6 -Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> -Reviewed-by: John Brooks <john.brooks@qt.io> -(cherry picked from commit 9f5b96225885f927727a57b6123d8550d6c373bb) ---- - src/client/qwaylandwindow.cpp | 46 +++++++++---------------------------------- - src/client/qwaylandwindow_p.h | 1 - - 2 files changed, 9 insertions(+), 38 deletions(-) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index 3cd7892a7..109110aef 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -1097,25 +1097,6 @@ QVariant QWaylandWindow::property(const QString &name, const QVariant &defaultVa - - void QWaylandWindow::timerEvent(QTimerEvent *event) - { -- if (event->timerId() == mFallbackUpdateTimerId) { -- killTimer(mFallbackUpdateTimerId); -- mFallbackUpdateTimerId = -1; -- qCDebug(lcWaylandBackingstore) << "mFallbackUpdateTimer timed out"; -- -- if (!isExposed()) { -- qCDebug(lcWaylandBackingstore) << "Fallback update timer: Window not exposed," -- << "not delivering update request."; -- return; -- } -- -- if (mWaitingForUpdate && hasPendingUpdateRequest() && !mWaitingForFrameCallback) { -- qCWarning(lcWaylandBackingstore) << "Delivering update request through fallback timer," -- << "may not be in sync with display"; -- deliverUpdateRequest(); -- } -- } -- -- - if (mFrameCallbackTimerId.testAndSetOrdered(event->timerId(), -1)) { - killTimer(event->timerId()); - qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed"; -@@ -1127,6 +1108,7 @@ void QWaylandWindow::timerEvent(QTimerEvent *event) - - void QWaylandWindow::requestUpdate() - { -+ qCDebug(lcWaylandBackingstore) << "requestUpdate"; - Q_ASSERT(hasPendingUpdateRequest()); // should be set by QPA - - // If we have a frame callback all is good and will be taken care of there -@@ -1134,20 +1116,17 @@ void QWaylandWindow::requestUpdate() - return; - - // If we've already called deliverUpdateRequest(), but haven't seen any attach+commit/swap yet -- if (mWaitingForUpdate) { -- // Ideally, we should just have returned here, but we're not guaranteed that the client -- // will actually update, so start this timer to deliver another request update after a while -- // *IF* the client doesn't update. -- int fallbackTimeout = 100; -- mFallbackUpdateTimerId = startTimer(fallbackTimeout); -- return; -- } -+ // This is a somewhat redundant behavior and might indicate a bug in the calling code, so log -+ // here so we can get this information when debugging update/frame callback issues. -+ // Continue as nothing happened, though. -+ if (mWaitingForUpdate) -+ qCDebug(lcWaylandBackingstore) << "requestUpdate called twice without committing anything"; - - // Some applications (such as Qt Quick) depend on updates being delivered asynchronously, - // so use invokeMethod to delay the delivery a bit. - QMetaObject::invokeMethod(this, [this] { - // Things might have changed in the meantime -- if (hasPendingUpdateRequest() && !mWaitingForUpdate && !mWaitingForFrameCallback) -+ if (hasPendingUpdateRequest() && !mWaitingForFrameCallback) - deliverUpdateRequest(); - }, Qt::QueuedConnection); - } -@@ -1157,6 +1136,7 @@ void QWaylandWindow::requestUpdate() - // Can be called from the render thread (without locking anything) so make sure to not make races in this method. - void QWaylandWindow::handleUpdate() - { -+ qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread(); - // TODO: Should sync subsurfaces avoid requesting frame callbacks? - QReadLocker lock(&mSurfaceLock); - if (!isInitialized()) -@@ -1167,15 +1147,6 @@ void QWaylandWindow::handleUpdate() - mFrameCallback = nullptr; - } - -- if (mFallbackUpdateTimerId != -1) { -- // Ideally, we would stop the fallback timer here, but since we're on another thread, -- // it's not allowed. Instead we set mFallbackUpdateTimer to -1 here, so we'll just -- // ignore it if it times out before it's cleaned up by the invokeMethod call. -- int id = mFallbackUpdateTimerId; -- mFallbackUpdateTimerId = -1; -- QMetaObject::invokeMethod(this, [this, id] { killTimer(id); }, Qt::QueuedConnection); -- } -- - mFrameCallback = frame(); - wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this); - mWaitingForFrameCallback = true; -@@ -1195,6 +1166,7 @@ void QWaylandWindow::handleUpdate() - - void QWaylandWindow::deliverUpdateRequest() - { -+ qCDebug(lcWaylandBackingstore) << "deliverUpdateRequest"; - mWaitingForUpdate = true; - QPlatformWindow::deliverUpdateRequest(); - } -diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h -index 717709938..0369bd0c2 100644 ---- a/src/client/qwaylandwindow_p.h -+++ b/src/client/qwaylandwindow_p.h -@@ -229,7 +229,6 @@ protected: - - // True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer - bool mWaitingForUpdate = false; -- int mFallbackUpdateTimerId = -1; // Started when waiting for app to commit - - QMutex mResizeLock; - bool mWaitingToApplyConfigure = false; --- -2.16.3 - diff --git a/community/qt5-qtwayland/APKBUILD b/community/qt5-qtwayland/APKBUILD index 271e243e3c..1f4da4bee4 100644 --- a/community/qt5-qtwayland/APKBUILD +++ b/community/qt5-qtwayland/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qt5-qtwayland -_pkgname="${pkgname/qt5-/}-everywhere-src" -pkgver=5.12.5 -pkgrel=3 +pkgver=5.14.1 +pkgrel=0 arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://www.qt.io/developers/" license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" @@ -11,15 +10,14 @@ pkgdesc='Provides APIs for Wayland' makedepends="$depends_dev libxkbcommon-dev libxcomposite-dev qt5-qtquickcontrols2-dev qt5-qtdeclarative-dev qt5-qtbase-dev wayland-dev" subpackages="$pkgname-dev $pkgname-doc" -builddir="$srcdir/$_pkgname-$pkgver" +builddir="$srcdir/qtwayland-everywhere-src-$pkgver" case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="http://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtwayland-everywhere-src-$pkgver.tar.xz - 03e8c91fc28b77c4f027b6c6d582b85878efae41.patch" +source="http://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtwayland-everywhere-src-$pkgver.tar.xz" build() { qmake-qt5 @@ -40,5 +38,4 @@ package() { install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="19e19b3d6226839856f8e8792665eda1f09f0bbf95a38077bdf2831205ee09254c8df6a521ba3f5a228bcd98c4d1929a2bd9e9aa2f6f14c218d4d7458d1a866c qtwayland-everywhere-src-5.12.5.tar.xz -f570e9b11611ec43289afc83230b094f974c7d48be5b79e00b3815b5fb92ec845c768fa2911ccfbeec29dda338d0b3fab8cc9702536c816c78d98820d38466c9 03e8c91fc28b77c4f027b6c6d582b85878efae41.patch" +sha512sums="6cdfb527ce8160b562343bfb3959dfcd8ccc91a50817756547f4a0559b77372bee7587bc2e4e658e15b58ecb52c6eb0ef2193e30a285d13c4192bb03a1149cfc qtwayland-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtwebchannel/APKBUILD b/community/qt5-qtwebchannel/APKBUILD index c7e761b23f..3db7c99b6a 100644 --- a/community/qt5-qtwebchannel/APKBUILD +++ b/community/qt5-qtwebchannel/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtwebchannel -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=1 +pkgrel=0 pkgdesc="library for seamless integration of C++ +and QML applications with HTML/JavaScript clients." url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -options="!check" #upstream does not provide check +options="!check" # upstream does not provide check makedepends="qt5-qtbase-dev qt5-qtwebsockets-dev qt5-qtdeclarative-dev" subpackages="$pkgname-dev" @@ -22,7 +21,7 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtwebchannel-everywhere-src-$_v.tar.xz" -builddir="$srcdir"/$_pkgname-${_v%-*} +builddir="$srcdir"/qtwebchannel-everywhere-src-${_v%-*} prepare() { default_prepare @@ -40,4 +39,4 @@ package() { cd "$builddir"/build make INSTALL_ROOT="$pkgdir" install } -sha512sums="8ea543f29e8f686961b033c1246714b1535d0be730026bef4b4ee172ce602c706d8a16b8391510a302df7be6545007a2f42311eb1aea4da326c3addde16ca2b2 qtwebchannel-everywhere-src-5.12.5.tar.xz" +sha512sums="7abe214227efcea665a38488b73286ae8335490d825dd8886270e2c1cbf7382e27d6ec368b28f9876d6843029023a63e58f42e2bdb6aeb1502ae464af3e8666e qtwebchannel-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD index c3ae9610ce..a5be60ce1a 100644 --- a/community/qt5-qtwebengine/APKBUILD +++ b/community/qt5-qtwebengine/APKBUILD @@ -1,15 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtwebengine -pkgver=5.12.5 -pkgrel=5 +pkgver=5.14.1 +pkgrel=0 pkgdesc="Qt5 - QtWebEngine components" url="https://www.qt.io/developers/" # ppc64le, s390x: not supported arch="all !ppc64le !s390x !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -depends_dev="qt5-qtdeclarative-dev qt5-qtwebchannel-dev gstreamer-dev gst-plugins-base-dev - libxslt-dev mesa-dev icu-dev libxext-dev glib-dev libxcomposite-dev - libxrender-dev ninja ffmpeg-dev +depends_dev="gstreamer-dev gst-plugins-base-dev libxslt-dev mesa-dev icu-dev + libxext-dev glib-dev libxcomposite-dev libxrender-dev ninja ffmpeg-dev " makedepends="$depends_dev alsa-lib-dev @@ -41,6 +40,8 @@ makedepends="$depends_dev pcre-dev protobuf-dev qt5-qtbase-dev + qt5-qtdeclarative-dev + qt5-qtwebchannel-dev re2-dev ruby snappy-dev @@ -61,14 +62,12 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtwebengine-everywhere-src-$_v.tar.xz - arm-void-is-not-android.patch qt-musl-dispatch_to_musl.patch qt-musl-execinfo.patch qt-musl-mallinfo.patch qt-musl-off_t.patch qt-musl-pvalloc.patch qt-musl-resolve.patch - qt-musl-serialio.patch qt-musl-siginfo_t.patch qt-musl-fpstate.patch qt-musl-pread-pwrite.patch @@ -77,6 +76,9 @@ source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtwebengin qt-musl-thread-stacksize.patch musl-sandbox.patch yasm-nls.patch + nasm.patch + musl-hacks.patch + sandbox-sched_getparam.patch " builddir="$srcdir"/qtwebengine-everywhere-src-$_v @@ -93,20 +95,21 @@ package() { sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc } -sha512sums="b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df qtwebengine-everywhere-src-5.12.5.tar.xz -5e017e6500af56d0e608839c466782193ab3f6e5d01938b84b7f9c86fbb826e140f9fca789a23e7a7431ba42377be328a8bfcacbf7c302746de79f7857f2832d arm-void-is-not-android.patch +sha512sums="fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9 qtwebengine-everywhere-src-5.14.1.tar.xz 5ecbf435062b8565322dd1cbd0cbdb44f3daef264ab677fe22fe8cb400d4bb22281cc607ea419c7362c483312482632ed41bd67130413188425ef6e0ae184f07 qt-musl-dispatch_to_musl.patch -982550095ccebc49b15f71bddc7c7373e8bc1aa88cbc6db0e8984c31d02760e6ed8ec635f5e16faa022cc312f354fc6811d3cd2438e20561be565f3c00bebc67 qt-musl-execinfo.patch +7084a07386fb9f66fbfeadac53869c0f386cea98dbb29787f030635bc8cd116b7459acafbe06540f1aef79d8a69817520ad18bcb9ac24954dd70773ef083537e qt-musl-execinfo.patch 229f148c2b9bbb517409d3627e3bacf144cd39bfd3b7915f35de2f3b8c3e19f80c93799ef42784014cdd79af7b56557b6852632c4f1646a747d9eed24f61decb qt-musl-mallinfo.patch 7eba28eb015f1a7e5cf70e9354fcd647b69f4e7c061b889a8c0d55f4a94a033f95d0252f9baebf13c3d501438074a05d547eef2c8cf898dc2c87cec3b60e76e0 qt-musl-off_t.patch ac563e0c444a6d3214ff7465cad2c701692cfa90408c57243d3ae9459937c36e88acd57335bb90da85157e03865faaf17d61a767483b00ed8f3580ebf8a2fbb5 qt-musl-pvalloc.patch 8d95e4fcb463b5d2053c9538e66150ec9a3acddd7815cc34c8cd6fa115e49f1d602c4f1fc73f5e507a932c918e36c9c3d1386476dca91c5fc422906d0d88f610 qt-musl-resolve.patch -c39b4c39ad3e297dc4f2508af9fb6b1618e8f6fac4399e41b5bde00a1e79cc0cd24af8b8c01bfe61e4748b2b74778a06afff166095e59baf491d6fc56f3537f7 qt-musl-serialio.patch 2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f qt-musl-siginfo_t.patch 059f22a594a046d552a33b17d811c50b645c4be11a49ed3b29a32ce38d501fd07c1e15a4e1075c46f984c850bf88aecb357e4310a62b30494ea25297055f05c8 qt-musl-fpstate.patch b1f7823d0bdd14dbcb4dbd72ab2d16460d343722d2601921a50f8912ce580a632e0d7b01d7fea6f27ff5014a1f21595c6d8d4500b995bcc6db38cbd10ac4aa96 qt-musl-pread-pwrite.patch 987b9b35d04317e22ae2cce382e776f3309fc7fd4588e408cd6bed846f47620d01e2b9958cb60c84b8f6f496de6544a21ba399ba8b8f107b73df179794740092 qt-musl-sysreg-for__WORDSIZE.patch 7dc3e9995596adef65cd96f650eb7ee13d52cabfe6353f04eeb5b8a5776e7e0585ffc2a0a31deea6924352ee9a5a8e03ac37432b558c6a46f3dc457b4283392a qt-musl-stackstart.patch b37fbc4df03c82123f94982039defa12d9bb8c885c9dcf8fff556b5f9cc58182fa471f970cc3a5e2d5dbe964855f591b474366b6a8926d94ae6a78e883811c1a qt-musl-thread-stacksize.patch -76b1966bdd76fd22f0073b23be50f69fb95451e06bdce567a439b0fbb69ff2956264704f5b53c50842e9c4aafaab7d2f330465a04092b66c5965e5d0ae2c7761 musl-sandbox.patch -f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch" +89005585780ee4459ae3f065f056e166c7686d4dfe3e9e3f2a77b0ed7b8ba819eeb1c9659a971c9cda79cf7fb49b29189765f010a7a55167b6e3282c62c4cbe1 musl-sandbox.patch +f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch +9add958caa0d6acb2866d3927aadfa6b378c92d62463f1b3d65ae1e5400915d89388ac54beb30c4d4d42d2901ee28f404d8574b771854556f6a75698301870eb nasm.patch +b99eaa4a0b06ab1cb461fc4bfc7416c779ba1e847614b96f08de97a137a09577ea642813e5e3235167ccc5180c6ffcc06ebf2a61e3b4c210de9dee765e0e7404 musl-hacks.patch +dbe606be93377f094c6a1ab0358ae042f3e7aff95c635b07ebc04aa3173f7221a478fd544e8347152a4ca125a837d6da774929423868d5c9d5bd6165bdd1ba6d sandbox-sched_getparam.patch" diff --git a/community/qt5-qtwebengine/arm-void-is-not-android.patch b/community/qt5-qtwebengine/arm-void-is-not-android.patch deleted file mode 100644 index 6ae86dde37..0000000000 --- a/community/qt5-qtwebengine/arm-void-is-not-android.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2018-01-30 16:42:15.332826020 +0100 -@@ -194,14 +194,6 @@ - "sp/src/arm/armv7/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S", - "sp/src/arm/armv7/omxSP_FFTInv_CCSToR_F32_Sfs_s.S", - ] -- if (arm_optionally_use_neon) { -- # Run-time NEON detection. -- deps = [ "//third_party/android_tools:cpu_features" ] -- # To get the __android_log_print routine -- libs = [ "log" ] -- # Detection routine -- sources += [ "sp/src/arm/detect.c" ] -- } - } - - # GYP: third_party/openmax_dl/dl/dl.gyp:openmax_dl_neon diff --git a/community/qt5-qtwebengine/musl-hacks.patch b/community/qt5-qtwebengine/musl-hacks.patch new file mode 100644 index 0000000000..ee82b48d3d --- /dev/null +++ b/community/qt5-qtwebengine/musl-hacks.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +index dbc8c5aaf..077bbde33 100644 +--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc ++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +@@ -1191,7 +1191,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( + msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); + msgvec->reserve(buffers.size()); + for (size_t j = 0; j < buffers.size(); j++) +- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0}); ++ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0}); + int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0)); + SendResult send_result(0, 0, std::move(buffers)); + if (result < 0) { diff --git a/community/qt5-qtwebengine/musl-sandbox.patch b/community/qt5-qtwebengine/musl-sandbox.patch index 45e3d9336e..ad64fae921 100644 --- a/community/qt5-qtwebengine/musl-sandbox.patch +++ b/community/qt5-qtwebengine/musl-sandbox.patch @@ -1,17 +1,12 @@ diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -index 2577f02..b27300c 100644 +index 348ab6e8c..2eac6ef82 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -@@ -129,23 +129,13 @@ namespace sandbox { - // CLONE_VM, nor CLONE_THREAD, which includes all fork() implementations. +@@ -139,21 +139,11 @@ namespace sandbox { + // present (as in newer versions of posix_spawn). ResultExpr RestrictCloneToThreadsAndEPERMFork() { const Arg<unsigned long> flags(0); -+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | -+ CLONE_THREAD | CLONE_SYSVSEM; -+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | -+ CLONE_DETACHED; -+ const BoolExpr thread_clone_ok = (flags&~safe)==required; - +- - // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2. - const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES | - CLONE_SIGHAND | CLONE_THREAD | @@ -26,17 +21,28 @@ index 2577f02..b27300c 100644 - const BoolExpr android_test = - AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, - flags == kGlibcPthreadFlags); -- ++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_THREAD | CLONE_SYSVSEM; ++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | ++ CLONE_DETACHED; ++ const BoolExpr thread_clone_ok = (flags&~safe)==required; + + // The following two flags are the two important flags in any vfork-emulating + // clone call. EPERM any clone call that contains both of them. +@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() { + AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0, + (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags); + - return If(IsAndroid() ? android_test : glibc_test, Allow()) + return If(thread_clone_ok, Allow()) - .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM)) + .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) .Else(CrashSIGSYSClone()); } diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -index 9f1cdef..a2d703b 100644 +index 6e2bd4fee..9f9e4ad8a 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -@@ -375,6 +375,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { #if defined(__i386__) case __NR_waitpid: #endif @@ -44,7 +50,7 @@ index 9f1cdef..a2d703b 100644 return true; case __NR_clone: // Should be parameter-restricted. case __NR_setns: // Privileged. -@@ -387,7 +388,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) case __NR_set_thread_area: #endif @@ -52,7 +58,7 @@ index 9f1cdef..a2d703b 100644 case __NR_unshare: #if !defined(__mips__) && !defined(__aarch64__) case __NR_vfork: -@@ -496,6 +496,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { case __NR_mlock: case __NR_munlock: case __NR_munmap: @@ -61,7 +67,7 @@ index 9f1cdef..a2d703b 100644 return true; case __NR_madvise: case __NR_mincore: -@@ -511,7 +513,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { case __NR_modify_ldt: #endif case __NR_mprotect: @@ -70,7 +76,7 @@ index 9f1cdef..a2d703b 100644 case __NR_munlockall: case __NR_readahead: diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h -index 59d0eab..7ae7002 100644 +index 59d0eab8e..7ae700213 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h @@ -1063,4 +1063,8 @@ @@ -83,22 +89,23 @@ index 59d0eab..7ae7002 100644 + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -index 1addd53..7843b5e 100644 +index 1addd5384..d8811ce87 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -@@ -1385,6 +1385,10 @@ +@@ -1385,6 +1385,11 @@ #define __NR_memfd_create (__NR_SYSCALL_BASE+385) #endif +#if !defined(__NR_membarrier) -+#define __NR_membarrier (__NR_SYSCALL_BASE+389) ++#define __NR_membarrier (__NR_SYSCALL_BASE+389)) +#endif + ++ // ARM private syscalls. #if !defined(__ARM_NR_BASE) #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h -index ec75815..612fcfa 100644 +index ec75815a8..612fcfaa9 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h @@ -1271,4 +1271,8 @@ @@ -111,7 +118,7 @@ index ec75815..612fcfa 100644 + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h -index ddbf97f..1742acd 100644 +index ddbf97f3d..1742acd4c 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h @@ -1433,4 +1433,8 @@ @@ -124,10 +131,10 @@ index ddbf97f..1742acd 100644 + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -index a6afc62..7ed0a3b 100644 +index a6afc62d9..6ab7740de 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -@@ -1422,5 +1422,9 @@ +@@ -1422,5 +1422,10 @@ #define __NR_memfd_create 356 #endif @@ -135,13 +142,14 @@ index a6afc62..7ed0a3b 100644 +#define __NR_membarrier 375 +#endif + ++ #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -index 349504a..ea3c7c9 100644 +index 349504aee..6a6d4756f 100644 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -@@ -1290,5 +1290,9 @@ +@@ -1290,5 +1290,10 @@ #define __NR_memfd_create 319 #endif @@ -149,5 +157,6 @@ index 349504a..ea3c7c9 100644 +#define __NR_membarrier 324 +#endif + ++ #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ diff --git a/community/qt5-qtwebengine/nasm.patch b/community/qt5-qtwebengine/nasm.patch new file mode 100644 index 0000000000..05e7307540 --- /dev/null +++ b/community/qt5-qtwebengine/nasm.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h +index 7eb7c20ff..3bdc2eb39 100644 +--- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h ++++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h +@@ -117,7 +117,7 @@ + #define HAVE_ACCESS 1 + + /* Define to 1 if you have the `canonicalize_file_name' function. */ +-#define HAVE_CANONICALIZE_FILE_NAME 1 ++// #define HAVE_CANONICALIZE_FILE_NAME 1 + + /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ + /* #undef HAVE_CPU_TO_LE16 */ diff --git a/community/qt5-qtwebengine/qt-musl-execinfo.patch b/community/qt5-qtwebengine/qt-musl-execinfo.patch index c5e085005c..7082f51aee 100644 --- a/community/qt5-qtwebengine/qt-musl-execinfo.patch +++ b/community/qt5-qtwebengine/qt-musl-execinfo.patch @@ -1,6 +1,29 @@ ---- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2018-01-27 21:50:04.693231905 +0100 -@@ -26,7 +26,7 @@ +diff --git a/src/3rdparty/chromium/base/debug/stack_trace.cc b/src/3rdparty/chromium/base/debug/stack_trace.cc +index d8ca822d9..f6f3d9c69 100644 +--- a/src/3rdparty/chromium/base/debug/stack_trace.cc ++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc +@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const { + } + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); + } + + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { +-#if !defined(__UCLIBC__) & !defined(_AIX) ++#if defined(__GLIBC__) & !defined(_AIX) + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; +diff --git a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc +index f4ddf9c1e..aef993613 100644 +--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc ++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc +@@ -27,7 +27,7 @@ #if !defined(USE_SYMBOLIZE) #include <cxxabi.h> #endif @@ -9,7 +32,7 @@ #include <execinfo.h> #endif -@@ -82,7 +82,7 @@ +@@ -88,7 +88,7 @@ void DemangleSymbols(std::string* text) { // Note: code in this function is NOT async-signal safe (std::string uses // malloc internally). @@ -18,17 +41,17 @@ std::string::size_type search_from = 0; while (search_from < text->size()) { // Look for the start of a mangled symbol, from search_from. -@@ -117,7 +117,7 @@ +@@ -123,7 +123,7 @@ void DemangleSymbols(std::string* text) { search_from = mangled_start + 2; } } -#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // !defined(__GLIBC__) && !defined(_AIX) ++#endif // defined(__GLIBC__) && !defined(_AIX) } #endif // !defined(USE_SYMBOLIZE) -@@ -129,7 +129,7 @@ - virtual ~BacktraceOutputHandler() {} +@@ -135,7 +135,7 @@ class BacktraceOutputHandler { + virtual ~BacktraceOutputHandler() = default; }; -#if !defined(__UCLIBC__) && !defined(_AIX) @@ -36,54 +59,45 @@ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { // This should be more than enough to store a 64-bit number in hex: // 16 hex digits + 1 for null-terminator. -@@ -206,7 +206,7 @@ +@@ -218,7 +218,7 @@ void ProcessBacktrace(void* const* trace, } #endif // defined(USE_SYMBOLIZE) } -#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // !defined(__GLIBC__) && !defined(_AIX) ++#endif // defined(__GLIBC__) && !defined(_AIX) void PrintToStderr(const char* output) { // NOTE: This code MUST be async-signal safe (it's used by in-process -@@ -749,7 +749,7 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. +@@ -834,7 +834,7 @@ size_t CollectStackTrace(void** trace, size_t count) { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - count = std::min(arraysize(trace_), count); - // Though the backtrace API man page does not list any possible negative -@@ -764,13 +764,13 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. + // return values, we take no chance. + return base::saturated_cast<size_t>(backtrace(trace, count)); +@@ -847,13 +847,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const { + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) PrintBacktraceOutputHandler handler; - ProcessBacktrace(trace_, count_, &handler); + ProcessBacktrace(trace_, count_, prefix_string, &handler); #endif } -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - void StackTrace::OutputToStream(std::ostream* os) const { + void StackTrace::OutputToStreamWithPrefix(std::ostream* os, + const char* prefix_string) const { StreamBacktraceOutputHandler handler(os); - ProcessBacktrace(trace_, count_, &handler); ---- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.cc 2018-01-27 22:31:08.296359000 +0100 -@@ -214,7 +214,7 @@ - - std::string StackTrace::ToString() const { - std::stringstream stream; --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - OutputToStream(&stream); - #endif - return stream.str(); ---- qtwebengine/src/3rdparty/chromium/base/logging.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/logging.cc 2018-01-27 22:46:34.970406807 +0100 -@@ -546,7 +546,7 @@ +diff --git a/src/3rdparty/chromium/base/logging.cc b/src/3rdparty/chromium/base/logging.cc +index 4c4bfa6af..0ca5c2159 100644 +--- a/src/3rdparty/chromium/base/logging.cc ++++ b/src/3rdparty/chromium/base/logging.cc +@@ -618,7 +618,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity, LogMessage::~LogMessage() { size_t stack_start = stream_.tellp(); @@ -92,15 +106,3 @@ !defined(OS_AIX) if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) { // Include a stack trace on a fatal, unless a debugger is attached. -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc -index c7ecc7f..96ba0e4 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc -@@ -51,7 +51,6 @@ - #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__)) - #include <cxxabi.h> - #include <dlfcn.h> --#include <execinfo.h> - #endif - - #if defined(OS_ANDROID) diff --git a/community/qt5-qtwebengine/qt-musl-serialio.patch b/community/qt5-qtwebengine/qt-musl-serialio.patch deleted file mode 100644 index cf0e0fa768..0000000000 --- a/community/qt5-qtwebengine/qt-musl-serialio.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/device/serial/serial_io_handler_posix.cc 2017-01-03 10:28:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/device/serial/serial_io_handler_posix.cc 2017-02-23 21:20:42.650669563 +0100 -@@ -12,6 +12,9 @@ - - #if defined(OS_LINUX) - #include <linux/serial.h> -+#if !defined(__GLIBC__) -+#include <asm-generic/ioctls.h> -+#endif - - // The definition of struct termios2 is copied from asm-generic/termbits.h - // because including that header directly conflicts with termios.h. diff --git a/community/qt5-qtwebengine/sandbox-sched_getparam.patch b/community/qt5-qtwebengine/sandbox-sched_getparam.patch new file mode 100644 index 0000000000..15c33a57f0 --- /dev/null +++ b/community/qt5-qtwebengine/sandbox-sched_getparam.patch @@ -0,0 +1,24 @@ +Allow SYS_sched_getparam and SYS_sched_getscheduler +musl uses them for pthread_getschedparam() + +source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e + +--- qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc 2019-11-12 20:48:20.013724661 +0100 ++++ qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc.patched 2019-11-12 20:58:57.330695676 +0100 +@@ -93,10 +93,16 @@ + case __NR_sysinfo: + case __NR_times: + case __NR_uname: ++#if !defined(__GLIBC__) ++ case __NR_sched_getparam: ++ case __NR_sched_getscheduler: ++#endif + return Allow(); + case __NR_sched_getaffinity: ++#if defined(__GLIBC__) + case __NR_sched_getparam: + case __NR_sched_getscheduler: ++#endif + case __NR_sched_setscheduler: + return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); + case __NR_prlimit64: diff --git a/community/qt5-qtwebsockets/APKBUILD b/community/qt5-qtwebsockets/APKBUILD index 435d0a9c11..11aff81a4e 100644 --- a/community/qt5-qtwebsockets/APKBUILD +++ b/community/qt5-qtwebsockets/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtwebsockets -_pkgname=qtwebsockets-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_p/-} _ver=${_ver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Provides WebSocket communication compliant with RFC 6455" url="https://www.qt.io/developers/" arch="all" @@ -16,19 +15,19 @@ license="(LGPL-3.0-or-later OR GPL-3.0-only OR GPL-2.0-or-later) AND Qt-GPL-exce makedepends="qt5-qtbase-dev" subpackages="$pkgname-dev" replaces="qt5-websockets" +options="!check" case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -options="!check" -source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_ver.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtwebsockets-everywhere-src-$_v.tar.xz" +builddir="$srcdir"/qtwebsockets-everywhere-src-${_v%-*} prepare() { default_prepare - cd "$builddir" + mkdir -p build } @@ -43,4 +42,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="970ad232ad1258630404d5e7347721505a780497e1775f88591098f11bca48cbf62c4f02491b133d31e4304eb9e16f923292c5b778e22d530d7a5a4e95d422ba qtwebsockets-everywhere-src-5.12.5.tar.xz" +sha512sums="ce8926f0c8022182504184141c64897c5c71e430d6366b1d0802247e81445934db419ff61625b046b624de7b459c74f9634ae2a13e2d646a1b1811c4dbe177eb qtwebsockets-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtx11extras/APKBUILD b/community/qt5-qtx11extras/APKBUILD index 57b8dfec1e..42fbae8d69 100644 --- a/community/qt5-qtx11extras/APKBUILD +++ b/community/qt5-qtx11extras/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=qt5-qtx11extras -_pkgname=qtx11extras-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_p/-} _ver=${_ver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} -_V=${_ver/rc/RC} -pkgrel=1 +_v=${_ver/rc/RC} +pkgrel=0 pkgdesc="Provides platform-specific APIs for X11" url="https://www.qt.io/developers/" arch="all" @@ -21,13 +20,13 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz" +source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtx11extras-everywhere-src-$_v.tar.xz" -builddir="$srcdir"/$_pkgname-${_V%-*} +builddir="$srcdir"/qtx11extras-everywhere-src-${_v%-*} prepare() { default_prepare - cd "$builddir" + mkdir -p build } @@ -47,4 +46,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="1e83c2d350f423053fe07c41a8b889391100df93dd50f700e98116c36b3dbad9637a618765daf97b82b7ffcd0687fc52c9590d9ce48c2a9204f1edc6d2cae248 qtx11extras-everywhere-src-5.12.5.tar.xz" +sha512sums="e88c9e0440c5d12003d74182dab5e63f0c65ced93447b5c3cabccd1c8c96e9b8e38fce327e678a433af18d2af683bb4f939dbc3e7bea2e911eeeb71ebe70c058 qtx11extras-everywhere-src-5.14.1.tar.xz" diff --git a/community/qt5-qtxmlpatterns/APKBUILD b/community/qt5-qtxmlpatterns/APKBUILD index 80d25b95c3..b0c5980843 100644 --- a/community/qt5-qtxmlpatterns/APKBUILD +++ b/community/qt5-qtxmlpatterns/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtxmlpatterns -_pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.12.5 +pkgver=5.14.1 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _v=${_ver/rc/RC} -pkgrel=1 +pkgrel=0 pkgdesc="Qt5 - QtXmlPatterns component" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -20,8 +19,7 @@ case $pkgver in esac source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtxmlpatterns-everywhere-src-$_v.tar.xz" -builddir="$srcdir"/$_pkgname-${_v%-*} -builddir="$srcdir"/$_pkgname-$_v +builddir="$srcdir"/qtxmlpatterns-everywhere-src-${_v%-*} build() { qmake-qt5 && make @@ -35,4 +33,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3 qtxmlpatterns-everywhere-src-5.12.5.tar.xz" +sha512sums="01a1e1af16c37cda8de23ed8da7f42f8f59116a3c7ff35fed4c589ab41f32c9e4ee3ef782517538e7d85ed86ad42bf5cf729bee9c239e4a1d7bf30458403a4ed qtxmlpatterns-everywhere-src-5.14.1.tar.xz" diff --git a/testing/shiboken2/APKBUILD b/testing/shiboken2/APKBUILD index c25f3bab67..9e81d581e0 100644 --- a/testing/shiboken2/APKBUILD +++ b/testing/shiboken2/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Drew DeVault <sir@cmpwn.com> pkgname=shiboken2 -_pkgname=pyside-setup-everywhere-src -pkgver=5.12.5 -pkgrel=3 +pkgver=5.14.1 +pkgrel=0 pkgdesc="CPython bindings generator for C++ libraries" url="https://wiki.qt.io/Qt_for_Python/Shiboken" arch="all !armhf" # qt5-qtxmlpatterns -> qt5-qtdeclarative @@ -21,28 +20,23 @@ makedepends=" " subpackages="$pkgname-doc lib$pkgname:libs lib$pkgname-dev py3-$pkgname:py3" source=" - https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/$_pkgname-$pkgver.tar.xz + https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/pyside-setup-opensource-src-$pkgver.tar.xz musl-execinfo.patch " -builddir="$srcdir/$_pkgname-$pkgver" +builddir="$srcdir/pyside-setup-opensource-src-$pkgver" provides="shiboken=$pkgver-r$pkgrel" # For backward compatibility replaces="shiboken" # For backward compatibility -prepare() { - mkdir build - default_prepare -} - build() { - cd build + export CLANG_INSTALL_DIR=/usr - cmake ../sources/shiboken2 \ + cmake -B "$builddir"/build sources/shiboken2 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=None \ -DBUILD_TESTS=OFF \ -DUSE_PYTHON_VERSION=3 - make + make -C build } package() { @@ -71,5 +65,5 @@ py3() { replaces="py3-shiboken" # For backward compatibility } -sha512sums="3c0c5b1d701e8085ff3b39effdd2c4dc042f6385ed8a222264d36b2052cdb6fde6a44e9b87c94001890c8b4e4c0f2ed6e81ab0edbdba977edfdc98fefe32809d pyside-setup-everywhere-src-5.12.5.tar.xz +sha512sums="6dfe8dc6f302a35a6448c4facb2b98d638506381638c8bda69b75a47ea6cb3168b11515faf0000dbfb5e36bfad5d14488ba5a9bd914adb3f5c38ed18714521d4 pyside-setup-opensource-src-5.14.1.tar.xz c894721b731e2f3819c5f985a6f9dc448e843c36d052143e34c4a7ccd7dc4599c15e0bf108a8362a9771c107bf45e1eff8d9d19a5d50318998abf10bfb7f3650 musl-execinfo.patch" |