appstream: 0.13.1 -> 0.14.0

This commit is contained in:
Jan Tojnar 2021-02-11 10:20:34 +01:00
parent 4ef8bd3d16
commit 34e2c2b310
3 changed files with 41 additions and 12 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext
{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
, pcre, itstool, gperf, vala, lmdb, libsoup
@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "appstream";
version = "0.13.1";
version = "0.14.0";
outputs = [ "out" "dev" ];
@ -14,9 +14,17 @@ stdenv.mkDerivation rec {
owner = "ximion";
repo = "appstream";
rev = "v${version}";
sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j";
sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q=";
};
patches = [
# Fix hardcoded paths
(substituteAll {
src = ./fix-paths.patch;
libstemmer_includedir = "${lib.getDev libstemmer}/include";
})
];
nativeBuildInputs = [
meson ninja pkg-config gettext
libxslt xmlto docbook_xsl docbook_xml_dtd_45
@ -25,14 +33,6 @@ stdenv.mkDerivation rec {
buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ];
prePatch = ''
substituteInPlace meson.build \
--replace /usr/include ${libstemmer}/include
substituteInPlace data/meson.build \
--replace /etc $out/etc
'';
mesonFlags = [
"-Dapidocs=false"
"-Ddocs=false"

View file

@ -0,0 +1,29 @@
diff --git a/data/meson.build b/data/meson.build
index 1eb3dfb0..623b66ec 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,4 +26,4 @@ i18n.merge_file (
)
install_data ('appstream.conf',
- install_dir: get_option('sysconfdir'))
+ install_dir: get_option('prefix') / 'etc')
diff --git a/meson.build b/meson.build
index dc1fb1a5..5ee03b73 100644
--- a/meson.build
+++ b/meson.build
@@ -108,12 +108,12 @@ if get_option ('gir')
dependency('gobject-introspection-1.0', version: '>=1.56')
endif
-stemmer_inc_dirs = include_directories(['/usr/include'])
+stemmer_inc_dirs = include_directories(['@libstemmer_includedir@'])
if get_option('stemming')
stemmer_lib = cc.find_library('stemmer', required: true)
if not cc.has_header('libstemmer.h')
if cc.has_header('libstemmer/libstemmer.h')
- stemmer_inc_dirs = include_directories('/usr/include/libstemmer')
+ stemmer_inc_dirs = include_directories('@libstemmer_includedir@/libstemmer')
else
error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.')
endif

View file

@ -4,7 +4,7 @@
mkDerivation {
pname = "appstream-qt";
inherit (appstream) version src prePatch;
inherit (appstream) version src patches;
outputs = [ "out" "dev" ];