diff options
Diffstat (limited to 'gnome-base/gnome-shell/files')
3 files changed, 146 insertions, 0 deletions
diff --git a/gnome-base/gnome-shell/files/3.28.3-defaults.patch b/gnome-base/gnome-shell/files/3.28.3-defaults.patch new file mode 100644 index 000000000000..a6f583144fcf --- /dev/null +++ b/gnome-base/gnome-shell/files/3.28.3-defaults.patch @@ -0,0 +1,28 @@ +From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 10 Dec 2013 23:33:51 +0100 +Subject: [PATCH 1/2] Alter list of default applications + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +[Updated to include desktop file renames to reverse DNS] +Signed-off-by: Mart Raudsepp <leio@gentoo.org> +--- + data/org.gnome.shell.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in +index c1e6b21..368c654 100644 +--- a/data/org.gnome.shell.gschema.xml.in ++++ b/data/org.gnome.shell.gschema.xml.in +@@ -31,7 +31,7 @@ + </description> + </key> + <key name="favorite-apps" type="as"> +- <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> ++ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'org.gnome.Shotwell', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> + <summary>List of desktop file IDs for favorite applications</summary> + <description> + The applications corresponding to these identifiers +-- +2.10.1 + diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch new file mode 100644 index 000000000000..9948b163009e --- /dev/null +++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch @@ -0,0 +1,59 @@ +From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001 +From: Pascal Nowack <Pascal.Nowack@gmx.de> +Date: Mon, 6 Aug 2018 14:21:02 +0200 +Subject: [PATCH] build: Fix build with meson >= 47.0 + +With meson >= 47.0, building gnome-shell will fail +when --rebuild-types is used as an option for gtk-doc, +so stop using that option and bump the meson requirement. + +https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191 +--- + docs/reference/shell/meson.build | 3 +-- + docs/reference/st/meson.build | 3 +-- + meson.build | 2 +- + 3 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build +index 1469ed422..a32d6a58a 100644 +--- a/docs/reference/shell/meson.build ++++ b/docs/reference/shell/meson.build +@@ -50,8 +50,7 @@ gnome.gtkdoc('shell', + join_paths(meson.build_root(), 'src') + ], + scan_args: [ +- '--ignore-headers=' + ' '.join(private_headers + exclude_directories), +- '--rebuild-types' ++ '--ignore-headers=' + ' '.join(private_headers + exclude_directories) + ], + install: true + ) +diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build +index fe89b53d4..3e9e9ab7c 100644 +--- a/docs/reference/st/meson.build ++++ b/docs/reference/st/meson.build +@@ -17,8 +17,7 @@ gnome.gtkdoc('st', + ], + scan_args: [ + '--ignore-headers=' + ' '.join(private_headers), +- '--rebuild-sections', +- '--rebuild-types' ++ '--rebuild-sections' + ], + install: true + ) +diff --git a/meson.build b/meson.build +index 03b9d52a8..e33a76183 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('gnome-shell', 'c', + version: '3.28.3', +- meson_version: '>= 0.42.0', ++ meson_version: '>= 0.47.0', + license: 'GPLv2+' + ) + +-- +2.17.0 + diff --git a/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch new file mode 100644 index 000000000000..3138c6d2b732 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch @@ -0,0 +1,59 @@ +From 26dbbd15fabd3c35135105720dc821edccb128fa Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Thu, 28 Feb 2019 00:50:19 +0200 +Subject: [PATCH] build: Make bluetooth support optional + +--- + js/misc/meson.build | 2 +- + meson.build | 7 ++++++- + meson_options.txt | 6 ++++++ + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/js/misc/meson.build b/js/misc/meson.build +index 5a4871762..3c5e02368 100644 +--- a/js/misc/meson.build ++++ b/js/misc/meson.build +@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name()) + jsconf.set('PACKAGE_VERSION', meson.project_version()) + jsconf.set('GETTEXT_PACKAGE', meson.project_name()) + jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version) +-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found()) ++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth) + jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager) + jsconf.set('datadir', datadir) + jsconf.set('libexecdir', libexecdir) +diff --git a/meson.build b/meson.build +index f38798caf..e1bcd1892 100644 +--- a/meson.build ++++ b/meson.build +@@ -92,7 +92,12 @@ ibus_dep = dependency('ibus-1.0', version: ibus_req) + x11_dep = dependency('x11') + schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) + +-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false) ++if get_option('bluetooth') ++ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req) ++ have_bluetooth = true ++else ++ have_bluetooth = false ++endif + gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false) + gst_base_dep = dependency('gstreamer-base-1.0', required: false) + +diff --git a/meson_options.txt b/meson_options.txt +index 65188c7ff..b6d49dfb5 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,9 @@ ++option('bluetooth', ++ type: 'boolean', ++ value: true, ++ description: 'Enable bluetooth support' ++) ++ + option('browser_plugin', + type: 'boolean', + value: true, +-- +2.17.0 + |