Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=a6a6aa015c9d70a3b0b48916613bacb6c27f0a76
commit a6a6aa015c9d70a3b0b48916613bacb6c27f0a76 Author: crazy <[email protected]> Date: Mon Feb 5 17:32:14 2018 +0100 appstream-0.11.8-4-x86_64 * fix cmake deetection of -qt part .. ( or so I hope ) :D diff --git a/source/lib/appstream/FrugalBuild b/source/lib/appstream/FrugalBuild index c67ede3..3a9fb77 100644 --- a/source/lib/appstream/FrugalBuild +++ b/source/lib/appstream/FrugalBuild @@ -4,7 +4,7 @@ pkgname=appstream _F_archive_name="AppStream" pkgver=0.11.8 -pkgrel=3 +pkgrel=4 pkgdesc="Provides a standard for creating app stores across distributions" url="http://distributions.freedesktop.org/wiki/${_F_archive_name}"; depends=('glib2>=2.50.0' 'libxml2>=2.9.4-3' 'libyaml>=0.1.7-2' 'xapian-core>=1.4.0-2' 'protobuf>=3.0.2-2' 'libstemmer') @@ -12,9 +12,11 @@ makedepends=('intltool' 'xmlto' 'docbook-xsl' 'python>=2.7.12-2' 'gobject-intros 'x11-protos' 'itstool' 'gtk-doc' 'vala' 'qt5-tools>=5.10.0') groups=('lib') archs=("x86_64") -source=("http://www.freedesktop.org/software/$pkgname/releases/${_F_archive_name}-$pkgver.tar.xz";) +source=(http://www.freedesktop.org/software/$pkgname/releases/${_F_archive_name}-$pkgver.tar.xz \ + fix-cmake-detection.patch) up2date="Flasttar http://www.freedesktop.org/software/$pkgname/releases"; -sha1sums=('7920490bb0a63e1c9ace7453c123d3ec74269f75') +sha1sums=('7920490bb0a63e1c9ace7453c123d3ec74269f75' \ + 'fd7453dd87f52b176bee9a7d08786c10c92c3c57') options=('scriptlet') _F_meson_confopts+=" -Dqt=true \ -Dvapi=true" diff --git a/source/lib/appstream/fix-cmake-detection.patch b/source/lib/appstream/fix-cmake-detection.patch new file mode 100644 index 0000000..a4cee27 --- /dev/null +++ b/source/lib/appstream/fix-cmake-detection.patch @@ -0,0 +1,25 @@ +From 3e58f9c97d95785b2bcab632871a59a04050a458 Mon Sep 17 00:00:00 2001 +From: Gabriel Souza Franco <[email protected]> +Date: Wed, 24 Jan 2018 14:26:28 +0100 +Subject: [PATCH] qt: Fix regression from #153 + +Define location and soname for all configurations, not just Debug. +--- + qt/cmake/AppStreamQtConfig.cmake.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qt/cmake/AppStreamQtConfig.cmake.in b/qt/cmake/AppStreamQtConfig.cmake.in +index aa61e820..b64a4f57 100644 +--- a/qt/cmake/AppStreamQtConfig.cmake.in ++++ b/qt/cmake/AppStreamQtConfig.cmake.in +@@ -32,8 +32,8 @@ add_library(AppStreamQt SHARED IMPORTED) + set_target_properties(AppStreamQt PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/" + INTERFACE_LINK_LIBRARIES "Qt5::Core" +- IMPORTED_LOCATION_DEBUG "@LIBDIR_FULL@/libAppStreamQt.so.${AppStreamQt_VERSION}" +- IMPORTED_SONAME_DEBUG "libAppStreamQt.${AppStreamQt_VERSION_MAJOR}" ++ IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt.so.${AppStreamQt_VERSION}" ++ IMPORTED_SONAME "libAppStreamQt.${AppStreamQt_VERSION_MAJOR}" + ) + + #################################################################################### _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
