diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2023-09-14 01:10:28 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-09-15 02:08:25 -0400 |
| commit | 728a3253db156002e09d19007f3cd457e3bd84e0 (patch) | |
| tree | 54bb08c6b557a4f72841d912ccde6f68f22391bc | |
| parent | ed62a3145ae28c9cadd296f4b0490551d75a01f5 (diff) | |
[qt5-webkit][pyqt5][qutebrowser][qt5-styleplugins]: relax version constraints
| -rw-r--r-- | libre/pyqt5/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/qt5-styleplugins/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/qt5-webkit/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/qutebrowser/PKGBUILD | 13 |
4 files changed, 18 insertions, 13 deletions
diff --git a/libre/pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD index 5cd73274a..4331b8a13 100644 --- a/libre/pyqt5/PKGBUILD +++ b/libre/pyqt5/PKGBUILD @@ -19,7 +19,7 @@ pkgname=('python-pyqt5') pkgdesc="A set of Python bindings for the Qt5 toolkit" pkgver=5.15.9 pkgrel=2 -pkgrel+=.parabola5 +pkgrel+=.parabola5.1 arch=('x86_64') arch+=('armv7h' 'i686') url="https://riverbankcomputing.com/software/pyqt/intro" @@ -116,8 +116,10 @@ build() { } package_python-pyqt5(){ - depends+=( $(_version_constraint python 2) \ - $(_version_constraint qt5-base ) ) + # pin to strongly-coupled dependency versions + depends=( ${depends[*]/qt5-base/} \ + $(_version_constraint python 2) \ + $(_version_constraint qt5-base 3) ) cd PyQt5-$pkgver/build make INSTALL_ROOT="$pkgdir" install diff --git a/libre/qt5-styleplugins/PKGBUILD b/libre/qt5-styleplugins/PKGBUILD index 4195d6076..760635198 100644 --- a/libre/qt5-styleplugins/PKGBUILD +++ b/libre/qt5-styleplugins/PKGBUILD @@ -103,9 +103,9 @@ build() { } package() { - # pin to current 'qt5-base' libs - depends=( ${depends[@]/qt5-base/} ) - depends+=( $(_version_constraint 'qt5-base' 3) ) + # pin to strongly-coupled dependency versions + depends=( ${depends[*]/qt5-base/} ) + depends+=( $(_version_constraint qt5-base 3) ) cd qtstyleplugins-${_commit} diff --git a/libre/qt5-webkit/PKGBUILD b/libre/qt5-webkit/PKGBUILD index fd1471bea..85747d9c2 100644 --- a/libre/qt5-webkit/PKGBUILD +++ b/libre/qt5-webkit/PKGBUILD @@ -17,7 +17,7 @@ pkgname=qt5-webkit _pkgver=5.212.0-alpha4 pkgver=${_pkgver/-/} pkgrel=19 -pkgrel+=.parabola1 +pkgrel+=.parabola2 arch=(x86_64) arch+=(armv7h i686) url='https://github.com/qtwebkit/qtwebkit' @@ -110,7 +110,7 @@ build() { package() { # pin to strongly-coupled dependency versions - depends+=( $(_version_constraint qt5-base) ) + depends+=( $(_version_constraint qt5-base 3) ) DESTDIR="$pkgdir" cmake --install build diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index be86517b3..de99c60de 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -21,7 +21,7 @@ pkgname=qutebrowser pkgver=2.5.4 pkgrel=2 -pkgrel+=.parabola4 +pkgrel+=.parabola4.1 pkgdesc="A keyboard-driven, vim-like browser based on PyQt5" pkgdesc+=" and QtWebKit" arch=("any") @@ -117,10 +117,13 @@ build() { } package() { - cd "$pkgname-$pkgver" - make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install - + # pin to strongly-coupled dependency versions + depends=( ${depends[*]/python-pyqt5/} ) + depends=( ${depends[*]/qt5-base/} ) depends+=( $(_version_constraint python 2) \ $(_version_constraint python-pyqt5 ) \ - $(_version_constraint qt5-base ) ) + $(_version_constraint qt5-base 3) ) + + cd "$pkgname-$pkgver" + make -f misc/Makefile DESTDIR="$pkgdir" PREFIX=/usr install } |