From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gnome-shell: update to 43.3.
Date: Wed, 08 Mar 2023 22:08:04 +0100 [thread overview]
Message-ID: <20230308210804.kz_P7pPcrI96vopaGUdHD8Q1CT5q4brBqDLhbL6gImo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42304@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome
https://github.com/void-linux/void-packages/pull/42304
gnome-shell: update to 43.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
The ibus patches are necessary to prevent gnome-shell from triggering an exception in inputMethod.js during initialization of ibus due to `require-surrounding-text` not being avaliable (causing ibus to not get initialized properly).
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-42304.patch --]
[-- Type: text/x-diff, Size: 4230 bytes --]
From 128fe7bc5b777886dbcee8a803d151c3e1ea0d07 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 16 Feb 2023 01:14:50 -0800
Subject: [PATCH 1/2] mutter: update to 43.3.
---
srcpkgs/mutter/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index c84c35f12b26..4705d3c72deb 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.2
-revision=2
+version=43.3
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/"
changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
libmutter-cogl-pango-11.so"
make_check=no # needs a full graphical session
From d51e06db2cb17cd5a7e26fbace9e584137806136 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 16 Feb 2023 01:15:07 -0800
Subject: [PATCH 2/2] gnome-shell: update to 43.3.
---
...2e61a9882edc722ac64da80804e75f832155.patch | 32 +++++++++++++++++++
srcpkgs/gnome-shell/template | 4 +--
2 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
new file mode 100644
index 000000000000..328ecbefb3c4
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
@@ -0,0 +1,32 @@
+From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar@redhat.com>
+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/template b/srcpkgs/gnome-shell/template
index 6aa67cd1a46b..5089c10c7627 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.2
+version=43.3
revision=1
build_style=meson
build_helper=gir
@@ -21,7 +21,7 @@ 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"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
+checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
do_check() {
mkdir /tmp/gnome-shell-xdg
next prev parent reply other threads:[~2023-03-08 21:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 9:18 [PR PATCH] " oreo639
2023-02-16 10:02 ` [PR PATCH] [Updated] " oreo639
2023-03-08 21:08 ` oreo639 [this message]
2023-03-08 21:09 ` oreo639
2023-03-09 18:58 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230308210804.kz_P7pPcrI96vopaGUdHD8Q1CT5q4brBqDLhbL6gImo@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).