diff options
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 87 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 54 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 54 |
3 files changed, 41 insertions, 154 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index ca95c384a..8956d6b68 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -14,8 +14,6 @@ "--socket=x11", "--socket=wayland", "--talk-name=org.gnome.OnlineAccounts", - "--talk-name=org.freedesktop.Tracker1", - "--talk-name=org.freedesktop.Tracker1.Miner.Extract", "--filesystem=host", "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*", @@ -24,7 +22,7 @@ "--filesystem=~/.config/dconf:ro", "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf", - "--env=TRACKER_SPARQL_BACKEND=bus" + "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:FileSystem;tracker:Documents" ], "modules": [ { @@ -59,91 +57,48 @@ ] }, { - "name": "tracker", + "name": "tracker-miners", + "buildsystem": "meson", "cleanup": [ - "/bin", "/etc", - "/libexec" + "/libexec/tracker-3", + "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service", + "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service", + "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service" ], - "buildsystem": "meson", - "builddir": true, "config-opts": [ - "-Ddocs=false", - "-Dfunctional_tests=false", - "-Djournal=false", - "-Dnetwork_manager=disabled", - "-Dstemmer=disabled", - "-Dbash_completion=no", - "-Dsystemd_user_services=no" + "-Dextract=true", + "-Dgeneric_media_extractor=none", + "-Dman=false", + "-Dminer_fs=true", + "-Dminer_rss=false", + "-Dsystemd_user_services=false", + "-Dwriteback=false" ], "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/tracker.git", - "branch": "tracker-2.3" - } - ] - }, - { - "name": "intltool", - "cleanup": [ "*" ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", - "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" + "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git", + "branch": "master" } ] }, { - "name": "tracker-miners", + "name": "gnome-desktop", "buildsystem": "meson", - "cleanup": [ - "/etc", - "/lib", - "/libexec", - "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service", - "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service", - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service", - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service", - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service", - "/share/tracker-miners", - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml", - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml" - ], "config-opts": [ - "-Dextract=false", - "-Dgeneric_media_extractor=none", - "-Dminer_apps=false", - "-Dminer_fs=true", - "-Dminer_rss=false", - "-Dsystemd_user_services=no", - "-Dwriteback=false" + "-Ddebug_tools=false", + "-Ddesktop_docs=false", + "-Dudev=disabled" ], "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git", - "branch": "tracker-miners-2.3" + "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", "sources": [ { diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index f22736fa6..7add949f5 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -13,8 +13,6 @@ finish-args: - "--socket=x11" - "--socket=wayland" - "--talk-name=org.gnome.OnlineAccounts" -- "--talk-name=org.freedesktop.Tracker1" -- "--talk-name=org.freedesktop.Tracker1.Miner.Extract" - "--filesystem=host" - "--talk-name=org.gtk.vfs" - "--talk-name=org.gtk.vfs.*" @@ -23,7 +21,8 @@ finish-args: - "--filesystem=~/.config/dconf:ro" - "--talk-name=ca.desrt.dconf" - "--env=DCONF_USER_CONFIG_DIR=.config/dconf" -- "--env=TRACKER_SPARQL_BACKEND=bus" +# Access to host Tracker Miners +- "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:FileSystem;tracker:Documents" modules: - name: exiv2 config-opts: @@ -44,59 +43,26 @@ modules: - type: git url: https://gitlab.gnome.org/GNOME/gexiv2.git tag: gexiv2-0.10.10 -- name: tracker - cleanup: - - "/bin" - - "/etc" - - "/libexec" - buildsystem: meson - builddir: true - config-opts: - - "-Ddocs=false" - - "-Dfunctional_tests=false" - - "-Djournal=false" - - "-Dnetwork_manager=disabled" - - "-Dstemmer=disabled" - - "-Dbash_completion=no" - - "-Dsystemd_user_services=no" - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/tracker.git - branch: tracker-2.3 -# Bundle intltool until tracker-miners drops that dependency https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/29 -- name: intltool - cleanup: - - "*" - sources: - - type: archive - url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz - sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd - name: tracker-miners buildsystem: meson cleanup: - "/etc" - - "/lib" - - "/libexec" - - "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service" - - "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service" - - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service" - - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service" - - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service" - - "/share/tracker-miners" - - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml" - - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml" + - "/libexec/tracker-3" + - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service" + - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service" + - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service" config-opts: - - "-Dextract=false" + - "-Dextract=true" - "-Dgeneric_media_extractor=none" - - "-Dminer_apps=false" + - "-Dman=false" - "-Dminer_fs=true" - "-Dminer_rss=false" - - "-Dsystemd_user_services=no" + - "-Dsystemd_user_services=false" - "-Dwriteback=false" sources: - type: git url: https://gitlab.gnome.org/GNOME/tracker-miners.git - branch: tracker-miners-2.3 + 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 10608aafd..b467e6c40 100644 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml @@ -13,8 +13,6 @@ finish-args: - "--socket=x11" - "--socket=wayland" - "--talk-name=org.gnome.OnlineAccounts" -- "--talk-name=org.freedesktop.Tracker1" -- "--talk-name=org.freedesktop.Tracker1.Miner.Extract" - "--filesystem=host" - "--talk-name=org.gtk.vfs" - "--talk-name=org.gtk.vfs.*" @@ -23,7 +21,8 @@ finish-args: - "--filesystem=~/.config/dconf:ro" - "--talk-name=ca.desrt.dconf" - "--env=DCONF_USER_CONFIG_DIR=.config/dconf" -- "--env=TRACKER_SPARQL_BACKEND=bus" +# Access to host Tracker Miners +- "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:FileSystem;tracker:Documents" modules: - name: exiv2 config-opts: @@ -43,59 +42,26 @@ modules: sources: - type: git url: https://gitlab.gnome.org/GNOME/gexiv2.git -- name: tracker - cleanup: - - "/bin" - - "/etc" - - "/libexec" - buildsystem: meson - builddir: true - config-opts: - - "-Ddocs=false" - - "-Dfunctional_tests=false" - - "-Djournal=false" - - "-Dnetwork_manager=disabled" - - "-Dstemmer=disabled" - - "-Dbash_completion=no" - - "-Dsystemd_user_services=no" - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/tracker.git - branch: tracker-2.3 -# Bundle intltool until tracker-miners drops that dependency https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/29 -- name: intltool - cleanup: - - "*" - sources: - - type: archive - url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz - sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd - name: tracker-miners buildsystem: meson cleanup: - "/etc" - - "/lib" - - "/libexec" - - "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service" - - "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service" - - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service" - - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service" - - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service" - - "/share/tracker-miners" - - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml" - - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml" + - "/libexec/tracker-3" + - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service" + - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service" + - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service" config-opts: - - "-Dextract=false" + - "-Dextract=true" - "-Dgeneric_media_extractor=none" - - "-Dminer_apps=false" + - "-Dman=false" - "-Dminer_fs=true" - "-Dminer_rss=false" - - "-Dsystemd_user_services=no" + - "-Dsystemd_user_services=false" - "-Dwriteback=false" sources: - type: git url: https://gitlab.gnome.org/GNOME/tracker-miners.git - branch: tracker-miners-2.3 + branch: master - name: gnome-desktop buildsystem: meson config-opts: |