Accepting request 421260 from home:zhangxiaofei:branches:GNOME:Factory

SLE sync and changelog cleanups
- Add gnome-settings-daemon-bring-back-updates-plugin.patch:
  Revert upstream commits fc22a8100fa40533fddfb4338160a20188e46c6b
  and e3e961c52419df5f2544b24957e71cf3a4c5ef85 to bring back the
  updates plugin.(bsc#991024)

  gnome-settings-daemon-initial-keyboard.patch for bsc#979051.
  English keyboard layout when using ibus (bsc#899530).
  gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch. Now
  as a result of the system being idle.
- Add gnome-settings-daemon-bnc873545-hide-warnings.patch:
  Hide the warnings when failed to find a colord instance
  (bnc873545).
  to apply this patch, for these tools use
  "--no-backup-if-mismatch" flag for "patch" and thus Patch 19
  would not create a backup file. "rpmbuild" don't use this
  "--no-backup-if-mismatch" flag and thus didn't catch this error
  (maybe this is a good time to think whether this flag should be
  included.)
  remove it.

- Add gnome-settings-daemon-upower-backport.patch -- from upstream;
  support upower 0.99.
- Up upower-glib dependency.
    and --disable-ibus is being passed to configure.
- Update spec file to add the missing BuildRequire of
    Makefile.am almost intact for copy/paste
  + Only use applicable configurations for switching with the
  + Only use applicable configurations when auto-configuring
  + Really lay out displays from left to right when using the
  + For the XF86Display hotkey, preserve the cycle order when

OBS-URL: https://build.opensuse.org/request/show/421260
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=251
This commit is contained in:
Dominique Leuenberger 2016-08-23 15:46:20 +00:00 committed by Git OBS Bridge
parent 5a9cffbdb4
commit 530f4b92bf
3 changed files with 4614 additions and 45 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Aug 10 02:24:44 UTC 2016 - sckang@suse.com
- Add gnome-settings-daemon-bring-back-updates-plugin.patch:
Revert upstream commits fc22a8100fa40533fddfb4338160a20188e46c6b
and e3e961c52419df5f2544b24957e71cf3a4c5ef85 to bring back the
updates plugin.(bsc#991024)
-------------------------------------------------------------------
Fri Aug 5 03:38:22 UTC 2016 - mgorse@suse.com
@ -31,7 +39,7 @@ Mon Jun 6 09:44:23 UTC 2016 - dimstar@opensuse.org
Mon May 16 21:06:18 CDT 2016 - federico@suse.com
- Added back an updated version of
gnome-settings-daemon-initial-keyboard.patch for bsc#979051.
gnome-settings-daemon-initial-keyboard.patch for bsc#979051.
Suse works differently from GNOME; we set the default keyboard
from xkb, and GNOME likes to do it itself. This makes sure
there is no keyboard selector icon if there is a single default
@ -99,13 +107,6 @@ Mon Mar 21 15:09:07 UTC 2016 - dimstar@opensuse.org
- Update to version 3.20.0:
+ Fix cancellation handling and possible crashes in all plugins.
-------------------------------------------------------------------
Fri Mar 18 17:53:18 UTC 2016 - fezhang@suse.com
- Add gnome-settings-daemon-bnc873545-hide-warnings.patch: Hide the
warnings when failed to find a colord instance on SLES
(bnc873545).
-------------------------------------------------------------------
Thu Mar 17 09:53:38 UTC 2016 - dimstar@opensuse.org
@ -243,7 +244,7 @@ Tue Nov 10 16:00:08 UTC 2015 - zaitor@opensuse.org
Thu Nov 5 18:15:11 UTC 2015 - mgorse@suse.com
- Modify gnome-settings-daemon-initial-keyboard.patch to add
English keyboard layout when using ibus (bsc#899530).
English keyboard layout when using ibus (bsc#899530).
-------------------------------------------------------------------
Thu Oct 22 21:40:19 CEST 2015 - tiwai@suse.de
@ -523,7 +524,7 @@ Sun Oct 5 13:24:21 UTC 2014 - dimstar@opensuse.org
Thu Sep 25 20:59:09 CDT 2014 - federico@suse.com
- Updated
gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch. Now
gnome-settings-daemon-bnc872820-gtk-decoration-layout.patch. Now
we pick up the correct dconf key names for Classic and default
modes, in order to set the window manager's button layout.
@ -661,7 +662,7 @@ Mon Jun 30 14:31:43 UTC 2014 - fcrozat@suse.com
Wed May 21 21:47:07 UTC 2014 - mgorse@suse.com
- Fix a crash when notifying after resuming from a suspend entered
as a result of the system being idle.
as a result of the system being idle.
Modified patch: gnome-settings-daemon-notify-idle-resumed.patch.
-------------------------------------------------------------------
@ -678,10 +679,9 @@ Wed May 7 18:59:57 CEST 2014 - sbrabec@suse.cz
-------------------------------------------------------------------
Tue May 6 09:14:32 UTC 2014 - fezhang@suse.com
- Disable colord warnings in /var/log/messages (bnc#873545)
- added patch:
* gnome-settings-daemon-bnc873545-hide-warnings.patch
- Add gnome-settings-daemon-bnc873545-hide-warnings.patch:
Hide the warnings when failed to find a colord instance
(bnc873545).
-------------------------------------------------------------------
Mon May 5 15:15:59 UTC 2014 - zaitor@opensuse.org
@ -706,9 +706,6 @@ Fri May 2 19:20:04 UTC 2014 - mgorse@suse.com
- Add updates-dont-use-changed-signal-on-UpClient.patch: Changed
signal no longer exists in upower 0.99. From upstream.
- Update gnome-settings-daemon-upower-backport.patch; no longer
try to listen to device-changed signal (bnc#873759).
-------------------------------------------------------------------
Wed Apr 16 13:05:00 UTC 2014 - zaitor@opensuse.org
@ -722,9 +719,7 @@ Wed Apr 16 13:05:00 UTC 2014 - zaitor@opensuse.org
Thu Mar 27 03:50:34 UTC 2014 - cxiong@suse.com
- The default blank timeout is too short, set it longer,
see bnc#869685
NOTE: this is actually the delay between screensaver is shown
(from blank) and return to blank, more precisely, blank and
monitor off. The instant blanking (not monitor off) when user
@ -738,16 +733,14 @@ Thu Mar 27 03:24:20 UTC 2014 - cxiong@suse.com
- Fix malformed parts of
gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch
The main removed part is actually patching a backup file, which
was created by Patch 19 in spec. Tools like "quilt" would fail
to apply this patch, for these
tools use "--no-backup-if-mismatch" flag for "patch" and thus
Patch 19 would not create a backup file. "rpmbuild" don't use
this "--no-backup-if-mismatch" flag and thus didn't catch this
error (maybe this is a good time to think whether this flag
should be included.)
to apply this patch, for these tools use
"--no-backup-if-mismatch" flag for "patch" and thus Patch 19
would not create a backup file. "rpmbuild" don't use this
"--no-backup-if-mismatch" flag and thus didn't catch this error
(maybe this is a good time to think whether this flag should be
included.)
There are also some other minor clean up.
-------------------------------------------------------------------
@ -789,8 +782,7 @@ Thu Feb 20 21:38:49 UTC 2014 - mgorse@suse.com
- Remove battery recall code (bnc#862603). The recall dialog is
reportedly being displayed erroneously, and it has been removed
upstream, since the last recalls date from 2006, so let's
remove it.
remove it.
- Added patches:
* gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch
@ -883,17 +875,19 @@ Fri Feb 7 03:11:01 UTC 2014 - dimstar@opensuse.org
- Drop gnome-settings-daemon-upower-backport.patch: fixed upstream.
- Drop gnome-settings-daemon-upower-fix.patch: fixed upstream.
-------------------------------------------------------------------
Thu Feb 6 15:03:34 UTC 2014 - lpechacek@suse.cz
- Add gnome-settings-daemon-upower-fix.patch: avoid immediate
hibernation/poweroff caused by GSD power plugin not being able to
determine battery charge (bnc#861365).
-------------------------------------------------------------------
Fri Dec 20 00:16:59 UTC 2013 - mgorse@suse.com
- Add gnome-settings-daemon-upower-backport.patch: support UPower
version 0.99.
- Add gnome-settings-daemon-upower-backport.patch -- from upstream;
support upower 0.99.
- Up upower-glib dependency.
-------------------------------------------------------------------
Sat Dec 14 21:42:59 UTC 2013 - zaitor@opensuse.org
@ -1642,7 +1636,7 @@ Tue Oct 2 16:59:37 UTC 2012 - dimstar@opensuse.org
+ when with_ibus is set to 1; pkconfig(ibus) BuildRequires will
be used and --enable-ibus is being passed to configure
+ when with_ibus is set to 0, pkgconfigu(ibus) is being ignored
and --disable-ibus is being passed to configure.
and --disable-ibus is being passed to configure.
-------------------------------------------------------------------
Tue Sep 25 14:34:37 UTC 2012 - dimstar@opensuse.org
@ -3300,7 +3294,7 @@ Wed Dec 2 16:44:02 CET 2009 - vuntz@opensuse.org
-------------------------------------------------------------------
Thu Oct 22 09:54:35 CEST 2009 - mxwu@novell.com
- Update spec file to add the missing BuildRequire of
- Update spec file to add the missing BuildRequire of
libcanberra-devel. Fix bnc#547565.
-------------------------------------------------------------------
@ -3309,7 +3303,7 @@ Tue Sep 22 14:25:48 CEST 2009 - dimstar@opensuse.org
- Update to version 2.28.0:
+ Fix incomplete function declaration
+ bgo#578538 - Don't install the dummy plugin whilst keeping the
Makefile.am almost intact for copy/paste
Makefile.am almost intact for copy/paste
+ bgo#594617 - Fix Touchpad left-handed issues
+ bgo#404683 - Add sound effect to volume key handling
+ Remove useless custom eject icon
@ -3352,13 +3346,13 @@ Fri Aug 14 16:24:02 CEST 2009 - vuntz@novell.com
Tue Jul 28 18:02:32 CEST 2009 - lmedinas@gmail.com
- Update to version 2.27.5:
+ Only use applicable configurations for switching with the
+ Only use applicable configurations for switching with the
XF86Display hotkey
+ Only use applicable configurations when auto-configuring
+ Only use applicable configurations when auto-configuring
outputs during hotplug
+ Really lay out displays from left to right when using the
+ Really lay out displays from left to right when using the
XF86Display hotkey
+ For the XF86Display hotkey, preserve the cycle order when
+ For the XF86Display hotkey, preserve the cycle order when
sanitizing the configurations
+ Remove last libglade dependency
+ Improved low disk space warning (bgo#573980)
@ -3750,13 +3744,13 @@ Mon May 26 17:10:43 CEST 2008 - vuntz@suse.de
- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to
unbreak corrupted keymaps on automatic login. This is only a
workaround for openSUSE 11.0, unfortunately, since nobody found
the right fix yet. Fix bnc#369263.
the right fix yet. Fix bnc#369263.
-------------------------------------------------------------------
Tue May 6 12:59:34 CEST 2008 - rodrigo@suse.de
- Updated gnome-settings-daemon-system-proxy-configuration.patch
to add a missing return in non-void function
to add a missing return in non-void function
-------------------------------------------------------------------
Wed Apr 30 19:51:08 CEST 2008 - rodrigo@suse.de
@ -3841,7 +3835,7 @@ Fri Feb 1 12:57:52 CET 2008 - rodrigo@suse.de
- Update to version 2.21.90.2:
* Use correct binary path in DBus service file
* Updated translations
* Updated translations
-------------------------------------------------------------------
Fri Jan 25 14:37:20 CET 2008 - rodrigo@suse.de

View File

@ -47,6 +47,8 @@ Patch22: gnome-settings-daemon-bnc873545-hide-warnings.patch
Patch24: sle-configure-timeout-blank.patch
# PATCH-FIX-SLE gnome-settings-daemon-initial-keyboard.patch bsc#979051 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
Patch29: gnome-settings-daemon-initial-keyboard.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch bsc#991024 sckang@suse.com -- Add the updates plugin back
Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gnome-common
@ -80,6 +82,9 @@ 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
BuildRequires: pkgconfig(xorg-wacom)
@ -146,9 +151,12 @@ gnome-patch-translation-prepare
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch24
%patch24 -p0
%patch29 -p1
%endif
%if 0%{?suse_version} == 1315
%patch31 -p1
%endif
%build
%if !0%{?is_opensuse}
@ -225,6 +233,9 @@ rm -rf %{buildroot}
%{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
%endif
%{_libdir}/gnome-settings-daemon-3.0/libsound.so
%if 0%{?suse_version} == 1315
%{_libdir}/gnome-settings-daemon-3.0/libupdates.so
%endif
%{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
%{_libdir}/gnome-settings-daemon-3.0/libxsettings.so
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
@ -243,6 +254,9 @@ rm -rf %{buildroot}
# 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
%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.*