From 26dd361a3b35b035211e46ba0a6f62941448e3a6 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 13 Nov 2018 20:45:23 -0200 Subject: [PATCH] hunspell: update to 1.7.0. [ci skip] --- common/shlibs | 2 +- srcpkgs/hunspell/template | 18 ++++++++++++------ srcpkgs/{libhunspell => libhunspell1.7} | 0 3 files changed, 13 insertions(+), 7 deletions(-) rename srcpkgs/{libhunspell => libhunspell1.7} (100%) diff --git a/common/shlibs b/common/shlibs index 9b847e16cfc..702e05ffe25 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1453,7 +1453,7 @@ libatomic_ops.so.1 libatomic_ops-7.4.2_1 libbfb.so.1 libbfb-0.24.2_1 libmulticobex.so.1 libmulticobex-0.24_1 libobexftp.so.0 libobexftp-0.24_1 -libhunspell-1.6.so.0 libhunspell-1.6.0_1 +libhunspell-1.7.so.0 libhunspell1.7-1.7.0_1 libstdlog.so.0 liblogging-1.0.0_1 liblogging-stdlog.so.0 liblogging-1.0.2_1 libdom.so.0 libdom-0.0.1_1 diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template index fcd8195ba9e..deb7f3b54c3 100644 --- a/srcpkgs/hunspell/template +++ b/srcpkgs/hunspell/template @@ -1,7 +1,7 @@ # Template file for 'hunspell' pkgname=hunspell -version=1.6.2 -revision=2 +version=1.7.0 +revision=1 build_style=gnu-configure configure_args="--with-ui" hostmakedepends="automake bison libtool pkg-config" @@ -11,22 +11,28 @@ maintainer="Juan RP " homepage="https://hunspell.github.io/" license="GPL-2.0-or-later, LGPL-2.1-or-later, MPL-1.1" distfiles="https://github.com/hunspell/hunspell/archive/v${version}.tar.gz" -checksum=3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4 +checksum=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a pre_configure() { autoreconf -fi } -libhunspell_package() { +libhunspell1.7_package() { short_desc+=" - runtime library" pkg_install() { - vmove usr/lib/*.so.* + vmove "usr/lib/*.so.*" } } + hunspell-devel_package() { - depends="libstdc++-devel ncurses-devel lib${sourcepkg}>=${version}_${revision}" + depends="libstdc++-devel ncurses-devel lib${sourcepkg}1.7>=${version}_${revision}" short_desc+=" - development files" pkg_install() { + # Provides symlinks that don't have versions before the .so and .a parts + # this fixes builds with stuff that uses -lhunspell instead of -lhunspell-x.y + ln -rs "${DESTDIR}"/usr/lib/libhunspell-1.7.so ${DESTDIR}/usr/lib/libhunspell.so + ln -rs "${DESTDIR}"/usr/lib/libhunspell-1.7.a ${DESTDIR}/usr/lib/libhunspell.a + vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/*.a diff --git a/srcpkgs/libhunspell b/srcpkgs/libhunspell1.7 similarity index 100% rename from srcpkgs/libhunspell rename to srcpkgs/libhunspell1.7