Accepting request 459855 from GNOME:Next
scripted push OBS-URL: https://build.opensuse.org/request/show/459855 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=273
This commit is contained in:
Git OBS Bridge
parent
d77f2a9451
commit
ece0dc2152
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba
|
||||
size 1622420
|
||||
3
gnome-settings-daemon-3.23.90.tar.xz
Normal file
3
gnome-settings-daemon-3.23.90.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c9e860558a8132763f6441f317e1df47fc5fe64bc5517bcc9ff9d44a08824fac
|
||||
size 1614204
|
||||
@ -18,7 +18,6 @@ Subject: [PATCH] revert upstream commits to bring back the updates plugin
|
||||
plugins/updates/gsd-updates-plugin.c | 28 +
|
||||
plugins/updates/gsd-updates-refresh.c | 573 ++++++++
|
||||
plugins/updates/gsd-updates-refresh.h | 52 +
|
||||
plugins/updates/test-updates.c | 7 +
|
||||
plugins/updates/updates-design.svg | 765 ++++++++++
|
||||
plugins/updates/updates.gnome-settings-plugin.in | 9 +
|
||||
po/POTFILES.in | 4 +
|
||||
@ -34,16 +33,15 @@ Subject: [PATCH] revert upstream commits to bring back the updates plugin
|
||||
create mode 100644 plugins/updates/gsd-updates-plugin.c
|
||||
create mode 100644 plugins/updates/gsd-updates-refresh.c
|
||||
create mode 100644 plugins/updates/gsd-updates-refresh.h
|
||||
create mode 100644 plugins/updates/test-updates.c
|
||||
create mode 100644 plugins/updates/updates-design.svg
|
||||
create mode 100644 plugins/updates/updates.gnome-settings-plugin.in
|
||||
|
||||
Index: gnome-settings-daemon-3.22.1/configure.ac
|
||||
Index: gnome-settings-daemon-3.23.2/configure.ac
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.22.1.orig/configure.ac
|
||||
+++ gnome-settings-daemon-3.22.1/configure.ac
|
||||
@@ -288,6 +288,33 @@ esac
|
||||
AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
|
||||
--- gnome-settings-daemon-3.23.2.orig/configure.ac
|
||||
+++ gnome-settings-daemon-3.23.2/configure.ac
|
||||
@@ -297,6 +297,33 @@ PKG_CHECK_MODULES(COMMON,
|
||||
PKG_CHECK_MODULES(HELPER, gio-unix-2.0)
|
||||
|
||||
dnl ==============================================
|
||||
+dnl PackageKit section
|
||||
@ -76,7 +74,7 @@ Index: gnome-settings-daemon-3.22.1/configure.ac
|
||||
dnl smartcard section
|
||||
dnl ==============================================
|
||||
have_smartcard_support=false
|
||||
@@ -533,6 +560,7 @@ plugins/screensaver-proxy/Makefile
|
||||
@@ -532,6 +559,7 @@ plugins/screensaver-proxy/Makefile
|
||||
plugins/sharing/Makefile
|
||||
plugins/smartcard/Makefile
|
||||
plugins/sound/Makefile
|
||||
@ -84,15 +82,15 @@ Index: gnome-settings-daemon-3.22.1/configure.ac
|
||||
plugins/wacom/Makefile
|
||||
plugins/xrandr/Makefile
|
||||
plugins/xsettings/Makefile
|
||||
@@ -549,6 +577,7 @@ data/org.gnome.settings-daemon.plugins.m
|
||||
@@ -544,6 +572,7 @@ data/org.gnome.settings-daemon.plugins.c
|
||||
data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.peripherals.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in
|
||||
+data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
|
||||
@@ -583,6 +612,7 @@ echo "
|
||||
@@ -576,6 +605,7 @@ echo "
|
||||
|
||||
NetworkManager support: ${enable_network_manager}
|
||||
Libnotify support: ${have_libnotify}
|
||||
@ -100,22 +98,22 @@ Index: gnome-settings-daemon-3.22.1/configure.ac
|
||||
Smartcard support: ${have_smartcard_support}
|
||||
Cups support: ${enable_cups}
|
||||
Wacom support: ${have_wacom}
|
||||
Index: gnome-settings-daemon-3.22.1/data/Makefile.am
|
||||
Index: gnome-settings-daemon-3.23.2/data/Makefile.am
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.22.1.orig/data/Makefile.am
|
||||
+++ gnome-settings-daemon-3.22.1/data/Makefile.am
|
||||
@@ -19,6 +19,7 @@ gsettings_SCHEMAS = \
|
||||
--- gnome-settings-daemon-3.23.2.orig/data/Makefile.am
|
||||
+++ gnome-settings-daemon-3.23.2/data/Makefile.am
|
||||
@@ -15,6 +15,7 @@ gsettings_SCHEMAS = \
|
||||
org.gnome.settings-daemon.plugins.sharing.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
|
||||
+ org.gnome.settings-daemon.plugins.updates.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
|
||||
+ org.gnome.settings-daemon.plugins.updates.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.orientation.gschema.xml \
|
||||
org.gnome.settings-daemon.peripherals.wacom.gschema.xml
|
||||
|
||||
Index: gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
|
||||
Index: gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
|
||||
+++ gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
|
||||
@@ -0,0 +1,79 @@
|
||||
+<schemalist>
|
||||
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.updates" path="/org/gnome/settings-daemon/plugins/updates/">
|
||||
@ -196,10 +194,10 @@ Index: gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.updat
|
||||
+ </key>
|
||||
+ </schema>
|
||||
+</schemalist>
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/Makefile.am
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/Makefile.am
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.22.1.orig/plugins/Makefile.am
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/Makefile.am
|
||||
--- gnome-settings-daemon-3.23.2.orig/plugins/Makefile.am
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/Makefile.am
|
||||
@@ -22,6 +22,12 @@ enabled_plugins = \
|
||||
|
||||
disabled_plugins = $(NULL)
|
||||
@ -213,66 +211,34 @@ Index: gnome-settings-daemon-3.22.1/plugins/Makefile.am
|
||||
if SMARTCARD_SUPPORT
|
||||
enabled_plugins += smartcard
|
||||
else
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/Makefile.am
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/Makefile.am
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/Makefile.am
|
||||
@@ -0,0 +1,98 @@
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/Makefile.am
|
||||
@@ -0,0 +1,64 @@
|
||||
+plugin_name = updates
|
||||
+
|
||||
+plugin_LTLIBRARIES = \
|
||||
+ libupdates.la
|
||||
+desktopdir = $(sysconfdir)/xdg/autostart
|
||||
+desktop_in_files = org.gnome.SettingsDaemon.Updates.desktop.in
|
||||
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||
+
|
||||
+libupdates_la_SOURCES = \
|
||||
+ gsd-updates-common.h \
|
||||
+ gsd-updates-plugin.c \
|
||||
+ gsd-updates-refresh.h \
|
||||
+ gsd-updates-refresh.c \
|
||||
+ gsd-updates-firmware.h \
|
||||
+ gsd-updates-firmware.c \
|
||||
+ gsd-updates-manager.h \
|
||||
+ gsd-updates-manager.c
|
||||
+org.gnome.SettingsDaemon.Updates.desktop: $(desktop_in_files) Makefile
|
||||
+ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
|
||||
+
|
||||
+libupdates_la_CPPFLAGS = \
|
||||
+ -I$(top_srcdir)/gnome-settings-daemon \
|
||||
+ -I$(top_builddir)/gnome-settings-daemon \
|
||||
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
|
||||
+ $(AM_CPPFLAGS)
|
||||
+polkit_policydir = $(datadir)/polkit-1/actions
|
||||
+polkit_policy_DATA = org.gnome.settings-daemon.plugins.update.policy
|
||||
+
|
||||
+libupdates_la_CFLAGS = \
|
||||
+ $(PLUGIN_CFLAGS) \
|
||||
+ $(SETTINGS_PLUGIN_CFLAGS) \
|
||||
+ $(GUDEV_CFLAGS) \
|
||||
+ -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
|
||||
+ $(PACKAGEKIT_CFLAGS) \
|
||||
+ -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE \
|
||||
+ -DDATADIR=\"$(datadir)\" \
|
||||
+ -DBINDIR=\"$(bindir)\" \
|
||||
+ -DLIBEXECDIR=\"$(libexecdir)\" \
|
||||
+ -I$(top_srcdir)/data \
|
||||
+ $(AM_CFLAGS)
|
||||
+
|
||||
+libupdates_la_LDFLAGS = \
|
||||
+ $(GSD_PLUGIN_LDFLAGS)
|
||||
+
|
||||
+libupdates_la_LIBADD = \
|
||||
+ $(SETTINGS_PLUGIN_LIBS) \
|
||||
+ $(PACKAGEKIT_LIBS)
|
||||
+
|
||||
+plugin_in_files = \
|
||||
+ updates.gnome-settings-plugin.in
|
||||
+
|
||||
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
|
||||
+
|
||||
+libexec_PROGRAMS = gsd-test-updates pk-clear-offline-update
|
||||
+libexec_PROGRAMS = gsd-updates pk-clear-offline-update
|
||||
+
|
||||
+pk_clear_offline_update_SOURCES = pk-offline-clear-update.c \
|
||||
+ gsd-updates-common.h
|
||||
+
|
||||
+pk_clear_offline_update_CFLAGS = $(SETTINGS_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)
|
||||
+pk_clear_offline_update_CFLAGS = \
|
||||
+ $(PLUGIN_CFLAGS) \
|
||||
+ `$(PKG_CONFIG) --cflags "glib-2.0"`
|
||||
+
|
||||
+gsd_test_updates_SOURCES = \
|
||||
+ test-updates.c \
|
||||
+gsd_updates_SOURCES = \
|
||||
+ main.c \
|
||||
+ gsd-updates-common.h \
|
||||
+ gsd-updates-refresh.h \
|
||||
+ gsd-updates-refresh.c \
|
||||
@ -281,7 +247,7 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/Makefile.am
|
||||
+ gsd-updates-manager.h \
|
||||
+ gsd-updates-manager.c
|
||||
+
|
||||
+gsd_test_updates_CPPFLAGS = \
|
||||
+gsd_updates_CPPFLAGS = \
|
||||
+ -I$(top_srcdir)/data/ \
|
||||
+ -I$(top_srcdir)/gnome-settings-daemon \
|
||||
+ -I$(top_builddir)/gnome-settings-daemon \
|
||||
@ -290,36 +256,34 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/Makefile.am
|
||||
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
|
||||
+ $(AM_CPPFLAGS)
|
||||
+
|
||||
+gsd_test_updates_CFLAGS = \
|
||||
+gsd_updates_CFLAGS = \
|
||||
+ -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE \
|
||||
+ -DDATADIR=\"$(datadir)\" \
|
||||
+ -DBINDIR=\"$(bindir)\" \
|
||||
+ `$(PKG_CONFIG) --cflags "gtk+-3.0 glib-2.0 gsettings-desktop-schemas"` \
|
||||
+ $(PLUGIN_CFLAGS) \
|
||||
+ $(SETTINGS_PLUGIN_CFLAGS) \
|
||||
+ $(PACKAGEKIT_CFLAGS) \
|
||||
+ $(AM_CFLAGS)
|
||||
+
|
||||
+gsd_test_updates_LDADD = \
|
||||
+gsd_updates_LDADD = \
|
||||
+ $(top_builddir)/plugins/common/libcommon.la \
|
||||
+ $(top_builddir)/gnome-settings-daemon/libgsd.la \
|
||||
+ $(SETTINGS_DAEMON_LIBS) \
|
||||
+ $(SETTINGS_PLUGIN_LIBS) \
|
||||
+ $(PACKAGEKIT_LIBS) \
|
||||
+ -lm
|
||||
+
|
||||
+EXTRA_DIST = \
|
||||
+ $(plugin_in_files)
|
||||
+EXTRA_DIST = $(desktop_in_files)
|
||||
+
|
||||
+CLEANFILES = \
|
||||
+ $(plugin_DATA)
|
||||
+CLEANFILES = \
|
||||
+ $(desktop_DATA) \
|
||||
+ org.gnome.settings-daemon.plugins.update.policy
|
||||
+
|
||||
+DISTCLEANFILES = \
|
||||
+ $(plugin_DATA)
|
||||
+
|
||||
+@GSD_INTLTOOL_PLUGIN_RULE@
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-common.h
|
||||
+DISTCLEANFILES = $(desktop_DATA)
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-common.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-common.h
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-common.h
|
||||
@@ -0,0 +1,46 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -367,10 +331,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-common.h
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* __GSD_UPDATES_COMMON_H */
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.c
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.c
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.c
|
||||
@@ -0,0 +1,1040 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -1412,10 +1376,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.c
|
||||
+ firmware = g_object_new (GSD_UPDATES_TYPE_FIRMWARE, NULL);
|
||||
+ return GSD_UPDATES_FIRMWARE (firmware);
|
||||
+}
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.h
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.h
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-firmware.h
|
||||
@@ -0,0 +1,52 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -1469,10 +1433,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-firmware.h
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* __GSD_UPDATES_FIRMWARE_H */
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.c
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.c
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.c
|
||||
@@ -0,0 +1,1509 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -2983,10 +2947,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.c
|
||||
+
|
||||
+ return GSD_UPDATES_MANAGER (manager_object);
|
||||
+}
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.h
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.h
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-manager.h
|
||||
@@ -0,0 +1,56 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -3044,10 +3008,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-manager.h
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* __GSD_UPDATES_MANAGER_H */
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-plugin.c
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-plugin.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-plugin.c
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-plugin.c
|
||||
@@ -0,0 +1,28 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -3077,10 +3041,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-plugin.c
|
||||
+#include "gsd-updates-manager.h"
|
||||
+
|
||||
+GNOME_SETTINGS_PLUGIN_REGISTER (GsdUpdates, gsd_updates)
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.c
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.c
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.c
|
||||
@@ -0,0 +1,573 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -3655,10 +3619,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.c
|
||||
+ return GSD_UPDATES_REFRESH (refresh);
|
||||
+}
|
||||
+
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.h
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.h
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/gsd-updates-refresh.h
|
||||
@@ -0,0 +1,52 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -3712,22 +3676,10 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/gsd-updates-refresh.h
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* __GSD_UPDATES_REFRESH_H */
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/test-updates.c
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/updates-design.svg
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/test-updates.c
|
||||
@@ -0,0 +1,7 @@
|
||||
+#define NEW gsd_updates_manager_new
|
||||
+#define START gsd_updates_manager_start
|
||||
+#define STOP gsd_updates_manager_stop
|
||||
+#define MANAGER GsdUpdatesManager
|
||||
+#include "gsd-updates-manager.h"
|
||||
+
|
||||
+#include "test-plugin.h"
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/updates-design.svg
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/updates-design.svg
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/updates-design.svg
|
||||
@@ -0,0 +1,765 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
@ -4494,70 +4446,56 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/updates-design.svg
|
||||
+ inkscape:connector-curvature="0" />
|
||||
+ </g>
|
||||
+</svg>
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/updates.gnome-settings-plugin.in
|
||||
Index: gnome-settings-daemon-3.23.2/po/POTFILES.in
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/updates.gnome-settings-plugin.in
|
||||
@@ -0,0 +1,9 @@
|
||||
+[GNOME Settings Plugin]
|
||||
+Module=updates
|
||||
+IAge=0
|
||||
+Priority=300
|
||||
+_Name=Updates
|
||||
+_Description=Updates plugin
|
||||
+Authors=Richard Hughes
|
||||
+Copyright=Copyright © 2011
|
||||
+Website=
|
||||
Index: gnome-settings-daemon-3.22.1/po/POTFILES.in
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.22.1.orig/po/POTFILES.in
|
||||
+++ gnome-settings-daemon-3.22.1/po/POTFILES.in
|
||||
@@ -13,6 +13,7 @@ data/org.gnome.settings-daemon.plugins.o
|
||||
--- gnome-settings-daemon-3.23.2.orig/po/POTFILES.in
|
||||
+++ gnome-settings-daemon-3.23.2/po/POTFILES.in
|
||||
@@ -8,6 +8,7 @@ data/org.gnome.settings-daemon.plugins.h
|
||||
data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
|
||||
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
|
||||
data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
|
||||
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
|
||||
+data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
|
||||
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
|
||||
data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
|
||||
gnome-settings-daemon/main.c
|
||||
@@ -52,6 +53,9 @@ plugins/smartcard/gsd-smartcard-manager.
|
||||
plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
|
||||
@@ -29,6 +30,9 @@ plugins/print-notifications/gsd-printer.
|
||||
plugins/print-notifications/gsd-print-notifications-manager.c
|
||||
plugins/smartcard/gsd-smartcard-manager.c
|
||||
plugins/smartcard/gsd-smartcard-service.c
|
||||
[type: gettext/ini]plugins/smartcard/smartcard.gnome-settings-plugin.in
|
||||
[type: gettext/ini]plugins/sound/sound.gnome-settings-plugin.in
|
||||
+plugins/updates/gsd-updates-firmware.c
|
||||
+plugins/updates/gsd-updates-manager.c
|
||||
+[type: gettext/ini]plugins/updates/updates.gnome-settings-plugin.in
|
||||
+plugins/updates/updates.gnome-settings-plugin.in
|
||||
plugins/wacom/gsd-wacom-button-editor.c
|
||||
plugins/wacom/gsd-wacom-device.c
|
||||
plugins/wacom/gsd-wacom-key-shortcut-button.c
|
||||
Index: gnome-settings-daemon-3.22.1/po/POTFILES.skip
|
||||
Index: gnome-settings-daemon-3.23.2/po/POTFILES.skip
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.22.1.orig/po/POTFILES.skip
|
||||
+++ gnome-settings-daemon-3.22.1/po/POTFILES.skip
|
||||
@@ -19,6 +19,7 @@ data/org.gnome.settings-daemon.plugins.o
|
||||
--- gnome-settings-daemon-3.23.2.orig/po/POTFILES.skip
|
||||
+++ gnome-settings-daemon-3.23.2/po/POTFILES.skip
|
||||
@@ -9,6 +9,7 @@ data/org.gnome.settings-daemon.plugins.h
|
||||
data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
|
||||
+data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
|
||||
data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
|
||||
plugins/automount/gnome-fallback-mount-helper.desktop.in
|
||||
Index: gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
|
||||
Index: gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.22.1.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
|
||||
+++ gnome-settings-daemon-3.22.1/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
|
||||
@@ -26,6 +26,7 @@
|
||||
<child name="sharing" schema="org.gnome.settings-daemon.plugins.sharing"/>
|
||||
<child name="smartcard" schema="org.gnome.settings-daemon.plugins.smartcard"/>
|
||||
<child name="sound" schema="org.gnome.settings-daemon.plugins.sound"/>
|
||||
--- gnome-settings-daemon-3.23.2.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
|
||||
+++ gnome-settings-daemon-3.23.2/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
|
||||
@@ -12,6 +12,7 @@
|
||||
<child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
|
||||
<child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
|
||||
<child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
|
||||
+ <child name="updates" schema="org.gnome.settings-daemon.plugins.updates"/>
|
||||
<child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/>
|
||||
<child name="xsettings" schema="org.gnome.settings-daemon.plugins.xsettings"/>
|
||||
</schema>
|
||||
Index: gnome-settings-daemon-3.22.1/plugins/updates/pk-offline-clear-update.c
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/pk-offline-clear-update.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.22.1/plugins/updates/pk-offline-clear-update.c
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/pk-offline-clear-update.c
|
||||
@@ -0,0 +1,50 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -4609,3 +4547,47 @@ Index: gnome-settings-daemon-3.22.1/plugins/updates/pk-offline-clear-update.c
|
||||
+ return EXIT_SUCCESS;
|
||||
+}
|
||||
+
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/main.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/main.c
|
||||
@@ -0,0 +1,7 @@
|
||||
+#define NEW gsd_updates_manager_new
|
||||
+#define START gsd_updates_manager_start
|
||||
+#define STOP gsd_updates_manager_stop
|
||||
+#define MANAGER GsdUpdatesManager
|
||||
+#include "gsd-updates-manager.h"
|
||||
+
|
||||
+#include "daemon-skeleton-gtk.h"
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.SettingsDaemon.Updates.desktop.in
|
||||
@@ -0,0 +1,9 @@
|
||||
+[Desktop Entry]
|
||||
+Type=Application
|
||||
+Name=GNOME Settings Daemon's updates plugin
|
||||
+Exec=@libexecdir@/gsd-updates
|
||||
+OnlyShowIn=GNOME;
|
||||
+NoDisplay=true
|
||||
+X-GNOME-Autostart-Phase=Initialization
|
||||
+X-GNOME-Autostart-Notify=true
|
||||
+X-GNOME-AutoRestart=true
|
||||
Index: gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gnome-settings-daemon-3.23.2/plugins/updates/org.gnome.settings-daemon.plugins.update.policy
|
||||
@@ -0,0 +1,13 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<!DOCTYPE policyconfig PUBLIC
|
||||
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
|
||||
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
|
||||
+<policyconfig>
|
||||
+ <vendor>The PackageKit Project</vendor>
|
||||
+ <vendor_url>http://www.packagekit.org/</vendor_url>
|
||||
+ <icon_name>package-x-generic</icon_name>
|
||||
+ <action id="org.freedesktop.packagekit.clear-offline-update">
|
||||
+ <description>Clear offline update message</description>
|
||||
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/lib/gnome-settings-daemon-3.0/pk-clear-offline-update</annotate>
|
||||
+ </action>
|
||||
+</policyconfig>
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 5aaf80d68716fbbd0bc122ef52defab579b84d80 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Goode <agoode@google.com>
|
||||
Date: Fri, 20 Jan 2017 10:09:33 -0500
|
||||
Subject: [PATCH] power: emit correct value for set keyboard backlight
|
||||
|
||||
In the UI, the keyboard backlight is expressed on a percent
|
||||
scale. This is translated to the hardware's scale and sent
|
||||
to the hardware. The just-set value is then emitted so that
|
||||
any UI can show the correct value. Unfortunately the value
|
||||
is sent in the hardware scale, not the expected percent scale,
|
||||
causing incorrect display of the current value.
|
||||
|
||||
This emits the value in the correct scale.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=725655
|
||||
---
|
||||
AUTHORS | 1 +
|
||||
plugins/power/gsd-power-manager.c | 5 ++---
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
|
||||
index 5db92f4..14c6542 100644
|
||||
--- a/plugins/power/gsd-power-manager.c
|
||||
+++ b/plugins/power/gsd-power-manager.c
|
||||
@@ -2941,9 +2941,8 @@ handle_set_property_other (GsdPowerManager *manager,
|
||||
}
|
||||
} else if (g_strcmp0 (interface_name, GSD_POWER_DBUS_INTERFACE_KEYBOARD) == 0) {
|
||||
g_variant_get (value, "i", &brightness_value);
|
||||
- brightness_value = PERCENTAGE_TO_ABS (0, manager->priv->kbd_brightness_max,
|
||||
- brightness_value);
|
||||
- if (upower_kbd_set_brightness (manager, brightness_value, error)) {
|
||||
+ if (upower_kbd_set_brightness (manager, PERCENTAGE_TO_ABS(0, manager->priv->kbd_brightness_max,
|
||||
+ brightness_value), error)) {
|
||||
backlight_iface_emit_changed (manager, GSD_POWER_DBUS_INTERFACE_KEYBOARD, brightness_value);
|
||||
return TRUE;
|
||||
} else {
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
From 21fb652101fbf81d16f76178da9614dcd547686a Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 17 Nov 2016 14:03:37 +0100
|
||||
Subject: media-keys: Fix shutdown dialog delay when using kbd shortcut
|
||||
|
||||
After pressing the Ctrl+Alt+Del shortcut, the shutdown dialog doesn't
|
||||
appear on screen for a couple of seconds.
|
||||
|
||||
The media-keys daemon calls the 'Shutdown' method synchronously. After that
|
||||
gnome-session calls the daemon with 'QueryEndSession'. The daemon cannot
|
||||
reply as it's blocked waiting for the reply to the Shutdown method.
|
||||
|
||||
Sending the message asynchronously fixes that delay.
|
||||
|
||||
Based on report by Xiaoguang Wang <xwang@suse.com>
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=774452
|
||||
---
|
||||
plugins/media-keys/gsd-media-keys-manager.c | 46 +++++++++++++++++++----------
|
||||
1 file changed, 31 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
|
||||
index aec094b..c178752 100644
|
||||
--- a/plugins/media-keys/gsd-media-keys-manager.c
|
||||
+++ b/plugins/media-keys/gsd-media-keys-manager.c
|
||||
@@ -813,26 +813,42 @@ do_media_action (GsdMediaKeysManager *manager,
|
||||
}
|
||||
|
||||
static void
|
||||
+gnome_session_shutdown_cb (GObject *source_object,
|
||||
+ GAsyncResult *res,
|
||||
+ gpointer user_data)
|
||||
+{
|
||||
+ GVariant *result;
|
||||
+ GError *error = NULL;
|
||||
+
|
||||
+ result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
|
||||
+ res,
|
||||
+ &error);
|
||||
+ if (result == NULL) {
|
||||
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
||||
+ g_warning ("Failed to call Shutdown on session manager: %s",
|
||||
+ error->message);
|
||||
+ g_error_free (error);
|
||||
+ } else {
|
||||
+ g_variant_unref (result);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
gnome_session_shutdown (GsdMediaKeysManager *manager)
|
||||
{
|
||||
- GError *error = NULL;
|
||||
- GVariant *variant;
|
||||
GDBusProxy *proxy;
|
||||
|
||||
proxy = G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
|
||||
- variant = g_dbus_proxy_call_sync (proxy,
|
||||
- "Shutdown",
|
||||
- NULL,
|
||||
- G_DBUS_CALL_FLAGS_NONE,
|
||||
- -1,
|
||||
- NULL,
|
||||
- &error);
|
||||
- if (variant == NULL) {
|
||||
- g_warning ("Failed to call Shutdown on session manager: %s", error->message);
|
||||
- g_error_free (error);
|
||||
- return;
|
||||
- }
|
||||
- g_variant_unref (variant);
|
||||
+
|
||||
+ g_dbus_proxy_call (proxy,
|
||||
+ "Shutdown",
|
||||
+ NULL,
|
||||
+ G_DBUS_CALL_FLAGS_NONE,
|
||||
+ -1,
|
||||
+ manager->priv->bus_cancellable,
|
||||
+ gnome_session_shutdown_cb,
|
||||
+ NULL);
|
||||
+
|
||||
g_object_unref (proxy);
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,3 +1,60 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 15 08:34:18 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.23.90:
|
||||
+ Color: Add interface to support "Night Light" functionality.
|
||||
+ Media-keys: Fix a number of race conditions in shortcuts
|
||||
grabbing.
|
||||
+ Power:
|
||||
- Free leaked UPower keyboard backlight.
|
||||
- Fix keyboard backlight problems on some systems.
|
||||
+ Rfkill: Fix a number of possible race conditions and crashes
|
||||
with slow rfkill devices.
|
||||
+ Smartcard: Fix a possible crash in smartcard plugin.
|
||||
+ Wacom: Move most of the Wacom support to mutter, including the
|
||||
OSD.
|
||||
- Drop pkgconfig(xorg-wacom) BuildRequires: no longer needed.
|
||||
- Drop gnome-settings-daemon-fix-keyboard-slider.patch: fixed
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:04:14 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.23.3:
|
||||
+ Plugins:
|
||||
- Fix crash when X is not available.
|
||||
- Fix compilation failure on some setups.
|
||||
- Fix warnings on exit.
|
||||
+ Media-keys: Fix shutdown dialog delay when using kbd shortcut.
|
||||
+ XSettings:
|
||||
- Make Gtk/EnablePrimaryPaste configurable through GSettings.
|
||||
- Fix large fonts being scanned before they're fully copied.
|
||||
- Add explicit pkgconfig(gio-2.0) BuildRequires: configure now
|
||||
checks for it.
|
||||
- Drop gnome-settings-daemon-shutdown-dialog-delay.patch: Fixed
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:03:14 UTC 2017 - sckang@suse.com
|
||||
|
||||
- Modify gnome-settings-daemon-bring-back-updates-plugin.patch:
|
||||
Change updates plugin to a separate daemon.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:02:14 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.23.2:
|
||||
+ This update requires gnome-session 3.23.2. It splits up
|
||||
gnome-settings-daemon into separate helper daemons, making it
|
||||
easier to root cause possible problems, and paving the way to
|
||||
using systemd to handle the session.
|
||||
+ Remove localeexec wrapper now that gnome-session implements
|
||||
that work-around.
|
||||
+ Loads of build fixes.
|
||||
+ Color: Require lcms2 2.2.
|
||||
+ Power: Make power plugin "mock" support a run-time check.
|
||||
+ Sound: Rename the sound plugin for PulseAudio.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:01:14 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
|
||||
@ -30,13 +30,13 @@
|
||||
%endif
|
||||
|
||||
Name: gnome-settings-daemon
|
||||
Version: 3.22.1
|
||||
Version: 3.23.90
|
||||
Release: 0
|
||||
Summary: Settings daemon for the GNOME desktop
|
||||
License: GPL-2.0+
|
||||
Group: System/GUI/GNOME
|
||||
Url: http://www.gnome.org
|
||||
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.22/%{name}-%{version}.tar.xz
|
||||
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.23/%{name}-%{version}.tar.xz
|
||||
# PATCH-FEATURE-SLE gnome-settings-daemon-revert-libinput-mandatory.patch fcrozat@suse.com -- ensure libinput is not mandatory
|
||||
Patch20: gnome-settings-daemon-revert-libinput-mandatory.patch
|
||||
# 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
|
||||
@ -51,10 +51,6 @@ Patch29: gnome-settings-daemon-initial-keyboard.patch
|
||||
Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch
|
||||
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
|
||||
Patch32: gnome-settings-daemon-more-power-button-actions.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-settings-daemon-shutdown-dialog-delay.patch bgo#774452 xwang@suse.com -- Shutdown dialog delay 1 to 2 seconds.
|
||||
Patch33: gnome-settings-daemon-shutdown-dialog-delay.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-settings-daemon-fix-keyboard-slider.patch bgo#725655 zaitor@opensuse.org -- Make keyboard backlight slider work
|
||||
Patch34: gnome-settings-daemon-fix-keyboard-slider.patch
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gtk-doc
|
||||
@ -76,9 +72,10 @@ BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1
|
||||
BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.2
|
||||
BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10.0
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.37.7
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.44.0
|
||||
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.19.3
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.23.3
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
|
||||
BuildRequires: pkgconfig(gudev-1.0)
|
||||
BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5
|
||||
@ -96,7 +93,6 @@ BuildRequires: pkgconfig(packagekit-glib2)
|
||||
%endif
|
||||
%if %{with wacom}
|
||||
BuildRequires: pkgconfig(libwacom) >= 0.7
|
||||
BuildRequires: pkgconfig(xorg-wacom)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(nss)
|
||||
BuildRequires: pkgconfig(pango) >= 1.20.0
|
||||
@ -168,8 +164,6 @@ gnome-patch-translation-prepare
|
||||
%patch31 -p1
|
||||
%endif
|
||||
%patch32 -p1
|
||||
%patch33 -p1
|
||||
%patch34 -p1
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} == 1315
|
||||
@ -192,7 +186,7 @@ make %{?jobs:-j%jobs}
|
||||
%install
|
||||
%makeinstall
|
||||
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
|
||||
%suse_update_desktop_file gnome-settings-daemon
|
||||
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
%fdupes %{buildroot}
|
||||
|
||||
@ -211,12 +205,7 @@ rm -rf %{buildroot}
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING ChangeLog NEWS
|
||||
%{_datadir}/gnome-settings-daemon/
|
||||
%if !0%{?is_opensuse}
|
||||
%{_datadir}/gnome-settings-daemon-3.0/
|
||||
%endif
|
||||
%dir %{_libexecdir}/gnome-settings-daemon-3.0/
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon-localeexec
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
|
||||
@ -225,67 +214,83 @@ rm -rf %{buildroot}
|
||||
#%%{_libexecdir}/novell-sysconfig-proxy-helper
|
||||
%dir %{_libdir}/gnome-settings-daemon-3.0/
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libgsd.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/*.gnome-settings-plugin
|
||||
# Explicitly list all the plugins so we know we don't lose any
|
||||
%{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libcolor.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libdatetime.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libmedia-keys.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libmouse.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/liborientation.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libpower.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/librfkill.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libscreensaver-proxy.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libsharing.so
|
||||
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-a11y-keyboard
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11yKeyboard.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-a11y-settings
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-clipboard
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-color
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-datetime
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-dummy
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-housekeeping
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-keyboard
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-media-keys
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-mouse
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-orientation
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Orientation.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-power
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-print-notifications
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-rfkill
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-screensaver-proxy
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-sharing
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
|
||||
%if %{with smartcard}
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-smartcard
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
|
||||
%endif
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libsound.so
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-sound
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
|
||||
%if 0%{?suse_version} == 1315
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libupdates.so
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-updates
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Updates.desktop
|
||||
%endif
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libxsettings.so
|
||||
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-xrandr
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XRANDR.desktop
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-xsettings
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.datetime.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.keyboard.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.media-keys.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.orientation.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml
|
||||
# From patch2
|
||||
#%%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
|
||||
%if 0%{?suse_version} == 1315
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
|
||||
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.update.policy
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/pk-clear-offline-update
|
||||
%endif
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xrandr.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/gsd-xrandr.*
|
||||
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
|
||||
%{_mandir}/man1/gnome-settings-daemon.1%{?ext_man}
|
||||
# Own the directory since we can't depend on gconf providing them
|
||||
%dir %{_datadir}/GConf
|
||||
%dir %{_datadir}/GConf/gsettings
|
||||
%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
|
||||
%if %{with wacom}
|
||||
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-list-wacom
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
|
||||
%endif
|
||||
%{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user