|
 |
42f94a |
From 77663ec7d0391254ff6e5afb73257d075fcb109e Mon Sep 17 00:00:00 2001
|
|
|
42f94a |
From: Ray Strode <rstrode@redhat.com>
|
|
|
42f94a |
Date: Thu, 8 Jun 2017 12:04:31 -0400
|
|
|
42f94a |
Subject: [PATCH] data: install process-working.svg to filesystem
|
|
|
42f94a |
|
|
|
42f94a |
This helps prevent unlock failure on inplace upgrades between
|
|
|
42f94a |
7.3 and 7.4
|
|
|
42f94a |
---
|
|
|
42f94a |
data/theme/meson.build | 2 ++
|
|
|
42f94a |
meson.build | 2 ++
|
|
|
42f94a |
2 files changed, 4 insertions(+)
|
|
|
42f94a |
|
|
|
42f94a |
diff --git a/data/theme/meson.build b/data/theme/meson.build
|
|
|
42f94a |
index 22bae3dd2..d5acb8d10 100644
|
|
|
42f94a |
--- a/data/theme/meson.build
|
|
|
42f94a |
+++ b/data/theme/meson.build
|
|
|
42f94a |
@@ -1,25 +1,27 @@
|
|
|
42f94a |
theme_sources = files([
|
|
|
42f94a |
'gnome-shell-high-contrast.scss',
|
|
|
42f94a |
'gnome-shell.scss',
|
|
|
42f94a |
'gnome-shell-sass/_colors.scss',
|
|
|
42f94a |
'gnome-shell-sass/_common.scss',
|
|
|
42f94a |
'gnome-shell-sass/_drawing.scss',
|
|
|
42f94a |
'gnome-shell-sass/_high-contrast-colors.scss'
|
|
|
42f94a |
])
|
|
|
42f94a |
|
|
|
42f94a |
styles = [
|
|
|
42f94a |
'gnome-shell-high-contrast',
|
|
|
42f94a |
'gnome-shell'
|
|
|
42f94a |
]
|
|
|
42f94a |
|
|
|
42f94a |
theme_deps = []
|
|
|
42f94a |
|
|
|
42f94a |
foreach style: styles
|
|
|
42f94a |
theme_deps += custom_target('style-' + style,
|
|
|
42f94a |
input: '@0@.scss'.format(style),
|
|
|
42f94a |
output: '@0@.css'.format(style),
|
|
|
42f94a |
command: [
|
|
|
42f94a |
sassc, '-a', '@INPUT@', '@OUTPUT@'
|
|
|
42f94a |
],
|
|
|
42f94a |
depend_files: theme_sources)
|
|
|
42f94a |
endforeach
|
|
|
42f94a |
+
|
|
|
42f94a |
+install_data('process-working.svg', install_dir: themedir)
|
|
|
42f94a |
diff --git a/meson.build b/meson.build
|
|
|
42f94a |
index 663a4d06f..7d60d25e2 100644
|
|
|
42f94a |
--- a/meson.build
|
|
|
42f94a |
+++ b/meson.build
|
|
|
42f94a |
@@ -30,60 +30,62 @@ startup_req = '>= 0.11'
|
|
|
42f94a |
ibus_req = '>= 1.5.2'
|
|
|
42f94a |
|
|
|
42f94a |
bt_req = '>= 3.9.0'
|
|
|
42f94a |
gst_req = '>= 0.11.92'
|
|
|
42f94a |
nm_req = '>= 0.9.8'
|
|
|
42f94a |
secret_req = '>= 0.18'
|
|
|
42f94a |
|
|
|
42f94a |
gnome = import('gnome')
|
|
|
42f94a |
i18n = import('i18n')
|
|
|
42f94a |
|
|
|
42f94a |
prefix = get_option('prefix')
|
|
|
42f94a |
|
|
|
42f94a |
bindir = join_paths(prefix, get_option('bindir'))
|
|
|
42f94a |
datadir = join_paths(prefix, get_option('datadir'))
|
|
|
42f94a |
libdir = join_paths(prefix, get_option('libdir'))
|
|
|
42f94a |
libexecdir = join_paths(prefix, get_option('libexecdir'))
|
|
|
42f94a |
mandir = join_paths(prefix, get_option('mandir'))
|
|
|
42f94a |
|
|
|
42f94a |
pkgdatadir = join_paths(datadir, meson.project_name())
|
|
|
42f94a |
pkglibdir = join_paths(libdir, meson.project_name())
|
|
|
42f94a |
|
|
|
42f94a |
convertdir = join_paths(datadir, 'GConf', 'gsettings')
|
|
|
42f94a |
desktopdir = join_paths(datadir, 'applications')
|
|
|
42f94a |
ifacedir = join_paths(datadir, 'dbus-1', 'interfaces')
|
|
|
42f94a |
localedir = join_paths(datadir, 'locale')
|
|
|
42f94a |
mozplugindir = join_paths(libdir, 'mozilla', 'plugins')
|
|
|
42f94a |
portaldir = join_paths(datadir, 'xdg-desktop-portal', 'portals')
|
|
|
42f94a |
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
|
|
|
42f94a |
servicedir = join_paths(datadir, 'dbus-1', 'services')
|
|
|
42f94a |
|
|
|
42f94a |
+themedir = join_paths(pkgdatadir, 'theme')
|
|
|
42f94a |
+
|
|
|
42f94a |
plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir)
|
|
|
42f94a |
|
|
|
42f94a |
keybindings_dep = dependency('gnome-keybindings', required: false)
|
|
|
42f94a |
if keybindings_dep.found()
|
|
|
42f94a |
keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
|
|
|
42f94a |
else
|
|
|
42f94a |
keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
|
|
|
42f94a |
endif
|
|
|
42f94a |
|
|
|
42f94a |
atk_bridge_dep = dependency('atk-bridge-2.0')
|
|
|
42f94a |
canberra_dep = dependency('libcanberra')
|
|
|
42f94a |
canberra_gtk_dep = dependency('libcanberra-gtk3')
|
|
|
42f94a |
ecal_dep = dependency('libecal-1.2', version: ecal_req)
|
|
|
42f94a |
eds_dep = dependency('libedataserver-1.2', version: eds_req)
|
|
|
42f94a |
gcr_dep = dependency('gcr-base-3', version: gcr_req)
|
|
|
42f94a |
gdk_x11_dep = dependency('gdk-x11-3.0')
|
|
|
42f94a |
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
|
|
|
42f94a |
gi_dep = dependency('gobject-introspection-1.0', version: gi_req)
|
|
|
42f94a |
gio_dep = dependency('gio-2.0', version: gio_req)
|
|
|
42f94a |
gio_unix_dep = dependency('gio-unix-2.0', version: gio_req)
|
|
|
42f94a |
gjs_dep = dependency('gjs-1.0', version: gjs_req)
|
|
|
42f94a |
gtk_dep = dependency('gtk+-3.0', version: gtk_req)
|
|
|
42f94a |
libxml_dep = dependency('libxml-2.0')
|
|
|
42f94a |
croco_dep = dependency('libcroco-0.6', version: croco_req)
|
|
|
42f94a |
clutter_dep = dependency(clutter_pc, version: mutter_req)
|
|
|
42f94a |
cogl_dep = dependency(cogl_pc, version: mutter_req)
|
|
|
42f94a |
cogl_pango_dep = dependency(cogl_pango_pc, version: mutter_req)
|
|
|
42f94a |
mutter_dep = dependency(libmutter_pc, version: mutter_req)
|
|
|
42f94a |
polkit_dep = dependency('polkit-agent-1', version: polkit_req)
|
|
|
42f94a |
soup_dep = dependency('libsoup-2.4')
|
|
|
42f94a |
--
|
|
|
42f94a |
2.17.1
|
|
|
42f94a |
|
