diff --git a/qt5-3d/PKGBUILD b/qt5-3d/PKGBUILD index a914845d4..770605acb 100644 --- a/qt5-3d/PKGBUILD +++ b/qt5-3d/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-3d -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=() groups=('qt5') options=('debug') replaces=(qt5-qt3d) -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('ab14d2104f393aa8727297ac96fadead') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-base/PKGBUILD b/qt5-base/PKGBUILD index e765c25d4..fcaa6558f 100644 --- a/qt5-base/PKGBUILD +++ b/qt5-base/PKGBUILD @@ -1,8 +1,7 @@ -source ../qt5.conf pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -21,13 +20,12 @@ optdepends=('qt5-svg: to use SVG icon themes' 'mtdev: evdev plugin') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) - qt-private-includes.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch/?id=67aa365d") -md5sums=($(getSum ${pkgname}) - 'aad1e05394f971c793771d4c0aacbd6f') +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('c656471f138d3810187a523293e2cc28') prepare() { - cd $(getPkgName ${pkgname}) + cd ${_pkgfqn} # Build qmake using Chakra {C,LD}FLAGS # This also sets default {C,CXX,LD}FLAGS for projects built using qmake @@ -45,7 +43,7 @@ prepare() { } build() { - cd $(getPkgName ${pkgname}) + cd ${_pkgfqn} PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \ -prefix /usr \ @@ -80,17 +78,18 @@ build() { package_qt5-base() { pkgdesc='A cross-platform application and UI framework' - cd $(getPkgName ${pkgname}) + cd ${_pkgfqn} make INSTALL_ROOT="${pkgdir}" install install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; # Fix wrong qmake path in pri file - sed -i "s|${srcdir}/$(getPkgName ${pkgname})|/usr|" \ + sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \ "${pkgdir}"/usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri # Useful symlinks @@ -108,7 +107,7 @@ package_qt5-xcb-private-headers() { groups=() conflicts=() - cd $(getPkgName ${pkgbase}) + cd ${_pkgfqn} install -d -m755 "$pkgdir"/usr/include/qtxcb-private cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/ } diff --git a/qt5-canvas3d/PKGBUILD b/qt5-canvas3d/PKGBUILD index fea133cc8..7bf372818 100644 --- a/qt5-canvas3d/PKGBUILD +++ b/qt5-canvas3d/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-canvas3d -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-declarative') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('fcccd9e9212f0a90fcab6f8b0bad0ae6') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-charts/PKGBUILD b/qt5-charts/PKGBUILD index dd973f16b..7a5ef3dba 100644 --- a/qt5-charts/PKGBUILD +++ b/qt5-charts/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-charts -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=('qt5-declarative') optdepends=('qt5-declarative: QML bindings') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('2a305e89f75b423bfe508a74e6105cd1') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-connectivity/PKGBUILD b/qt5-connectivity/PKGBUILD index cfb22ec57..30a4645e1 100644 --- a/qt5-connectivity/PKGBUILD +++ b/qt5-connectivity/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-connectivity -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=('qt5-declarative') optdepends=('qt5-declarative: QML bindings') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('65ff5d921a30f7fccf0223af23011aa6') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-datavis3d/PKGBUILD b/qt5-datavis3d/PKGBUILD index 66915da83..a25362bd7 100644 --- a/qt5-datavis3d/PKGBUILD +++ b/qt5-datavis3d/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-datavis3d -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=('qt5-declarative') optdepends=('qt5-declarative: QML bindings') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('b6e658a92ae14500f7425773e315e8c1') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-declarative-render2d/PKGBUILD b/qt5-declarative-render2d/PKGBUILD deleted file mode 100644 index a0a15bc9f..000000000 --- a/qt5-declarative-render2d/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -source ../qt5.conf - -pkgname=qt5-declarative-render2d -pkgver=${QSubVersion} -pkgrel=1 -arch=('x86_64') -url='http://qt-project.org/' -license=('GPL3' 'LGPL' 'FDL' 'custom') -pkgdesc='Raster backend for QtQuick scene graph' -depends=('qt5-declarative') -makedepends=() -groups=('qt5') -options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) - -prepare() { - mkdir -p build -} - -build() { - cd build - - qmake-qt5 ../$(getPkgName ${pkgname}) - make -} - -package() { - cd build - make INSTALL_ROOT="$pkgdir" install - - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} -} diff --git a/qt5-declarative/PKGBUILD b/qt5-declarative/PKGBUILD index b9a4836dc..c9216c051 100644 --- a/qt5-declarative/PKGBUILD +++ b/qt5-declarative/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-declarative -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -13,8 +12,9 @@ conflicts=('qt5-declarative-render2d') replaces=('qt5-declarative-render2d') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('cc655aaa10c47a84c41e8f0eb3bce112') prepare() { mkdir -p build @@ -27,7 +27,7 @@ build() { cd build export PYTHON=python2 - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -42,7 +42,8 @@ package() { done # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-doc/PKGBUILD b/qt5-doc/PKGBUILD index 833909fd0..df00d5f22 100644 --- a/qt5-doc/PKGBUILD +++ b/qt5-doc/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-doc -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('any') url='http://qt-project.org/' @@ -10,11 +9,12 @@ pkgdesc='A cross-platform application and UI framework (Documentation)' depends=('qt5-base') makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss') groups=('qt5') -source=( $(getSingleSrc "qt") ) -md5sums=( $(getSum "qt") ) +_pkgfqn="qt-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/single/${_pkgfqn}.tar.xz") +md5sums=('26a2b31d8a4dce8260048f6d18fb6fc3') prepare() { - cd $(getPkgName "qt") + cd ${_pkgfqn} ln -s /usr/lib/qt5/bin qttools/ ln -s /usr/lib/qt5/bin/{rcc,uic,moc} qtbase/bin/ @@ -26,7 +26,7 @@ prepare() { } build() { - cd $(getPkgName "qt") + cd ${_pkgfqn} export PATH="$srcdir/bin:$PATH" PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \ @@ -48,7 +48,7 @@ build() { } package() { - cd $(getPkgName "qt") + cd ${_pkgfqn} make INSTALL_ROOT="$pkgdir" install_docs install -d "$pkgdir"/usr/share/licenses diff --git a/qt5-doc/qt-no-statx.patch b/qt5-doc/qt-no-statx.patch deleted file mode 100644 index 56150f73e..000000000 --- a/qt5-doc/qt-no-statx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp.orig 2017-11-14 12:10:28.156094557 +0000 -+++ qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp 2017-11-14 12:10:46.156136206 +0000 -@@ -95,7 +95,7 @@ - { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); } - # endif - --# if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE() -+# if 0 - # include - static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) - { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } diff --git a/qt5-examples/PKGBUILD b/qt5-examples/PKGBUILD index 34a49d6bf..629183c58 100644 --- a/qt5-examples/PKGBUILD +++ b/qt5-examples/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-examples -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('any') url='http://qt-project.org/' @@ -10,8 +9,9 @@ pkgdesc='Examples and demos from qt5 documentation' depends=('qt5-doc') makedepends=() groups=('qt5') -source=( $(getSrc "qt") ) -md5sums=( $(getSum "qt") ) +_pkgfqn="qt-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/single/${_pkgfqn}.tar.xz") +md5sums=('') package() { _base="$pkgdir"/usr/share/doc/qt5/examples @@ -20,9 +20,9 @@ package() { # QtCreator requires them to be in the same top-level directory. # Matching the Qt5 installer, only the qtbase project is kept. mkdir -p $_base - cp $(getPkgName "qt")/qtbase/examples/examples.pro $_base + cp ${_pkgfqn}/qtbase/examples/examples.pro $_base - _fdirs=$(find "$(getPkgName "qt")" -maxdepth 2 -type d -name examples) + _fdirs=$(find "${_pkgfqn}" -maxdepth 2 -type d -name examples) for _dir in $_fdirs; do _mod=$(basename ${_dir%/examples}) diff --git a/qt5-gamepad/PKGBUILD b/qt5-gamepad/PKGBUILD index d0dc89dee..bc645bbd5 100644 --- a/qt5-gamepad/PKGBUILD +++ b/qt5-gamepad/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-gamepad -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=('qt5-declarative') optdepends=('qt5-declarative: QML bindings') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('ea537868f3dddc075bfc3dedf35bf80e') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-graphicaleffects/PKGBUILD b/qt5-graphicaleffects/PKGBUILD index 7d5e12732..ad8fe4033 100644 --- a/qt5-graphicaleffects/PKGBUILD +++ b/qt5-graphicaleffects/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-graphicaleffects -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-declarative') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('90e4ec0ff93a07abcb121e33196f44eb') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } diff --git a/qt5-imageformats/PKGBUILD b/qt5-imageformats/PKGBUILD index cbd35bf57..87a4bae7b 100644 --- a/qt5-imageformats/PKGBUILD +++ b/qt5-imageformats/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-imageformats -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-base' 'jasper' 'libmng' 'libwebp') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('ba8ff26f9a8fd70d4c96edccc9356608') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } diff --git a/qt5-location/PKGBUILD b/qt5-location/PKGBUILD index 267ba863e..c2a671e36 100644 --- a/qt5-location/PKGBUILD +++ b/qt5-location/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-location -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=('gypsy') optdepends=('gypsy: Gypsy geolocation plugin') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('6fa1c97270382cbe2c26b820358ff28b') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-multimedia/PKGBUILD b/qt5-multimedia/PKGBUILD index bdf4d6908..f7ae899fa 100644 --- a/qt5-multimedia/PKGBUILD +++ b/qt5-multimedia/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-multimedia -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=('qt5-declarative' 'gst-plugins-bad') optdepends=('qt5-declarative: QML bindings' 'gst-plugins-bad: camera support') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('c2604625f291f4020798097d2f72042a') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-networkauth/PKGBUILD b/qt5-networkauth/PKGBUILD index 83720c3cf..e9f489836 100644 --- a/qt5-networkauth/PKGBUILD +++ b/qt5-networkauth/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-networkauth -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -10,8 +9,9 @@ pkgdesc='Network authentication module' depends=(qt5-base) groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('906632ac705197a228d4ba2f93079f95') prepare() { mkdir -p build @@ -20,7 +20,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -29,7 +29,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-quickcontrols/PKGBUILD b/qt5-quickcontrols/PKGBUILD index baf83545f..e002f100c 100644 --- a/qt5-quickcontrols/PKGBUILD +++ b/qt5-quickcontrols/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-quickcontrols -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-declarative') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('e9743376000e5db6665114c07148e993') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-quickcontrols2/PKGBUILD b/qt5-quickcontrols2/PKGBUILD index bcd2dbfff..3cfc3d646 100644 --- a/qt5-quickcontrols2/PKGBUILD +++ b/qt5-quickcontrols2/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-quickcontrols2 -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-declarative') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('d74e20323399a05ad0b3e9f0dc419519') prepare() { mkdir -p build } @@ -20,7 +20,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -29,7 +29,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-remoteobjects/PKGBUILD b/qt5-remoteobjects/PKGBUILD index 683eea4f5..9be2756f1 100644 --- a/qt5-remoteobjects/PKGBUILD +++ b/qt5-remoteobjects/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-remoteobjects -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=(x86_64) url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=(qt5-declarative) optdepends=('qt5-declarative: QML bindings') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('3d45ad8a196ed2e932cfbc3035276a9f') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-script/PKGBUILD b/qt5-script/PKGBUILD index a0f6e1f19..0f37a10db 100644 --- a/qt5-script/PKGBUILD +++ b/qt5-script/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-script -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-base') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('d865e4d0281b04c6fc024ab89f65bafd') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-scxml/PKGBUILD b/qt5-scxml/PKGBUILD index d459a3360..40ef7e055 100644 --- a/qt5-scxml/PKGBUILD +++ b/qt5-scxml/PKGBUILD @@ -1,8 +1,7 @@ -source ../qt5.conf pkgname=qt5-scxml -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ depends=('qt5-declarative') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('bdd7a21ed86478304f042f439ec1d761') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-sensors/PKGBUILD b/qt5-sensors/PKGBUILD index c9526825f..d78bba32d 100644 --- a/qt5-sensors/PKGBUILD +++ b/qt5-sensors/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-sensors -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=('qt5-declarative') optdepends=('qt5-declarative: QML bindings') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('149dc75c1748f0d9e8dd591fa6928aad') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-serialbus/PKGBUILD b/qt5-serialbus/PKGBUILD index 07f3d6726..a890297a8 100644 --- a/qt5-serialbus/PKGBUILD +++ b/qt5-serialbus/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-serialbus -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-serialport') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('8faec586a60182099cea5f28526f7ea6') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-serialport/PKGBUILD b/qt5-serialport/PKGBUILD index c00bb2ef7..92d1c4ffe 100644 --- a/qt5-serialport/PKGBUILD +++ b/qt5-serialport/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-serialport -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-base') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('688a0da3a81da7c0ca0a9a50e7d3de9e') prepare() { @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-speech/PKGBUILD b/qt5-speech/PKGBUILD index 41c2a978f..f329189ca 100644 --- a/qt5-speech/PKGBUILD +++ b/qt5-speech/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-speech -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,8 +11,9 @@ makedepends=(flite speech-dispatcher) optdepends=('flite: flite TTS backend' 'speech-dispatcher: speech-dispatcher TTS backend') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('c76b6663b8818f2a85c45465b03c8d6a') prepare() { mkdir -p build @@ -22,7 +22,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -31,7 +31,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-svg/PKGBUILD b/qt5-svg/PKGBUILD index c126b0e77..8c5356d8b 100644 --- a/qt5-svg/PKGBUILD +++ b/qt5-svg/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-svg -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-base') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('c7dfa4b3504105ec45f888c9012d1969') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-tools/PKGBUILD b/qt5-tools/PKGBUILD index 30c102951..051a2b9bc 100644 --- a/qt5-tools/PKGBUILD +++ b/qt5-tools/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-tools -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -12,9 +11,10 @@ makedepends=('qt5-declarative' 'qt5-webkit' 'vulkan-headers' 'clang') optdepends=('clang: for qdoc' 'qt5-webkit: for Qt Assistant') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") {assistant,designer,linguist,qdbusviewer}-qt5.desktop) -md5sums=( $(getSum ${pkgname}) +md5sums=('41aea9500d21bd03bfa718b1d715cbba' '892d3632bdcd9a22f191aa8f28a3c0e1' '208921efc9e4c11fae762e9580ca23aa' '59cbeef3e6090dcb7d2a7d32cd62ea08' @@ -27,7 +27,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -35,7 +35,7 @@ package() { cd build make INSTALL_ROOT="${pkgdir}" install - cd ../$(getPkgName ${pkgname}) + cd ../${_pkgfqn} # install missing icons and desktop files for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do size=$(echo $(basename ${icon}) | cut -d- -f2) @@ -64,7 +64,8 @@ package() { done # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-translations/PKGBUILD b/qt5-translations/PKGBUILD index 3638e1ef5..a3ce32f8c 100644 --- a/qt5-translations/PKGBUILD +++ b/qt5-translations/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-translations -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -10,8 +9,9 @@ pkgdesc='A cross-platform application and UI framework (Translations)' depends=('qt5-base') makedepends=('qt5-tools') groups=('qt5') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('67c0dbd61c2b92552b5339d82a94b1a8') prepare() { mkdir -p build @@ -20,7 +20,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } diff --git a/qt5-virtualkeyboard/PKGBUILD b/qt5-virtualkeyboard/PKGBUILD index 4fa68e3ea..c34c40cb2 100644 --- a/qt5-virtualkeyboard/PKGBUILD +++ b/qt5-virtualkeyboard/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-virtualkeyboard -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -10,8 +9,9 @@ pkgdesc='Virtual keyboard framework' depends=('qt5-declarative' 'qt5-svg') makedepends=() groups=('qt5') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('76dfb143438a79f49b043a597c7a0f2b') prepare() { mkdir -p build @@ -20,7 +20,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -29,7 +29,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-wayland/PKGBUILD b/qt5-wayland/PKGBUILD index a1a6515dd..0eda0bdd1 100644 --- a/qt5-wayland/PKGBUILD +++ b/qt5-wayland/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-wayland -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -10,8 +9,9 @@ pkgdesc='Provides APIs for Wayland' depends=('qt5-declarative' 'libxcomposite') makedepends=() groups=('qt5') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('26d9d22805572adb75610da4316736cd') prepare() { mkdir -p build @@ -23,21 +23,22 @@ build() { # build bug: https://bugreports.qt.io/browse/QTBUG-54148 #- out-of-tree build fails - #qmake-qt5 ../$(getPkgName ${pkgname}) - #qmake-qt5 ../$(getPkgName ${pkgname})/src/plugins + #qmake-qt5 ../${_pkgfqn} + #qmake-qt5 ../${_pkgfqn}/src/plugins - cd $(getPkgName ${pkgname}) + cd ${_pkgfqn} qmake-qt5 . make } package() { #cd build - cd $(getPkgName ${pkgname}) + cd ${_pkgfqn} make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-webchannel/PKGBUILD b/qt5-webchannel/PKGBUILD index e6ceff220..5d1959ff2 100644 --- a/qt5-webchannel/PKGBUILD +++ b/qt5-webchannel/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-webchannel -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -10,8 +9,9 @@ pkgdesc='Provides access to QObject or QML objects from HTML clients for seamles depends=('qt5-declarative') makedepends=() groups=('qt5') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('1feb1fe54c3fcafbdc4dbd2ed14d98b8') prepare() { @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-webengine/PKGBUILD b/qt5-webengine/PKGBUILD index 50536965a..bddb460fb 100644 --- a/qt5-webengine/PKGBUILD +++ b/qt5-webengine/PKGBUILD @@ -1,8 +1,7 @@ -source ../qt5.conf pkgname=qt5-webengine -pkgver=${QSubVersion} -pkgrel=2 +pkgver=5.11.1 +pkgrel=1 arch=('x86_64') url='http://qt-project.org/' license=('LGPL3' 'LGPL2.1' 'BSD') @@ -12,16 +11,14 @@ depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' makedepends=('python2' 'git' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) - qtwebengine-harmony.patch qtwebengine-gcc8.patch qtwebengine-ffmpeg4.patch - falkon-copy-menu.patch::"http://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=af0c47b1" - qtwebengine-no-gpu.patch) -md5sums=( $(getSum ${pkgname}) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz" + qtwebengine-harmony.patch qtwebengine-ffmpeg4.patch + qtwebengine-wayland.patch::"http://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=a66d4cd8") +md5sums=('75d2ff31addba4ec41981b0f459cc587' '254061cb349cff714230b7cca83b0a4c' - 'c5779e35eb15edf97789885a72ec873a' '2835f9fe8097ff3d6098812c70f48044' - '4fd37c3ceb4a1f92276cae2c83ee1a5a' - 'c182ccd60d079d65203e112c30a4217d') + '04360a0896a267ee6b32df946db8202f') prepare() { mkdir -p build @@ -30,17 +27,14 @@ prepare() { mkdir -p bin ln -s /usr/bin/python2 bin/python - cd $(getPkgName ${pkgname}) + cd ${_pkgfqn} # FreeType 2.8.1 patch -Np1 -i ../qtwebengine-harmony.patch - # Fix copy context menu - patch -p1 -i "$srcdir"/falkon-copy-menu.patch - # Disable GPU rendering on Wayland https://bugreports.qt.io/browse/QTBUG-68479 - patch -p1 -i "$srcdir"/qtwebengine-no-gpu.patch - # Fix build with gcc8 (Fedora) + # Fix openGL detection on Wayland + patch -p1 -i ../qtwebengine-wayland.patch + cd src/3rdparty/chromium - patch -p1 -i "$srcdir"/qtwebengine-gcc8.patch # Fix build with ffmpeg 4 patch -p2 -i "$srcdir"/qtwebengine-ffmpeg4.patch } @@ -49,7 +43,7 @@ build() { cd build export PATH="$srcdir/bin:$PATH" - qmake-qt5 ../$(getPkgName ${pkgname}) -- \ + qmake-qt5 ../${_pkgfqn} -- \ -proprietary-codecs \ -system-ffmpeg \ -webp \ @@ -63,7 +57,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; - install -Dm644 "$srcdir"/$(getPkgName ${pkgname})/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium + install -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium } diff --git a/qt5-webengine/qtwebengine-gcc8.patch b/qt5-webengine/qtwebengine-gcc8.patch deleted file mode 100644 index a27f3a81d..000000000 --- a/qt5-webengine/qtwebengine-gcc8.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h ---- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-03-15 13:07:54.999428755 -0400 -+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-03-15 13:08:21.270794252 -0400 -@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { - - bool is_valid() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { - return std::move(handle_); -diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h ---- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-03-15 13:07:09.680523296 -0400 -+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h 2018-03-15 13:07:44.429684037 -0400 -@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { - // handle. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } - -diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h ---- chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-03-15 13:08:33.494499025 -0400 -+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h 2018-03-15 13:10:39.218462546 -0400 -@@ -54,7 +54,7 @@ class InterfaceRequest { - // Indicates whether the request currently contains a valid message pipe. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - // Removes the message pipe from the request and returns it. - ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } diff --git a/qt5-webengine/qtwebengine-no-gpu.patch b/qt5-webengine/qtwebengine-no-gpu.patch deleted file mode 100644 index 4662f5f35..000000000 --- a/qt5-webengine/qtwebengine-no-gpu.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Antonio Larrosa -Subject: Disable GPU when using nouveau or running on wayland -References: boo#1005323, boo#1060990 - -Qt WebEngine uses multi-threaded OpenGL, which nouveau does not support. -It also crashes when running on wayland, the cause is not yet known. -Work around these issues by not doing GPU-accelerated rendering in such -cases. - -Index: qtwebengine-everywhere-src-5.10.0/src/core/web_engine_context.cpp -=================================================================== ---- qtwebengine-everywhere-src-5.10.0.orig/src/core/web_engine_context.cpp -+++ qtwebengine-everywhere-src-5.10.0/src/core/web_engine_context.cpp -@@ -93,6 +93,7 @@ - #include - #ifndef QT_NO_OPENGL - # include -+# include - #endif - #include - #include -@@ -167,6 +168,39 @@ void dummyGetPluginCallback(const std::v - } - #endif - -+#ifndef QT_NO_OPENGL -+QString openGLVendor() -+{ -+ QString vendor; -+ -+ QOpenGLContext *oldContext = QOpenGLContext::currentContext(); -+ QSurface *oldSurface = 0; -+ if (oldContext) -+ oldSurface = oldContext->surface(); -+ -+ QScopedPointer surface( new QOffscreenSurface ); -+ surface->create(); -+ QOpenGLContext context; -+ if (!context.create()) { -+ qDebug() << "Error creating openGL context"; -+ } -+ else if (!context.makeCurrent(surface.data())) { -+ qDebug() << "Error making openGL context current context"; -+ } else { -+ const GLubyte *p; -+ QOpenGLFunctions *f = context.functions(); -+ if ((p = f->glGetString(GL_VENDOR))) -+ vendor = QString::fromLatin1(reinterpret_cast(p)); -+ } -+ -+ context.doneCurrent(); -+ if (oldContext && oldSurface) -+ oldContext->makeCurrent(oldSurface); -+ -+ return vendor; -+} -+#endif -+ - } // namespace - - namespace QtWebEngineCore { -@@ -379,6 +413,27 @@ WebEngineContext::WebEngineContext() - const char *glType = 0; - #ifndef QT_NO_OPENGL - -+ bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU"); -+ -+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive)) -+ { -+ qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n" -+ "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n" -+ "environment variable before running this application, but this is \n" -+ "not recommended since this usually causes applications to crash."; -+ disableGpu = true; -+ } -+ -+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau")) -+ { -+ qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n" -+ "Note: you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n" -+ "environment variable before running this application, but this is \n" -+ "not recommended since this usually causes applications to crash as\n" -+ "Nouveau openGL drivers don't support multithreaded rendering"; -+ disableGpu = true; -+ } -+ - bool tryGL = - !usingANGLE() - && (!usingSoftwareDynamicGL() -@@ -389,7 +444,7 @@ WebEngineContext::WebEngineContext() - || enableWebGLSoftwareRendering - #endif - ) -- && !usingQtQuick2DRenderer(); -+ && !usingQtQuick2DRenderer() && !disableGpu; - - if (tryGL) { - if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) { - diff --git a/qt5-webengine/qtwebengine-wayland.patch b/qt5-webengine/qtwebengine-wayland.patch new file mode 100644 index 000000000..4b2676faa --- /dev/null +++ b/qt5-webengine/qtwebengine-wayland.patch @@ -0,0 +1,68 @@ +From a66d4cd82972996d76edff52d17464c150dec6a6 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 11 Jun 2018 16:16:55 +0300 +Subject: Add fallback lookup for eglGetProcAddress + +Use the GLContext to find address for eglGetProcAddress symbol, if it's +not found with dlopen. + +Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85 +Reviewed-by: Michal Klocek +--- + src/core/gl_context_qt.cpp | 11 +++++++++++ + src/core/gl_context_qt.h | 1 + + src/core/gl_surface_qt.cpp | 4 ++++ + 3 files changed, 16 insertions(+) + +diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp +index 9ed1db8b..95491709 100644 +--- a/src/core/gl_context_qt.cpp ++++ b/src/core/gl_context_qt.cpp +@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress() + return get_proc_address; + } + ++QFunctionPointer GLContextHelper::getEglGetProcAddress() ++{ ++ QFunctionPointer get_proc_address = nullptr; ++#ifndef QT_NO_OPENGL ++ if (QOpenGLContext *context = qt_gl_global_share_context()) { ++ get_proc_address = context->getProcAddress("eglGetProcAddress"); ++ } ++#endif ++ return get_proc_address; ++} ++ + QT_END_NAMESPACE + + #if defined(USE_OZONE) || defined(OS_WIN) +diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h +index 8ffdad58..cecceabc 100644 +--- a/src/core/gl_context_qt.h ++++ b/src/core/gl_context_qt.h +@@ -63,6 +63,7 @@ public: + static void* getXDisplay(); + static void* getNativeDisplay(); + static QFunctionPointer getGlXGetProcAddress(); ++ static QFunctionPointer getEglGetProcAddress(); + private: + Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs); + +diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp +index 7e579246..4d38d7c2 100644 +--- a/src/core/gl_surface_qt.cpp ++++ b/src/core/gl_surface_qt.cpp +@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) { + base::GetFunctionPointerFromNativeLibrary(library, + "eglGetProcAddress")); + if (!get_proc_address) { ++ QFunctionPointer address = GLContextHelper::getEglGetProcAddress(); ++ get_proc_address = reinterpret_cast(address); ++ } ++ if (!get_proc_address) { + LOG(ERROR) << "eglGetProcAddress not found."; + base::UnloadNativeLibrary(library); + return false; +-- +cgit v1.1-6-g87c4 + diff --git a/qt5-webglplugin/PKGBUILD b/qt5-webglplugin/PKGBUILD index 505f611b1..13b2e8788 100644 --- a/qt5-webglplugin/PKGBUILD +++ b/qt5-webglplugin/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-webglplugin -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=(x86_64) url='http://qt-project.org/' @@ -10,8 +9,9 @@ pkgdesc='QPA plugin for running an application via a browser using streamed WebG depends=(qt5-websockets qt5-declarative) groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('3dad0513a81e122b07126f775801240d') prepare() { mkdir -p build @@ -20,7 +20,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -29,7 +29,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-webkit/PKGBUILD b/qt5-webkit/PKGBUILD index c6731f3fc..a07a87a31 100644 --- a/qt5-webkit/PKGBUILD +++ b/qt5-webkit/PKGBUILD @@ -1,7 +1,7 @@ pkgname=qt5-webkit _qtver=5.212.0-alpha2 -pkgver=${_qtver/-/} -pkgrel=6 +pkgver=5.11.1 +pkgrel=1 arch=(x86_64) url='http://qt-project.org/' license=(GPL3 LGPL3 FDL custom) @@ -11,7 +11,8 @@ makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools) optdepends=('gst-plugins-good: Webm codec support') groups=(qt5) _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz" +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") qt5-webkit-gcc7.patch qt5-webkit-null-pointer-dereference.patch qt5-webkit-trojita-1.patch::"https://github.com/annulen/webkit/commit/6faf1121.patch" diff --git a/qt5-websockets/PKGBUILD b/qt5-websockets/PKGBUILD index 90b19a844..6fc08a657 100644 --- a/qt5-websockets/PKGBUILD +++ b/qt5-websockets/PKGBUILD @@ -1,8 +1,7 @@ -source ../qt5.conf pkgname=qt5-websockets -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -13,8 +12,9 @@ makedepends=('qt5-declarative') optdepends=('qt5-declarative: QML bindings') groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('ee12e76e1190e8510fcd56e5831f26be') prepare() { mkdir -p build @@ -23,7 +23,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -32,7 +32,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-webview/PKGBUILD b/qt5-webview/PKGBUILD index 5cada1d91..55fa59ffc 100644 --- a/qt5-webview/PKGBUILD +++ b/qt5-webview/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-webview -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-webengine') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('c02bc92e1753a0e94dcb364d2d520994') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-x11extras/PKGBUILD b/qt5-x11extras/PKGBUILD index 0950660c3..cd4cc2ea1 100644 --- a/qt5-x11extras/PKGBUILD +++ b/qt5-x11extras/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-x11extras -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-base') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('6e08ba5d9a6b01fcd55f2b80a0ab995e') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5-xmlpatterns/PKGBUILD b/qt5-xmlpatterns/PKGBUILD index 6c970bb38..18e0f89de 100644 --- a/qt5-xmlpatterns/PKGBUILD +++ b/qt5-xmlpatterns/PKGBUILD @@ -1,7 +1,6 @@ -source ../qt5.conf pkgname=qt5-xmlpatterns -pkgver=${QSubVersion} +pkgver=5.11.1 pkgrel=1 arch=('x86_64') url='http://qt-project.org/' @@ -11,8 +10,9 @@ depends=('qt5-base') makedepends=() groups=('qt5') options=('debug') -source=( $(getSrc ${pkgname}) ) -md5sums=( $(getSum ${pkgname}) ) +_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") +md5sums=('02aacaf696541ceb478b1f33be567aa0') prepare() { mkdir -p build @@ -21,7 +21,7 @@ prepare() { build() { cd build - qmake-qt5 ../$(getPkgName ${pkgname}) + qmake-qt5 ../${_pkgfqn} make } @@ -30,7 +30,8 @@ package() { make INSTALL_ROOT="$pkgdir" install # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - qtprlfix + find "${pkgdir}/usr/lib" -type f -name *.prl \ + -exec sed -i -e /^QMAKE_PRL_BUILD_DIR/d {} ; install -d "$pkgdir"/usr/share/licenses ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} diff --git a/qt5.conf b/qt5.conf index 481848d43..d56fabe2e 100644 --- a/qt5.conf +++ b/qt5.conf @@ -1,38 +1,14 @@ -# the install prefix -QInstallPrefix="/usr" - -# Qt5 version -QVersion=5.11.0 -QSubVersion=${QVersion/-/} -QMainVersion=${QSubVersion%.*} - -# download location -# http://download.qt.io/development_releases/qt/5.7/5.7.0-rc/submodules/ -#QServer="http://download.qt.io/development_releases/qt/${QMainVersion}/${QVersion}/submodules/" -QServer="https://download.qt.io/official_releases/qt/${QMainVersion}/${QVersion}/submodules/" -QSingleServer="https://download.qt.io/official_releases/qt/${QMainVersion}/${QVersion}/single/" - -#wget -nc -O qt5.sums http://download.qt.io/official_releases/qt/${QMainVersion}/${QVersion}/submodules/md5sums.txt - function getPkgName() { echo "${1/5-/}-everywhere-src-${QVersion}"; } -function getSrc() { - echo "${QServer}$(getPkgName ${1}).tar.xz"; -} -function getSingleSrc() { - echo "${QSingleServer}$(getPkgName ${1}).tar.xz"; -} +# Qt5 version +Version="5.11.1" +# Tthe branch to build for official_releases/development_releases +Branch="official_releases" -function getSum() { - awk "\$2 ~ /^$(getPkgName ${1}).tar.xz/ {print \$1}" ../qt5.sums; -} - -function qtprlfix() { - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "${pkgdir}/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; -} +# Qt5 version +Version=5.11.1 +QSubVersion=${QVersion/-/} diff --git a/qtupdate.sh b/qtupdate.sh new file mode 100755 index 000000000..8fc6c50e6 --- /dev/null +++ b/qtupdate.sh @@ -0,0 +1,95 @@ +#!/bin/bash + +# kdeupdate.sh +# +# Copyright © 2018 Luca Giambonini +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . + +_script_name="kde update" + +# load functions +for subroutine in $_needed_functions ; do + source ~/bin/functions/$subroutine +done + +# Get package information +function _package_info() { + local package="${1}" + local properties=("${@:2}") + for property in "${properties[@]}"; do + local -n nameref_property="${property}" + nameref_property=($( + #source "${package}/PKGBUILD" + source "PKGBUILD" + declare -n nameref_property="${property}" + echo "${nameref_property[@]}")) + done +} + +build() +{ + while read -r pkg; do + [[ $pkg =~ ^[:blank:]*$ ]] && continue + + local comment_re="^[:blank:]*#" + [[ $pkg =~ $comment_re ]] && continue + + echo "Processing: '$pkg'" + pushd "$pkg" &>/dev/null + + # update version + sed -r "s|pkgver=.*|pkgver=$Version|g" -i PKGBUILD + sed -r "s|pkgrel=.*|pkgrel=1|g" -i PKGBUILD + + # update source link + #sed -r "s|https://download.kde.org/.*stable/|https://download.kde.org/${Branch}/|g" -i PKGBUILD + + # update md5 sums + local pkgver pkgname source _pkgname _pkgbase + _package_info "$pkg" pkgver pkgname source _pkgname _pkgbase + + if [ ! -z "$_pkgname" ]; then + pkgname=$_pkgname + fi + if [ ! -z "$_pkgbase" ]; then + pkgname=$_pkgbase + fi + + echo $pkgname + _url="http://ftp.fau.de/qtproject/archive/qt/${Version%.*}/$Version/submodules/md5sums.txt" + echo $_url + _pkgfqn="${pkgname/5-/}-everywhere-src" + echo $_pkgfqn + _md5sums=$(curl "$_url" | grep "${_pkgfqn}" | grep .xz | cut -c-32) + sed -r "s|md5sums=.*|md5sums=('$_md5sums'|g" -i PKGBUILD + echo $_md5sums + unset pkgver pkgname source _pkgname _pkgbase + + popd &>/dev/null + done < "$1" +} + +title "$_script_name" + +if [ ! -f $1.conf ]; then + echo "$1.conf: File not found!" + exit 1 +fi + +# load the configurations +source $1.conf + +time build "$1.order" +