[nautilus/sam/tracker-3] flatpak: Build tracker-miners inside the Flatpak
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/sam/tracker-3] flatpak: Build tracker-miners inside the Flatpak
- Date: Sun, 10 May 2020 22:06:22 +0000 (UTC)
commit b3ad418a10c6cadeb97c4935c121921fee857f0b
Author: Sam Thursfield <sam afuera me uk>
Date: Sun May 10 23:22:58 2020 +0200
flatpak: Build tracker-miners inside the Flatpak
This is only needed so that the org.freedesktop.Tracker3.Miner.Files settings
schema is available. It would perhaps be better if Nautilus didn't hard depend
on this schema.
build-aux/flatpak/org.gnome.Nautilus.json | 57 ++++++++++++++++++--------
build-aux/flatpak/org.gnome.Nautilus.yml | 25 +++++++++++
build-aux/flatpak/org.gnome.NautilusMaster.yml | 25 +++++++++++
3 files changed, 89 insertions(+), 18 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index e6e6e37da..2b2b19566 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -59,30 +59,51 @@
]
},
{
- "name": "intltool",
- "cleanup": [ "*" ],
+ "name": "tracker-miners",
+ "buildsystem": "meson",
+ "cleanup": [
+ "/etc",
+ "/lib",
+ "/libexec",
+ "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service",
+ "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service",
+ "/share/tracker/miners/org.freedesktop.Tracker3.Miner.Extract.service",
+ "/share/tracker-miners",
+ "/share/glib-2.0/schemas/org.freedesktop.Tracker3.Extract.gschema.xml",
+ "/share/glib-2.0/schemas/org.freedesktop.Tracker3.Writeback.gschema.xml"
+ ],
+ "config-opts": [
+ "-Dextract=false",
+ "-Dgeneric_media_extractor=none",
+ "-Dman=false",
+ "-Dminer_apps=false",
+ "-Dminer_fs=true",
+ "-Dminer_rss=false",
+ "-Dsystemd_user_services=false",
+ "-Dwriteback=false"
+ ],
"sources": [
{
- "type": "archive",
- "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
- "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
+ "type": "git",
+ "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git",
+ "branch": "master"
}
]
},
{
- "name": "gnome-desktop",
- "buildsystem": "meson",
- "config-opts": [
- "-Ddebug_tools=false",
- "-Ddesktop_docs=false",
- "-Dudev=disabled"
- ],
- "sources": [
- {
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
- }
- ]
+ "name": "gnome-desktop",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Ddebug_tools=false",
+ "-Ddesktop_docs=false",
+ "-Dudev=disabled"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
+ }
+ ]
},
{
"name": "gnome-autoar",
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index b87818ade..6122c5a04 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -44,6 +44,31 @@ modules:
- type: git
url: https://gitlab.gnome.org/GNOME/gexiv2.git
tag: gexiv2-0.10.10
+- name: tracker-miners
+ buildsystem: meson
+ cleanup:
+ - "/etc"
+ - "/lib"
+ - "/libexec"
+ - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service"
+ - "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+ - "/share/tracker/miners/org.freedesktop.Tracker3.Miner.Extract.service"
+ - "/share/tracker-miners"
+ - "/share/glib-2.0/schemas/org.freedesktop.Tracker3.Extract.gschema.xml"
+ - "/share/glib-2.0/schemas/org.freedesktop.Tracker3.Writeback.gschema.xml"
+ config-opts:
+ - "-Dextract=false"
+ - "-Dgeneric_media_extractor=none"
+ - "-Dman=false"
+ - "-Dminer_apps=false"
+ - "-Dminer_fs=true"
+ - "-Dminer_rss=false"
+ - "-Dsystemd_user_services=false"
+ - "-Dwriteback=false"
+ sources:
+ - type: git
+ url: https://gitlab.gnome.org/GNOME/tracker-miners.git
+ branch: master
- name: gnome-desktop
buildsystem: meson
config-opts:
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 6b54d9e32..cc040a8a1 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -43,6 +43,31 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gexiv2.git
+- name: tracker-miners
+ buildsystem: meson
+ cleanup:
+ - "/etc"
+ - "/lib"
+ - "/libexec"
+ - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service"
+ - "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+ - "/share/tracker/miners/org.freedesktop.Tracker3.Miner.Extract.service"
+ - "/share/tracker-miners"
+ - "/share/glib-2.0/schemas/org.freedesktop.Tracker3.Extract.gschema.xml"
+ - "/share/glib-2.0/schemas/org.freedesktop.Tracker3.Writeback.gschema.xml"
+ config-opts:
+ - "-Dextract=false"
+ - "-Dgeneric_media_extractor=none"
+ - "-Dman=false"
+ - "-Dminer_apps=false"
+ - "-Dminer_fs=true"
+ - "-Dminer_rss=false"
+ - "-Dsystemd_user_services=false"
+ - "-Dwriteback=false"
+ sources:
+ - type: git
+ url: https://gitlab.gnome.org/GNOME/tracker-miners.git
+ branch: master
- name: gnome-desktop
buildsystem: meson
config-opts:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]