openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to localsearch-3.11.1.

Browse Source
This commit is contained in:
ajacoutot
2026-05-11 10:55:33 +00:00
parent 7743eb97a4
commit 4690cfa9b4
8 changed files with 17 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/gnome/localsearch/Makefile
+8 -9
View File
@@ -1,16 +1,16 @@
COMMENT= collection of data extractors for Tracker/Nepomuk
GNOME_PROJECT= localsearch
GNOME_VERSION= 3.10.2
GNOME_VERSION= 3.11.1
# LGPLv2.1+ - GPLv2+
PERMIT_PACKAGE= Yes
WANTLIB += avformat c cue exempi exif gexiv2 gif gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gsf-1 gstreamer-1.0 gsttag-1.0
WANTLIB += gupnp-dlna-2.0 gxps icui18n intl iptcdata jpeg kvm
WANTLIB += m osinfo-1.0 png poppler-glib tiff tinysparql-3.0 totem-plparser
WANTLIB += upower-glib webpdemux xml2
WANTLIB += avformat c cue exempi gexiv2 gif gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gsf-1 gstreamer-1.0 gsttag-1.0 gupnp-dlna-2.0
WANTLIB += gxps icui18n intl jpeg kvm m osinfo-1.0 png poppler-glib
WANTLIB += tiff tinysparql-3.0 totem-plparser upower-glib webpdemux
WANTLIB += xml2 zip
MODULES= devel/dconf \
devel/meson \
@@ -23,14 +23,13 @@ BUILD_DEPENDS= textproc/asciidoc
# sha256sum; cf. patch-meson_build
BUILD_DEPENDS += sysutils/coreutils
LIB_DEPENDS= audio/libcue \
LIB_DEPENDS= archivers/libzip \
audio/libcue \
devel/libgsf \
graphics/ffmpeg \
graphics/giflib \
graphics/libexif \
graphics/libgexiv2 \
graphics/libgxps \
graphics/libiptcdata \
graphics/libwebp \
misc/osinfo/libosinfo \
net/gupnp/dlna \
x11/gnome/localsearch/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (gnome/localsearch-3.10.2.tar.xz) = tN2JyF12YXEButTsmjNnj2MexQMumIDrQj3OUuh4ooU=
SIZE (gnome/localsearch-3.10.2.tar.xz) = 4494144
SHA256 (gnome/localsearch-3.11.1.tar.xz) = ezmmwoqKzysXLxWy+17nx6N2TER8L0oUyqI5t+vmGUI=
SIZE (gnome/localsearch-3.11.1.tar.xz) = 4505604
x11/gnome/localsearch/patches/patch-meson_build
+1 -12
View File
@@ -1,20 +1,9 @@
XXX Add a gudev option to meson(1)
XXX fix and push upstream
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -27,7 +27,7 @@ endif
gio = dependency('gio-2.0', version: '>=' + glib_required)
gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required)
glib = dependency('glib-2.0', version: '>=' + glib_required)
-gudev = dependency('gudev-1.0')
+gudev = []
gmodule = dependency('gmodule-2.0', version: '>=' + glib_required)
gobject = dependency('gobject-2.0', version: '>=' + glib_required)
gobject_introspection = dependency('gobject-introspection-1.0')
@@ -64,7 +64,7 @@ if get_option('man')
@@ -66,7 +66,7 @@ if get_option('man')
a2x = find_program('a2x')
endif
x11/gnome/localsearch/patches/patch-src_indexer_meson_build
-45
View File
@@ -1,45 +0,0 @@
REVERT (needs Gudev)
From e7372fcd955d52284de2adf9ea77776016980a44 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sat, 14 Jun 2025 15:03:28 +0200
Subject: [PATCH] indexer: Lazily populate root IDs in TrackerIndexingTree
Index: src/indexer/meson.build
--- src/indexer/meson.build.orig
+++ src/indexer/meson.build
@@ -1,7 +1,4 @@
-files_extract = files(
- 'tracker-miner-files-methods.c',
- 'tracker-indexing-tree-methods.c',
-)
+files_extract = files('tracker-miner-files-methods.c')
miner_fs_enums = gnome.mkenums_simple('tracker-miner-enum-types',
sources: 'tracker-miner-enums.h',
@@ -24,8 +21,7 @@ private_sources = [
'tracker-priority-queue.c',
'tracker-task-pool.c',
'tracker-sparql-buffer.c',
- 'tracker-utils.c',
- files_extract,
+ 'tracker-utils.c'
]
if have_fanotify
@@ -37,7 +33,7 @@ libtracker_miner_private = static_library(
miner_fs_resources[0], miner_fs_resources[1],
miner_fs_enums[0], miner_fs_enums[1],
private_sources,
- dependencies: [tracker_miners_common_dep, tracker_sparql, gmodule, gudev],
+ dependencies: [tracker_miners_common_dep, tracker_sparql, gmodule],
c_args: tracker_c_args,
)
@@ -55,6 +51,7 @@ sources = [
'tracker-main.c',
'tracker-miner-files.c',
'tracker-storage.c',
+ files_extract,
]
tracker_miner_fs_deps = [
x11/gnome/localsearch/patches/patch-src_indexer_tracker-indexing-tree-methods_c
-81
View File
@@ -1,81 +0,0 @@
REVERT (needs Gudev)
From e7372fcd955d52284de2adf9ea77776016980a44 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sat, 14 Jun 2025 15:03:28 +0200
Subject: [PATCH] indexer: Lazily populate root IDs in TrackerIndexingTree
Index: src/indexer/tracker-indexing-tree-methods.c
--- src/indexer/tracker-indexing-tree-methods.c.orig
+++ src/indexer/tracker-indexing-tree-methods.c
@@ -28,6 +28,71 @@
#if !GLIB_CHECK_VERSION (2, 83, 0)
#define g_unix_mount_entry_for g_unix_mount_for
#define g_unix_mount_entry_at g_unix_mount_at
+#endif
+
+char *
+tracker_indexing_tree_get_root_id (TrackerIndexingTree *tree,
+ GFile *root,
+ GUdevClient *udev_client)
+{
+ g_autofree char *path = NULL, *expanded = NULL;
+ const char *devpath = NULL, *id = NULL;
+ GUnixMountEntry *mount = NULL;
+ GUdevDevice *udev_device = NULL;
+
+ path = g_file_get_path (root);
+ expanded = realpath (path, NULL);
+
+ mount = g_unix_mount_entry_at (expanded ? expanded : path, NULL);
+
+ if (!mount)
+ mount = g_unix_mount_entry_for (expanded ? expanded : path, NULL);
+
+ if (mount)
+ devpath = g_unix_mount_entry_get_device_path (mount);
+
+ if (devpath) {
+ udev_device = g_udev_client_query_by_device_file (udev_client, devpath);
+
+ if (udev_device) {
+ id = g_udev_device_get_property (udev_device, "ID_FS_UUID_SUB");
+ if (!id)
+ id = g_udev_device_get_property (udev_device, "ID_FS_UUID");
+ }
+ }
+
+ return g_strdup (id);
+}
+/*
+ * Copyright (C) 2025, Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+#include "config-miners.h"
+
+#include "tracker-indexing-tree-methods.h"
+
+#include <gio/gunixmounts.h>
+
+#if !GLIB_CHECK_VERSION (2, 83, 0)
+#define g_unix_mount_entry_for g_unix_mount_for
+#define g_unix_mount_entry_at g_unix_mount_at
#define g_unix_mount_entry_get_device_path g_unix_mount_get_device_path
#endif
x11/gnome/localsearch/patches/patch-src_indexer_tracker-indexing-tree_c
-57
View File
@@ -1,57 +0,0 @@
REVERT (needs Gudev)
From e7372fcd955d52284de2adf9ea77776016980a44 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sat, 14 Jun 2025 15:03:28 +0200
Subject: [PATCH] indexer: Lazily populate root IDs in TrackerIndexingTree
Index: src/indexer/tracker-indexing-tree.c
--- src/indexer/tracker-indexing-tree.c.orig
+++ src/indexer/tracker-indexing-tree.c
@@ -23,8 +23,6 @@
#include "tracker-indexing-tree.h"
-#include "tracker-indexing-tree-methods.h"
-
#include <tracker-common.h>
/**
@@ -67,7 +65,6 @@ struct _TrackerIndexingTreePrivate
{
GNode *config_tree;
GList *filter_patterns;
- GUdevClient *udev_client;
GList *allowed_text_patterns;
GFile *root;
@@ -220,8 +217,6 @@ tracker_indexing_tree_constructed (GObject *object)
data->shallow = TRUE;
priv->config_tree = g_node_new (data);
-
- priv->udev_client = g_udev_client_new (NULL);
}
static void
@@ -248,8 +243,6 @@ tracker_indexing_tree_finalize (GObject *object)
NULL);
g_node_destroy (priv->config_tree);
- g_clear_object (&priv->udev_client);
-
if (priv->root) {
g_object_unref (priv->root);
}
@@ -993,12 +986,6 @@ tracker_indexing_tree_get_root (TrackerIndexingTree
(file == data->file ||
g_file_equal (file, data->file) ||
g_file_has_prefix (file, data->file))) {
- if (!data->id) {
- data->id = tracker_indexing_tree_get_root_id (tree,
- data->file,
- priv->udev_client);
- }
-
if (id)
*id = data->id;
if (directory_flags)
x11/gnome/localsearch/patches/patch-src_indexer_tracker-miner-files_h
-13
View File
@@ -1,13 +0,0 @@
XXX Add a gudev option to meson(1)
Index: src/indexer/tracker-miner-files.h
--- src/indexer/tracker-miner-files.h.orig
+++ src/indexer/tracker-miner-files.h
@@ -21,7 +21,6 @@
#define __TRACKER_MINER_FS_FILES_H__
#include <gio/gio.h>
-#include <gudev/gudev.h>
#include "tracker-config.h"
x11/gnome/localsearch/pkg/PLIST
+6 -2
View File
@@ -28,6 +28,7 @@ lib/localsearch-3.0/extract-modules/
@so lib/localsearch-3.0/extract-modules/libextract-tiff.so
@so lib/localsearch-3.0/extract-modules/libextract-webp.so
@so lib/localsearch-3.0/extract-modules/libextract-xps.so
@so lib/localsearch-3.0/libtracker-extract-zip.so
@so lib/localsearch-3.0/libtracker-extract.so
lib/localsearch-3.0/trackertestutils/
lib/localsearch-3.0/trackertestutils/__init__.py
@@ -42,9 +43,11 @@ lib/localsearch-3.0/trackertestutils/sandbox.py
lib/localsearch-3.0/trackertestutils/storehelper.py
lib/localsearch-3.0/writeback-modules/
@so lib/localsearch-3.0/writeback-modules/libwriteback-gstreamer.so
@so lib/localsearch-3.0/writeback-modules/libwriteback-playlist.so
@so lib/localsearch-3.0/writeback-modules/libwriteback-xmp.so
@bin libexec/localsearch-3
@bin libexec/localsearch-control-3
@bin libexec/localsearch-endpoint-3
@bin libexec/localsearch-extractor-3
@bin libexec/localsearch-writeback-3
@man man/man1/localsearch-3.1
@@ -59,6 +62,7 @@ lib/localsearch-3.0/writeback-modules/
@man man/man1/localsearch-writeback-3.1
@man man/man1/localsearch.1
share/bash-completion/completions/localsearch
share/dbus-1/interfaces/
share/dbus-1/interfaces/org.freedesktop.Tracker3.Miner.Files.Index.xml
share/dbus-1/interfaces/org.freedesktop.Tracker3.Miner.xml
share/dbus-1/services/org.freedesktop.LocalSearch3.Control.service
@@ -138,6 +142,8 @@ share/locale/th/LC_MESSAGES/localsearch3.mo
share/locale/tr/LC_MESSAGES/localsearch3.mo
share/locale/ug/LC_MESSAGES/localsearch3.mo
share/locale/uk/LC_MESSAGES/localsearch3.mo
share/locale/uz/
share/locale/uz/LC_MESSAGES/
share/locale/uz/LC_MESSAGES/localsearch3.mo
share/locale/vi/LC_MESSAGES/localsearch3.mo
share/locale/zh_CN/LC_MESSAGES/localsearch3.mo
@@ -177,6 +183,4 @@ share/localsearch3/extract-rules/15-text.rule
share/localsearch3/extract-rules/90-disc-generic.rule
share/localsearch3/extract-rules/90-libav-audio-generic.rule
share/localsearch3/extract-rules/90-libav-video-generic.rule
share/localsearch3/miners/
share/localsearch3/miners/org.freedesktop.Tracker3.Miner.Files.service
@tag glib-compile-schemas