Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/gnome-base/gnome-settings-daemon
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
-rw-r--r--gnome-base/gnome-settings-daemon/ChangeLog11
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch95
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch47
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild (renamed from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild)11
4 files changed, 159 insertions, 5 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index b2a95fd98427..a0e7affcc362 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for gnome-base/gnome-settings-daemon
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.156 2015/05/01 22:00:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.157 2015/06/09 14:21:45 eva Exp $
+
+*gnome-settings-daemon-3.16.2-r1 (09 Jun 2015)
+
+ 09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org>
+ -gnome-settings-daemon-3.14.3.ebuild,
+ +gnome-settings-daemon-3.16.2-r1.ebuild,
+ +files/gnome-settings-daemon-3.16.0-optional.patch,
+ +files/gnome-settings-daemon-3.16.2-settings_set_display.patch:
+ Version bump for Gnome 3.16. Clean up old revision.
*gnome-settings-daemon-3.14.4 (01 May 2015)
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch
new file mode 100644
index 000000000000..46d97392b9e8
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch
@@ -0,0 +1,95 @@
+From 8b526c757f0e977eeda9285762e137deba0a31f4 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <mail@ole-reifschneider.de>
+Date: Sat, 11 Apr 2015 23:10:21 +0200
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac | 35 +++++++++++++++++++++++++++++------
+ plugins/Makefile.am | 7 ++++++-
+ 2 files changed, 35 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 50a6bb1..a42ec20 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,7 +236,20 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++ AS_HELP_STRING([--disable-color],
++ [turn off color plugin]),
++ [with_color=$enableval],
++ [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++ PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+
+ dnl ---------------------------------------------------------------------------
+ dnl - datetime
+@@ -267,15 +280,25 @@ case $host_os in
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+ have_wacom=no
+ else
++ have_wacom=no
+ if test x$enable_gudev != xno; then
+- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
+- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++ AC_ARG_ENABLE([wacom],
++ AS_HELP_STRING([--disable-wacom],
++ [turn off wacom plugin]),
++ [with_wacom=$enableval],
++ [with_wacom=no]) dnl Default value
++ if test x$with_wacom = xyes; then
++ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
++ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
++ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++ have_wacom=yes
++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
++ fi
++ AC_SUBST(WACOM_CFLAGS)
++ AC_SUBST(WACOM_LIBS)
+ else
+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+ fi
+- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+- have_wacom=yes
+ fi
+ ;;
+ *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 7365953..779b5d9 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins = \
+ a11y-keyboard \
+ a11y-settings \
+ clipboard \
+- color \
+ datetime \
+ dummy \
+ power \
+@@ -21,6 +20,12 @@ enabled_plugins = \
+
+ disabled_plugins = $(NULL)
+
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
+ else
+--
+2.0.5
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
new file mode 100644
index 000000000000..a8116b6d0177
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
@@ -0,0 +1,47 @@
+From 804a75e86c8aafa46ff3c99933d1c8cd54ba7fcc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 25 May 2015 12:35:13 -0400
+Subject: [PATCH] common: settings_set_display(): fix segfault when output ==
+ NULL
+
+If settings_set_display() was called with output == NULL, edid remained
+initialized to NULLs, but an array of NULLs is an illegal value for
+KEY_DISPLAY settings, which has type "as".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=749844
+---
+ plugins/common/gsd-device-mapper.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/common/gsd-device-mapper.c b/plugins/common/gsd-device-mapper.c
+index ce70fd0..c8a1a1a 100644
+--- a/plugins/common/gsd-device-mapper.c
++++ b/plugins/common/gsd-device-mapper.c
+@@ -365,7 +365,8 @@ static void
+ settings_set_display (GSettings *settings,
+ GnomeRROutput *output)
+ {
+- gchar **prev, *edid[4] = { NULL, NULL, NULL, NULL };
++ /* KEY_DISPLAY is type "as", so edid[0..2] must not be NULL */
++ gchar **prev, *edid[4] = { "", "", "", NULL };
+ GVariant *value;
+ gsize nvalues;
+
+@@ -384,9 +385,11 @@ settings_set_display (GSettings *settings,
+ g_settings_set_value (settings, KEY_DISPLAY, value);
+ }
+
+- g_free (edid[0]);
+- g_free (edid[1]);
+- g_free (edid[2]);
++ if (output) {
++ g_free (edid[0]);
++ g_free (edid[1]);
++ g_free (edid[2]);
++ }
+ g_strfreev (prev);
+ }
+
+--
+2.4.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
index 32c3a6d42398..995e7b78be78 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild,v 1.1 2015/03/28 16:07:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild,v 1.1 2015/06/09 14:21:45 eva Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -24,9 +24,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
COMMON_DEPEND="
>=dev-libs/glib-2.37.7:2[dbus]
- >=x11-libs/gtk+-3.7.8:3
+ >=x11-libs/gtk+-3.15.3:3
>=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.9.91.1
+ >=gnome-base/gsettings-desktop-schemas-3.15.4
>=gnome-base/librsvg-2.36.2
media-fonts/cantarell
media-libs/fontconfig
@@ -101,7 +101,10 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
# Make colord and wacom optional; requires eautoreconf
- epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
+
+ # Fix segfault, https://bugzilla.gnome.org/show_bug.cgi?id=749844
+ epatch "${FILESDIR}"/${PN}-3.16.2-settings_set_display.patch
epatch_user
eautoreconf