diff options
author | Carlos Soriano <csoriano@redhat.com> | 2019-01-29 16:24:43 +0100 |
---|---|---|
committer | Carlos Soriano <csoriano@redhat.com> | 2019-02-04 19:16:48 +0100 |
commit | 7f19a036491cb27579daa674aaf7f5353d910709 (patch) | |
tree | c7b2292fda3558c6f3c07bb4d8912daff9d67f4a /build-aux | |
parent | 0d12969029b9923457033a44c49bbeb7c142769c (diff) | |
download | nautilus-7f19a036491cb27579daa674aaf7f5353d910709.tar.gz |
files-view: Use tracked directories for star
We were using the xdg directories to check whether we can star a file
or not, since the star feature only works on directories that are
tracked by tracker.
Tracker is usually shipped in distributions tracking the
xdg-directories, so we check that as a stop gap solution for 3.30
since we didn't have time to actually query what directories tracker
is tracking and match that.
This work makes it so that we show the star action on tracked
directories.
Diffstat (limited to 'build-aux')
-rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 31 | ||||
-rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 31 | ||||
-rw-r--r-- | build-aux/flatpak/org.gnome.NautilusGtk4.yml | 186 | ||||
-rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 172 |
4 files changed, 260 insertions, 160 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index ef359d4f4..e7a18a6d1 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -16,6 +16,7 @@ "--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.*", @@ -85,6 +86,34 @@ ] }, { + "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" ], + "config-opts": [ "-Dextract=false", + "-Dgeneric_media_extractor=none", + "-Dminer_apps=false", + "-Dminer_fs=true", + "-Dminer_rss=false", + "-Dsystemd_user_services=no", + "-Dwriteback=false" ], + "sources": [ + { + "type": "git", + "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git" + } + ] + }, + { "name" : "gnome-autoar", "sources" : [ { @@ -110,4 +139,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index 50b5820d9..d5cb9fb02 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -1,7 +1,7 @@ --- app-id: org.gnome.NautilusDevel runtime: org.gnome.Platform -runtime-version: 'master' +runtime-version: master sdk: org.gnome.Sdk command: nautilus tags: @@ -15,6 +15,7 @@ finish-args: - "--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.*" @@ -63,6 +64,31 @@ modules: sources: - type: git url: https://gitlab.gnome.org/GNOME/tracker.git +- 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" + config-opts: + - "-Dextract=false" + - "-Dgeneric_media_extractor=none" + - "-Dminer_apps=false" + - "-Dminer_fs=true" + - "-Dminer_rss=false" + - "-Dsystemd_user_services=no" + - "-Dwriteback=false" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/tracker-miners.git - name: gnome-autoar sources: - type: git @@ -76,4 +102,5 @@ modules: - "-Dprofile=Devel" sources: - type: git - url: https://gitlab.gnome.org/GNOME/nautilus.git
\ No newline at end of file + url: https://gitlab.gnome.org/GNOME/nautilus.git + diff --git a/build-aux/flatpak/org.gnome.NautilusGtk4.yml b/build-aux/flatpak/org.gnome.NautilusGtk4.yml index 2a8eee1ef..c6067eb1f 100644 --- a/build-aux/flatpak/org.gnome.NautilusGtk4.yml +++ b/build-aux/flatpak/org.gnome.NautilusGtk4.yml @@ -1,87 +1,107 @@ -app-id: "org.gnome.NautilusGtk4" -runtime: "org.gnome.Platform" -runtime-version: "master" -sdk: "org.gnome.Sdk" -command: "nautilus" +--- +app-id: org.gnome.NautilusDevel +runtime: org.gnome.Platform +runtime-version: master +sdk: org.gnome.Sdk +command: nautilus tags: - - "devel" - - "nightly" - - "gtk4" -desktop-file-name-prefix: "(Development Gtk4) " +- devel +- development +- nightly +desktop-file-name-prefix: "(Development) " finish-args: - - "--filesystem=host" - - "--share=ipc" - - "--socket=x11" - - "--socket=wayland" - - "--talk-name=org.gnome.OnlineAccounts" - - "--talk-name=org.freedesktop.Tracker1" - - "--talk-name=org.gtk.vfs" - - "--talk-name=org.gtk.vfs.*" - - "--filesystem=xdg-run/dconf" - - "--filesystem=~/.config/dconf:ro" - # Remove to something better for dconf when ready. - # See https://github.com/flatpak/flatpak/issues/78 - - "--talk-name=ca.desrt.dconf" - - "--env=DCONF_USER_CONFIG_DIR=.config/dconf" - - "--device=dri" - # It's a fallback path for tracker, Flatpak seems needs it. - - --env=TRACKER_SPARQL_BACKEND=bus - +- "--share=ipc" +- "--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.*" +- "--filesystem=xdg-run/dconf" +- "--filesystem=~/.config/dconf:ro" +- "--talk-name=ca.desrt.dconf" +- "--env=DCONF_USER_CONFIG_DIR=.config/dconf" +- "--env=TRACKER_SPARQL_BACKEND=bus" modules: - - name: "exiv2" - buildsystem: "cmake-ninja" - sources: - - type: "archive" - url: "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz" - sha256: "51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01" - - - name: "gexiv2" - buildsystem: "meson" - cleanup: - - '/lib/girepository-1.0' - - '/share/gir-1.0' - build-options: - config-opts: - - '-Ddisable-introspection=True' - - '-Ddisable-vala=true' - - '-Dpython2-girdir=no' - - '-Dpython3-girdir=no' - sources: - - type: "git" - url: "https://gitlab.gnome.org/GNOME/gexiv2.git" - - - name: "tracker" - cleanup: - - "/bin" - - "/etc" - - "/libexec" - buildsystem: "meson" - build-options: - config-opts: - - "-Dbash_completion=no" - - "-Ddocs=false" - - "-Dfunctional_tests=false" - - "-Djournal=false" - - "-Dnetwork_manager=no" - - "-Dstemmer=no" - - "-Dsystemd_user_services=no" - sources: - - type: "git" - url: "https://gitlab.gnome.org/GNOME/tracker.git" - - - name: "gnome-autoar" - sources: - - type: "git" - url: "https://gitlab.gnome.org/GNOME/gnome-autoar.git" - tag: "0.2.3" +- gcovr.json +- name: exiv2 + config-opts: + - "-DCMAKE_INSTALL_PREFIX=/app" + - "-DCMAKE_INSTALL_LIBDIR=/app/lib" + buildsystem: cmake-ninja + sources: + - type: archive + url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz + sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01 +- name: gexiv2 + buildsystem: meson + builddir: true + config-opts: + - "--libdir=/app/lib" + - "-Ddisable-introspection=True" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/gexiv2.git + tag: gexiv2-0.10.8 +- name: tracker + cleanup: + - "/bin" + - "/etc" + - "/libexec" + buildsystem: meson + builddir: true + config-opts: + - "--libdir=lib" + - "-Ddocs=false" + - "-Dfunctional_tests=false" + - "-Djournal=false" + - "-Dnetwork_manager=no" + - "-Dstemmer=no" + - "-Dbash_completion=no" + - "-Dsystemd_user_services=no" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/tracker.git +- 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" + config-opts: + - "-Dextract=false" + - "-Dgeneric_media_extractor=none" + - "-Dminer_apps=false" + - "-Dminer_fs=true" + - "-Dminer_rss=false" + - "-Dsystemd_user_services=no" + - "-Dwriteback=false" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/tracker-miners.git +- name: gnome-autoar + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/gnome-autoar.git + tag: 0.2.3 +- buildsystem: meson + builddir: true + name: nautilus + config-opts: + - "--libdir=/app/lib" + - "-Dprofile=Devel" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/nautilus.git + branch: wip/ernestask/gtk4-continued - - name: "nautilus" - buildsystem: "meson" - build-options: - config-opts: - - "-Dprofile=Gtk4" - - "-Dintrospection=false" - sources: - - type: "git" - url: "https://gitlab.gnome.org/GNOME/nautilus.git" - branch: "wip/ernestask/gtk4-continued" diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml index 74fd74387..d5cb9fb02 100644 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml @@ -1,82 +1,106 @@ -app-id: org.gnome.NautilusMaster +--- +app-id: org.gnome.NautilusDevel runtime: org.gnome.Platform runtime-version: master sdk: org.gnome.Sdk command: nautilus tags: - - devel - - nightly - - master -desktop-file-name-prefix: "(Development Master) " +- devel +- development +- nightly +desktop-file-name-prefix: "(Development) " finish-args: - - --filesystem=host - - --share=ipc - - --socket=x11 - - --socket=wayland - - --talk-name=org.gnome.OnlineAccounts - - --talk-name=org.freedesktop.Tracker1 - - --filesystem=host - - --talk-name=org.gtk.vfs - - --talk-name=org.gtk.vfs.* - - --filesystem=xdg-run/dconf - - --filesystem=~/.config/dconf:ro - # Remove to something better for dconf when ready. - # See https://github.com/flatpak/flatpak/issues/78 - - --talk-name=ca.desrt.dconf - - --env=DCONF_USER_CONFIG_DIR=.config/dconf - # It's a fallback path for tracker, Flatpak seems needs it. - - --env=TRACKER_SPARQL_BACKEND=bus - +- "--share=ipc" +- "--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.*" +- "--filesystem=xdg-run/dconf" +- "--filesystem=~/.config/dconf:ro" +- "--talk-name=ca.desrt.dconf" +- "--env=DCONF_USER_CONFIG_DIR=.config/dconf" +- "--env=TRACKER_SPARQL_BACKEND=bus" modules: - - name: "exiv2" - buildsystem: "cmake-ninja" - sources: - - type: "git" - url: "https://github.com/Exiv2/exiv2.git" - tag: "v0.26" - - - name: gexiv2 - buildsystem: meson - cleanup: - - '/lib/girepository-1.0' - - '/share/gir-1.0' - build-options: - config-opts: - - '-Dpython2_girdir=no' - - '-Dpython3_girdir=no' - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/gexiv2.git - - - name: tracker - cleanup: - - /bin - - /etc - - /libexec - buildsystem: meson - build-options: - config-opts: - - -Ddocs=false - - -Dfunctional_tests=false - - -Djournal=false - - -Dnetwork_manager=no - - -Dstemmer=no - - -Dbash_completion=no - - -Dsystemd_user_services=no - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/tracker.git - - - name: gnome-autoar - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/gnome-autoar.git +- gcovr.json +- name: exiv2 + config-opts: + - "-DCMAKE_INSTALL_PREFIX=/app" + - "-DCMAKE_INSTALL_LIBDIR=/app/lib" + buildsystem: cmake-ninja + sources: + - type: archive + url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz + sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01 +- name: gexiv2 + buildsystem: meson + builddir: true + config-opts: + - "--libdir=/app/lib" + - "-Ddisable-introspection=True" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/gexiv2.git + tag: gexiv2-0.10.8 +- name: tracker + cleanup: + - "/bin" + - "/etc" + - "/libexec" + buildsystem: meson + builddir: true + config-opts: + - "--libdir=lib" + - "-Ddocs=false" + - "-Dfunctional_tests=false" + - "-Djournal=false" + - "-Dnetwork_manager=no" + - "-Dstemmer=no" + - "-Dbash_completion=no" + - "-Dsystemd_user_services=no" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/tracker.git +- 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" + config-opts: + - "-Dextract=false" + - "-Dgeneric_media_extractor=none" + - "-Dminer_apps=false" + - "-Dminer_fs=true" + - "-Dminer_rss=false" + - "-Dsystemd_user_services=no" + - "-Dwriteback=false" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/tracker-miners.git +- name: gnome-autoar + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/gnome-autoar.git + tag: 0.2.3 +- buildsystem: meson + builddir: true + name: nautilus + config-opts: + - "--libdir=/app/lib" + - "-Dprofile=Devel" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/nautilus.git - - name: nautilus - buildsystem: meson - build-options: - config-opts: - - -Dprofile=Master - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/nautilus.git |