Accepting request 1073813 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1073813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=232
This commit is contained in:
Dominique Leuenberger 2023-03-24 14:18:34 +00:00 committed by Git OBS Bridge
commit 734e452980
11 changed files with 164 additions and 91 deletions

View File

@ -3,12 +3,11 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
<param name="revision">refs/tags/43.3</param>
<param name="revision">9e19f27e</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<!-- <param name="changesgenerate">enable</param>
-->
<param name="changesgenerate">enable</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
<param name="changesrevision">9e19f27e45d9311e622ba66f617e18c12097d099</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f725dac570d5523b3998766ad8a94df08868495b30fc5b7ca39d741df2b83075
size 16159245

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c84b02e2c2fb2b819b1176c27c96c5af8b871c65a1e8b44cb15a8b6d1b4cac36
size 16421389

View File

@ -1,8 +1,8 @@
Index: gnome-shell-42.rc/data/meson.build
Index: gnome-shell-44.beta/data/meson.build
===================================================================
--- gnome-shell-42.rc.orig/data/meson.build
+++ gnome-shell-42.rc/data/meson.build
@@ -124,8 +124,14 @@ if have_systemd
--- gnome-shell-44.beta.orig/data/meson.build
+++ gnome-shell-44.beta/data/meson.build
@@ -117,8 +117,14 @@ if have_systemd
install_dir: systemduserunitdir
)
@ -19,9 +19,9 @@ Index: gnome-shell-42.rc/data/meson.build
install_data(units, install_dir: systemduserunitdir)
endif
Index: gnome-shell-42.rc/data/org.gnome.Shell-disable-extensions.service
Index: gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service
===================================================================
--- gnome-shell-42.rc.orig/data/org.gnome.Shell-disable-extensions.service
--- gnome-shell-44.beta.orig/data/org.gnome.Shell-disable-extensions.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
@ -39,10 +39,10 @@ Index: gnome-shell-42.rc/data/org.gnome.Shell-disable-extensions.service
-# Disable extensions
-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
-Restart=no
Index: gnome-shell-42.rc/data/org.gnome.Shell-disable-extensions.service.in
Index: gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service.in
===================================================================
--- /dev/null
+++ gnome-shell-42.rc/data/org.gnome.Shell-disable-extensions.service.in
+++ gnome-shell-44.beta/data/org.gnome.Shell-disable-extensions.service.in
@@ -0,0 +1,15 @@
+[Unit]
+Description=Disable GNOME Shell extensions after failure

View File

@ -1,13 +1,13 @@
Index: gnome-shell-42.rc/src/main.c
Index: gnome-shell-44.beta/src/main.c
===================================================================
--- gnome-shell-42.rc.orig/src/main.c
+++ gnome-shell-42.rc/src/main.c
@@ -569,7 +569,7 @@ main (int argc, char **argv)
ecode = EXIT_FAILURE;
}
--- gnome-shell-44.beta.orig/src/main.c
+++ gnome-shell-44.beta/src/main.c
@@ -680,7 +680,7 @@ main (int argc, char **argv)
g_object_unref (shell_global_get ());
g_debug ("Tearing down the mutter context");
- meta_context_destroy (g_steal_pointer (&context));
+ g_steal_pointer (&context);
shell_profiler_shutdown ();
return ecode;
}

View File

@ -1,8 +1,8 @@
Index: gnome-shell-42.rc/js/ui/endSessionDialog.js
Index: gnome-shell-44.beta/js/ui/endSessionDialog.js
===================================================================
--- gnome-shell-42.rc.orig/js/ui/endSessionDialog.js
+++ gnome-shell-42.rc/js/ui/endSessionDialog.js
@@ -298,7 +298,7 @@ class EndSessionDialog extends ModalDial
--- gnome-shell-44.beta.orig/js/ui/endSessionDialog.js
+++ gnome-shell-44.beta/js/ui/endSessionDialog.js
@@ -296,7 +296,7 @@ class EndSessionDialog extends ModalDial
this.contentLayout.add_child(this._applicationSection);
this._sessionSection = new Dialog.ListSection({
@ -11,7 +11,7 @@ Index: gnome-shell-42.rc/js/ui/endSessionDialog.js
});
this.contentLayout.add_child(this._sessionSection);
@@ -773,8 +773,8 @@ class EndSessionDialog extends ModalDial
@@ -758,8 +758,8 @@ class EndSessionDialog extends ModalDial
this._applications.push(inhibitor);
}

