diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-05-04 16:02:22 +0200 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2019-05-04 17:27:30 +0300 |
| commit | b1dc52326cd7b90efb2464d26d6533d12c9ee257 (patch) | |
| tree | 756c9eabd0ce336e218edc633b203c251208bbe2 | |
| parent | 4b2a010aa29819028a82d787a3e11c6776729172 (diff) | |
| download | aports-b1dc52326cd7b90efb2464d26d6533d12c9ee257.tar.bz2 aports-b1dc52326cd7b90efb2464d26d6533d12c9ee257.tar.xz | |
testing/tracker: fix build on armhf
| -rw-r--r-- | testing/tracker/90.patch | 33 | ||||
| -rw-r--r-- | testing/tracker/APKBUILD | 8 |
2 files changed, 38 insertions, 3 deletions
diff --git a/testing/tracker/90.patch b/testing/tracker/90.patch new file mode 100644 index 0000000000..e255ae4504 --- /dev/null +++ b/testing/tracker/90.patch @@ -0,0 +1,33 @@ +From cceb17a9af73fbfcb670a824f657d5dcb24d0dae Mon Sep 17 00:00:00 2001 +From: Sam Thursfield <sam@afuera.me.uk> +Date: Sat, 4 May 2019 15:53:07 +0200 +Subject: [PATCH] build: libtracker-sparql C code depends on libtracker-sparql + Vala code + +We need to express this dependency, otherwise the C code might fail to +build with this kind of error: + + ../src/libtracker-sparql/tracker-notifier.c:89:10: fatal error: tracker-generated-no-checks.h: No such file or directory + +The `tracker-generated-no-checks.h` file is generated by Vala. + +Hopefully fixes https://gitlab.gnome.org/GNOME/tracker/issues/96 +--- + src/libtracker-sparql/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build +index 65985baad..30325a37e 100644 +--- a/src/libtracker-sparql/meson.build ++++ b/src/libtracker-sparql/meson.build +@@ -76,6 +76,7 @@ libtracker_sparql_intermediate_c = static_library('tracker-sparql-intermediate-c + enums_c, enums_h, + libtracker_sparql_c_sources, + dependencies: [tracker_common_dep, json_glib], ++ link_with: libtracker_sparql_intermediate_vala, + ) + + sparqlinc = [include_directories('.'), meson.current_build_dir()] +-- +2.18.1 + diff --git a/testing/tracker/APKBUILD b/testing/tracker/APKBUILD index 235578f182..89f57d3aa7 100644 --- a/testing/tracker/APKBUILD +++ b/testing/tracker/APKBUILD @@ -5,7 +5,7 @@ pkgver=2.2.2 pkgrel=1 pkgdesc="Personal search tool and storage system" url="https://wiki.gnome.org/Projects/Tracker" -arch="all !armhf" # https://gitlab.gnome.org/GNOME/tracker/issues/96 +arch="all" license="GPL-2.0-or-later" makedepends=" bash-completion @@ -28,7 +28,8 @@ subpackages=" $pkgname-lang lib$pkgname:libs $pkgname-bash-completion:bashcomp:noarch" -source="https://download.gnome.org/sources/tracker/${pkgver%.*}/tracker-${pkgver}.tar.xz" +source="https://download.gnome.org/sources/tracker/${pkgver%.*}/tracker-${pkgver}.tar.xz + 90.patch" build() { meson \ @@ -58,4 +59,5 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share } -sha512sums="2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7 tracker-2.2.2.tar.xz" +sha512sums="2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7 tracker-2.2.2.tar.xz +caa7a01b047dd8f7bcfd14e5d5439f7f44c5abbbad642899b02f8fbb8b9ed4639a16c1b1020f5fade96f67c6855170666f0e95f027efceecf52d30a209a02f14 90.patch" |