Date: Thursday, February 14, 2019 @ 19:25:33 Author: heftig Revision: 346275
2.1.7-1 Modified: tracker/trunk/PKGBUILD Deleted: tracker/trunk/0001-build-Restore-right-soversion-to-libraries.patch -------------------------------------------------------+ 0001-build-Restore-right-soversion-to-libraries.patch | 70 ---------------- PKGBUILD | 16 +-- 2 files changed, 8 insertions(+), 78 deletions(-) Deleted: 0001-build-Restore-right-soversion-to-libraries.patch =================================================================== --- 0001-build-Restore-right-soversion-to-libraries.patch 2019-02-14 16:29:59 UTC (rev 346274) +++ 0001-build-Restore-right-soversion-to-libraries.patch 2019-02-14 19:25:33 UTC (rev 346275) @@ -1,70 +0,0 @@ -From 5c018575301e44547706963d98c91df50a395e58 Mon Sep 17 00:00:00 2001 -Message-Id: <5c018575301e44547706963d98c91df50a395e58.1541488496.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Tue, 6 Nov 2018 07:11:37 +0000 -Subject: [PATCH] build: Restore right soversion to libraries - -The previous change did not leave the expected .0 symlinks. - -'soversion' is the actual version linked against. To match the scheme -used by libtool, we need to give the libraries a 'version' as well. ---- - meson.build | 3 ++- - src/libtracker-control/meson.build | 1 + - src/libtracker-miner/meson.build | 1 + - src/libtracker-sparql-backend/meson.build | 1 + - 4 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6ab39956d..51eb8687e 100644 ---- a/meson.build -+++ b/meson.build -@@ -15,7 +15,8 @@ tracker_interface_age = 0 - tracker_binary_age = 100 * tracker_minor_version + tracker_micro_version - tracker_interface_age - - # This the .Z used in libtracker-sparql-2.0.so.Z --soversion = '0.@0@.@1@'.format(tracker_binary_age - tracker_interface_age, tracker_interface_age) -+soversion = '0' -+libversion = '@0@.@1@.@2@'.format(soversion, tracker_binary_age - tracker_interface_age, tracker_interface_age) - - libdir = join_paths(get_option('prefix'), get_option('libdir')) - datadir = join_paths(get_option('prefix'), get_option('datadir')) -diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build -index 81578e306..533ac538e 100644 ---- a/src/libtracker-control/meson.build -+++ b/src/libtracker-control/meson.build -@@ -10,6 +10,7 @@ libtracker_control = library('tracker-control-' + tracker_api_version, - tracker_common_enum_header, - c_args: tracker_c_args, - soversion: soversion, -+ version: libversion, - install: true, - install_rpath: tracker_internal_libs_dir, - # This doesn't depend on tracker_common_dep because of -diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build -index e53b21cf9..49c879057 100644 ---- a/src/libtracker-miner/meson.build -+++ b/src/libtracker-miner/meson.build -@@ -60,6 +60,7 @@ libtracker_miner = library( - miner_enums[0], miner_enums[1], miner_sources, - c_args: tracker_c_args, - soversion: soversion, -+ version: libversion, - install: true, - install_rpath: tracker_internal_libs_dir, - # This doesn't depend on tracker_common_dep because of -diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build -index c8415efb8..e54333bec 100644 ---- a/src/libtracker-sparql-backend/meson.build -+++ b/src/libtracker-sparql-backend/meson.build -@@ -8,6 +8,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version, - 'tracker-backend.vala', - - soversion: soversion, -+ version: libversion, - - install: true, - install_rpath: tracker_internal_libs_dir, --- -2.19.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-14 16:29:59 UTC (rev 346274) +++ PKGBUILD 2019-02-14 19:25:33 UTC (rev 346275) @@ -3,8 +3,8 @@ # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=2.1.6 -pkgrel=2 +pkgver=2.1.7 +pkgrel=1 pkgdesc="Desktop-neutral user information store, search tool and indexer" url="https://wiki.gnome.org/Projects/Tracker"; arch=(x86_64) @@ -13,11 +13,9 @@ makedepends=(gobject-introspection intltool vala git gtk-doc bash-completion meson) checkdepends=(python2-gobject python2-dbus) groups=(gnome) -_commit=c2d3289a13092642ec9735e0b2d508592532483d # tags/2.1.6^0 -source=("git+https://gitlab.gnome.org/GNOME/tracker.git#commit=$_commit"; - 0001-build-Restore-right-soversion-to-libraries.patch) -sha256sums=('SKIP' - '13dbef758222723729a55de04a98488b5b943e565e6cbde25eb4f5598a6729c3') +_commit=88bbc0a37d7a2be7d648e7b0e037529c45a9a4ee # tags/2.1.7^0 +source=("git+https://gitlab.gnome.org/GNOME/tracker.git#commit=$_commit";) +sha256sums=('SKIP') pkgver() { cd $pkgname @@ -26,7 +24,9 @@ prepare() { cd $pkgname - patch -Np1 -i ../0001-build-Restore-right-soversion-to-libraries.patch + + # Fix soversions + git cherry-pick -n 282cd5aa85852cc7f9e603dae435f6b528c4712a } build() {
