commit:     19caff9886615963ec0383baf143ef6fd3d44055
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 18:35:20 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:55:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=19caff98

gnome-base/gnome-settings-daemon: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...ings-daemon-3.7.90-short-touchpad-timeout.patch | 25 ----------------------
 ....ebuild => gnome-settings-daemon-3.20.0.ebuild} | 17 +++++----------
 .../gnome-settings-daemon-9999.ebuild              | 10 ++++-----
 3 files changed, 10 insertions(+), 42 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
deleted file mode 100644
index 7dc410f..0000000
--- 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bc0f7c1da87b17839ebf71dc102c19b7d7b6c65a Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpo...@yahoo.fr>
-Date: Mon, 25 Feb 2013 17:24:25 +0330
-Subject: [PATCH] gnome-settings-daemon-3.7.90-short-touchpad-timeout
-
----
- plugins/mouse/gsd-mouse-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/mouse/gsd-mouse-manager.c 
b/plugins/mouse/gsd-mouse-manager.c
-index a62800a..e7d39e1 100644
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -583,7 +583,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean 
state)
- 
-                 g_ptr_array_add (args, "syndaemon");
-                 g_ptr_array_add (args, "-i");
--                g_ptr_array_add (args, "1.0");
-+                g_ptr_array_add (args, "0.5");
-                 g_ptr_array_add (args, "-t");
-                 g_ptr_array_add (args, "-K");
-                 g_ptr_array_add (args, "-R");
--- 
-1.8.1.2
-

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
similarity index 87%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
index 934e8d7..866b786 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit autotools eutils gnome2 python-r1 systemd udev virtualx
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="
        >=dev-libs/glib-2.37.7:2[dbus]
        >=x11-libs/gtk+-3.15.3:3
        >=gnome-base/gnome-desktop-3.11.1:3=
-       >=gnome-base/gsettings-desktop-schemas-3.15.4
+       >=gnome-base/gsettings-desktop-schemas-3.19.3
        >=gnome-base/librsvg-2.36.2
        media-fonts/cantarell
        media-libs/fontconfig
@@ -46,7 +46,7 @@ COMMON_DEPEND="
        x11-libs/libXxf86misc
        x11-misc/xkeyboard-config
 
-       >=app-misc/geoclue-2.1.2:2.0
+       >=app-misc/geoclue-2.3.1:2.0
        >=dev-libs/libgweather-3.9.5:2
        >=sci-geosciences/geocode-glib-3.10
        >=sys-auth/polkit-0.103
@@ -58,7 +58,7 @@ COMMON_DEPEND="
                >=x11-libs/pango-1.20
                x11-drivers/xf86-input-wacom
                virtual/libgudev:= )
-       networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
+       networkmanager? ( >=net-misc/networkmanager-1.0 )
        smartcard? ( >=dev-libs/nss-3.11.2 )
        udev? ( virtual/libgudev:= )
        wayland? ( dev-libs/wayland )
@@ -93,13 +93,6 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-       # https://bugzilla.gnome.org/show_bug.cgi?id=621836
-       # Apparently this change severely affects touchpad usability for some
-       # people, so revert it if USE=short-touchpad-timeout.
-       # Revisit if/when upstream adds a setting for customizing the timeout.
-       use short-touchpad-timeout &&
-               epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
-
        # Make colord and wacom optional; requires eautoreconf
        epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 1c29112..655ca29 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit autotools eutils gnome2 python-r1 systemd udev virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -33,7 +33,7 @@ COMMON_DEPEND="
        >=dev-libs/glib-2.37.7:2[dbus]
        >=x11-libs/gtk+-3.15.3:3
        >=gnome-base/gnome-desktop-3.11.1:3=
-       >=gnome-base/gsettings-desktop-schemas-3.15.4
+       >=gnome-base/gsettings-desktop-schemas-3.19.3
        >=gnome-base/librsvg-2.36.2
        media-fonts/cantarell
        media-libs/fontconfig
@@ -53,7 +53,7 @@ COMMON_DEPEND="
        x11-libs/libXxf86misc
        x11-misc/xkeyboard-config
 
-       >=app-misc/geoclue-2.1.2:2.0
+       >=app-misc/geoclue-2.3.1:2.0
        >=dev-libs/libgweather-3.9.5:2
        >=sci-geosciences/geocode-glib-3.10
        >=sys-auth/polkit-0.103
@@ -65,7 +65,7 @@ COMMON_DEPEND="
                >=x11-libs/pango-1.20
                x11-drivers/xf86-input-wacom
                virtual/libgudev:= )
-       networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
+       networkmanager? ( >=net-misc/networkmanager-1.0 )
        smartcard? ( >=dev-libs/nss-3.11.2 )
        udev? ( virtual/libgudev:= )
        wayland? ( dev-libs/wayland )

Reply via email to