From 59c62576b40da737703a0b7a42c63c927d95a7c5 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 2 May 2024 10:48:27 -0400 Subject: tracker-miners: upgrade 3.7.1 -> 3.7.2 0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch 0001-fix-reproducibility.patch refreshed for 3.7.2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...file-to-a-fixed-path-instead-of-a-host-pa.patch | 15 +-- .../tracker-miners/0001-fix-reproducibility.patch | 104 +++++++++++---------- .../recipes-gnome/tracker/tracker-miners_3.7.1.bb | 86 ----------------- .../recipes-gnome/tracker/tracker-miners_3.7.2.bb | 86 +++++++++++++++++ 4 files changed, 147 insertions(+), 144 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb create mode 100644 meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch index 7a40ae338..36dd4a588 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch @@ -7,21 +7,22 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Lei Maohui --- - src/libtracker-miners-common/tracker-miner-enum-types.c.template | 1 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + .../tracker-miners-enum-types.c.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template -index c712dda..cb449e2 100644 +index 4db7ef1..7c44c13 100644 --- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template +++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template @@ -7,7 +7,7 @@ - + /*** BEGIN file-production ***/ /* enumerations from "@basename@" */ -#include "@filename@" +#include "tracker-enums.h" /*** END file-production ***/ + + +-- +2.34.1 - --- -2.25.1 diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch index 98618e5d3..ea239c41f 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch @@ -12,16 +12,18 @@ Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Markus Volk --- - meson.build | 20 ++++++++++---------- - src/tracker-extract/meson.build | 2 +- - tests/tracker-miner-fs/meson.build | 2 +- - 3 files changed, 12 insertions(+), 12 deletions(-) + meson.build | 8 ++++---- + src/libtracker-miners-common/tracker-landlock.c | 4 ++-- + src/miners/fs/meson.build | 4 ++-- + src/tracker-extract/meson.build | 2 +- + tests/tracker-miner-fs/meson.build | 2 +- + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build -index 935584185..aa6126081 100644 +index a838344..6945f63 100644 --- a/meson.build +++ b/meson.build -@@ -380,7 +380,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) +@@ -393,7 +393,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) # Config that goes in some other generated files (.desktop, .pc, etc) @@ -30,7 +32,7 @@ index 935584185..aa6126081 100644 conf.set('exec_prefix', get_option('prefix')) conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) conf.set('datadir', datadir) -@@ -409,7 +409,7 @@ tracker_c_args = [ +@@ -422,7 +422,7 @@ tracker_c_args = [ configinc = include_directories('./') srcinc = include_directories('src/') @@ -39,7 +41,7 @@ index 935584185..aa6126081 100644 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64 # directory, following the existing convention in that directory. -@@ -438,8 +438,8 @@ subdir('data') +@@ -451,8 +451,8 @@ subdir('data') subdir('docs') test_c_args = tracker_c_args + [ @@ -50,11 +52,48 @@ index 935584185..aa6126081 100644 ] if get_option('tests_tap_protocol') +diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c +index 95c652e..608cee4 100644 +--- a/src/libtracker-miners-common/tracker-landlock.c ++++ b/src/libtracker-miners-common/tracker-landlock.c +@@ -276,7 +276,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) + LANDLOCK_ACCESS_FS_READ_DIR); + } + } +- ++#if 0 + current_dir = g_get_current_dir (); + + /* Detect running in-tree */ +@@ -296,7 +296,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) + in_tree_rules[i].flags); + } + } +- ++#endif + /* Add user cache for readonly databases */ + #ifdef MINER_FS_CACHE_LOCATION + add_rule (landlock_fd, MINER_FS_CACHE_LOCATION, +diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build +index 6e58832..04750f8 100644 +--- a/src/miners/fs/meson.build ++++ b/src/miners/fs/meson.build +@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major), + dependencies: tracker_miner_fs_deps, + c_args: [ + tracker_c_args, +- '-DBUILDROOT="@0@"'.format(meson.global_build_root()), +- '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'), ++ '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'), ++ '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'), + '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')), + ], + install: true, diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build -index 4aaad5c41..d17cce221 100644 +index 16ce367..bbd494d 100644 --- a/src/tracker-extract/meson.build +++ b/src/tracker-extract/meson.build -@@ -159,7 +159,7 @@ endif +@@ -158,7 +158,7 @@ endif executable('tracker-extract-@0@'.format(tracker_api_major), tracker_extract_sources, # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387 @@ -64,10 +103,10 @@ index 4aaad5c41..d17cce221 100644 dependencies: tracker_extract_dependencies, install: true, diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build -index e131b85ad..59e509fa6 100644 +index 8c081fd..9792082 100644 --- a/tests/tracker-miner-fs/meson.build +++ b/tests/tracker-miner-fs/meson.build -@@ -19,7 +19,7 @@ libtracker_miner_test_c_args = [ +@@ -18,7 +18,7 @@ libtracker_miner_test_c_args = [ ] libtracker_miner_test_environment = environment() @@ -76,43 +115,6 @@ index e131b85ad..59e509fa6 100644 libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql] - -diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build -index 6e5883288..04750f82b 100644 ---- a/src/miners/fs/meson.build -+++ b/src/miners/fs/meson.build -@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major), - dependencies: tracker_miner_fs_deps, - c_args: [ - tracker_c_args, -- '-DBUILDROOT="@0@"'.format(meson.global_build_root()), -- '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'), -+ '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'), -+ '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'), - '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')), - ], - install: true, -diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c -index 27e7db65b..3021343eb 100644 ---- a/src/libtracker-miners-common/tracker-landlock.c -+++ b/src/libtracker-miners-common/tracker-landlock.c -@@ -276,7 +276,7 @@ - LANDLOCK_ACCESS_FS_READ_DIR); - } - } -- -+#if 0 - current_dir = g_get_current_dir (); - - /* Detect running in-tree */ -@@ -296,7 +296,7 @@ - in_tree_rules[i].flags); - } - } -- -+#endif - /* Add user cache for readonly databases */ - #ifdef MINER_FS_CACHE_LOCATION - add_rule (landlock_fd, MINER_FS_CACHE_LOCATION, -- -2.41.0 +2.34.1 + diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb deleted file mode 100644 index 7bbee2a88..000000000 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb +++ /dev/null @@ -1,86 +0,0 @@ -SUMMARY = "Tracker miners and metadata extractors" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = " \ - file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" - -DEPENDS = " \ - intltool-native \ - tracker \ - zlib \ -" - - -inherit gnomebase gsettings gobject-introspection vala bash-completion features_check - -SRC_URI:append = " \ - file://0001-fix-reproducibility.patch \ - file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ -" -SRC_URI[archive.sha256sum] = "50a3abe40cfb0b35ced43ec716dbf1368992e444ef7a0babf202c7ac6ab2f6f4" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" -VALA_MESON_OPTION = "" - -PACKAGECONFIG ??= " \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg", "", d)} \ - gexiv2 \ - gstreamer \ - icu \ - libexif \ - libgsf \ - jpeg \ - pdf \ - png \ - tiff \ - raw \ - xml \ - ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ - battery \ - networkmanager \ -" -# Needs tgkill API which musl does not support -# see https://www.openwall.com/lists/musl/2019/08/02/1 -PACKAGECONFIG:remove:libc-musl = "seccomp" - -PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" -PACKAGECONFIG[cue] = "-Dcue=enabled,-Dcue=disabled,libcue" -PACKAGECONFIG[ffmpeg] = "-Dgeneric_media_extractor=libav,,ffmpeg" -PACKAGECONFIG[gexiv2] = ",,gexiv2" -PACKAGECONFIG[gstreamer] = "-Dgeneric_media_extractor=gstreamer,,gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[gupnp] = "-Dgstreamer_backend=gupnp,,gupnp-dlna" -PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" -PACKAGECONFIG[icu] = "-Dcharset_detection=icu,,icu" -PACKAGECONFIG[iso] = "-Diso=enabled,-Diso=disabled,libosinfo" -PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" -PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" -PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" -PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" -PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" -PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" -PACKAGECONFIG[raw] = "-Draw=enabled,-Draw=disabled,libraw" -PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" -PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanager" -PACKAGECONFIG[landlock] = "-Dlandlock=enabled,-Dlandlock=disabled" - -# For security reasons it is strongly recommended to set add meta-security in -# your layers and 'libseccomp' to PACKAGECONFIG". -PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" -# not yet in meta-gnome -PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" - -EXTRA_OEMESON += " \ - -Dman=false \ - -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ - -Dsystemd_user_services_dir=${systemd_user_unitdir} \ -" - - -FILES:${PN} += " \ - ${datadir} \ - ${libdir}/tracker-miners-3.0 \ - ${systemd_user_unitdir} \ -" diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb new file mode 100644 index 000000000..a1fefe6a0 --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb @@ -0,0 +1,86 @@ +SUMMARY = "Tracker miners and metadata extractors" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + intltool-native \ + tracker \ + zlib \ +" + + +inherit gnomebase gsettings gobject-introspection vala bash-completion features_check + +SRC_URI:append = " \ + file://0001-fix-reproducibility.patch \ + file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ +" +SRC_URI[archive.sha256sum] = "eb4f2b288a0cbe9e614871cb0048274461cfe1cb8467ac817b102d3873dbcba5" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" +VALA_MESON_OPTION = "" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg", "", d)} \ + gexiv2 \ + gstreamer \ + icu \ + libexif \ + libgsf \ + jpeg \ + pdf \ + png \ + tiff \ + raw \ + xml \ + ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ + battery \ + networkmanager \ +" +# Needs tgkill API which musl does not support +# see https://www.openwall.com/lists/musl/2019/08/02/1 +PACKAGECONFIG:remove:libc-musl = "seccomp" + +PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" +PACKAGECONFIG[cue] = "-Dcue=enabled,-Dcue=disabled,libcue" +PACKAGECONFIG[ffmpeg] = "-Dgeneric_media_extractor=libav,,ffmpeg" +PACKAGECONFIG[gexiv2] = ",,gexiv2" +PACKAGECONFIG[gstreamer] = "-Dgeneric_media_extractor=gstreamer,,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gupnp] = "-Dgstreamer_backend=gupnp,,gupnp-dlna" +PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" +PACKAGECONFIG[icu] = "-Dcharset_detection=icu,,icu" +PACKAGECONFIG[iso] = "-Diso=enabled,-Diso=disabled,libosinfo" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" +PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[raw] = "-Draw=enabled,-Draw=disabled,libraw" +PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" +PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanager" +PACKAGECONFIG[landlock] = "-Dlandlock=enabled,-Dlandlock=disabled" + +# For security reasons it is strongly recommended to set add meta-security in +# your layers and 'libseccomp' to PACKAGECONFIG". +PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" +# not yet in meta-gnome +PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" + +EXTRA_OEMESON += " \ + -Dman=false \ + -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ + -Dsystemd_user_services_dir=${systemd_user_unitdir} \ +" + + +FILES:${PN} += " \ + ${datadir} \ + ${libdir}/tracker-miners-3.0 \ + ${systemd_user_unitdir} \ +" -- cgit v1.2.3-54-g00ecf