1
0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-07-05 01:41:28 +00:00
Commit Graph

145 Commits

Author SHA1 Message Date
Jordan Petridis
45fc00c5c3
flatpak: fix the yml manifests to better reflect json structure
See !467
2019-07-02 18:42:07 +03: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
cab54308aa flatpak: Unpin dependencies for the master manifest
Doing so defeats the point...
2019-03-21 15:12:34 +01:00
Carlos Soriano
4635f34cf4 flatpak: Pin dependencies to 3.32 releases 2019-03-21 15:12:34 +01:00
Carlos Soriano
e3f1b309ad Flatpak: Remove gtk4 manifest
The gtk4 branch should have the proper manifest already
2019-03-21 13:20:28 +00:00
Carlos Soriano
091db8c4dc Flatpak: Sync json from yaml
Generate the json from the yaml file.
2019-03-13 11:21:15 +01:00
Ondrej Holy
2e38753aed flatpak: Add --share=network to fix synchronous gvfs connections
GVfs communicates with daemons over abstract sockets. Currently, synchronous
GIO API doesn't work for GVfs locations, because abstract sockets seem to be
blocked by sandbox permissions. This is not problem in most cases as Nautilus
uses asynchronous API usually. But this breaks e.g. "Empty Trash" functionality
as it is for some reason based on synchronous API.

In order to fix this problems, it is necessary to allow access to sockets
beginning with `unix:abstract=/dbus-vfs-daemon/socket-`, but I am not aware of
better way than adding `--share=network`, which allows access to all abstract
sockets:
http://docs.flatpak.org/en/latest/sandbox-permissions-reference.html#f2

Just a note that it is not clear to me, why it affects only the synchronous
API as the asynchronous API also uses abstract sockets. See the corresponding
Flatpak bug:
https://github.com/flatpak/flatpak/issues/2711
2019-03-13 08:47:04 +00:00
Ernestas Kulik
7f5d6b2afc org.gnome.NautilusGtk4.yml: Fix tracker options
92e052be73 - guess what, not very.
2019-02-17 21:24:49 +00:00
Ernestas Kulik
92e052be73 org.gnome.NautilusMaster.yml: Fix tracker options
f9df2bbf7f - how deep can we go?
2019-02-17 21:23:56 +00:00
Ernestas Kulik
f9df2bbf7f org.gnome.Nautilus.yml: Fix tracker options
Same thing as 288197a122, but now a gorillion other manifests need to be changed.
2019-02-17 21:22:52 +00: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
Ernestas Kulik
34321c9380 org.gnome.NautilusMaster.yml: Fix gexiv2 options 2019-01-11 09:27:42 +00:00
Ernestas Kulik
c600aae36a org.gnome.NautilusMaster.yml: Fix gexiv2 options 2019-01-11 09:26:00 +00: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
Jordan Petridis
6b64657848
Flatpak: do not build gtk4 from source.
Gtk4 is included in the master Sdk now.
2018-12-14 01:35:48 +02:00
Jordan Petridis
0428392dde
Flatpak: remove no longer needed options
builddir: true is assumed always whenever the buildsystem is meson.

libdir no longer needs to be specified, and cmake was patched to
be able to deal with lib64. See [1] for more.

[1]: https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/77
2018-12-14 01:27:44 +02:00
Jordan Petridis
be1888bc50
Flatpak: get gexiv2 module to compile again
This seems to have been broken for a while now cause by default
it tries to install a python overide in the python shared packages
in /usr, but this is immutable since it comes from the runtime.

