tracker-miners: 2.3.3 -> 3.0.0

- The ontologies were moved to tracker-miners
This commit is contained in:
WORLDofPEACE 2020-09-20 20:57:09 -04:00 committed by Jan Tojnar
parent d2cba8af0a
commit b2e2b8cb2b
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 28 additions and 27 deletions

View file

@ -1,7 +1,10 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, substituteAll , substituteAll
, intltool , asciidoc
, docbook-xsl-nons
, docbook_xml_dtd_45
, gettext
, itstool , itstool
, libxslt , libxslt
, gexiv2 , gexiv2
@ -15,7 +18,6 @@
, dbus , dbus
, evolution-data-server , evolution-data-server
, exempi , exempi
, flac
, giflib , giflib
, glib , glib
, gnome3 , gnome3
@ -35,9 +37,10 @@
, libsoup , libsoup
, libtiff , libtiff
, libuuid , libuuid
, libvorbis
, libxml2 , libxml2
, networkmanager
, poppler , poppler
, systemd
, taglib , taglib
, upower , upower
, totem-pl-parser , totem-pl-parser
@ -45,15 +48,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tracker-miners"; pname = "tracker-miners";
version = "2.3.3"; version = "3.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl"; sha256 = "0hj0ixrladm7sxcmi0hr6d7wdlg9zcq0cyk22prg9pn54dy1lj5v";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
intltool asciidoc
docbook-xsl-nons
docbook_xml_dtd_45
gettext
itstool itstool
libxslt libxslt
meson meson
@ -69,7 +75,6 @@ stdenv.mkDerivation rec {
dbus dbus
evolution-data-server evolution-data-server
exempi exempi
flac
giflib giflib
glib glib
gexiv2 gexiv2
@ -92,9 +97,10 @@ stdenv.mkDerivation rec {
libsoup libsoup
libtiff libtiff
libuuid libuuid
libvorbis
libxml2 libxml2
networkmanager
poppler poppler
systemd
taglib taglib
upower upower
]; ];
@ -102,19 +108,12 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
# TODO: tests do not like our sandbox # TODO: tests do not like our sandbox
"-Dfunctional_tests=false" "-Dfunctional_tests=false"
"-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
"-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
]; ];
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit tracker; inherit asciidoc;
})
# https://bugzilla.gnome.org/show_bug.cgi?id=795576
(fetchurl {
url = "https://bugzilla.gnome.org/attachment.cgi?id=371427";
sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
}) })
]; ];

View file

@ -1,11 +1,13 @@
--- a/src/libtracker-miners-common/tracker-domain-ontology.c diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+++ b/src/libtracker-miners-common/tracker-domain-ontology.c index 0b8a64863..a09db59f0 100644
@@ -323,7 +323,7 @@ --- a/docs/manpages/meson.build
goto end; +++ b/docs/manpages/meson.build
} @@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages
} else { command: [xsltproc,
- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", '--output', '@OUTPUT@',
+ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies", '--stringparam', 'man.authors.section.enabled', '0',
DEFAULT_RULE, NULL); - '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { input: xml,
output: manpage,
install: true,