Accepting request 1159522 from GNOME:Factory

GNOME 46 (forwarded request 1159250 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1159522
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-kiosk?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2024-03-20 20:15:45 +00:00 committed by Git OBS Bridge
commit c596183b9a
7 changed files with 86 additions and 10 deletions

View File

@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-kiosk.git</param>
<param name="revision">refs/tags/45.0</param>
<param name="revision">46.0</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>

View File

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

3
gnome-kiosk-46.0.obscpio Normal file
View File

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

View File

@ -0,0 +1,46 @@
From f9c184bf52ce218c2121301a68480b105594a071 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 4 Mar 2024 16:16:15 -0800
Subject: [PATCH] kiosk-compositor.c: drop xevent_filter
mutter dropped this upstream in
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3599
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
compositor/kiosk-compositor.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/compositor/kiosk-compositor.c b/compositor/kiosk-compositor.c
index 6c25c6c..9527408 100644
--- a/compositor/kiosk-compositor.c
+++ b/compositor/kiosk-compositor.c
@@ -462,16 +462,6 @@ kiosk_compositor_show_window_menu_for_rect (MetaPlugin *plugin,
g_assert (META_PLUGIN_CLASS (kiosk_compositor_parent_class)->show_window_menu_for_rect == NULL);
}
-static gboolean
-kiosk_compositor_xevent_filter (MetaPlugin *plugin,
- XEvent *x_server_event)
-{
- KioskCompositor *self = KIOSK_COMPOSITOR (plugin);
-
- g_signal_emit (G_OBJECT (self), signals[X_SERVER_EVENT], 0, x_server_event);
- return FALSE;
-}
-
static gboolean
kiosk_compositor_keybinding_filter (MetaPlugin *plugin,
MetaKeyBinding *binding)
@@ -546,7 +536,6 @@ kiosk_compositor_class_init (KioskCompositorClass *compositor_class)
plugin_class->show_window_menu = kiosk_compositor_show_window_menu;
plugin_class->show_window_menu_for_rect = kiosk_compositor_show_window_menu_for_rect;
- plugin_class->xevent_filter = kiosk_compositor_xevent_filter;
plugin_class->keybinding_filter = kiosk_compositor_keybinding_filter;
plugin_class->confirm_display_change = kiosk_compositor_confirm_display_change;
--
GitLab

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Tue Mar 19 07:48:31 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.0:
+ Fixes with localed integration.
-------------------------------------------------------------------
Thu Mar 7 15:34:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Add gnome-kiosk-mutter-46.patch: Fix build against mutter 46.rc.
-------------------------------------------------------------------
Mon Mar 4 08:26:37 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.rc:
+ Use gnome-text-editor instead of gedit for example script.
+ Keymap fix.
-------------------------------------------------------------------
Wed Jan 17 07:43:29 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.alpha:
+ Add automount manager.
+ Support headless sessions.
+ Port to mutter 46.
+ Docs update.
- Set mutter_api 14, following upstreams port to Mutter 46.
-------------------------------------------------------------------
Sun Sep 17 12:52:47 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,4 +1,4 @@
name: gnome-kiosk
version: 45.0
mtime: 1694954679
commit: a235abce1828be82adcb004688a26aefebae843b
version: 46.0
mtime: 1710790799
commit: ece36cecbac4e5ca0cd7ed0e6a06b7d59c8b5bf4

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-kiosk
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,15 +16,17 @@
#
%define mutter_api 13
%define mutter_api 14
Name: gnome-kiosk
Version: 45.0
Version: 46.0
Release: 0
Summary: Mutter based compositor for kiosks
License: GPL-2.0-or-later
URL: https://gitlab.gnome.org/GNOME/gnome-kiosk
Source0: %{name}-%{version}.tar.zst
# PATCH-FIX-UPSTREAM
Patch0: gnome-kiosk-mutter-46.patch
BuildRequires: fdupes
BuildRequires: meson