diff --git a/_service b/_service new file mode 100644 index 0000000..ab6b66a --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git + git + gnome-3-34 + @PARENT_TAG@+@TAG_OFFSET@ + GNOME_SETTINGS_DAEMON_(\d+)_(\d+)_(\d+) + \1.\2.\3 + enable + + + + *.tar + xz + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..c8f6e82 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git + 952234344affd1cf7fd218fd0a3e0b59c60fea52 \ No newline at end of file diff --git a/gnome-settings-daemon-3.34.0+10.obscpio b/gnome-settings-daemon-3.34.0+10.obscpio new file mode 100644 index 0000000..2a49036 --- /dev/null +++ b/gnome-settings-daemon-3.34.0+10.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c22b980422a9cd739dac1269f145701534bb61bb7a661e7ec62453a03b39167e +size 13650445 diff --git a/gnome-settings-daemon-3.34.0.tar.xz b/gnome-settings-daemon-3.34.0.tar.xz deleted file mode 100644 index 9129e63..0000000 --- a/gnome-settings-daemon-3.34.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337 -size 1396432 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 2a5abac..0063026 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -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 diff --git a/gnome-settings-daemon.obsinfo b/gnome-settings-daemon.obsinfo new file mode 100644 index 0000000..9abcf01 --- /dev/null +++ b/gnome-settings-daemon.obsinfo @@ -0,0 +1,5 @@ +name: gnome-settings-daemon +version: 3.34.0+10 +mtime: 1570397831 +commit: 952234344affd1cf7fd218fd0a3e0b59c60fea52 + diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 46f1b8b..b11c6a0 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -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 diff --git a/gsd-smartcard-parent-type.patch b/gsd-smartcard-parent-type.patch deleted file mode 100644 index 10f3a26..0000000 --- a/gsd-smartcard-parent-type.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bdd9bb53689262efb2516024b810a30a6803d335 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -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 -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 -