diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-05-05 00:47:06 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-05-05 16:52:11 +0200 |
commit | 8ab5b16f3a2d2f6bd32f612a12ed4e5667f8196c (patch) | |
tree | 72f064b65a4b06e4d12e0ece2d863fcb4c75e0a3 /libre/openttd | |
parent | a5808bcbe826616029449b722393ea87045f809b (diff) | |
download | abslibre-8ab5b16f3a2d2f6bd32f612a12ed4e5667f8196c.tar.gz abslibre-8ab5b16f3a2d2f6bd32f612a12ed4e5667f8196c.tar.bz2 abslibre-8ab5b16f3a2d2f6bd32f612a12ed4e5667f8196c.zip |
libre: openttd: adapt to new Parabola and Arch Linux icu changes
The Arch Linux icu PKGBUILD has now the following:
provides=(libicu{data,i18n,io,test,tu,uc}.so)
and the resulting packages are already in Parabola.
Thanks to that, adding such libraries as a dependency will
make sure that the package depends on the precise version
of the library like libicui18n.so=67-64.
For some reason even if libicudata.so.67 is used by the
OpenTTD binary:
$ ldd /usr/bin/openttd | grep libicudata.so
libicudata.so.67 => /usr/lib/libicudata.so.67
When building the package, it didn't add manage to find the
automatic libicudata.so dependency:
==> Checking for packaging issues...
==> WARNING: Package contains reference to $srcdir
usr/bin/openttd
==> Creating package "openttd"...
-> Generating .PKGINFO file...
==> WARNING: Library listed in 'depends' is not required by any files: libicudata.so
-> Generating .BUILDINFO file...
-> Generating .MTREE file...
-> Compressing package...
This also shows up in the package:
$ pacman -Q -i openttd
Depends On: [...] libicui18n.so=67-64 libicuuc.so=67-64 libicudata.so
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'libre/openttd')
-rw-r--r-- | libre/openttd/PKGBUILD | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD index 2e3d6bffa..804a11646 100644 --- a/libre/openttd/PKGBUILD +++ b/libre/openttd/PKGBUILD @@ -4,17 +4,22 @@ # parabola changes and rationale: # - removed recommendation for non-free openttd-opensfx +# - depends on individual icu libraries to prevent upgrade breakages and +# enable Parabola to provide older icu libraries in a separate package to +# make transition easier for Parabola contributors. See the comments in +# the icu-parabola PKGBUILD for more details. pkgname=openttd pkgver=1.9.3 pkgrel=2 -pkgrel+=.parabola3 +pkgrel+=.parabola4 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('x86_64') arch+=('i686' 'armv7h') url='https://www.openttd.org' license=('GPL') -depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz' 'fluidsynth') +depends=('libpng' 'sdl' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz' 'fluidsynth') +depends+=('libicui18n.so' 'libicuuc.so' 'libicudata.so') optdepends=('openttd-opengfx: free graphics') source=("https://proxy.binaries.openttd.org/openttd-releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") sha256sums=('1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846') @@ -40,10 +45,6 @@ build() { } package() { - local _icu_ver - _icu_ver=$(pacman -S --print-format='%v' icu-parabola) - depends+=("icu-parabola>=${_icu_ver}" "icu-parabola<$((${_icu_ver%%.*} + 1))") - cd ${pkgname}-${pkgver} make install |