From 28647eb9111a37b150097c98a0d660e0580a9459 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 6 Mar 2019 20:10:57 -0300 Subject: [PATCH] tracker: update to 2.2.1. --- srcpkgs/tracker/patches/fix-cross-gir.patch | 28 ----- srcpkgs/tracker/patches/fix-cross.patch | 108 -------------------- srcpkgs/tracker/template | 17 +-- 3 files changed, 10 insertions(+), 143 deletions(-) delete mode 100644 srcpkgs/tracker/patches/fix-cross-gir.patch delete mode 100644 srcpkgs/tracker/patches/fix-cross.patch diff --git a/srcpkgs/tracker/patches/fix-cross-gir.patch b/srcpkgs/tracker/patches/fix-cross-gir.patch deleted file mode 100644 index 5f7831163dd..00000000000 --- a/srcpkgs/tracker/patches/fix-cross-gir.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build -index 49c879057..a3bd2d9d9 100644 ---- src/libtracker-miner/meson.build -+++ src/libtracker-miner/meson.build -@@ -91,6 +91,7 @@ tracker_miner_gir = gnome.generate_gir(libtracker_miner, - install: true, - extra_args: tracker_c_args + [ - '--c-include=libtracker-miner/tracker-miner.h', -+ '-DTRACKER_COMPILATION', - ]) - - gnome.generate_vapi( -diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build -index e54333bec..8f4a9e4a0 100644 ---- src/libtracker-sparql-backend/meson.build -+++ src/libtracker-sparql-backend/meson.build -@@ -45,7 +45,9 @@ tracker_sparql_c_gir = gnome.generate_gir(libtracker_sparql, - includes : ['GLib-2.0', 'GObject-2.0', 'Gio-2.0' ], - link_with: libtracker_sparql, - extra_args: [ -- '--c-include', 'libtracker-sparql/tracker-sparql.h', -+ '--c-include', -+ 'libtracker-sparql/tracker-sparql.h', -+ '-DTRACKER_COMPILATION', - ]) - - tracker_sparql_c_gir = tracker_sparql_c_gir[0] # Ignore this .typelib - diff --git a/srcpkgs/tracker/patches/fix-cross.patch b/srcpkgs/tracker/patches/fix-cross.patch deleted file mode 100644 index 91b81d853e4..00000000000 --- a/srcpkgs/tracker/patches/fix-cross.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git meson.build meson.build -index 3794b1142..432445757 100644 ---- meson.build -+++ meson.build -@@ -72,6 +72,7 @@ add_project_arguments(['-D', 'TRACKER_COMPILATION'], - language: 'vala') - - enable_fts = get_option('fts') -+sqlite3_fts5 = get_option('sqlite3_fts5') - - network_manager = dependency('libnm', required: get_option('network_manager')) - have_network_manager = network_manager.found() -@@ -88,41 +89,51 @@ have_libstemmer = libstemmer.found() - ################################################################## - - if enable_fts -- sqlite3_builtin_fts5_test = ''' -- #include -- -- int main (int argc, char *argv[]) { -- sqlite3 *db; -- int rc; -- rc = sqlite3_open(":memory:", &db); -- if (rc!=SQLITE_OK) return -1; -- rc = sqlite3_exec(db, "create table a(text)", 0, 0, 0); -- if (rc!=SQLITE_OK) return -1; -- rc = sqlite3_exec(db, "create virtual table t using fts5(content='a',text)", 0, 0, 0); -- if (rc!=SQLITE_OK) return -1; -- } -- ''' -- -- result = cc.run(sqlite3_builtin_fts5_test, -- name: 'sqlite3 has builtin FTS5 module', -- dependencies: sqlite) -- -- if not result.compiled() -- error('Failed to compile SQLite FTS test.') -- endif -- -- if result.returncode() == 0 -- message('Using sqlite3 builtin FTS module') -- sqlite3_has_builtin_fts5 = true -+ if meson.is_cross_build() and not meson.has_exe_wrapper() -+ if sqlite3_fts5 == 'auto' -+ error('Can\'t detect whether sqlite3 has builtin fts5. please set sqlite3_fts5 accordingly.') -+ elif sqlite3_fts5 == 'builtin' -+ sqlite3_has_builtin_fts5 = true -+ elif sqlite3_fts5 == 'external' -+ sqlite3_has_builtin_fts5 = false -+ endif - else -- message('FTS support was enabled but SQLite doesn\'t have the FTS module built in') -- if sqlite.version().version_compare('>= 3.20.0') -- error('sqlite3 >= 3.20.0 must be compiled with --enable-fts5 in order to get FTS support.') -+ sqlite3_builtin_fts5_test = ''' -+ #include -+ -+ int main (int argc, char *argv[]) { -+ sqlite3 *db; -+ int rc; -+ rc = sqlite3_open(":memory:", &db); -+ if (rc!=SQLITE_OK) return -1; -+ rc = sqlite3_exec(db, "create table a(text)", 0, 0, 0); -+ if (rc!=SQLITE_OK) return -1; -+ rc = sqlite3_exec(db, "create virtual table t using fts5(content='a',text)", 0, 0, 0); -+ if (rc!=SQLITE_OK) return -1; -+ } -+ ''' -+ -+ result = cc.run(sqlite3_builtin_fts5_test, -+ name: 'sqlite3 has builtin FTS5 module', -+ dependencies: sqlite) -+ -+ if not result.compiled() -+ error('Failed to compile SQLite FTS test.') -+ endif -+ -+ if result.returncode() == 0 -+ message('Using sqlite3 builtin FTS module') -+ sqlite3_has_builtin_fts5 = true - else -- message('sqlite3 is older than version 3.20.0, using FTS module that is bundled with Tracker') -- sqlite3_has_builtin_fts5 = false -+ message('FTS support was enabled but SQLite doesn\'t have the FTS module built in') -+ if sqlite.version().version_compare('>= 3.20.0') -+ error('sqlite3 >= 3.20.0 must be compiled with --enable-fts5 in order to get FTS support.') -+ else -+ message('sqlite3 is older than version 3.20.0, using FTS module that is bundled with Tracker') -+ sqlite3_has_builtin_fts5 = false -+ endif - endif -- endif -+ endif - - else - sqlite3_has_builtin_fts5 = false -diff --git meson_options.txt meson_options.txt -index fa1ce51dc..19bfa02f3 100644 ---- meson_options.txt -+++ meson_options.txt -@@ -22,3 +22,6 @@ option('dbus_services', type: 'string', value: '', - description: 'Directory to install D-Bus .service files (leave blank to use the value from dbus-1.pc)') - option('systemd_user_services', type: 'string', value: 'yes', - description: 'Directory to install systemd user .service files (or "yes" for default directory, "no" to disable installation)') -+ -+option('sqlite3_fts5', type: 'combo', choices: ['auto', 'builtin', 'external'], value: 'auto', -+ description: 'Whether sqlite has fts support builtin, meant for cross compilation') - diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 20adad3221f..b7f14a1d57d 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,7 +1,7 @@ # Template file for 'tracker' pkgname=tracker -version=2.2.0 -revision=2 +version=2.2.1 +revision=1 build_style=meson build_helper="gir" configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false @@ -16,17 +16,20 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://live.gnome.org/Tracker" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=6da6c4abd2341a5f2748e504590ef719b8c6fcc78f033d11fb22dab79b8f2306 - -if [ "$CROSS_BUILD" ]; then - configure_args+=" -Dsqlite3_fts5=builtin" -fi +checksum=0ccef9e67440859119fa6cae230355c1b1b3485ac08122017c9499ad2dada2ff case "$XBPS_TARGET_MACHINE" in i686-musl|x86_64-musl) ;; *-musl) broken="gobject-introspection" ;; esac +post_patch() { + if [ "$CROSS_BUILD" ]; then + # Tell the build system that we have internal fts5 in sqlite3 + vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross + fi +} + tracker-devel_package() { depends="libglib-devel libtracker>=${version}_${revision}" short_desc+=" - development files"