View File

@ -1,31 +0,0 @@
From 9a0ecad2b94243fbed5290f78d967d8714c3d3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 6 Oct 2021 10:00:43 +0200
Subject: [PATCH] main: Leak the GJS context and ShellGlobal
There are many crash-on-exit happening as a side effect of destroying
the GJS context. Work around these until we have a better solution by
leaking them.
---
src/main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main.c b/src/main.c
index 3cd9e10a5b..ce56e2a87a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -570,9 +570,11 @@ main (int argc, char **argv)
shell_profiler_shutdown ();
+#if 0
g_debug ("Doing final cleanup");
_shell_global_destroy_gjs_context (shell_global_get ());
g_object_unref (shell_global_get ());
+#endif
return ecode;
}
--
2.31.1

View File

@ -1,3 +1,109 @@
-------------------------------------------------------------------
Wed Mar 22 13:33:02 UTC 2023 - bjorn.lie@gmail.com
- Update to version 44.0+28:
* status/network: Generalize code to hide subtitle
* screenshot: Get cursor texture from window
+ st/icon-theme: Disconnect from settings signals on disposal
+ workspacesView: Update visibility after updating workspaces
+ screenshot: Use meta_window_has_pointer () for pointer check
+ main:
- Add missing newlines
- Fix syncing animations-enabled
+ style: Reduce padding between quick menu toggle text and
separator
+ modalDialog: Fix fading out dialog
+ endSessionDialog: Catch async errors
+ tests:
- Set GNOME_SHELL_SESSION_MODE to user
- Add default test setup with common env settings
+ extension-tool: Set reminder for removing old compat code
+ Updated translations.
- Move patch to SLE only patches:
+ gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
-------------------------------------------------------------------
Sun Mar 19 12:42:17 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.0:
+ Updated translations.
-------------------------------------------------------------------
Wed Mar 8 11:16:18 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Add Soup to global Requires exclude, and add a manual
typelib(Soup) = 3.0 Requires. Only require 3.0, before we got a
dependency on Soup 2.4 as well.
- Add St, Cogl and Clutter typelibs to global Requires exclude
aswell. These typelibs are provided by multiple packages, but
currently gnome-shell gets these provided by itself or mutter.
We already have an explicit mutter requires in place so no more
changes are needed for now from our end.
- Drop explicit typelib(Rsvg) Requires, no longer needed.
-------------------------------------------------------------------
Mon Mar 6 18:51:17 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.rc:
+ Unmute to default volume when slider was at 0
+ Fix missing battery percentage in the top bar
+ Fix unexpected focus order after activating apps
+ Stop using GTK for systray support
+ Expose GtkIconTheme replacement to extensions
+ Disallow using (most of) GTK in the compositor process
+ Plugged leak
+ Misc. bug fixes and cleanups
+ Updated translations.
- Replace pkgconfig(gnome-desktop-3.0) with
pkgconfig(gnome-desktop-4) BuildRequires following upstream
changes.
- Temp disable gtk-doc, fails build atm.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6486
-------------------------------------------------------------------
Fri Feb 24 12:23:21 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.beta:
+ Fix screencast UI being erroneously disabled
+ Fix unresponsive screen area when quick settings are opened
+ Ensure completions are disabled when hiding on-screen keyboard
+ Fix missing name in wired network quick settings button
+ Properly apply saved shortcuts inhibition permissions
+ Don't let wayland popovers block overview
+ Improve high contrast styling
+ Open correct Settings panel from on-screen keyboard menu
+ Test running gnome-shell in CI
+ Do not use symbolic app icons for High Contrast
+ Prepare extension loading for ESM
+ Fix input source switching with focus on password entry
+ Ensure quick settings toggles align with the pixel grid
+ Lower OOM score of gnome-shell process
+ Polish page switching behavior during DND in app grid
+ Tweak lock- and login screen styling
+ Consistently link to Settings from menus
+ Make it easier for extensions to add a credential manager
+ Fix mount operation dialog when Disks is not available
+ Refine quick settings
+ Mute/unmute volume when clicking slider icon
+ Add device menu to Bluetooth quick settings
+ Expose list of background apps in quick settings
+ Compile extension GSettings after install
+ Fixed crash
+ Plugged memory leak
+ Misc. bug fixes and cleanups
+ Updated translations.
- Replace pkgconfig(libmutter-11), pkgconfig(mutter-clutter-11),
pkgconfig(mutter-cogl-11) and pkgconfig(mutter-cogl-pango-11)
with a new mutter_api define and set it to 12. Also add a new
mutter_req define and set it to 44.beta. Make future versionbumps
more practical.
- Rebase patches with quilt. Disable
gnome-shell-exit-crash-workaround.patch for now, should no longer
be needed + Not sure I trust the rebase quilt did.
- Drop gnome-shell-main-Leak-the-GJS-context-and-ShellGlobal.patch:
Fixed upstream.
- Add a glob to typelib exclude.
-------------------------------------------------------------------
Tue Feb 14 10:40:16 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,4 +1,4 @@
name: gnome-shell
version: 43.3
mtime: 1676333492
commit: 85f141fabd427fea597dfd87f9a2dedcf8695809
version: 44.0+28
mtime: 1679431951
commit: 9e19f27e45d9311e622ba66f617e18c12097d099

