diff --git a/.gitignore b/.gitignore index 7b2fc2c..3914c51 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /mate-settings-daemon-1.16.0.tar.xz /mate-settings-daemon-1.17.0.tar.xz /mate-settings-daemon-1.17.1.tar.xz +/mate-settings-daemon-1.18.0.tar.xz diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 7238727..bfc539d 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.17 +%global branch 1.18 # Settings used for build from snapshots. %{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921} @@ -13,9 +13,9 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: mate-settings-daemon -Version: %{branch}.1 +Version: %{branch}.0 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 1%{?dist} %else Release: 0.3%{?git_rel}%{?dist} %endif @@ -29,6 +29,9 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} +# https://github.com/mate-desktop/mate-settings-daemon/commit/280c174 +Patch1: mate-settings-daemon_0001-Make-pointer-locater-always-pass-through.patch + BuildRequires: dbus-glib-devel BuildRequires: dconf-devel BuildRequires: desktop-file-utils @@ -66,6 +69,8 @@ under it. %prep %setup -q%{!?rel_build:n %{name}-%{commit}} +%patch1 -p1 -b .0001 + %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh %else # 0%{?rel_build} @@ -141,6 +146,10 @@ fi %changelog +* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 +- update to 1.18.0 release +- add https://github.com/mate-desktop/mate-settings-daemon/commit/280c174 + * Fri Feb 10 2017 Fedora Release Engineering - 1.17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/mate-settings-daemon_0001-Make-pointer-locater-always-pass-through.patch b/mate-settings-daemon_0001-Make-pointer-locater-always-pass-through.patch new file mode 100644 index 0000000..1930212 --- /dev/null +++ b/mate-settings-daemon_0001-Make-pointer-locater-always-pass-through.patch @@ -0,0 +1,25 @@ +From 280c1746b557369793e41f39e1d6b5edb1a1bf2b Mon Sep 17 00:00:00 2001 +From: Alexei Sorokin +Date: Tue, 14 Mar 2017 15:58:27 +0300 +Subject: [PATCH] Make pointer locater always pass through + +--- + plugins/mouse/msd-locate-pointer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/mouse/msd-locate-pointer.c b/plugins/mouse/msd-locate-pointer.c +index e114fd0..4cddd97 100644 +--- a/plugins/mouse/msd-locate-pointer.c ++++ b/plugins/mouse/msd-locate-pointer.c +@@ -417,7 +417,7 @@ move_locate_pointer_window (MsdLocatePointerData *data, + 0); + cr = cairo_create (mask); + +- cairo_set_source_rgb (cr, 0., 0., 0.); ++ cairo_set_source_rgba (cr, 0., 0., 0., 0.); + cairo_rectangle (cr, 0., 0., WINDOW_SIZE, WINDOW_SIZE); + cairo_fill (cr); + +-- +2.12.0 + diff --git a/sources b/sources index 76ab798..b12a5d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mate-settings-daemon-1.17.1.tar.xz) = 6bfef87f629ca067796a06b906234ef1987adc74970bea1bc4cb15cbfc02221c07f82f7de3859845a626bd6002eab8a07e5e623aa12f69e20b8bd43b1f3fd01b +SHA512 (mate-settings-daemon-1.18.0.tar.xz) = 156166039ee2bd108f4932ab27423e94dba9e7d0e27d814419d74a1d8ddddb18f452a3e43bc0522dc832a0fc415ceb481d4fe656367ff73f6d8b30ad27e42278