From 4f79ce3960bf5d1ccea0a7de6a6935b34f55f2a4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:26:38 -0700 Subject: [PATCH] gnome-shell: update to 44.2. --- ...2e61a9882edc722ac64da80804e75f832155.patch | 32 ------------------- .../patches/no-exe-introspection.patch | 25 +++++++++++++++ srcpkgs/gnome-shell/template | 7 ++-- 3 files changed, 29 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch deleted file mode 100644 index 328ecbefb3c..00000000000 --- a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001 -From: Takao Fujiwara -Date: Fri, 3 Mar 2023 17:50:10 +0900 -Subject: [PATCH] inputMethod: Try to connect require-surrounding-text signal - -require-surrounding-text signal has been added since IBus 1.5.28. - -Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6405 ---- - js/misc/inputMethod.js | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js -index e008e6411..aa610b3bf 100644 ---- a/js/misc/inputMethod.js -+++ b/js/misc/inputMethod.js -@@ -76,7 +76,11 @@ var InputMethod = GObject.registerClass({ - - this._context.set_client_commit_preedit(true); - this._context.connect('commit-text', this._onCommitText.bind(this)); -- this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this)); -+ try { -+ // Require ibus 1.5.28 or later. -+ this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this)); -+ } catch (e) { -+ } - this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this)); - this._context.connect('update-preedit-text-with-mode', this._onUpdatePreeditText.bind(this)); - this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this)); --- -GitLab - diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch new file mode 100644 index 00000000000..8088fd2f5a6 --- /dev/null +++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch @@ -0,0 +1,25 @@ +commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e +Author: Daniel Kolesa +Date: Sun Mar 19 19:11:00 2023 +0100 + + Disable 9bc89b821cf09195418f20225bbec39c0567d263 + + Even if we manually define _DYNAMIC, it does not work (segfaults + somewhere in musl, coming from g_strsplit) and is pretty useless + for our case anyway. + +diff --git a/src/main.c b/src/main.c +index 8cccc0a..ef6408f 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -19,6 +19,10 @@ + #include + #include + ++#ifdef HAVE_EXE_INTROSPECTION ++#undef HAVE_EXE_INTROSPECTION ++#endif ++ + #ifdef HAVE_EXE_INTROSPECTION + #include + #endif diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 5089c10c762..3fc7eb89d17 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=43.3 +version=44.2 revision=1 build_style=meson build_helper=gir @@ -19,9 +19,10 @@ short_desc="GNOME core user interface" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz" -checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e +checksum=55f279ec6303b7c0c89246eced81247c87fc1c73948f45eb212a647218d1b63f do_check() { mkdir /tmp/gnome-shell-xdg