Update to 45.beta.1
This commit is contained in:
Florian Müllner
parent
4ea9fdc45c
commit
fe8d8559c3
1
.gitignore
vendored
1
.gitignore
vendored
@ -216,3 +216,4 @@ gnome-shell-2.31.5.tar.bz2
|
||||
/gnome-shell-44.2.tar.xz
|
||||
/gnome-shell-45.alpha.tar.xz
|
||||
/gnome-shell-45.beta.tar.xz
|
||||
/gnome-shell-45.beta.1.tar.xz
|
||||
|
||||
79
2871.patch
79
2871.patch
@ -1,79 +0,0 @@
|
||||
From 854191c2444cdc90e92bcb6684893148dd007798 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Tue, 8 Aug 2023 16:08:36 +0200
|
||||
Subject: [PATCH 1/2] st: Handle emulated scroll events through the
|
||||
ClutterEventFlag
|
||||
|
||||
Emulated scroll events no longer get clutter_event_is_pointer_emulated()
|
||||
set to TRUE, instead this information is propagated through the
|
||||
ClutterEventFlags of the event.
|
||||
|
||||
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2871>
|
||||
---
|
||||
src/st/st-scroll-bar.c | 3 ++-
|
||||
src/st/st-scroll-view.c | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/st/st-scroll-bar.c b/src/st/st-scroll-bar.c
|
||||
index d5d5264943..e2c09203e1 100644
|
||||
--- a/src/st/st-scroll-bar.c
|
||||
+++ b/src/st/st-scroll-bar.c
|
||||
@@ -469,7 +469,8 @@ st_scroll_bar_scroll_event (ClutterActor *actor,
|
||||
ClutterTextDirection direction;
|
||||
ClutterScrollDirection scroll_dir;
|
||||
|
||||
- if (clutter_event_is_pointer_emulated ((ClutterEvent *) event))
|
||||
+ if (!!(clutter_event_get_flags ((ClutterEvent *) event) &
|
||||
+ CLUTTER_EVENT_FLAG_POINTER_EMULATED))
|
||||
return TRUE;
|
||||
|
||||
direction = clutter_actor_get_text_direction (actor);
|
||||
diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
|
||||
index 9f667e5459..764065b606 100644
|
||||
--- a/src/st/st-scroll-view.c
|
||||
+++ b/src/st/st-scroll-view.c
|
||||
@@ -770,7 +770,8 @@ st_scroll_view_scroll_event (ClutterActor *self,
|
||||
if (!priv->mouse_scroll)
|
||||
return FALSE;
|
||||
|
||||
- if (clutter_event_is_pointer_emulated ((ClutterEvent *) event))
|
||||
+ if (!!(clutter_event_get_flags ((ClutterEvent *) event) &
|
||||
+ CLUTTER_EVENT_FLAG_POINTER_EMULATED))
|
||||
return TRUE;
|
||||
|
||||
direction = clutter_actor_get_text_direction (self);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From c9741ae3d5f661b2aee352c50ce21fab16694fbe Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Tue, 8 Aug 2023 16:10:39 +0200
|
||||
Subject: [PATCH 2/2] ui/slider: Handle emulated scroll events through the
|
||||
Clutter.EventFlags
|
||||
|
||||
Emulated scroll events no longer get event.is_pointer_emulated() set to
|
||||
True, instead this information is propagated through the Clutter.EventFlags
|
||||
of the event.
|
||||
|
||||
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2871>
|
||||
---
|
||||
js/ui/slider.js | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/ui/slider.js b/js/ui/slider.js
|
||||
index 6653898b0c..4f60556aea 100644
|
||||
--- a/js/ui/slider.js
|
||||
+++ b/js/ui/slider.js
|
||||
@@ -140,7 +140,7 @@ export const Slider = GObject.registerClass({
|
||||
let direction = event.get_scroll_direction();
|
||||
let delta;
|
||||
|
||||
- if (event.is_pointer_emulated())
|
||||
+ if (event.get_flags() & Clutter.EventFlags.POINTER_EMULATED)
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
|
||||
if (direction == Clutter.ScrollDirection.DOWN) {
|
||||
--
|
||||
GitLab
|
||||
|
||||
1339
2872.patch
1339
2872.patch
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: gnome-shell
|
||||
Version: 45~beta
|
||||
Version: 45~beta.1
|
||||
Release: %autorelease
|
||||
Summary: Window management and application launching for GNOME
|
||||
|
||||
@ -9,14 +9,6 @@ License: GPLv2+
|
||||
URL: https://wiki.gnome.org/Projects/GnomeShell
|
||||
Source0: https://download.gnome.org/sources/gnome-shell/45/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
# Needed to fix broken alt-tab (along with gnome-shell patches)
|
||||
# 2872 is the fix, but only applies clean on top of 2871
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/issues/2950
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2871
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2872
|
||||
Patch0: 2871.patch
|
||||
Patch1: 2872.patch
|
||||
|
||||
# Replace Epiphany with Firefox in the default favourite apps list
|
||||
Patch10001: gnome-shell-favourite-apps-firefox.patch
|
||||
|
||||
@ -31,7 +23,7 @@ Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch
|
||||
%define gjs_version 1.73.1
|
||||
%define gtk4_version 4.0.0
|
||||
%define adwaita_version 1.0.0
|
||||
%define mutter_version 45~beta
|
||||
%define mutter_version 45~beta.1
|
||||
%define polkit_version 0.100
|
||||
%define gsettings_desktop_schemas_version 42~beta
|
||||
%define ibus_version 1.5.2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnome-shell-45.beta.tar.xz) = aa05f68be69b4424157a37a5de8c2e86f0f72a1cdf357cda9fe264bfe4b61ead97185845f253209a07b3d111b53295b6f3f8e5545a316e8981acd234bcb580da
|
||||
SHA512 (gnome-shell-45.beta.1.tar.xz) = 3430e36d46294f5d2d3fd839ebdd505f029f13efbf80fcb4934ec3cf8fd8489dee00c01d7596821f59826c0857e8afffac7832dab7b9843493694dbdadc858e6
|
||||
|
||||
Loading…
Reference in New Issue
Block a user