This patch disables that.
2018-12-14 01:22:05 +02:00
Ernestas Kulik
8442b4e7dd flatpak: Fix fallout from JSON-YAML conversion 2018-12-06 08:15:53 +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
a0f07a0445 Flatpak: Use json2yaml tool for the yaml manifest
So they are more equal and we have a simple way to generate it.
2018-10-09 13:16:24 +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
Ernestas Kulik
f6d8292b57 Flatpak: Remove Automake leftovers from exiv2 2018-10-09 07:29:41 +00:00
Ernestas Kulik
dd0e258d49 Flatpak: master: use url, not path for git repo 2018-10-05 20:08:56 +03: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
Jordan Petridis
60389de8f6
Flatpak: Remove duplicate modules 2018-09-20 19:19:55 +03:00
Carlos Soriano
9f45d23bfd Update build-aux/flatpak/org.gnome.NautilusGtk4.yml, build-aux/flatpak/org.gnome.NautilusMaster.yml files 2018-09-18 11:45:48 +00:00
Carlos Soriano
3b0c1da590 Update build-aux/flatpak/org.gnome.Nautilus.yml 2018-09-18 11:16:46 +00:00
Carlos Soriano
63011cba78 Update build-aux/flatpak/org.gnome.Nautilus.json 2018-09-18 11:15:51 +00:00
Carlos Soriano
77cf43762f Update build-aux/flatpak/org.gnome.Nautilus.yml 2018-09-14 07:41:12 +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
63795eb969 f 2018-09-14 09:13:13 +02: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
Ernestas Kulik
5a2f05d234 flatpak: pass --device=dri in the GTK+ 4 manifest
(cherry picked from commit bef68f12d7)
2018-08-13 09:05:20 +00:00
Ernestas Kulik
0b5124ab2e flatpak: Enable demos in the GTK+ 4 manifest
(cherry picked from commit f9298aa3ab)
2018-08-13 09:04:18 +00:00
Ernestas Kulik
ecbba6a532 flatpak: Fix quotes in exiv2 build options 2018-08-03 06:40:16 +00:00
Ernestas Kulik
7b894b8216 flatpak: Get exiv2 sources from git
Additionally, this removes the Autotools-related shell commands.
2018-08-03 06:38:33 +00:00
Will Thompson
4401658708 flatpak: add space after (Development) prefix
Without this, the app name comes out as "(Development)Files". No
functional issue, just ugly.
2018-07-29 06:12:48 +00:00
Ernestas Kulik
40d7df88cb flatpak: Update GTK+ 4 manifest
This commit builds master Tracker with Meson and removes a redundant
finish argument.


(cherry picked from commit f42bca3852)
2018-07-28 06:18:21 +00:00
Ernestas Kulik
aa11347f5d flatpak: Tweak GTK+ 4 manifest
This pins versions of most dependencies, uses quotes for strings and
removes header cleanup from GTK+ module, because CI pipelines choke on
them being absent when ninja decides to rebuild everything when running
tests.


(cherry picked from commit a9f13fc91f7319b318e75a95a89918e9cadf94cf)
2018-07-26 14:25:45 +00:00
Carlos Soriano
703618c12c flatpak: Use meson for gexvi2
Life's much better now.
2018-07-26 15:40:23 +02:00
Ernestas Kulik
51cbc4d1c1 flatpak: Disable GIR data generation in GTK+ 4 manifest 2018-07-25 19:06:53 +03:00
Ernestas Kulik
74d3b20089 flatpak: Fix GTK+ 4 manifest
Indentation was off.


(cherry picked from commit b1840664f6970010493c53f6f78cdf2a4443cad5)
2018-07-25 15:41:42 +00:00
Ernestas Kulik
a93c886e09 Update org.gnome.NautilusGtk4.yml 2018-07-25 15:26:46 +00: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
Carlos Soriano
3a7b29ee68 Flatpak: Fix Nautilus URL
Forgot to change it back to upstream.
2018-07-14 11:59:01 +02:00
Carlos Soriano
ea8d1d065f Flatpak: Add Gtk4 version
So it can be tested while it's on development
2018-07-14 11:33:57 +02:00
Carlos Soriano
d31b8b59de general: Assume development profile if app id is not Nautilus
Instead of checking explicitly for some options, we allow any value as
profile and assume is a development snapshot.

This will help with having Flatpak bundles/refs of different branches
with different purposes.
2018-07-14 11:33:57 +02:00
Carlos Soriano
fd309ecfbc Flatpak: Rename nautilus-master to NautilusMaster
So we are consistent on using camel case
2018-07-14 11:33:57 +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
Carlos Soriano
3b8f238624 Flatpak: Add yaml variant
I needed for a talk because it's more compacted, and we should switch to
it as soon as Builder gets support for yaml!
2018-05-25 12:09:48 +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
Jordan Petridis
153ee62edb
flatpak: switch to using gnome-nightly 2018-03-19 09:51:30 +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
Carlos Soriano
690d79247f Flatpak: Remove disabling Selinux
Since now we have it off by default.
2018-01-30 14:39:31 +01:00
Carlos Soriano
3f6cd2feb2 Flatpak: Allow access to the whole filesystem
Nautilus as a file manager needs access to the whole file system, for
that there is a value called "host" which allows direct access to it.

