Accepting request 736739 from GNOME:Next
Go git checkout, stable branch OBS-URL: https://build.opensuse.org/request/show/736739 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=351
This commit is contained in:
Git OBS Bridge
parent
859746ce6c
commit
be70b93b71
17
_service
Normal file
17
_service
Normal file
@ -0,0 +1,17 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">gnome-3-34</param>
|
||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||
<param name="versionrewrite-pattern">GNOME_SETTINGS_DAEMON_(\d+)_(\d+)_(\d+)</param>
|
||||
<param name="versionrewrite-replacement">\1.\2.\3</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service mode="buildtime" name="tar" />
|
||||
<service mode="buildtime" name="recompress">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service mode="disabled" name="set_version" />
|
||||
</services>
|
||||
4
_servicedata
Normal file
4
_servicedata
Normal file
@ -0,0 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
|
||||
<param name="changesrevision">952234344affd1cf7fd218fd0a3e0b59c60fea52</param></service></servicedata>
|
||||
3
gnome-settings-daemon-3.34.0+10.obscpio
Normal file
3
gnome-settings-daemon-3.34.0+10.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c22b980422a9cd739dac1269f145701534bb61bb7a661e7ec62453a03b39167e
|
||||
size 13650445
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337
|
||||
size 1396432
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 09 19:45:45 UTC 2019 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 3.34.0+10:
|
||||
+ smartcard:
|
||||
- Change timeout on spurious event error
|
||||
- Change manager to non-blocking
|
||||
+ GsdSmartcardService: Use correct parent type for structs
|
||||
+ media-keys: Divide keyboard brightness value by 100
|
||||
+ Updated translations.
|
||||
- Switch to git checkout via source service, use upstream stable
|
||||
branch.
|
||||
- Drop gsd-smartcard-parent-type.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 10:36:50 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
|
||||
5
gnome-settings-daemon.obsinfo
Normal file
5
gnome-settings-daemon.obsinfo
Normal file
@ -0,0 +1,5 @@
|
||||
name: gnome-settings-daemon
|
||||
version: 3.34.0+10
|
||||
mtime: 1570397831
|
||||
commit: 952234344affd1cf7fd218fd0a3e0b59c60fea52
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
%endif
|
||||
|
||||
Name: gnome-settings-daemon
|
||||
Version: 3.34.0
|
||||
Version: 3.34.0+10
|
||||
Release: 0
|
||||
Summary: Settings daemon for the GNOME desktop
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-only
|
||||
Group: System/GUI/GNOME
|
||||
URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
|
||||
Source0: https://download.gnome.org/sources/gnome-settings-daemon/3.34/%{name}-%{version}.tar.xz
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
|
||||
# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
|
||||
Patch1: gnome-settings-daemon-initial-keyboard.patch
|
||||
@ -42,8 +42,6 @@ Patch1: gnome-settings-daemon-initial-keyboard.patch
|
||||
Patch2: 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
|
||||
Patch3: gnome-settings-daemon-bgo793253.patch
|
||||
# PATCH-FIX-UPSTREAM gsd-smartcard-parent-type.patch mgorse@suse.com -- use correct parent type for structs.
|
||||
Patch4: gsd-smartcard-parent-type.patch
|
||||
|
||||
## SLE-only patches start at 1000
|
||||
# PATCH-FEATURE-SLE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
|
||||
@ -148,13 +146,13 @@ contact the settings daemon via its DBus interface.
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -N
|
||||
translation-update-upstream po %{name}
|
||||
gnome-patch-translation-prepare po %{name}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
# SLE-only patches start at 1000
|
||||
%if !0%{?is_opensuse}
|
||||
%patch1000 -p1
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From bdd9bb53689262efb2516024b810a30a6803d335 Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Mon, 16 Sep 2019 08:40:42 +0100
|
||||
Subject: [PATCH] GsdSmartcardService: Use correct parent type for structs
|
||||
|
||||
GDBusObjectSkeleton objects are larger than GObject, so we need to
|
||||
allocate enough space. Otherwise, if we're lucky we'll get:
|
||||
|
||||
Sep 13 11:09:32 espresso gsd-smartcard[12882]: specified class size for type 'GsdSmartcardService' is smaller than the parent type's 'GsdSmartcardServiceManagerSkeleton' class size
|
||||
Sep 13 11:09:32 espresso gsd-smartcard[12882]: g_type_add_interface_static: assertion 'G_TYPE_IS_INSTANTIATABLE (instance_type)' failed
|
||||
|
||||
and if we're unlucky we'll get object fields overwriting each other.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
Fixes: 76b6b794 "smartcard: Use G_DECLARE_FINAL_TYPE for GsdSmartcardService"
|
||||
(cherry picked from commit 1b31868c23feb556b6b9abb9e922a77a24ac451b)
|
||||
---
|
||||
plugins/smartcard/gsd-smartcard-service.c | 2 +-
|
||||
plugins/smartcard/gsd-smartcard-service.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plugins/smartcard/gsd-smartcard-service.c b/plugins/smartcard/gsd-smartcard-service.c
|
||||
index 783624f6..4d529c30 100644
|
||||
--- a/plugins/smartcard/gsd-smartcard-service.c
|
||||
+++ b/plugins/smartcard/gsd-smartcard-service.c
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
struct _GsdSmartcardService
|
||||
{
|
||||
- GObject parent;
|
||||
+ GsdSmartcardServiceManagerSkeleton parent;
|
||||
|
||||
GDBusConnection *bus_connection;
|
||||
GDBusObjectManagerServer *object_manager_server;
|
||||
diff --git a/plugins/smartcard/gsd-smartcard-service.h b/plugins/smartcard/gsd-smartcard-service.h
|
||||
index cf071fdc..11b3e222 100644
|
||||
--- a/plugins/smartcard/gsd-smartcard-service.h
|
||||
+++ b/plugins/smartcard/gsd-smartcard-service.h
|
||||
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
|
||||
|
||||
#define GSD_TYPE_SMARTCARD_SERVICE (gsd_smartcard_service_get_type ())
|
||||
|
||||
-G_DECLARE_FINAL_TYPE (GsdSmartcardService, gsd_smartcard_service, GSD, SMARTCARD_SERVICE, GObject)
|
||||
+G_DECLARE_FINAL_TYPE (GsdSmartcardService, gsd_smartcard_service, GSD, SMARTCARD_SERVICE, GsdSmartcardServiceManagerSkeleton)
|
||||
|
||||
void gsd_smartcard_service_new_async (GsdSmartcardManager *manager,
|
||||
GCancellable *cancellable,
|
||||
--
|
||||
2.23.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user