From 4eaf90c37bbcc09172ab43d230e8800fa38df9e7 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 17 Sep 2020 00:16:04 +0200 Subject: [PATCH] New package: tracker3-miners-3.0.0 --- srcpkgs/tracker3-miners/patches/build.patch | 25 +++++ .../patches/dont-use-malloc-trim.patch | 104 ++++++++++++++++++ srcpkgs/tracker3-miners/template | 34 ++++++ 3 files changed, 163 insertions(+) create mode 100644 srcpkgs/tracker3-miners/patches/build.patch create mode 100644 srcpkgs/tracker3-miners/patches/dont-use-malloc-trim.patch create mode 100644 srcpkgs/tracker3-miners/template diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker3-miners/patches/build.patch new file mode 100644 index 00000000000..d58a0d8c0f8 --- /dev/null +++ b/srcpkgs/tracker3-miners/patches/build.patch @@ -0,0 +1,25 @@ +From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Wed, 16 Sep 2020 23:57:32 +0200 +Subject: [PATCH] fix build + +--- + src/libtracker-miner/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build +index a226623..9eacee3 100644 +--- src/libtracker-miner/meson.build ++++ src/libtracker-miner/meson.build +@@ -40,7 +40,7 @@ endif + + libtracker_miner = library( + 'tracker-miner-' + tracker_api_version, +- miner_enums[0], miner_enums[1], miner_sources, ++ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources, + c_args: tracker_c_args, + install: true, + install_dir: tracker_internal_libs_dir, +-- +2.28.0 + diff --git a/srcpkgs/tracker3-miners/patches/dont-use-malloc-trim.patch b/srcpkgs/tracker3-miners/patches/dont-use-malloc-trim.patch new file mode 100644 index 00000000000..3f42a912097 --- /dev/null +++ b/srcpkgs/tracker3-miners/patches/dont-use-malloc-trim.patch @@ -0,0 +1,104 @@ +Reason: This reverts 191cc5218b53fba85baec1c8c17bb246a74044c0 and +ccb0b4ebbff4dfacf17ea67ce56bb27c39741811. malloc_trim is glibc specific +API, so this causes the build to fail on musl. +Upstream: https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/135 +diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c +index c60070d..220916d 100644 +--- src/miners/fs/tracker-main.c ++++ src/miners/fs/tracker-main.c +@@ -57,7 +57,6 @@ + static GMainLoop *main_loop; + static GDBusProxy *index_proxy; + static GPtrArray *proxy_folders; +-static guint cleanup_id; + + static gint initial_sleep = -1; + static gboolean no_daemon; +@@ -433,37 +432,6 @@ miner_start (TrackerMiner *miner, + miner); + } + +-static gboolean +-cleanup_cb (gpointer user_data) +-{ +- /* Reclaim as much memory as possible */ +- malloc_trim (0); +- +- cleanup_id = 0; +- +- return G_SOURCE_REMOVE; +-} +- +-#if GLIB_CHECK_VERSION (2, 64, 0) +-static void +-on_low_memory (GMemoryMonitor *monitor, +- GMemoryMonitorWarningLevel level, +- gpointer user_data) +-{ +- if (level > G_MEMORY_MONITOR_WARNING_LEVEL_LOW) +- malloc_trim (0); +-} +-#endif +- +-static void +-miner_started_cb (TrackerMinerFS *fs) +-{ +- if (cleanup_id) { +- g_source_remove (cleanup_id); +- cleanup_id = 0; +- } +-} +- + static void + miner_finished_cb (TrackerMinerFS *fs, + gdouble seconds_elapsed, +@@ -483,8 +451,6 @@ miner_finished_cb (TrackerMinerFS *fs, + TRUE); + } + +- cleanup_id = g_timeout_add_seconds (30, cleanup_cb, NULL); +- + /* We're not sticking around for file updates, so stop + * the mainloop and exit. + */ +@@ -941,9 +907,6 @@ main (gint argc, gchar *argv[]) + TrackerEndpointDBus *endpoint; + TrackerDomainOntology *domain_ontology; + GCancellable *cancellable; +-#if GLIB_CHECK_VERSION (2, 64, 0) +- GMemoryMonitor *memory_monitor; +-#endif + gchar *domain_name, *dbus_name; + + main_loop = NULL; +@@ -1129,18 +1092,10 @@ main (gint argc, gchar *argv[]) + tracker_miner_files_set_mtime_checking (TRACKER_MINER_FILES (miner_files), do_mtime_checking); + } + +- g_signal_connect (miner_files, "started", +- G_CALLBACK (miner_started_cb), +- NULL); + g_signal_connect (miner_files, "finished", + G_CALLBACK (miner_finished_cb), + NULL); + +-#if GLIB_CHECK_VERSION (2, 64, 0) +- memory_monitor = g_memory_monitor_dup_default (); +- g_signal_connect (memory_monitor, "low-memory-warning", on_low_memory, NULL); +-#endif +- + /* Preempt creation of graphs */ + tracker_sparql_connection_update_async (tracker_miner_get_connection (miner_files), + "CREATE SILENT GRAPH tracker:FileSystem; " +@@ -1183,11 +1138,6 @@ main (gint argc, gchar *argv[]) + tracker_sparql_connection_close (sparql_conn); + g_object_unref (sparql_conn); + +-#if GLIB_CHECK_VERSION (2, 64, 0) +- g_signal_handlers_disconnect_by_func (memory_monitor, on_low_memory, NULL); +- g_object_unref (memory_monitor); +-#endif +- + g_print ("\nOK\n\n"); + + return EXIT_SUCCESS; diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template new file mode 100644 index 00000000000..0bf14b48479 --- /dev/null +++ b/srcpkgs/tracker3-miners/template @@ -0,0 +1,34 @@ +# Template file for 'tracker3-miners' +pkgname=tracker3-miners +version=3.0.0 +revision=1 +wrksrc=tracker-miners-${version} +build_style=meson +# missing libgrss for miner_rss +configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true + -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled + -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled + -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled + -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled + -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu + -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer + -Dsystemd_user_services=false -Dnetwork_manager=enabled" +hostmakedepends="pkg-config glib-devel intltool asciidoc" +makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel + libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel + libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel + libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel + libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel + upower-devel zlib-devel gst-plugins-base1-devel giflib-devel + NetworkManager-devel libharfbuzz" +short_desc="Data miners for tracker3" +maintainer="q66 " +license="GPL-2.0-or-later" +homepage="https://developer.gnome.org/libtracker-miner/stable" +distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" +checksum=bb481a7c23c5def4f215627a0630fbe9d1c64f3319825859d7a73645738f4042 + +# relies on unsupported ops in chroot +do_check() { + : +}