From e81ce6bcda666f4181aaff0c34fd6126321c6729 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 11 Aug 2015 22:21:14 +0200 Subject: [PATCH] updates PKGBUILDs --- c++utilities/default/PKGBUILD | 4 ++-- c++utilities/mingw-w64/PKGBUILD | 4 ++-- passwordfile/mingw-w64/PKGBUILD | 2 +- qtutilities/default/PKGBUILD | 2 +- repoindex/default/PKGBUILD | 4 ++-- tageditor/default/PKGBUILD | 13 ++++++++++--- tageditor/mingw-w64/PKGBUILD | 13 ++++++++++--- tagparser/default/PKGBUILD | 2 +- videodownloader/default/PKGBUILD | 2 +- videodownloader/mingw-w64/PKGBUILD | 2 +- 10 files changed, 31 insertions(+), 17 deletions(-) diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD index f0c14002..39c3ea77 100644 --- a/c++utilities/default/PKGBUILD +++ b/c++utilities/default/PKGBUILD @@ -6,8 +6,8 @@ arch=('i686' 'x86_64') pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities." license=('GPL') -depends=('qt5-base') -makedepends= +depends=('gcc-libs') +makedepends=('qt5-base') url="https://github.com/Martchus/cpp-utilities" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v${pkgver}.tar.gz") _reponame=cpp-utilities diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD index fb241823..449a38da 100644 --- a/c++utilities/mingw-w64/PKGBUILD +++ b/c++utilities/mingw-w64/PKGBUILD @@ -7,8 +7,8 @@ arch=('any') pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities (mingw-w64)." license=('GPL') -depends=('mingw-w64-crt' 'mingw-w64-qt5-base') -makedepends=('mingw-w64-gcc') +depends=('mingw-w64-crt') +makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base') url="https://github.com/Martchus/cpp-utilities" source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v${pkgver}.tar.gz") _reponame=cpp-utilities diff --git a/passwordfile/mingw-w64/PKGBUILD b/passwordfile/mingw-w64/PKGBUILD index d75a29b7..166c5896 100644 --- a/passwordfile/mingw-w64/PKGBUILD +++ b/passwordfile/mingw-w64/PKGBUILD @@ -7,7 +7,7 @@ arch=('any') pkgdesc="A library for reading and writing AES-256-CBC encrypted password files using OpenSSL (mingw-w64)." license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-openssl') -makedepends=('mingw-w64-gcc') +makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base') url="https://github.com/Martchus/passwordfile" source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/passwordfile/archive/v${pkgver}.tar.gz") _reponame=passwordfile diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD index 7ac9f466..afe94d20 100644 --- a/qtutilities/default/PKGBUILD +++ b/qtutilities/default/PKGBUILD @@ -6,7 +6,7 @@ arch=('i686' 'x86_64') pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models." license=('GPL') -depends=('c++utilities') +depends=('c++utilities' 'qt5-base') makedepends= url="https://github.com/Martchus/qtutilities" source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/qtutilities/archive/v${pkgver}.tar.gz") diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD index bdeb0ce9..557cd6f7 100644 --- a/repoindex/default/PKGBUILD +++ b/repoindex/default/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Martchus pkgname=repoindex pkgver=1.0.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Provides a web interface to browse Arch Linux package repositories." license=('GPL') -depends=('qt5-base' 'qt5-network' 'pacman') +depends=('qt5-base' 'qt5-network' 'pacman' 'c++utilities') makedepends= url="https://github.com/Martchus/repoindex" source=("repoindex-${pkgver}.tar.gz::https://github.com/Martchus/repoindex/archive/v${pkgver}.tar.gz") diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD index 4103087b..ba95273b 100644 --- a/tageditor/default/PKGBUILD +++ b/tageditor/default/PKGBUILD @@ -1,11 +1,14 @@ # Maintainer: Martchus +# decide whether to link against the deprecated Qt WebKit module (in qt5-webkit package ~40 MB) or +# the newer, chromium-based Qt WebEngine module (in qt5-webengine package ~100 MB) +_webviewprovider=qt5-webkit pkgname=tageditor pkgver=1.1.5 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc="Library for reading and editing meta-data of several media formats." license=('GPL') -depends=('qt5-base' 'qt5-script' 'qt5-webkit' 'qtutilities' 'tagparser') +depends=('qt5-script' $_webviewprovider 'qtutilities' 'tagparser') makedepends=('qt5-tools') install=${pkgname}.install url="https://github.com/Martchus/tageditor" @@ -17,7 +20,11 @@ sha256sums=('3f928ba196940cc539d0af752b69339a') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++ + cfg=() + if [[ _webviewprovider == qt5-webkit ]]; then + cfg+=(forcewebkit) + fi + INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done) make } diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD index f082f8f5..7c8ac856 100644 --- a/tageditor/mingw-w64/PKGBUILD +++ b/tageditor/mingw-w64/PKGBUILD @@ -1,12 +1,15 @@ # Maintainer: Martchus _name=tageditor +# decide whether to link against the deprecated Qt WebKit module (qt5-webkit package ~40 MB) or +# the newer, chromium-based Qt WebEngine module (qt5-webengine package ~100 MB) +_webviewprovider=qt5-webkit pkgname=mingw-w64-tageditor pkgver=1.1.5 -pkgrel=2 +pkgrel=4 arch=('any') pkgdesc="Library for reading and editing meta-data of several media formats (mingw-w64)." license=('GPL') -depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qt5-script' 'mingw-w64-qt5-webkit' 'mingw-w64-qtutilities' 'mingw-w64-tagparser') +depends=(mingw-w64-{crt,qt5-script,$_webviewprovider,qtutilities,tagparser}) makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools') url="https://github.com/Martchus/tageditor" source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/tageditor/archive/v${pkgver}.tar.gz") @@ -18,10 +21,14 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cfg=(mingw-w64-{install,manualstrip-exe,noversion}) + if [[ _webviewprovider == qt5-webkit ]]; then + cfg+=(forcewebkit) + fi # build utilities for each architecture for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 -r ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-exe CONFIG+=mingw-w64-noversion + INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done) make popd done diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD index 4884bb37..0f0c229a 100644 --- a/tagparser/default/PKGBUILD +++ b/tagparser/default/PKGBUILD @@ -6,7 +6,7 @@ arch=('i686' 'x86_64') pkgdesc="Library for reading and editing meta-data of several media formats." license=('GPL') depends=('c++utilities') -makedepends= +makedepends=('qt5-base') url="https://github.com/Martchus/tagparser" source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/tagparser/archive/v${pkgver}.tar.gz") _reponame=tagparser diff --git a/videodownloader/default/PKGBUILD b/videodownloader/default/PKGBUILD index fd18c223..fa80a573 100644 --- a/videodownloader/default/PKGBUILD +++ b/videodownloader/default/PKGBUILD @@ -5,7 +5,7 @@ pkgrel=2 arch=('i686' 'x86_64') pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained)." license=('GPL') -depends=('qt5-base' 'qtutilities' 'openssl') +depends=('qtutilities' 'openssl') makedepends=('qt5-tools') install=${pkgname}.install url="https://github.com/Martchus/videodownloader" diff --git a/videodownloader/mingw-w64/PKGBUILD b/videodownloader/mingw-w64/PKGBUILD index 5022abb0..8812f16b 100644 --- a/videodownloader/mingw-w64/PKGBUILD +++ b/videodownloader/mingw-w64/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=2 arch=('any') pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained, mingw-w64)." license=('GPL') -depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qtutilities' 'mingw-w64-openssl') +depends=('mingw-w64-crt' 'mingw-w64-qtutilities' 'mingw-w64-openssl') makedepends=('mingw-w64-gcc') url="https://github.com/Martchus/videodownloader" source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/videodownloader/archive/v${pkgver}.tar.gz")