Update to tracker-miners-2.1.5.

This commit is contained in:
ajacoutot 2019-01-03 14:23:04 +00:00
parent ba6f78d459
commit 44b251cf11
4 changed files with 12 additions and 43 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2018/10/27 16:59:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2019/01/03 14:23:04 ajacoutot Exp $
TRACKER_API= 2.0
SUBST_VARS= TRACKER_API
@ -6,8 +6,7 @@ SUBST_VARS= TRACKER_API
COMMENT= tracker miners and metadata extractors
GNOME_PROJECT= tracker-miners
GNOME_VERSION= 2.0.5
REVISION= 3
GNOME_VERSION= 2.1.5
SHARED_LIBS += tracker-extract 1.0 # 0.0
@ -20,11 +19,11 @@ WANTLIB += ffi fontconfig freetype gcrypt gexiv2 gif gio-2.0 glib-2.0
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gsf-1
WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gxps iconv icudata
WANTLIB += icui18n icuuc intl iptcdata jpeg json-glib-1.0
WANTLIB += icui18n icuuc idn2 intl iptcdata jpeg json-glib-1.0
WANTLIB += kvm lcms2 lz4 lzma m openjp2 orc-0.4 osinfo-1.0 pcre
WANTLIB += pixman-1 png poppler poppler-glib soup-2.4 sqlite3
WANTLIB += tag tag_c tiff totem-plparser upower-glib util uuid
WANTLIB += xcb xcb-render xcb-shm xml2 xslt z idn2 unistring zstd
WANTLIB += pixman-1 png16 poppler poppler-glib soup-2.4 sqlite3
WANTLIB += tag tag_c tiff totem-plparser unistring upower-glib
WANTLIB += util uuid xcb xcb-render xcb-shm xml2 xslt z zstd
WANTLIB += tracker-sparql-${TRACKER_API}
WANTLIB += tracker-miner-${TRACKER_API}
WANTLIB += lib/tracker-${TRACKER_API}/tracker-common

View File

@ -1,2 +1,2 @@
SHA256 (gnome/tracker-miners-2.0.5.tar.xz) = ZJnAg3YWMbFK1Y1GPErx1pvKhC2aPRGmxFbO1dCyaAI=
SIZE (gnome/tracker-miners-2.0.5.tar.xz) = 3652280
SHA256 (gnome/tracker-miners-2.1.5.tar.xz) = 9f09S1VzU5VU1Zgu6OzBDqhPZpM3jFvMexYglqY7uM0=
SIZE (gnome/tracker-miners-2.1.5.tar.xz) = 3455264

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.3 2018/06/26 07:52:25 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.4 2019/01/03 14:23:04 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=789768
@ -67,7 +67,7 @@ Index: configure.ac
glib-2.0 >= $GLIB_REQUIRED
libgrss >= $LIBGRSS_REQUIRED"
@@ -1301,7 +1301,6 @@ OLD_CFLAGS="$CFLAGS"
@@ -1305,7 +1305,6 @@ OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
@ -75,7 +75,7 @@ Index: configure.ac
LIBS=""
AC_ARG_ENABLE(libgif,
@@ -1389,7 +1388,6 @@ OLD_CFLAGS="$CFLAGS"
@@ -1393,7 +1392,6 @@ OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
@ -83,7 +83,7 @@ Index: configure.ac
LIBS=""
AC_ARG_ENABLE(libtiff,
@@ -1440,7 +1438,6 @@ OLD_CFLAGS="$CFLAGS"
@@ -1444,7 +1442,6 @@ OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_libtracker-extract_tracker-module-manager_c,v 1.1 2018/07/17 11:18:03 ajacoutot Exp $
From a3990f72a0a029e59b677accd4d1a782b9890c98 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam@afuera.me.uk>
Date: Mon, 16 Jul 2018 16:50:15 +0200
Subject: [PATCH] Avoid segfault when there are no extract .rule files discovered
Index: src/libtracker-extract/tracker-module-manager.c
--- src/libtracker-extract/tracker-module-manager.c.orig
+++ src/libtracker-extract/tracker-module-manager.c
@@ -126,10 +126,6 @@ load_extractor_rule (GKeyFile *key_file,
rule.patterns = g_list_prepend (rule.patterns, pattern);
}
- if (G_UNLIKELY (!rules)) {
- rules = g_array_new (FALSE, TRUE, sizeof (RuleInfo));
- }
-
g_array_append_val (rules, rule);
g_strfreev (mimetypes);
g_free (module_path);
@@ -174,6 +170,8 @@ tracker_extract_module_manager_init (void)
}
g_message ("Loading extractor rules... (%s)", extractors_dir);
+
+ rules = g_array_new (FALSE, TRUE, sizeof (RuleInfo));
for (l = files; l; l = l->next) {
GKeyFile *key_file;