Accepting request 1205456 from GNOME:Factory
SCripted push of GNOME 47 OBS-URL: https://build.opensuse.org/request/show/1205456 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=196
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
eeeec62fd2
2
_service
2
_service
@ -3,7 +3,7 @@
|
||||
<service name="obs_scm" mode="manual">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
|
||||
<param name="revision">46.0</param>
|
||||
<param name="revision">47.1</param>
|
||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||
<param name="versionrewrite-pattern">(.*)\+0</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b72615c82b0c2957b1053271b42a8aa91021e45564034fdac79bc1f0203523b4
|
||||
size 15255565
|
||||
BIN
gnome-settings-daemon-47.1.obscpio
(Stored with Git LFS)
Normal file
BIN
gnome-settings-daemon-47.1.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,48 +0,0 @@
|
||||
Index: gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-45.0.orig/plugins/media-keys/gsd-media-keys-manager.c
|
||||
+++ gnome-settings-daemon-45.0/plugins/media-keys/gsd-media-keys-manager.c
|
||||
@@ -350,7 +350,7 @@ get_key_string (MediaKey *key)
|
||||
else if (key->custom_path != NULL)
|
||||
return g_strdup_printf ("custom:%s", key->custom_path);
|
||||
else
|
||||
- g_assert_not_reached ();
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
static GStrv
|
||||
@@ -392,7 +392,7 @@ get_bindings (GsdMediaKeysManager *manag
|
||||
key->custom_path);
|
||||
binding = g_settings_get_string (settings, "binding");
|
||||
} else
|
||||
- g_assert_not_reached ();
|
||||
+ return NULL;
|
||||
|
||||
array = g_ptr_array_new ();
|
||||
g_ptr_array_add (array, binding);
|
||||
Index: gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-45.0.orig/plugins/rfkill/rfkill-glib.c
|
||||
+++ gnome-settings-daemon-45.0/plugins/rfkill/rfkill-glib.c
|
||||
@@ -268,7 +268,7 @@ op_to_string (unsigned int op)
|
||||
case RFKILL_OP_CHANGE_ALL:
|
||||
return "CHANGE_ALL";
|
||||
default:
|
||||
- g_assert_not_reached ();
|
||||
+ return "NULL";
|
||||
}
|
||||
}
|
||||
|
||||
Index: gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-45.0.orig/plugins/xsettings/xsettings-manager.c
|
||||
+++ gnome-settings-daemon-45.0/plugins/xsettings/xsettings-manager.c
|
||||
@@ -271,7 +271,7 @@ xsettings_get_typecode (GVariant *value)
|
||||
case G_VARIANT_CLASS_TUPLE:
|
||||
return XSETTINGS_TYPE_COLOR;
|
||||
default:
|
||||
- g_assert_not_reached ();
|
||||
+ return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From 9a1c14127fd135a6bf6abbf5d57ae1a2961bf4d0 Mon Sep 17 00:00:00 2001
|
||||
From: Joan Torres <joan.torres@suse.com>
|
||||
Date: Thu, 4 Apr 2024 13:40:02 +0200
|
||||
Subject: [PATCH] sharing: Stop assigned services only when no network
|
||||
connection
|
||||
|
||||
This allows grd handover service to be started even with network access
|
||||
through a mobile device or when the network access is from Wi-Fi.
|
||||
---
|
||||
plugins/sharing/gsd-sharing-manager.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/plugins/sharing/gsd-sharing-manager.c b/plugins/sharing/gsd-sharing-manager.c
|
||||
index 7713569f..2ab2cb05 100644
|
||||
--- a/plugins/sharing/gsd-sharing-manager.c
|
||||
+++ b/plugins/sharing/gsd-sharing-manager.c
|
||||
@@ -297,7 +297,7 @@ start_assigned_service (GsdSharingManager *manager,
|
||||
{
|
||||
AssignedService *service;
|
||||
|
||||
- if (manager->sharing_status != GSD_SHARING_STATUS_AVAILABLE)
|
||||
+ if (manager->sharing_status == GSD_SHARING_STATUS_OFFLINE)
|
||||
return;
|
||||
|
||||
if (!info->system_service_running)
|
||||
@@ -414,10 +414,10 @@ gsd_sharing_manager_sync_assigned_services (GsdSharingManager *manager)
|
||||
for (l = services; l != NULL; l = l->next) {
|
||||
AssignedServiceInfo *info = l->data;
|
||||
|
||||
- if (manager->sharing_status == GSD_SHARING_STATUS_AVAILABLE)
|
||||
- start_assigned_service (manager, info);
|
||||
- else
|
||||
+ if (manager->sharing_status == GSD_SHARING_STATUS_OFFLINE)
|
||||
stop_assigned_service (manager, info);
|
||||
+ else
|
||||
+ start_assigned_service (manager, info);
|
||||
}
|
||||
g_list_free (services);
|
||||
}
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 15 21:57:28 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 47.1:
|
||||
+ meson: Fix project version.
|
||||
- Changes from version 47.0:
|
||||
+ Power: Only update mutter backlight properties when the mutter
|
||||
backend is in use
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 2 07:01:25 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 47.rc:
|
||||
+ Port X11 tests to using Xwayland
|
||||
+ Power: Set backlight through Mutter APIs, drop gnome-rr
|
||||
dependency
|
||||
+ Wwan: Fix memory access errors
|
||||
+ Xsettings: Get UI scaling factor from a dedicated Mutter D-Bus
|
||||
API
|
||||
- Changes from version 47.beta:
|
||||
+ Housekeeping: Improve string in OOM notifications
|
||||
+ Sharing:
|
||||
- Stop assigned services only when there is no network
|
||||
connection
|
||||
- Fix building without systemd
|
||||
+ Printing: Clear members of GsdPrintNotificationsManager
|
||||
+ Updated translations.
|
||||
- Bump base_ver define to 47.
|
||||
- Use autopatch for SLE/Leap also.
|
||||
- Drop patches fixed upstream:
|
||||
+ gnome-settings-daemon-stop-service-when-no-network.patch
|
||||
+ gnome-settings-daemon-bgo793253.patch: No longer needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 19 02:38:55 UTC 2024 - Jonathan Kang <songchuan.kang@suse.com>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
name: gnome-settings-daemon
|
||||
version: 46.0
|
||||
mtime: 1710627298
|
||||
commit: 8ff4196096efba8b2441ee31a63c8bd8cea4b1d8
|
||||
version: 47.1
|
||||
mtime: 1726434154
|
||||
commit: 1d74286fc38483febffb935679ad9588a6b7321d
|
||||
|
||||
@ -27,10 +27,10 @@
|
||||
%bcond_without wacom
|
||||
%endif
|
||||
|
||||
%define base_ver 46
|
||||
%define base_ver 47
|
||||
|
||||
Name: gnome-settings-daemon
|
||||
Version: 46.0
|
||||
Version: 47.1
|
||||
Release: 0
|
||||
Summary: Settings daemon for the GNOME desktop
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-only
|
||||
@ -42,10 +42,6 @@ Source0: %{name}-%{version}.tar.zst
|
||||
Patch0: gnome-settings-daemon-initial-keyboard.patch
|
||||
# PATCH-FIX-OPENSUSE gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
|
||||
Patch1: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function
|
||||
Patch2: gnome-settings-daemon-bgo793253.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-settings-daemon-stop-service-when-no-network.patch [merged] joan.torres@suse.com -- Stop assigned services only when no network connection
|
||||
Patch3: gnome-settings-daemon-stop-service-when-no-network.patch
|
||||
# PATCH-FIX-UPSTREAM 0001-usb-protection-Treat-hubs-and-HID-devices-like-any-o.patch glgo#GNOME/gnome-settings-daemon#780, bsc#1226423, CVE-2024-38394 sckang@suse.com -- usb-protection: Treat hubs and HID devices like any other USB gadget
|
||||
Patch4: 0001-usb-protection-Treat-hubs-and-HID-devices-like-any-o.patch
|
||||
|
||||
@ -150,16 +146,7 @@ contact the settings daemon via its DBus interface.
|
||||
%if ! 0%{?sle_version}
|
||||
%autopatch -p1 -M 999
|
||||
%else
|
||||
%patch -P 0 -p1
|
||||
%patch -P 1 -p1
|
||||
%patch -P 2 -p1
|
||||
%patch -P 4 -p1
|
||||
%endif
|
||||
|
||||
# Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476.
|
||||
%if 0%{?sle_version} >= 150000
|
||||
%patch -P 1000 -p1
|
||||
%patch -P 1001 -p1
|
||||
%autopatch -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user