Accepting request 523837 from GNOME:Factory
(forwarded request 523835 from dimstar) OBS-URL: https://build.opensuse.org/request/show/523837 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=134
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3d6230fc30
@ -1,18 +0,0 @@
|
||||
Index: gnome-shell-3.20.4/js/ui/extensionSystem.js
|
||||
===================================================================
|
||||
--- gnome-shell-3.20.4.orig/js/ui/extensionSystem.js
|
||||
+++ gnome-shell-3.20.4/js/ui/extensionSystem.js
|
||||
@@ -224,7 +224,12 @@ function initExtension(uuid) {
|
||||
let extensionState = null;
|
||||
|
||||
ExtensionUtils.installImporter(extension);
|
||||
- extensionModule = extension.imports.extension;
|
||||
+ try {
|
||||
+ extensionModule = extension.imports.extension;
|
||||
+ } catch(e) {
|
||||
+ logExtensionError(uuid, e);
|
||||
+ return false;
|
||||
+ }
|
||||
|
||||
if (extensionModule.init) {
|
||||
try {
|
||||
@ -1,52 +0,0 @@
|
||||
Index: gnome-shell-3.20.4/js/ui/extensionDownloader.js
|
||||
===================================================================
|
||||
--- gnome-shell-3.20.4.orig/js/ui/extensionDownloader.js
|
||||
+++ gnome-shell-3.20.4/js/ui/extensionDownloader.js
|
||||
@@ -130,12 +130,14 @@ function updateExtension(uuid) {
|
||||
FileUtils.recursivelyMoveDir(extensionDir, oldExtensionTmpDir);
|
||||
FileUtils.recursivelyMoveDir(newExtensionTmpDir, extensionDir);
|
||||
|
||||
- let extension = ExtensionUtils.createExtensionObject(uuid, extensionDir, ExtensionUtils.ExtensionType.PER_USER);
|
||||
+ let extension = null;
|
||||
|
||||
try {
|
||||
+ extension = ExtensionUtils.createExtensionObject(uuid, extensionDir, ExtensionUtils.ExtensionType.PER_USER);
|
||||
ExtensionSystem.loadExtension(extension);
|
||||
} catch(e) {
|
||||
- ExtensionSystem.unloadExtension(extension);
|
||||
+ if (extension)
|
||||
+ ExtensionSystem.unloadExtension(extension);
|
||||
|
||||
logError(e, 'Error loading extension %s'.format(uuid));
|
||||
|
||||
@@ -242,9 +244,8 @@ const InstallExtensionDialog = new Lang.
|
||||
global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
|
||||
}
|
||||
|
||||
- let extension = ExtensionUtils.createExtensionObject(uuid, dir, ExtensionUtils.ExtensionType.PER_USER);
|
||||
-
|
||||
try {
|
||||
+ let extension = ExtensionUtils.createExtensionObject(uuid, dir, ExtensionUtils.ExtensionType.PER_USER);
|
||||
ExtensionSystem.loadExtension(extension);
|
||||
} catch(e) {
|
||||
uninstallExtension(uuid);
|
||||
Index: gnome-shell-3.20.4/js/ui/extensionSystem.js
|
||||
===================================================================
|
||||
--- gnome-shell-3.20.4.orig/js/ui/extensionSystem.js
|
||||
+++ gnome-shell-3.20.4/js/ui/extensionSystem.js
|
||||
@@ -198,7 +198,14 @@ function reloadExtension(oldExtension) {
|
||||
unloadExtension(oldExtension);
|
||||
|
||||
// Now, recreate the extension and load it.
|
||||
- let newExtension = ExtensionUtils.createExtensionObject(uuid, dir, type);
|
||||
+ let newExtension;
|
||||
+ try {
|
||||
+ newExtension = ExtensionUtils.createExtensionObject(uuid, dir, type);
|
||||
+ } catch(e) {
|
||||
+ logExtensionError(uuid, e);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
loadExtension(newExtension);
|
||||
}
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Index: gnome-shell-3.20.4/js/ui/extensionSystem.js
|
||||
===================================================================
|
||||
--- gnome-shell-3.20.4.orig/js/ui/extensionSystem.js
|
||||
+++ gnome-shell-3.20.4/js/ui/extensionSystem.js
|
||||
@@ -217,8 +217,10 @@ function initExtension(uuid) {
|
||||
throw new Error("Extension was not properly created. Call loadExtension first");
|
||||
|
||||
let extensionJs = dir.get_child('extension.js');
|
||||
- if (!extensionJs.query_exists(null))
|
||||
- throw new Error('Missing extension.js');
|
||||
+ if (!extensionJs.query_exists(null)) {
|
||||
+ logExtensionError(uuid, new Error('Missing extension.js'));
|
||||
+ return false;
|
||||
+ }
|
||||
|
||||
let extensionModule;
|
||||
let extensionState = null;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8
|
||||
size 1982088
|
||||
3
gnome-shell-3.26.0.tar.xz
Normal file
3
gnome-shell-3.26.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9bc35c206435d6e0ee9e8880578716a7d5bd0ebe7d475fa4f0b3010b44eebaed
|
||||
size 1402896
|
||||
@ -1,38 +0,0 @@
|
||||
Index: gnome-shell-3.24.3/js/gdm/loginDialog.js
|
||||
===================================================================
|
||||
--- gnome-shell-3.24.3.orig/js/gdm/loginDialog.js
|
||||
+++ gnome-shell-3.24.3/js/gdm/loginDialog.js
|
||||
@@ -730,6 +730,14 @@ const LoginDialog = new Lang.Class({
|
||||
_updateDisableUserList: function() {
|
||||
let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
|
||||
|
||||
+ // Disable user list when there are no users.
|
||||
+ if (( disableUserList == false ) && ( this._userListLoaded == true )) {
|
||||
+ let items = this._userList._items;
|
||||
+ if ( Object.keys(items).length === 0 ) {
|
||||
+ disableUserList = true;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (disableUserList != this._disableUserList) {
|
||||
this._disableUserList = disableUserList;
|
||||
|
||||
@@ -1264,14 +1272,18 @@ const LoginDialog = new Lang.Class({
|
||||
this._userList.addUser(users[i]);
|
||||
}
|
||||
|
||||
+ this._updateDisableUserList();
|
||||
+
|
||||
this._userAddedId = this._userManager.connect('user-added',
|
||||
Lang.bind(this, function(userManager, user) {
|
||||
this._userList.addUser(user);
|
||||
+ this._updateDisableUserList();
|
||||
}));
|
||||
|
||||
this._userRemovedId = this._userManager.connect('user-removed',
|
||||
Lang.bind(this, function(userManager, user) {
|
||||
this._userList.removeUser(user);
|
||||
+ this._updateDisableUserList();
|
||||
}));
|
||||
|
||||
this._userChangedId = this._userManager.connect('user-changed',
|
||||
@ -1,45 +0,0 @@
|
||||
From 1819d1fdadcf51a0443598a802b1a0eb46e6c7ee Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Date: Wed, 13 Jul 2016 18:03:58 +0200
|
||||
Subject: [PATCH] build: Add necessary rpath to the private gnome-shell
|
||||
libraries
|
||||
|
||||
Since mutter cloned some libraries (cogl, clutter) and installs them
|
||||
in a private directory, gnome-shell's libraries need to have information
|
||||
where to load them from.
|
||||
|
||||
This is done using -rpath, but as libtool does not like multiple -rpath
|
||||
in the command line (and it adds one on its own for linking our own libs)
|
||||
we pass the 'libtool' variant for -rpath: -R
|
||||
|
||||
The linking / runtime issue only surfaces when users/distros build using
|
||||
-Wl,--as-needed. Otherwise some of the parent libs seem to pull in the
|
||||
needed rpath as well.
|
||||
---
|
||||
src/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index e9aacfe..1e59b23 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -321,14 +321,14 @@ libgnome_shell_libadd = \
|
||||
gvc/libgvc.la \
|
||||
$(NULL)
|
||||
|
||||
-libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags)
|
||||
+libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags) -R$(MUTTER_TYPELIB_DIR)
|
||||
libgnome_shell_menu_la_LIBADD = $(GNOME_SHELL_LIBS)
|
||||
libgnome_shell_menu_la_CPPFLAGS = $(GNOME_SHELL_CFLAGS)
|
||||
|
||||
libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
|
||||
libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
|
||||
|
||||
-libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
|
||||
+libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags) -R$(MUTTER_TYPELIB_DIR)
|
||||
libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la
|
||||
libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
|
||||
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From debe4b096445e25cfc098564d6ff22e32dba5324 Mon Sep 17 00:00:00 2001
|
||||
From: Xiaoguang Wang <xwang@suse.com>
|
||||
Date: Wed, 19 Apr 2017 13:29:59 +0800
|
||||
Subject: [PATCH] loginDialog: Fix session button can be clicked
|
||||
|
||||
When session menu button is hidden, button can be clicked and show popup
|
||||
menu.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=781482
|
||||
---
|
||||
js/gdm/loginDialog.js | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: gnome-shell-3.24.3/js/gdm/loginDialog.js
|
||||
===================================================================
|
||||
--- gnome-shell-3.24.3.orig/js/gdm/loginDialog.js
|
||||
+++ gnome-shell-3.24.3/js/gdm/loginDialog.js
|
||||
@@ -806,10 +806,12 @@ const LoginDialog = new Lang.Class({
|
||||
},
|
||||
|
||||
_onPrompted: function() {
|
||||
- this._sessionMenuButton.updateSensitivity(true);
|
||||
+ this._sessionMenuButton.updateSensitivity(false);
|
||||
|
||||
- if (this._shouldShowSessionMenuButton())
|
||||
+ if (this._shouldShowSessionMenuButton()) {
|
||||
+ this._sessionMenuButton.updateSensitivity(true);
|
||||
this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton.actor);
|
||||
+ }
|
||||
this._showPrompt();
|
||||
},
|
||||
|
||||
@@ -914,6 +916,7 @@ const LoginDialog = new Lang.Class({
|
||||
}));
|
||||
this._updateCancelButton();
|
||||
|
||||
+ this._sessionMenuButton.updateSensitivity(false);
|
||||
this._authPrompt.updateSensitivity(true);
|
||||
this._showPrompt();
|
||||
},
|
||||
13
gnome-shell-meson.patch
Normal file
13
gnome-shell-meson.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: gnome-shell-3.25.90/subprojects/gvc/meson.build
|
||||
===================================================================
|
||||
--- gnome-shell-3.25.90.orig/subprojects/gvc/meson.build
|
||||
+++ gnome-shell-3.25.90/subprojects/gvc/meson.build
|
||||
@@ -102,7 +102,7 @@ else
|
||||
include_directories: libgvc_inc,
|
||||
dependencies: libgvc_deps,
|
||||
c_args: c_args,
|
||||
- install_rpath: pkgdatadir,
|
||||
+ install_rpath: pkglibdir,
|
||||
install_dir: pkglibdir,
|
||||
install: true
|
||||
)
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 12 19:13:25 UTC 2017 - luc14n0@linuxmail.org
|
||||
|
||||
- Update to version 3.26.0:
|
||||
+ Misc. bug fixes bgo#786332, bgo#786783, bgo#786886, bgo#786868.
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 23 07:47:11 UTC 2017 - xwang@suse.com
|
||||
|
||||
@ -5,6 +12,128 @@ Wed Aug 23 07:47:11 UTC 2017 - xwang@suse.com
|
||||
desktop when scaling-factor equals 2(Require patched
|
||||
gnome-shell-extensions)(bsc#1046570).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 22 11:35:14 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.25.91:
|
||||
+ Open context menu of highlighted search result on Shift+F10
|
||||
(bgo#675315).
|
||||
+ Fix mid-sentence capitalization in weather forecasts
|
||||
(bgo#779873).
|
||||
+ Add switcher popup to cycle through monitor configurations
|
||||
(bgo#783550).
|
||||
+ Offer system actions in search (bgo#691900).
|
||||
+ Misc. bug fixes: bgo#777519, bgo#786120, bgo#786145,
|
||||
bgo#786419, bgo#786526, bgo#786520, bgo#786520, bgo#786146.
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 21 13:09:00 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.25.90:
|
||||
+ Add permission dialog for inhibiting shortucts (bgo#783342).
|
||||
+ Improve window picker layout (bgo#783953).
|
||||
+ Remove legacy status icon tray (bgo#785956).
|
||||
+ Drop autotools support (bgo#785153).
|
||||
+ Misc. bug fixes: bgo#785090, bgo#785309, bgo#767805,
|
||||
bgo#747794, bgo#785358, bgo#785556.
|
||||
+ Updated translations.
|
||||
- Drop gnome-shell-linking.patch, libtool BuildRequires and call to
|
||||
autogen.sh: no longer needed after the port to meson build
|
||||
system.
|
||||
- Add gnome-shell-meson.patch: Fix rpath path while linking gvc
|
||||
(/usr/share/gnome-shell is not valid to carry arch dependent
|
||||
binaries).
|
||||
- Add meson BuildRequires: follow upstreams port to meson.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 13:25:04 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.25.4:
|
||||
+ gdm: Fix "Not listed" focus indication (bgo#7840409).
|
||||
+ Fix missing icons in freedesktop notifications (bgo#784245).
|
||||
+ gdm: Disable user list when empty (bgo#731320).
|
||||
+ gdm: Allow empty reponse to PAM messages (bgo#784360).
|
||||
+ Fix blocked clicks in shutdown dialog (bgo#781738).
|
||||
+ Show OSD popup when changing volume via scroll wheel (bgo#781028).
|
||||
+ Refine list search results (bgo#749957).
|
||||
+ Replace mutter's unresponsive app dialog (bgo#762083).
|
||||
+ Improve handling of extension errors (bgo#781728).
|
||||
+ Implement tablet rings/strips configuration (bgo#782033).
|
||||
+ Adjust to mozjs52 update in gjs (bgo#785084, bgo#785090).
|
||||
+ Support the meson build system (bgo#783229).
|
||||
+ Misc. bug fixes: bgo#780403, bgo#772589, bgo#784130,
|
||||
bgo#783975, bgo#784353, bgo#784361, bgo#772284, bgo#765011,
|
||||
bgo#765011, bgo#765011, bgo#784985, bgo#781471, bgo#785047,
|
||||
bgo#736148, bgo#736148.
|
||||
+ Updated translations.
|
||||
- Stop handling glib2_gsettings_schema_post(un) and
|
||||
desktop_database_post(un) in post(un), no longer needed as we
|
||||
have filetriggers to take care of this now. Also drop obsolete
|
||||
clean section.
|
||||
- Rebase gnome-shell-linking.patch.
|
||||
- Disable gnome-shell-private-connection.patch, needs rebase or is
|
||||
possibly no longer needed.
|
||||
- Drop upstream fixed patches:
|
||||
+ gnome-shell-1036494-Consistently-handle-createExtensionObject-errors.patch
|
||||
+ gnome-shell-1036494-Catch-import-errors.patch
|
||||
+ gnome-shell-1036494-Consistently-handle-initExtension-errors.patch
|
||||
+ gnome-shell-878951-hide-list-with-no-user.patch
|
||||
- Pass autogen.sh instead of autoreconf, upstream tarball is not
|
||||
proper, need to bootstrap it.
|
||||
- Following the above, add gnome-common BuildRequires.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 13:25:03 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.25.3:
|
||||
+ Bypass proxies for captive portal (bgo#769692).
|
||||
+ Correctly handle "text-shadow: none;" (bgo#783485).
|
||||
+ Add StEntry:hint-actor property (bgo#783484).
|
||||
+ Support text-shadow CSS property in StEntry (bgo#783484).
|
||||
+ Misc. bug fixes: bgo#777732, bgo#783202, bgo#783210,
|
||||
bgo#783206, bgo#783286, bgo#783439, bgo#783483, bgo#783823,
|
||||
bgo#781950.
|
||||
+ Updated translations.
|
||||
- Rebase gnome-shell-linking.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 13:25:02 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.25.2:
|
||||
+ Fix StEntry::primary-icon-clicked emission (bgo#782190).
|
||||
+ Add an optional icon parameter to PopupMenu.addAction()
|
||||
(bgo#782166).
|
||||
+ Allow search providers to include clipboard text with results
|
||||
(bgo#775099).
|
||||
+ Reduce dependency on Caribou (bgo#777342).
|
||||
+ Add transparency to top bar when free floating (bgo#747163).
|
||||
+ Animate maximize/unmaximize operations (bgo#766685).
|
||||
+ Misc. bug fixes: bgo#782000, bgo#780215, bgo#782802,
|
||||
bgo#782637, bgo#782930, bgo#755164, bgo#780215, bgo#782982.
|
||||
+ Updated translations.
|
||||
- Drop gnome-shell-portalhelper-fixes.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 13:25:01 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.25.1:
|
||||
+ Close Wifi selection dialog on lock (bgo#780054).
|
||||
+ Fix DND over window previews in overview (bgo#737166).
|
||||
+ Follow GNOME Weather's location permissions (bgo#780252).
|
||||
+ Fix portals that require a new window to be loaded
|
||||
(bgo#759044).
|
||||
+ Fix restricting menus to screen height on HiDPI displays
|
||||
(bgo#753305).
|
||||
+ Misc. bug fixes and cleanups: bgo#780063, bgo#780321,
|
||||
bgo#780381, bgo#780453, bgo#758873, bgo#780606, bgo#642652,
|
||||
bgo#777732, bgo#780157, bgo#781482, bgo#780404, bgo#781545,
|
||||
bgo#781728).
|
||||
+ Updated translations.
|
||||
- Drop
|
||||
gnome-shell-login-fix-session-button-can-be-clicked.patch: Fixed
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 02:35:25 UTC 2017 - xwang@suse.com
|
||||
|
||||
|
||||
144
gnome-shell.spec
144
gnome-shell.spec
@ -17,24 +17,23 @@
|
||||
|
||||
|
||||
%global __requires_exclude typelib\\(Meta\\)
|
||||
|
||||
Name: gnome-shell
|
||||
Version: 3.24.3
|
||||
Version: 3.26.0
|
||||
Release: 0
|
||||
Summary: GNOME Shell
|
||||
License: GPL-2.0+
|
||||
Group: System/GUI/GNOME
|
||||
Url: http://live.gnome.org/GnomeShell
|
||||
Source: http://download.gnome.org/sources/gnome-shell/3.24/%{name}-%{version}.tar.xz
|
||||
Source: http://download.gnome.org/sources/gnome-shell/3.26/%{name}-%{version}.tar.xz
|
||||
# SOURCE-FEATURE-SLE SLE-Classic specific core extension file, see bnc#862615
|
||||
Source1: SLEClassicExt.js
|
||||
# SOURCE-FEATURE-SLE aboutMenu fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
|
||||
Source2: aboutMenu.js
|
||||
# SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme
|
||||
Source3: sle-background.png
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-linking.patch bgo#768781 dimstar@opensuse.org -- Fix linking the various libs in private directories
|
||||
Patch0: gnome-shell-linking.patch
|
||||
# PATCH-NEEDS-REBASE gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Was PATCH-FIX-UPSTREAM
|
||||
# PATCH-FIX-OPENSUSE gnome-shell-meson.patch dimstar@opensuse.org -- Fix rpath statement for gvc (needs validation, upstream fix)
|
||||
Patch0: gnome-shell-meson.patch
|
||||
# PATCH-NEEDS-REBASE gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Was PATCH-FIX-UPSTREAM
|
||||
Patch1: gnome-shell-private-connection.patch
|
||||
# PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area.
|
||||
Patch2: gnome-shell-disable-ibus-when-not-installed.patch
|
||||
@ -42,8 +41,6 @@ Patch2: gnome-shell-disable-ibus-when-not-installed.patch
|
||||
Patch3: gnome-shell-gdm-login-applet.patch
|
||||
# PATCH-FEATURE-SLE gnome-shell-domain.patch fate#307773 dliang@suse.com -- Active Directory Integration
|
||||
Patch4: gnome-shell-domain.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-878951-hide-list-with-no-user.patch bnc#878951 bgo#731320 dliang@suse.com -- hide use list when there is not user
|
||||
Patch5: gnome-shell-878951-hide-list-with-no-user.patch
|
||||
# PATCH-FIX-SLE gnome-shell-screen-disappear.patch bnc#870217 dliang@suse.com -- screen disapper.
|
||||
Patch6: gnome-shell-screen-disappear.patch
|
||||
# PATCH-FIX-SLE endSession-dialog-update-time-label-every-sec.patch bnc#886132 cxiong@suse.com -- update time label every second in end session dialog
|
||||
@ -54,36 +51,23 @@ Patch8: gnome-shell-864872-unlock-by-mouse-motion.patch
|
||||
Patch9: gnome-shell-lock-bg-on-primary.patch
|
||||
# PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
|
||||
Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-login-fix-session-button-can-be-clicked.patch bsc#1034584 bsc#1034827 bgo#781482 xwang@suse.com -- Disable session selection button function when it does not display.
|
||||
Patch13: gnome-shell-login-fix-session-button-can-be-clicked.patch
|
||||
# PATCH-FEATURE-SLE gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme.
|
||||
Patch15: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-1036494-Consistently-handle-createExtensionObject-errors.patch bsc#1036494 bgo#781728 alarrosa@suse.com -- Handle errors consistently
|
||||
Patch16: gnome-shell-1036494-Consistently-handle-createExtensionObject-errors.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-1036494-Catch-import-errors.patch bsc#1036494 bgo#781728 alarrosa@suse.com -- Catch import errors
|
||||
Patch17: gnome-shell-1036494-Catch-import-errors.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-1036494-Consistently-handle-initExtension-errors.patch bsc#1036494 bgo#781728 alarrosa@suse.com -- Handle errors consistently
|
||||
Patch18: gnome-shell-1036494-Consistently-handle-initExtension-errors.patch
|
||||
## NOTE: Keep SLE Classic pathes at bottom.
|
||||
## NOTE: Keep SLE Classic pathes at bottom.
|
||||
## NOTE: Keep SLE Classic patches at bottom.
|
||||
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
|
||||
Patch1000: gs-sle-classic-ext.patch
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: gcc-c++
|
||||
# Needed for patch2
|
||||
BuildRequires: libtool
|
||||
%if !0%{?is_opensuse}
|
||||
BuildRequires: translation-update-upstream
|
||||
%endif
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xsltproc
|
||||
BuildRequires: python(abi) >= 3
|
||||
# needed for directory ownership
|
||||
BuildRequires: dbus-1
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xsltproc
|
||||
BuildRequires: pkgconfig(atk-bridge-2.0)
|
||||
BuildRequires: pkgconfig(gcr-base-3) >= 3.7.5
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.45.3
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.53.0
|
||||
BuildRequires: pkgconfig(gjs-1.0) >= 1.47.0
|
||||
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.9.0
|
||||
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.90
|
||||
@ -97,9 +81,9 @@ BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.2
|
||||
BuildRequires: pkgconfig(libcanberra)
|
||||
BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||
BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.5.3
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.17.2
|
||||
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3
|
||||
BuildRequires: pkgconfig(libmutter-0) >= 3.23.92
|
||||
BuildRequires: pkgconfig(libmutter-1) >= 3.25.91
|
||||
BuildRequires: pkgconfig(libnm-glib)
|
||||
BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8
|
||||
BuildRequires: pkgconfig(libnm-util) >= 0.9.8
|
||||
@ -109,44 +93,46 @@ BuildRequires: pkgconfig(libsecret-unstable)
|
||||
BuildRequires: pkgconfig(libsoup-2.4)
|
||||
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(mutter-clutter-0) >= 1.26.1
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-0)
|
||||
BuildRequires: pkgconfig(mutter-clutter-1) >= 3.26.0
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-1) >= 3.25.2
|
||||
BuildRequires: pkgconfig(polkit-agent-1) >= 0.100
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
BuildRequires: python(abi) >= 3
|
||||
Requires: gdk-pixbuf-loader-rsvg
|
||||
Requires: gnome-session
|
||||
# For a GSettings schema and power system icon
|
||||
Requires: gnome-settings-daemon
|
||||
Requires: gsettings-desktop-schemas
|
||||
## Finally, dependencies for session services that are needed for system icons and the user menu
|
||||
# bluetooth system icon
|
||||
Requires: gnome-bluetooth
|
||||
# "System settings" menu item
|
||||
Requires: gnome-control-center
|
||||
Requires: gnome-session
|
||||
# For a GSettings schema and power system icon
|
||||
Requires: gnome-settings-daemon
|
||||
# "High Contrast" in accessibility status icon
|
||||
Requires: gnome-themes-accessibility
|
||||
Requires: gsettings-desktop-schemas
|
||||
# Due to now private typelib(Meta)
|
||||
Requires: mutter
|
||||
Recommends: %{name}-calendar
|
||||
Recommends: %{name}-lang
|
||||
# network system icon
|
||||
Recommends: NetworkManager-gnome
|
||||
# The dateTime applet in the panel launches gnome-clocks upon user request
|
||||
Recommends: gnome-clocks
|
||||
Recommends: gnome-shell-search-provider-documents
|
||||
#merged into gnome-shell in 3.19
|
||||
Obsoletes: gnome-shell-wayland
|
||||
# gnome-shell implements the dbus interface org.freedesktop.Notifications directly
|
||||
Provides: dbus(org.freedesktop.Notifications)
|
||||
%glib2_gsettings_schema_requires
|
||||
%if !0%{?is_opensuse}
|
||||
BuildRequires: translation-update-upstream
|
||||
%endif
|
||||
# 11.4 doesn't have typelib dependency
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires: libaccountsservice0
|
||||
Requires: libcaribou0
|
||||
Requires: libgdmgreeter1
|
||||
%endif
|
||||
# Due to now private typelib(Meta)
|
||||
Requires: mutter
|
||||
Recommends: %{name}-calendar
|
||||
Recommends: %{name}-lang
|
||||
# The dateTime applet in the panel launches gnome-clocks upon user request
|
||||
Recommends: gnome-clocks
|
||||
Recommends: gnome-shell-search-provider-documents
|
||||
# network system icon
|
||||
Recommends: NetworkManager-gnome
|
||||
#merged into gnome-shell in 3.19
|
||||
Obsoletes: gnome-shell-wayland
|
||||
# gnome-shell implements the dbus interface org.freedesktop.Notifications directly
|
||||
Provides: dbus(org.freedesktop.Notifications)
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%glib2_gsettings_schema_requires
|
||||
|
||||
%description
|
||||
The GNOME Shell redefines user interactions with the GNOME desktop. In
|
||||
@ -206,35 +192,25 @@ into GNOME Shell calendar.
|
||||
%patch11 -p1
|
||||
%patch15 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
%patch13 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
|
||||
%if !0%{?is_opensuse}
|
||||
%patch1000 -p1
|
||||
translation-update-upstream
|
||||
%endif
|
||||
cp %{S:1} js/ui/
|
||||
cp %{SOURCE1} js/ui/
|
||||
%if !0%{?is_opensuse}
|
||||
cp %{S:2} js/ui/
|
||||
cp %{S:3} data/theme/
|
||||
cp %{SOURCE2} js/ui/
|
||||
cp %{SOURCE3} data/theme/
|
||||
%endif
|
||||
|
||||
%build
|
||||
# Needed for patch2
|
||||
autoreconf -fiv
|
||||
export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins
|
||||
%configure \
|
||||
--disable-static \
|
||||
--libexecdir=%{_libexecdir}/%{name} \
|
||||
--enable-compile-warnings=no
|
||||
%__make %{?_smp_mflags}
|
||||
%meson \
|
||||
--libexecdir=%{_libexecdir}/%{name}
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%meson_install
|
||||
# This is the directory where extensions get installed
|
||||
install -d %{buildroot}%{_datadir}/gnome-shell/extensions
|
||||
# This is the directory where search providers get installed
|
||||
@ -246,17 +222,6 @@ install -d %{buildroot}%{_datadir}/gnome-shell/search-providers
|
||||
# Work around race, as reported in bnc#844891 & bgo#709313.
|
||||
install -d %{buildroot}%{_datadir}/gnome-shell/modes
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
%glib2_gsettings_schema_post
|
||||
%desktop_database_post
|
||||
|
||||
%postun
|
||||
%glib2_gsettings_schema_postun
|
||||
%desktop_database_postun
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING README NEWS
|
||||
@ -283,7 +248,7 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
|
||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml
|
||||
%{_datadir}/gnome-shell/
|
||||
%doc %{_mandir}/man?/gnome-shell.*
|
||||
%{_mandir}/man?/gnome-shell.*
|
||||
%dir %{_datadir}/xdg-desktop-portal
|
||||
%dir %{_datadir}/xdg-desktop-portal/portals
|
||||
%{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal
|
||||
@ -292,16 +257,19 @@ rm -rf %{buildroot}
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/gnome-shell-extension-tool
|
||||
%{_bindir}/gnome-shell-perf-tool
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
%dir %{_datadir}/gtk-doc/html/st
|
||||
%dir %{_datadir}/gtk-doc/html/shell
|
||||
%{_datadir}/gtk-doc/html/st/
|
||||
%{_datadir}/gtk-doc/html/shell/
|
||||
#dir %%{_datadir}/gtk-doc/html
|
||||
#dir %%{_datadir}/gtk-doc/html/st
|
||||
#dir %%{_datadir}/gtk-doc/html/shell
|
||||
#{_datadir}/gtk-doc/html/st/
|
||||
#{_datadir}/gtk-doc/html/shell/
|
||||
|
||||
%files browser-plugin
|
||||
%defattr(-,root,root)
|
||||
%doc browser-plugin/README
|
||||
%{_libdir}/browser-plugins/libgnome-shell-browser-plugin.*
|
||||
#%{_libdir}/browser-plugins/libgnome-shell-browser-plugin.*
|
||||
%dir %{_libdir}/mozilla/plugins/
|
||||
%dir %{_libdir}/mozilla
|
||||
%{_libdir}/mozilla/plugins/libgnome-shell-browser-plugin.*
|
||||
|
||||
%files calendar
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user