View File

@ -16,10 +16,12 @@
#
%global __requires_exclude typelib\\(Meta\\)
%global __requires_exclude typelib\\(Meta|MetaTest|Soup|St|Cogl|Clutter\\)
%define mutter_api 12
%define mutter_req 44.beta
Name: gnome-shell
Version: 43.3
Version: 44.0+28
Release: 0
Summary: GNOME Shell
# shew extension is LGPL 2.1; gnome-shell-extension-tool is GPL-3.0-or-later
@ -37,14 +39,10 @@ Source2: noise-texture.png
# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch
# PATCH-FEATURE-OPENSUSE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu@suse.com -- Remove sessionList of endSessionDialog
Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
# PATCH-FIX-OPENSUSE gnome-shell-executable-path-not-absolute.patch bsc#1176051 xwang@suse.com -- Fix ExecStart is not absolute path
Patch7: gnome-shell-executable-path-not-absolute.patch
# PATCH-FIX-UPSTREAM gnome-shell-exit-crash-workaround.patch bsc#1190878 glgo#GNOME/gnome-shell#4344 qkzhu@suse.com -- Workaround logout crashing
Patch8: gnome-shell-exit-crash-workaround.patch
# PATCH-FIX-OPENSUSE gnome-shell-main-Leak-the-GJS-context-and-ShellGlobal.patch bsc#1205518 xwang@suse.com -- Leak the GJS context and ShellGlobal
Patch9: gnome-shell-main-Leak-the-GJS-context-and-ShellGlobal.patch
## NOTE: Keep SLE-only patches at bottom (starting on 1000).
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
@ -65,6 +63,8 @@ Patch1009: gnome-shell-fate324570-Make-GDM-background-image-configurable.pa
Patch1010: gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
# PATCH-FIX-SLE gnome-shell-disable-offline-update-dialog.patch bsc#944832 milachew@mail.lv -- Disable offline update suggestion before shutdown/reboot in SLE and openSUSE Leap.
Patch1011: gnome-shell-disable-offline-update-dialog.patch
# PATCH-FEATURE-SLE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu@suse.com -- Remove sessionList of endSessionDialog
Patch1012: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
# needed for directory ownership
BuildRequires: asciidoc
@ -87,7 +87,7 @@ BuildRequires: pkgconfig(gio-unix-2.0) >= 2.56.0
BuildRequires: pkgconfig(gjs-1.0) >= 1.71.1
BuildRequires: pkgconfig(gnome-autoar-0)
BuildRequires: pkgconfig(gnome-bluetooth-3.0)
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.35.90
BuildRequires: pkgconfig(gnome-desktop-4)
BuildRequires: pkgconfig(gnome-keybindings)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.49.1
@ -103,7 +103,7 @@ BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libecal-2.0) >= 3.33.1
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.33.1
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3
BuildRequires: pkgconfig(libmutter-11) >= 43.beta
BuildRequires: pkgconfig(libmutter-%{mutter_api}) >= %{mutter_req}
BuildRequires: pkgconfig(libnm) >= 1.10.4
BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libpulse) >= 2.0
@ -113,9 +113,9 @@ BuildRequires: pkgconfig(libsoup-3.0)
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mutter-clutter-11) >= 43.beta
BuildRequires: pkgconfig(mutter-cogl-11) >= 43.beta
BuildRequires: pkgconfig(mutter-cogl-pango-11) >= 43.beta
BuildRequires: pkgconfig(mutter-clutter-%{mutter_api}) >= %{mutter_req}
BuildRequires: pkgconfig(mutter-cogl-%{mutter_api}) >= %{mutter_req}
BuildRequires: pkgconfig(mutter-cogl-pango-%{mutter_api}) >= %{mutter_req}
BuildRequires: pkgconfig(polkit-agent-1) >= 0.100
BuildRequires: pkgconfig(x11)
BuildRequires: python(abi) >= 3
@ -129,8 +129,8 @@ Requires: gnome-settings-daemon
# "High Contrast" in accessibility status icon
Requires: gnome-themes-accessibility
Requires: gsettings-desktop-schemas
Requires: mutter >= 41.0
Requires: typelib(Rsvg)
Requires: mutter >= %{mutter_req}
Requires: typelib(Soup) = 3.0
Recommends: %{name}-calendar
## Finally, dependencies for session services that are needed for system icons and the user menu
# bluetooth system icon
@ -183,10 +183,8 @@ This package contains an optional extensions app for managing GNOME Shell extens
%prep
%setup -q
#patch1 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
#patch8 -p1
%if 0%{?sle_version}
%patch1001 -p1
@ -200,6 +198,7 @@ This package contains an optional extensions app for managing GNOME Shell extens
%patch1010 -p1
%patch1011 -p1
%endif
%patch1012 -p1
%endif
cp %{SOURCE2} data/theme/
@ -210,11 +209,11 @@ cp %{SOURCE1} js/ui/
%build
%meson \
--libexecdir=%{_libexecdir}/%{name} \
-Dgtk_doc=true \
-Dman=true \
-Dnetworkmanager=true \
-Dsystemd=true \
-Dtests=false \
-D gtk_doc=false \
-D man=true \
-D networkmanager=true \
-D systemd=true \
-D tests=false \
%{nil}
%meson_build
@ -243,13 +242,12 @@ rm -f %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Extensions.D
%{_libexecdir}/gnome-shell/gnome-shell-perf-helper
%{_libexecdir}/gnome-shell/gnome-shell-portal-helper
%{_libdir}/gnome-shell/Gvc-1.0.typelib
%{_libdir}/gnome-shell/Shell-0.1.typelib
#%%{_libdir}/gnome-shell/ShellMenu-0.1.typelib
%{_libdir}/gnome-shell/St-1.0.typelib
%{_libdir}/gnome-shell/Shell-12.typelib
%{_libdir}/gnome-shell/St-12.typelib
%{_libdir}/gnome-shell/libgnome-shell-menu.so
%{_libdir}/gnome-shell/libgnome-shell.so
%{_libdir}/gnome-shell/libshell-12.so
%{_libdir}/gnome-shell/libgvc.so
%{_libdir}/gnome-shell/libst-1.0.so
%{_libdir}/gnome-shell/libst-12.so
%{_datadir}/applications/org.gnome.Shell.desktop
%{_datadir}/applications/org.gnome.Shell.Extensions.desktop
%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
@ -283,8 +281,6 @@ rm -f %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Extensions.D
%{_userunitdir}/org.gnome.Shell@wayland.service
%{_userunitdir}/org.gnome.Shell@x11.service
%{_userunitdir}/org.gnome.Shell-disable-extensions.service
%{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop
%{_libexecdir}/gnome-shell/gnome-shell-overrides-migration.sh
%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
@ -312,7 +308,7 @@ rm -f %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Extensions.D
%files devel
%doc HACKING.md
%doc %{_datadir}/gtk-doc/html
#%%doc %%{_datadir}/gtk-doc/html
%{_bindir}/gnome-shell-extension-tool
%{_bindir}/gnome-shell-perf-tool
%{_datadir}/gnome-shell/*.gir
@ -320,7 +316,6 @@ rm -f %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Extensions.D
%{_datadir}/gnome-shell/gir-1.0/Shew-0.gir
%files calendar
%{_datadir}/applications/evolution-calendar.desktop
%{_libexecdir}/gnome-shell/gnome-shell-calendar-server
%{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service