From c813ebaee65e7950a77f4129ab5bd74d0431640d Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 7 Jun 2020 22:39:56 +0200 Subject: Bump pkgrel for some packages affected by the i686 icu and poppler upgrade. On i686 I've the following: $ sudo pacman -Suu :: Starting full system upgrade... :: Replace haskell-exceptions with community/ghc-libs? [Y/n] resolving dependencies... looking for conflicting packages... error: failed to prepare transaction (could not satisfy dependencies) :: installing poppler (0.88.0-1.0) breaks dependency 'poppler=0.87.0' required by cups-filters :: installing icu (67.1-1.0) breaks dependency 'icu<66' required by icecat :: installing icu (67.1-1.0) breaks dependency 'icu=65.1' required by icedove :: installing icu (67.1-1.0) breaks dependency 'icu<66' required by iceweasel :: installing icu (67.1-1.0) breaks dependency 'icu<66' required by texlive-bin :: installing poppler (0.88.0-1.0) breaks dependency 'poppler=0.87.0-1.1' required by texlive-bin More packages, that I don't have installed are probably affected. Once we rebuilt and pushed the new packages, i686 users will be able to upgrade to the new icu and poppler. The new icu and poppler packages now have Provides for the various libraries they provides: $ pacman -S -i icu Provides : libicudata.so=67-32 libicui18n.so=67-32 libicuio.so=67-32 libicutest.so=67-32 libicutu.so=67-32 libicuuc.so=67-32 $ pacman -S -i poppler Provides : libpoppler.so=99-32 libpoppler-cpp.so=0-32 The provides are already there for x86_64 and armv7h. Now that all architectures have provides for these two packages, we will be able to convert our PKGBUILDs to depend on the libraries provided, to make the next transition easier: Thanks to the provides we can now provide packages like icu-parabola, icu-57, etc to provide the current icu library version. This means that with the next icu library version that comes from Arch Linux, Arch Linux 32, or Arch Linux ARM, each packages that is built by Parabola and that has been converted to use provides will continue to work as it will pull the icu-parabola package to continue satisfying the dependency on old libraries. This in turn will enable users to continue upgrade will not be blocked anymore by icu or poppler issues, and it will enable developers to have more time to fix build issues. Signed-off-by: Denis 'GNUtoo' Carikli --- libre/icecat/PKGBUILD | 2 +- libre/icedove/PKGBUILD | 2 +- libre/iceweasel/PKGBUILD | 2 +- libre/texlive-bin/PKGBUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index dacfa2ba7..5590185cb 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -17,7 +17,7 @@ pkgname=icecat _pkgver=60.7.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=3 pkgdesc="GNU IceCat - a libre standalone web browser based on Mozilla Firefox." arch=(x86_64 i686 armv7h) license=(MPL GPL LGPL) diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index edbf18bf1..c4c7d506e 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -24,7 +24,7 @@ replaces=("$_pkgname") epoch=1 pkgver=68.8.0 pkgrel=1 -pkgrel+=.parabola3 +pkgrel+=.parabola4 _brandingver=68.6 _brandingrel=1 pkgdesc='Standalone mail and news reader based on Mozilla Thunderbird' diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index cfde70967..30e1fb042 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -49,7 +49,7 @@ replaces=('firefox') epoch=1 pkgver=76.0 pkgrel=2 -pkgrel+=.parabola1 +pkgrel+=.parabola2 _brandingver=76.0 _brandingrel=1 pkgdesc="Standalone web browser derived from Mozilla Firefox" diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD index 27398d640..ec0cdf390 100644 --- a/libre/texlive-bin/PKGBUILD +++ b/libre/texlive-bin/PKGBUILD @@ -14,7 +14,7 @@ pkgname=('texlive-bin' 'libsynctex') pkgver=2020.54586 pkgrel=1 -pkgrel+=.parabola1 +pkgrel+=.parabola2 license=('GPL') arch=('x86_64') arch+=('i686' 'armv7h') -- cgit v1.2.3