diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /gnome-base/gnome-shell/files | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'gnome-base/gnome-shell/files')
3 files changed, 0 insertions, 158 deletions
diff --git a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch deleted file mode 100644 index 9f7e5aea4da3..000000000000 --- a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Mon, 10 Sep 2018 13:17:39 +0200 -Subject: [PATCH] Make bluetooth support optional - -https://bugs.gentoo.org/show_bug.cgi?id=398145 -leio: Fixed enable_bluetooth get_option string ---- - js/misc/meson.build | 2 +- - meson.build | 15 ++++++++++++++- - meson_options.txt | 7 +++++++ - 3 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/js/misc/meson.build b/js/misc/meson.build -index 20489496c..3071f9dfb 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 b82c41398..7d342ff61 100644 ---- a/meson.build -+++ b/meson.build -@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_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) -+bt_dep = [] -+enable_bluetooth = get_option('enable-bluetooth') -+if enable_bluetooth != 'no' -+ want_bluetooth = enable_bluetooth == 'yes' -+ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth) -+ have_bluetooth = bt_dep.found() -+ -+ if not have_bluetooth -+ bt_dep = [] -+ endif -+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 18899ffdb..9191f8c0e 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -16,6 +16,13 @@ option('enable-man', - description: 'Generate man pages' - ) - -+option('enable-bluetooth', -+ type: 'combo', -+ choices: ['yes', 'no', 'auto'], -+ value: 'auto', -+ description: 'Enable bluetooth support' -+) -+ - option('enable-networkmanager', - type: 'combo', - choices: ['yes', 'no', 'auto'], --- -2.18.0 - diff --git a/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch deleted file mode 100644 index c7637046c013..000000000000 --- a/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 77518c23dd1ce3d000d5667b4d903af095939f7c 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 21a80bcc8..c76afaa9c 100644 ---- a/meson.build -+++ b/meson.build -@@ -95,7 +95,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 853ca98dc..33f76379b 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,9 @@ -+option('bluetooth', -+ type: 'boolean', -+ value: true, -+ description: 'Enable bluetooth support' -+) -+ - option('gtk_doc', - type: 'boolean', - value: false, --- -2.20.1 - diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch deleted file mode 100644 index b80dbc3a0dce..000000000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch +++ /dev/null @@ -1,26 +0,0 @@ -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> ---- - 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', 'evolution.desktop', 'rhythmbox.desktop', '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 - |