diff --git a/gnome-settings-daemon-3.24.3.tar.xz b/gnome-settings-daemon-3.24.3.tar.xz deleted file mode 100644 index 0478773..0000000 --- a/gnome-settings-daemon-3.24.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593 -size 1583044 diff --git a/gnome-settings-daemon-3.26.0.tar.xz b/gnome-settings-daemon-3.26.0.tar.xz new file mode 100644 index 0000000..ae77ed6 --- /dev/null +++ b/gnome-settings-daemon-3.26.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e4c0ce3ac14262be022c3c33ebab794d7bd6a36b0246084be452b1ec540dc05 +size 1587788 diff --git a/gnome-settings-daemon-more-power-button-actions.patch b/gnome-settings-daemon-more-power-button-actions.patch index b574c0e..4343989 100644 --- a/gnome-settings-daemon-more-power-button-actions.patch +++ b/gnome-settings-daemon-more-power-button-actions.patch @@ -12,20 +12,20 @@ diff --git a/data/gsd-enums.h b/data/gsd-enums.h index 4a0356a..87fd158 100644 --- a/data/gsd-enums.h +++ b/data/gsd-enums.h -@@ -113,6 +113,8 @@ typedef enum +@@ -105,6 +105,8 @@ typedef enum typedef enum { GSD_POWER_BUTTON_ACTION_NOTHING, + GSD_POWER_BUTTON_ACTION_INTERACTIVE, + GSD_POWER_BUTTON_ACTION_SHUTDOWN, GSD_POWER_BUTTON_ACTION_SUSPEND, - GSD_POWER_BUTTON_ACTION_HIBERNATE - } GsdPowerButtonActionType; + GSD_POWER_BUTTON_ACTION_HIBERNATE, + GSD_POWER_BUTTON_ACTION_INTERACTIVE diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c index d77ed10..e9611b9 100644 --- a/plugins/media-keys/gsd-media-keys-manager.c +++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -1929,6 +1929,12 @@ do_config_power_button_action (GsdMediaKeysManager *manager, +@@ -1953,6 +1953,12 @@ do_config_power_button_action (GsdMediaKeysManager *manager, action_type = g_settings_get_enum (manager->priv->power_settings, "power-button-action"); switch (action_type) { diff --git a/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch b/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch new file mode 100644 index 0000000..26d1f77 --- /dev/null +++ b/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch @@ -0,0 +1,16 @@ +diff -Nura gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c gnome-settings-daemon-3.24.3_new/plugins/keyboard/gsd-keyboard-manager.c +--- gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c 2017-08-28 17:44:30.078220888 +0800 ++++ gnome-settings-daemon-3.24.3_new/plugins/keyboard/gsd-keyboard-manager.c 2017-08-28 17:49:05.435064987 +0800 +@@ -478,7 +478,11 @@ + else + id = g_strdup (layouts[i]); + +- g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id); ++ if (!g_strcmp0 (id, "jp")) ++ g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, "mozc-jp"); ++ else ++ g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id); ++ + g_free (id); + } + diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index efff0c2..79828eb 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,10 +1,115 @@ +------------------------------------------------------------------- +Tue Sep 12 14:45:19 UTC 2017 - mgorse@suse.com + +- Rebase gnome-settings-daemon-more-power-button-actions.patch and + enable for SLE 15 (bsc#1057770). + +------------------------------------------------------------------- +Tue Sep 12 09:17:07 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.26.0: + + Updated translations. + +------------------------------------------------------------------- +Sat Sep 2 09:19:41 UTC 2017 - qzhao@suse.com + +- Add gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch: + Switch new user's default input engine from "anthy" to "mozc" in + gnome-desktop with Japanese language and ibus input frame-work + (bnc#1029083, boo#1056289). + +------------------------------------------------------------------- +Fri Sep 1 12:27:59 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.92: + + Ensure translatable strings are actually translated. + + Housekeeping: Ignore the Retrode's low-space. + + Sharing: Add gnome-remote-desktop as available service. + + Updated translations. +- Drop obsolete clean section, glib2_gsettings_schema_requires + and post(un) handling of following macros: + + glib2_gsettings_schema_post(un). + + icon_theme_cache_post(un). +- Run spec-cleaner, modernize spec. + +------------------------------------------------------------------- +Tue Aug 22 18:04:25 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.91: + + Color: Prevent a potential crash on an uninitialized variable. + + Power: + - Fix automatic brightness adjustment being done inactive + sessions. + - Don't use undefined ambient light readings. + + XSettings: + - Use the new mutter API exclusively. + - Drop the gnome-desktop requirement. +- Keep pkgconfig(gnome-desktop-3.0) BuildRequires: Configure still + checks for it, no matter what upstream changes says. + +------------------------------------------------------------------- +Wed Aug 9 09:11:55 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.90: + + Color: + - Honor location enabled setting. + - Request location updates with a larger time granularity. + + Date & Time: Honor location enabled setting. + + Media-keys: Restore interactive option for power button. + + Wacom: Exclude non-display attached devices from remapping. + + XSettings: Fix fontconfig cache updates causing desktop + freezes. + ------------------------------------------------------------------- Tue Aug 8 13:55:19 CEST 2017 - ro@suse.de -- run autoreconf if running update-translations and add the - missing buildrequires -- dont apply gnome-settings-daemon-revert-libinput-mandatory.patch - on sle15 +- Run autoreconf if running update-translations and add the + missing BuildRequires. +- Don't apply gnome-settings-daemon-revert-libinput-mandatory.patch + on sle15. + +------------------------------------------------------------------- +Tue Aug 01 03:25:04 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.4: + + Fix GConf->GSettings convert script. + + Color: Fix smearing out of Night Light effect. + + Keyboard: Only add the "us" layout if the system config cannot + be determined. + + Media-keys: + - Add a precise volume change shortcut. + - Moved video-out and rotate-video bindings to mutter. + - Fix grabbing of previously disabled shortcuts. + + Orientation: Removed - functionality migrated to mutter. + + Wacom: Fix touchscreens being assigned the wrong output. + + XRandR: Removed - functionality migrated to mutter. + + XSettings: Calculate window scale from configuration state. + +------------------------------------------------------------------- +Tue Aug 01 03:25:02 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.2: + + Avoid initializing gtk+ on plugins that don't need it. + + Avoid loading gtk+ css theme since we don't have UI. + + Several correctness fixes pointed by Coverity. + + Fix for no plugins getting loaded under GDM. + + Mark forgotten strings in gschema files for translation. + + Housekeeping: Ignore GPFS and rootfs mounts. + + Media-keys: + - Make calculator key work again. + - Fix a few memory leaks. + - Changed MediaKeys D-Bus API to match API docs. + - Add support for new XF86RFKill keysym. + - Show OSD on hardware keyboard brightness changes. + + Power: + - Choose correct backlight device on laptops with hybrid + graphics. + - Handle hardware keyboard brightness changes. + + RFKill: Disable the kernel's handling of rfkill events when the + session is active. + + Updated translations. +- Disable gnome-settings-daemon-initial-keyboard.patch, needs + rebase or removal. ------------------------------------------------------------------- Mon Jul 31 11:19:54 UTC 2017 - fezhang@suse.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 9a41bf9..4876872 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -18,25 +18,22 @@ # Allow to disable wayland components %bcond_without wayland - # Smart-Card support was not available from version 3.7.3 to 3.9.5; allow to easily disable it %bcond_without smartcard - # Wacom input support is not available on all platforms %ifarch s390 s390x %bcond_with wacom %else %bcond_without wacom %endif - Name: gnome-settings-daemon -Version: 3.24.3 +Version: 3.26.0 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.24/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-settings-daemon/3.26/%{name}-%{version}.tar.xz # PATCH-FEATURE-SLE gnome-settings-daemon-revert-libinput-mandatory.patch fcrozat@suse.com -- ensure libinput is not mandatory Patch0: 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,24 +48,17 @@ Patch4: gnome-settings-daemon-initial-keyboard.patch Patch5: 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. Patch6: gnome-settings-daemon-more-power-button-actions.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. +Patch7: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gtk-doc -%if 0%{?suse_version} == 1315 -BuildRequires: gnome-common -%endif -%if !0%{?is_opensuse} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gnome-patch-translation -BuildRequires: libtool -BuildRequires: translation-update-upstream -%endif BuildRequires: intltool -BuildRequires: update-desktop-files -BuildRequires: xsltproc +BuildRequires: pkgconfig # For directory ownership; it's fine to BuildRequire it since it's also a Requires BuildRequires: polkit +BuildRequires: update-desktop-files +BuildRequires: xsltproc BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(colord) >= 1.0.2 BuildRequires: pkgconfig(fontconfig) @@ -76,7 +66,7 @@ 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(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.53.0 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.23.3 BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3 @@ -91,42 +81,50 @@ BuildRequires: pkgconfig(libnotify) >= 0.7.3 BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2 -%if 0%{?suse_version} == 1315 -BuildRequires: pkgconfig(packagekit-glib2) -%endif -%if %{with wacom} -BuildRequires: pkgconfig(libwacom) >= 0.7 -%endif BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(pango) >= 1.20.0 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 -%if !0%{?is_opensuse} -# For directory ownership. No longer needed in TW, since filesystem package -# now owns -BuildRequires: pkgconfig(udev) -%endif BuildRequires: pkgconfig(upower-glib) >= 0.99.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xtst) -%if %{with wayland} -BuildRequires: pkgconfig(wayland-client) -%endif Requires: gsettings-desktop-schemas # g-s-d uses the pkexec binary Requires: polkit Recommends: %{name}-lang # For housekeeping plugin, that uses the nautilus dbus service Recommends: nautilus +%if 0%{?suse_version} == 1315 +BuildRequires: gnome-common +%endif +%if !0%{?is_opensuse} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gnome-patch-translation +BuildRequires: libtool +BuildRequires: translation-update-upstream +%endif +%if 0%{?suse_version} == 1315 +BuildRequires: pkgconfig(packagekit-glib2) +%endif +%if %{with wacom} +BuildRequires: pkgconfig(libwacom) >= 0.7 +%endif +%if !0%{?is_opensuse} +# For directory ownership. No longer needed in TW, since filesystem package +# now owns +BuildRequires: pkgconfig(udev) +%endif +%if %{with wayland} +BuildRequires: pkgconfig(wayland-client) +%endif %if 0%{?is_opensuse} || 0%{?suse_version} == 1500 +Recommends: iio-sensor-proxy # g-s-d only support configurtion of libinput based pointer drivers now. Recommends: xf86-input-libinput -Recommends: iio-sensor-proxy %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%glib2_gsettings_schema_requires %description gnome-settings-daemon provides a daemon run by all GNOME sessions to @@ -152,6 +150,7 @@ This package includes header files used for client applications to contact the settings daemon via its DBus interface. %lang_package + %prep %setup -q %if !0%{?is_opensuse} @@ -162,13 +161,16 @@ gnome-patch-translation-prepare %endif %patch1 -p1 %patch2 -p1 -%patch3 -p0 +%patch3 %endif %patch4 -p1 %if 0%{?suse_version} == 1315 %patch5 -p1 + %endif + %if 0%{?suse_version} == 1315 || !0%{?is_opensuse} %patch6 -p1 %endif +%patch7 -p1 %build # need autoreconf if patch translation has run @@ -187,31 +189,19 @@ autoreconf -f -i %{nil} # work around a racing condition in plugins/common, which does not always build properly using parallel build (cd plugins/common; make -j 1 gsd-common-enums.h) -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install %if %{without wacom} rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop %endif -find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} -%clean -rm -rf %{buildroot} - -%post -%glib2_gsettings_schema_post -%icon_theme_cache_post - -%postun -%glib2_gsettings_schema_postun -%icon_theme_cache_postun - %files -%defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS %{_datadir}/gnome-settings-daemon/ %dir %{_libexecdir}/gnome-settings-daemon-3.0/ @@ -244,8 +234,6 @@ rm -rf %{buildroot} %{_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 @@ -266,8 +254,6 @@ rm -rf %{buildroot} %{_libexecdir}/gnome-settings-daemon-3.0/gsd-updates %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Updates.desktop %endif -%{_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 @@ -286,9 +272,7 @@ rm -rf %{buildroot} %{_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 # Own the directory since we can't depend on gconf providing them %dir %{_datadir}/GConf @@ -306,7 +290,6 @@ rm -rf %{buildroot} %files lang -f %{name}.lang %files devel -%defattr (-, root, root) %{_includedir}/gnome-settings-daemon-3.0/ %{_libdir}/pkgconfig/gnome-settings-daemon.pc