Use it instead of just access to home.

Closes #201
2018-01-15 11:32:16 +01:00
Carlos Soriano
1cd19241d1 Flatpak: Remove version 3.24
Every branch has its corresponding version, no need to have older
versions in each.
2018-01-15 11:31:29 +01:00
Carlos Soriano
3d0b63c6c0 Flatpak: Update 3.24 version 2018-01-05 15:12:51 +00:00
Carlos Soriano
d5cefedb02 Revert "flatpak: Remove stable Flatpak manifest"
This reverts commit dd0fae86de
2018-01-05 14:55:15 +00:00
Ernestas Kulik
5996435da9 flatpak: don’t build Meson
The need for 0.44 has been removed.
2018-01-04 17:38:38 +02:00
Carlos Soriano
a04da1d485 build: Remove auxiliary script for making releases
Now is built in meson with "meson dist".
2018-01-03 14:40:41 +01:00
Carlos Soriano
4045ac7700 Flatpak: Build meson since we require 0.44
With the latest changes, and it's going to take a while to be present
in the Flatpak SDK.
2018-01-02 21:59:20 +01:00
Ernestas Kulik
74dd9c9f72 general: remove desktop support 2018-01-02 12:51:32 +02:00
Carlos Soriano
eb8e440ebb flatpak: Remove unused build-options
We use Meson nowadays that doesn't spew tons of deprecated warnings.
2017-11-21 15:24:11 +01:00
Carlos Soriano
dd0fae86de flatpak: Remove stable Flatpak manifest
This should live elsewhere, like Flathub or so.
2017-11-20 21:15:56 +01:00
Carlos Soriano
78ca21634d flatpak: Move file to build-aux 2017-11-20 21:15:45 +01:00
Christian Hergert
d335b9cfda flatpak: fix URL to nautilus repository 2017-09-07 17:39:37 -07:00
Carlos Soriano
bd9ae8d0a6 flatpak: Add stable release
So we can put it in FlatHub

https://bugzilla.gnome.org/show_bug.cgi?id=782125
2017-05-03 20:26:27 +02:00
Carlos Soriano
53928d7f46 postinstall: Use python
Instead of shell scripts, much better to maintain.
Also, the new python script has better handling of non existing paths.
2017-05-02 19:50:54 +02:00
Ernestas Kulik
55d17ec481 make_release.sh: fix post-Autotools breakage
The script broke after killing off Autotools support, since the libgd
submodule was moved to /subprojects/libgd. Additionally, this commit
makes the script exit on error and makes xz print verbose output.

https://bugzilla.gnome.org/show_bug.cgi?id=781892
2017-04-28 14:09:16 +03:00
Ernestas Kulik
9948131521 meson: delegate submodule initialization to Meson
As of 0.40.0, Meson has the ability to initialize subprojects that are
git submodules. This removes the need for a separate script to achieve
that.

https://bugzilla.gnome.org/show_bug.cgi?id=781653
2017-04-25 11:22:41 +03:00
Carlos Soriano
9e92f6e7ac build: Fix check_libgd
Forgot to change the path to check whether the subproject is initalized.
2017-03-27 21:00:13 +02:00
Ernestas Kulik
ec2af08b38 libgd: move submodule to a subdirectory
Meson looks for subprojects in subprojects/ by default. Since Autotools
is no longer a resident here, the submodule should be moved to the
subdirectory, instead of being linked to.

https://bugzilla.gnome.org/show_bug.cgi?id=780501
2017-03-27 12:45:56 +03:00
Carlos Soriano
13c959d389 build: Update flatpak build and organize folder structure
Flatpak doesn't need to build meson or a patch for ninja and meson to
work properly:
https://github.com/flatpak/flatpak/issues/607
https://bugzilla.gnome.org/show_bug.cgi?id=774368
273e2460aa

This patch updates this and improves the folder structure with a
build-aux folder to clear up the root folder.

https://bugzilla.gnome.org/show_bug.cgi?id=780580
2017-03-27 12:14:47 +03:00