Skip to content

Commit

Permalink
general: Copy gnome-desktop thumbnailing code
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ernestask committed May 22, 2018
1 parent 0aca206 commit 673c81c
Show file tree
Hide file tree
Showing 10 changed files with 2,305 additions and 20 deletions.
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ ubuntu:devel:
# Ubuntu requires running update to fetch metadata and find packges
- apt update
- apt install -y gcc meson gettext itstool git libgtk-3-dev
libgnome-autoar-0-dev libgnome-desktop-3-dev
gobject-introspection libxml2-dev
libtracker-control-2.0-dev desktop-file-utils libgexiv2-dev
libgail-3-dev libtracker-sparql-2.0-dev
libgirepository1.0-dev
libgnome-autoar-0-dev
gobject-introspection libxml2-dev
libtracker-control-2.0-dev desktop-file-utils libgexiv2-dev
libgail-3-dev libtracker-sparql-2.0-dev
libgirepository1.0-dev
<<: *distro_test
only:
- schedules
Expand All @@ -107,7 +107,7 @@ opensuse:tumbleweed:
stage: cross_distro
before_script:
- zypper install -y gcc meson gettext-runtime gettext-tools itstool git
gtk3-devel gnome-autoar-devel libgnome-desktop-3-devel
gtk3-devel gnome-autoar-devel
gobject-introspection-devel libxml2-devel tracker-devel
desktop-file-utils libgexiv2-devel
<<: *distro_test
Expand Down
10 changes: 0 additions & 10 deletions build-aux/flatpak/org.gnome.Nautilus.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@
}
]
},
{
"name": "gnome-desktop",
"config-opts": ["--disable-debug-tools", "--disable-udev"],
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-desktop"
}
]
},
{
"name": "gnome-autoar",
"sources": [
Expand Down
19 changes: 18 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ gio_unix = dependency('gio-unix-2.0', version: glib_ver)
glib = dependency('glib-2.0', version: glib_ver)
gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.2.1')
gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
gsettings_desktop_schemas = dependency('gsettings-desktop-schemas')
gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
seccomp = dependency('libseccomp')
selinux = []
if get_option('selinux')
selinux = dependency('libselinux', version: '>= 2.0')
Expand Down Expand Up @@ -113,9 +114,25 @@ conf.set_quoted('LOCALEDIR', join_paths(prefix, get_option('localedir')))
conf.set_quoted('NAUTILUS_DATADIR', join_paths(datadir, 'nautilus'))
conf.set_quoted('NAUTILUS_EXTENSIONDIR', join_paths(prefix, extensiondir))
conf.set_quoted('APPLICATION_ID', application_id)
conf.set_quoted('INSTALL_PREFIX', prefix)
conf.set_quoted('PROFILE', profile)
conf.set_quoted('NAME_SUFFIX', name_suffix)


# _ _ _
# __ _ _ __ ___ _ __ ___ ___ __| | ___ ___| | _| |_ ___ _ __
# / _` | '_ \ / _ \| '_ ` _ \ / _ \_____ / _` |/ _ \/ __| |/ / __/ _ \| '_ \
#| (_| | | | | (_) | | | | | | __/_____| (_| | __/\__ \ <| || (_) | |_) |
# \__, |_| |_|\___/|_| |_| |_|\___| \__,_|\___||___/_|\_\\__\___/| .__/
# |___/ |_|
#
# gnome-desktop macros for thumbnailer sandboxing.
####################################
conf.set10('_GNU_SOURCE', true) # `man user_namespaces` /CLONE_NEWUSER
conf.set10('ENABLE_SECCOMP', true) #
conf.set10('HAVE_BWRAP', true) #
####################################

if get_option('packagekit')
conf.set10('ENABLE_PACKAGEKIT', true)
endif
Expand Down
Loading

0 comments on commit 673c81c

Please sign in to comment.