From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6B52F1384B4 for ; Sat, 14 Nov 2015 13:48:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66F4F21C094; Sat, 14 Nov 2015 13:48:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 905E921C0A7 for ; Sat, 14 Nov 2015 13:48:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09A2B340771 for ; Sat, 14 Nov 2015 13:48:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6364A16C4 for ; Sat, 14 Nov 2015 13:48:15 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1447508779.3b1e9b7f653f9c8d9a44f95bdf43c72a3e6f8bcf.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-settings-daemon/Manifest gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.4.ebuild gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild X-VCS-Directories: gnome-base/gnome-settings-daemon/files/ gnome-base/gnome-settings-daemon/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 3b1e9b7f653f9c8d9a44f95bdf43c72a3e6f8bcf X-VCS-Branch: master Date: Sat, 14 Nov 2015 13:48:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cc5deb29-d50e-48a4-abb9-4214ca3f8e90 X-Archives-Hash: 61359809f1f92df54fd689cd621699e7 commit: 3b1e9b7f653f9c8d9a44f95bdf43c72a3e6f8bcf Author: Pacho Ramos gentoo org> AuthorDate: Sat Nov 14 12:19:31 2015 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Nov 14 13:46:19 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1e9b7f gnome-base/gnome-settings-daemon: Drop old Package-Manager: portage-2.2.24 gnome-base/gnome-settings-daemon/Manifest | 2 - .../gnome-settings-daemon-3.14.0-optional.patch | 95 ------------- ...ttings-daemon-3.16.2-settings_set_display.patch | 47 ------- .../gnome-settings-daemon-3.14.4.ebuild | 152 -------------------- .../gnome-settings-daemon-3.16.2-r1.ebuild | 155 --------------------- 5 files changed, 451 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index f00585d..7108a86 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,4 +1,2 @@ -DIST gnome-settings-daemon-3.14.4.tar.xz 1650276 SHA256 ce4453f83a19328e4f031251430325cb6ae832b83fa9fce80a8cde1d4bb0a2a5 SHA512 c6c62f7e13f93fd3dcff7990571289e10c9ef341ebb9d6deab67adf705a32a13142b7e8aebccd4a71d39f191a472d427fdea5acebc5fcf6f6106c641af320a32 WHIRLPOOL 145e694c74364f6fec6543976cf1e0abb6049f8a13c8f0c8b95a481d849a94255f68ade1a4926f0207c19cdbc8927f55edbcae68b01e7ef95046c3786cb07cbb -DIST gnome-settings-daemon-3.16.2.tar.xz 1602508 SHA256 d8d536584ebb8fb1403050eb65e7ee3328eba14b123542369ff1917e727fa69a SHA512 04f62429b6f3edf6d7c11b0fbe8b5b74a3be3d6309ec7a9019dc77d2f8557ad26242a210bcfb36b393b99d93c33590c595c6d7dca9c1272f04bdf5cfc7144076 WHIRLPOOL 95f69752b3a9ad7d22489123555cd84dffb6c0ac4872dd5febbfb444013eb2417a0f50f53b311f640cc3d4ac8b662c0b2a102fbe3e32de0614161ed9cf646579 DIST gnome-settings-daemon-3.16.3.tar.xz 1651880 SHA256 8752f79ba2ee76701744b4806140d1b88c665ad7cd44e7ff58b4e78e1063daea SHA512 d11c16b9ccf17683c0917ed8bee8b5142bfcc3d2099073df5318e8a1f801a9b7e07f2dfe68818edee568d6fb2cc8571580b072c1de46dc22aee4bbffddfc3ff5 WHIRLPOOL 1dec35ba84975bd297b69622733ab33db981a4b569cf67711f8b526bc3285515ca8fd522131888f6419459d6382ac493aed54b073a4e5950a837cca3f55f2ccf DIST gnome-settings-daemon-3.18.2.tar.xz 1626400 SHA256 3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f SHA512 82aa939c485d4fa90ee135d4f987a13c6b1629546f41a1399b2badd166c0cc4e298096d860fafefa1236d3af87484bd8903fb6e39fe971660e553e28768775fc WHIRLPOOL 98dc47d6428134504f2a6ed332944fb0f24f95304dfb44a6009d5778ae68820a49ff77e42a6be6721f7880484ba729ee518b0f03e59404560ee78d04a82c44e5 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch deleted file mode 100644 index a7a56b0..0000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch +++ /dev/null @@ -1,95 +0,0 @@ -From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour -Date: Tue, 10 Dec 2013 00:27:27 +0100 -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 c42ea8b..26ccd36 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -225,7 +225,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 -@@ -256,15 +269,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 7bb01f0..7cc3655 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -4,7 +4,6 @@ enabled_plugins = \ - a11y-keyboard \ - a11y-settings \ - clipboard \ -- color \ - cursor \ - datetime \ - dummy \ -@@ -22,6 +21,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.1.2 - 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 deleted file mode 100644 index a8116b6..0000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 804a75e86c8aafa46ff3c99933d1c8cd54ba7fcc Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.4.ebuild deleted file mode 100644 index 5db7cb9..0000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.4.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2015 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} ) - -inherit autotools eutils gnome2 python-r1 systemd udev virtualx - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland" -REQUIRED_USE=" - input_devices_wacom? ( udev ) - smartcard? ( udev ) - test? ( ${PYTHON_REQUIRED_USE} ) -" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=dev-libs/glib-2.37.7:2[dbus] - >=x11-libs/gtk+-3.7.8:3 - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.9.91.1 - >=gnome-base/librsvg-2.36.2 - media-fonts/cantarell - media-libs/fontconfig - >=media-libs/lcms-2.2:2 - media-libs/libcanberra[gtk3] - >=media-sound/pulseaudio-2 - >=sys-power/upower-0.99:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/libnotify-0.7.3:= - x11-libs/libX11 - x11-libs/libxkbfile - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/libXxf86misc - x11-misc/xkeyboard-config - - >=app-misc/geoclue-2.1.2:2.0 - >=dev-libs/libgweather-3.9.5:2 - >=sci-geosciences/geocode-glib-3.10 - >=sys-auth/polkit-0.103 - - colord? ( >=x11-misc/colord-1.0.2:= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/pango-1.20 - x11-drivers/xf86-input-wacom - virtual/libgudev:= ) - networkmanager? ( >=net-misc/networkmanager-0.9.9.1 ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - udev? ( virtual/libgudev:= ) - wayland? ( dev-libs/wayland ) -" -# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly -#