Commit graph

57 commits

Author SHA1 Message Date
Felipe Borges 7cab1cd762 build, flatpak: Add libportal dependency
Fixes #795
2020-11-18 15:30:13 +00:00
Sam Thursfield 034a6a3394 flatpak: Update for Tracker Miners 3
Tracker 3 is provided in the Flatpak SDK, see
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/630.

We still build tracker-miners inside the Flatpak bundle, so that the
org.freedesktop.Tracker3.Miner.Files settings schema is available, and
so that the tests that depend on Tracker can pass as part of the CI
build.

Access to the host's miners is controlled by the new
org.freedesktop.Tracker.portal process provided in Tracker 3.
2020-09-02 18:50:17 +02:00
Ondrej Holy 7868470694 flatpak: Build all tests by default
The flatpak template has been changed recently and MESON_ARGS variable
doesn't have any effect currently. Let's drop MESON_ARGS and move the
build options into the manifests directly (ie. -Dtests=all).

See:
https://gitlab.gnome.org/GNOME/citemplates/blob/master/flatpak/flatpak_ci_initiative.yml
https://mail.gnome.org/archives/desktop-devel-list/2020-April/thread.html
2020-05-10 22:59:32 +00:00
Ondrej Holy 0c91a64a43 flatpak: Remove unused gcovr module
The coverage is not computed since the commit a5a405d. Let's remove
the unused gcovr module also.
2020-04-05 16:22:26 +00:00
António Fernandes 65c338384c flatpak: Fix typos
Pipeline failed.

Cause: invalid URLs resulting from faulty select-copy-paste operation.
2020-03-09 21:27:14 +00:00
António Fernandes 90cc5fed28 flatpak: Unpin tracker[-miners]
We've pinned to specific versions, because their
git master branches have API-breaking changes.

Instead, let's follow from the tracker[-miners]-2.3 branches, where 
the stable API is still maintained.
2020-03-09 21:15:28 +00:00
Ondrej Holy 68f63d2c40 flatpak: Use also tracker-miners 2.3.2
tracker-miners master requires tracker-testutils 2.0, but they are not
provided by tracker 2.3.2 and tracker master provides just version 3.0.
Let's use tracker-miners 2.3.2 to workaround this issue.
2020-02-21 12:30:22 +01:00
Ondrej Holy 5b7192c34f flatpak: Use tracker 2.3.2 as tracker-miners requires old API
Flatpak generation fails currently because tracker-miners still requires
tracker API version 2.0. Let's use tracker 2.3.2, until tracker-miners
will be ported to 3.0.
2020-02-21 12:01:28 +01:00
Ondrej Holy 5a74959caf flatpak: Use default libdir location for tracker
I don't see any reason to manually specify libdir for tracker as
it seemingly uses the same directory by default. Let's remove that
redundant definition.
2020-02-21 12:01:28 +01:00
António Fernandes d95a616116 flatpak: Unpin most dependencies
We are near 3.36, so let's update the dependencies.

gexiv2 git master is failing to build locally, so I've 
updated it to the latest tag that builds locally.
2020-02-06 20:28:17 +00:00
António Fernandes cdd9ce790f flatpak: Drop '(Development)' app name prefix
The prefix is not localized, and tends to ellipsize the name.

With the introduction of an icon for the development profile, there is
enough visual distinction in the app grip.

So, drop the prefix.

Part of https://gitlab.gnome.org/GNOME/Initiatives/issues/12
2019-10-13 17:17:53 +01:00
António Fernandes 81dd339634 flatpak: Update to 3.34 runtime
Also, bundle intltool, because the 3.34 Sdk doesn't include it but
tracker-miners still depends on it.

Intltool lines taken from https://github.com/flathub/shared-modules.git
2019-09-18 21:46:20 +01:00
Christian Hergert daac24d50c build: fix flatpak json manifest
This allows Builder to open the Nautilus project again. I suspect that
there is also some configuration issue with the .yml file.
2019-07-01 16:42:17 -07:00
Ernestas Kulik 3862cf7980 general: Drop in-tree copy of gnome-desktop
The code was copied to avoid having an external GTK+ 3 dependency, but
at this point it’s more trouble than it’s worth.
2019-06-28 15:49:15 +02:00
Carlos Soriano 4635f34cf4 flatpak: Pin dependencies to 3.32 releases 2019-03-21 15:12:34 +01:00
Carlos Soriano 091db8c4dc Flatpak: Sync json from yaml
Generate the json from the yaml file.
2019-03-13 11:21:15 +01:00
Ernestas Kulik 288197a122 org.gnome.Nautilus.json: Fix tracker options
cfab5f9604
2019-02-17 21:21:11 +00:00
Carlos Soriano 7f19a03649 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.
2019-02-04 19:16:48 +01:00
Carlos Soriano 10af9a05a9 Flatpak: Use master SDK
We are close to 3.32, let's dogfood. We also need to try the new theme.
2019-01-17 13:54:30 +01:00
Debarshi Ray 0f38ffd494 Use CMake's Ninja backend
The difference between Make and Ninja for full, non-incremental builds
isn't that much [1,2]; but Ninja is already being used by Meson, so
why not?

[1] https://david.rothlis.net/ninja-benchmark/
[2] http://hamelot.io/programming/make-vs-ninja-performance-comparison/

https://gitlab.gnome.org/GNOME/nautilus/merge_requests/386
2019-01-10 14:09:16 +00:00
Ernestas Kulik 3ae0c8901e flatpak: Fix JSON manifest some more
Booleans are not strings.
2018-12-06 08:06:48 +00:00
Ernestas Kulik 6580594954 flatpak: Fix JSON manifest
The profile option is set to a wrong value.
2018-12-06 08:02:37 +00:00
Vaibhav Yadav 9e166fc9ee Replacing gcovr module with gcovr.json
Currently network is used during build time because of pip fetching from
internet.
However network should not be used during build time.
To fix this issue, use gcovr.json generated by flatpak-pip-generator
and replace them with gcovr module in org.gnome.Nautilus.json and
org.gnome.Nautilus.yml and remove build option that uses network.

Closes issue https://gitlab.gnome.org/GNOME/nautilus/issues/681
2018-11-20 14:02:20 +00:00
Carlos Soriano 837123f9ff Flatpak: Add gcovr
So we can generate coverage reports.

And do it with pip, cannot make my system run the pipToFlatpak tool
locally.
2018-10-09 13:16:24 +00:00
Carlos Soriano 9fbb8a8557 Flatpak: Update to 3.30 2018-10-09 12:08:17 +02:00
Jordan Petridis 61e54e4f8d Revert "Flatpak: Remove unecessary meson options"
This reverts commit a565907fe6
2018-09-20 16:49:00 +00:00
Jordan Petridis a565907fe6
Flatpak: Remove unecessary meson options 2018-09-20 19:25:22 +03:00
Carlos Soriano 63011cba78 Update build-aux/flatpak/org.gnome.Nautilus.json 2018-09-18 11:15:51 +00:00
Carlos Soriano b4471d3c3b Update build-aux/flatpak/org.gnome.Nautilus.json 2018-09-14 07:30:03 +00:00
Carlos Soriano bfe8f49e15 Update build-aux/flatpak/org.gnome.Nautilus.json 2018-09-14 07:29:03 +00:00
Carlos Soriano cb3849df58 Flatpak: Tracker moved to Meson 2018-09-14 08:46:55 +02:00
Carlos Soriano 1c8b75bcde Flatpak: Explictely set tracker bus
Otherwise a warning is raised.
2018-09-12 13:00:07 +00:00
Carlos Soriano 76f14a5cc8 Flatpak: Fix meson of the json manifest 2018-09-05 12:33:24 +00:00
Carlos Soriano 45e0fc7939 Flatpak: Use meson 0.47
Seems we use some features from 0.47 already
2018-09-05 11:44:49 +00:00
Carlos Soriano 703618c12c flatpak: Use meson for gexvi2
Life's much better now.
2018-07-26 15:40:23 +02:00
Carlos Soriano 8d3ab27e1c Flatpak: Give up on Builder formatting the JSON
Builder keeps trying to format the JSON automatically for any change,
which is quite cumbersome since it appears as a changed file on git and
also it's a mess if an actual change happens.

Just accept the defeat and go with whatever Builder wants.
2018-07-14 11:59:56 +02:00
António Fernandes 443a7ed5bf flatpak: Update dependency modules source URLs
The YAML files already use the gitlab URLs, while the json doesn't.

The gnome-apps-nightly build script reads the json file, and the
builds have been failing because of this.

Update the json file accordingly.

Closes https://gitlab.gnome.org/GNOME/nautilus/issues/485
2018-06-12 22:34:57 +01:00
Carlos Soriano 0994474acc Flatpak: Update exiv2 upstream url and build system 2018-05-28 19:50:08 +00:00
Carlos Soriano d945455178 Flatpak: Separate master dependencies from stable
So far we have been building master of all of our dependencies, also
master of the Sdk. This is good for testing the next version of the
ecosystem, but has many downsides that we now can avoid with Flatpak.

For instance, we want to be buildable at any point in the history,
specially when doing bisects. Also, we need to be a bit stable so that
when designers, users or others build the latest Nautilus they are able
to work with it regardless of its dependencies on other projects.

Even more, now with CI we can test the master of the ecosystem regularly
while not affecting our regular development and operations by depending
on that.

So let's separate in two different manifests the development version
with stable dependencies, intended for our regular operations, and a
development version with all the ecosystem on master, to test the
ecosystem regularly on the CI or on-demand locally.
2018-05-28 19:50:08 +00:00
Carlos Soriano e6a94fcef3 Flatpak/CI: Fix exiv.org being down
So the site is down, and the archive cannot be downloaded...

I uploaded the archive to an issue in GitLab
https://gitlab.gnome.org/GNOME/nautilus/issues/458.

If it works...

It works.
2018-05-25 17:10:12 +02:00
Ernestas Kulik 673c81cf9f general: Copy gnome-desktop thumbnailing code
This is one of prerequisite steps to take before fully switching to GTK+
4, as gnome-desktop has code, depending on GTK+ 3. Since the
thumbnailing machinery is self-contained, it can easily be just copied
over.
2018-05-22 16:52:48 +03:00
Carlos Soriano 2e331b6c80 CI: Use 3.28 image until master is fixed
And run only headless tests, as things are a bit on flow now and the
ostree image is missing some needed bits.
2018-05-18 15:47:09 +02:00
Carlos Soriano 487e907b81 Flatpak: Install Meson from sources
Until we can use the master runtime that includes Meson 0.46.0.
2018-05-18 08:45:27 +02:00
Carlos Soriano e212a3f703 Flatpak: Use 3.28 version
Until master is fixed, due to the rebase to fdo 1.8.
2018-05-17 16:35:04 +02:00
Carlos Soriano b4282720a9 Flatpak: Update to fdo 1.8 runtime 2018-05-17 13:01:56 +02:00
Carlos Soriano 8ac9c87306 Flatpak: Allow access to gsettings folder
Recently we have been seeing that gsettings doesn't work inside the
Flatpak build of Nautilus.

In 3f6cd2feb2
we gave full host access to Nautilus, so I expected that no more
--filesystem permission would be necessary.

For some reason... we still need to put that. Although it looks like a
bug somewhere.

For now, let's just explicitly allow access the desrt folder.
2018-04-08 18:09:28 +02:00
Ernestas Kulik fc5d9cbcbc Flatpak: Don’t rename the manifest
We can have non-matching ID and file name, and we only keep one
manifest.
2018-03-19 14:17:11 +02:00
Ernestas Kulik df583c2e4a general: Allow running in separate instance
When hacking on Nautilus, it is very inconvenient to have to close any
running instance before running the built version. This commit enables
running three different instances by changing the application ID.
Beside the default “profile” is one crafted for stable flatpak
releases and one for development. The stable flatpak profile adds an
identifying mark to the about dialog to aid collecting information in
bug reports. The development profile is that plus additional styling to
help visually identify the development instance. It also will be used
when generating Flatpak bundles with the help of CI.

Generally, the implementation is slightly hacky to allow all the
different workflows, spanning from regular installations to GNOME
Builder flatpak builds, as each comes with its own quirks.
2018-03-18 22:28:08 +02:00
Carlos Soriano 714442f53e Flatpak: Don't clean up include dirs, etc.
So we can actually enter the environment and run ninja test and other stuff.

This is pretty handy for development, and our main flatpak manifest is for that
use.
2018-03-17 23:18:00 +01:00
Carlos Soriano a4e797d974 Flatpak: Use Sdk 3.28 2018-03-16 15:00:34 +00:00