From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RKF1h-0001QY-1x for garchives@archives.gentoo.org; Sat, 29 Oct 2011 19:57:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB2CF21C0D5; Sat, 29 Oct 2011 19:56:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9653621C0D2 for ; Sat, 29 Oct 2011 19:56:46 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0D8F1B401F for ; Sat, 29 Oct 2011 19:56:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 264AE8005B for ; Sat, 29 Oct 2011 19:56:45 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <6de2125684379e4611fc972e9ea671e48e4f5685.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild X-VCS-Directories: gnome-base/gnome-settings-daemon/ gnome-base/gnome-settings-daemon/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 6de2125684379e4611fc972e9ea671e48e4f5685 Date: Sat, 29 Oct 2011 19:56:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 50550b253bf02fc64d3eb35ab4d5cd9b commit: 6de2125684379e4611fc972e9ea671e48e4f5685 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sat Oct 29 19:54:07 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sat Oct 29 19:54:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D6de21256 gnome-base/gnome-settings-daemon: moved 3.2.1 to gx86 + qa --- ...emon-3.2.0-color-unbreak-loading-profiles.patch | 41 ------ .../gnome-settings-daemon-3.2.1-WEXITSTATUS.patch | 21 --- .../gnome-settings-daemon-3.2.1.ebuild | 135 --------------= ------ .../gnome-settings-daemon-9999.ebuild | 2 +- 4 files changed, 1 insertions(+), 198 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon= -3.2.0-color-unbreak-loading-profiles.patch b/gnome-base/gnome-settings-d= aemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.pa= tch deleted file mode 100644 index 370cfc5..0000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-= color-unbreak-loading-profiles.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e46d34f5bd9b0260a204d5f8a9d23c747b61923f Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi -Date: Mon, 3 Oct 2011 10:02:34 -0400 -Subject: [PATCH] color: unbreak loading profiles at startup - -A recent commit broke color profile loading at startup if the profile -directory exists already. Fix this. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D660790 - -Signed-off-by: Richard Hughes - -[Alexandre Rostovtsev : backported to 3.2] ---- - plugins/color/gcm-profile-store.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profi= le-store.c -index 3dde406..f8b0889 100644 ---- a/plugins/color/gcm-profile-store.c -+++ b/plugins/color/gcm-profile-store.c -@@ -445,13 +445,14 @@ gcm_profile_store_search (GcmProfileStore *profile= _store) - /* get Linux per-user profiles */ - path =3D g_build_filename (g_get_user_data_dir (), "icc", NULL)= ; - ret =3D gcm_profile_store_mkdir_with_parents (path, &error); -- if (!ret) { -+ if (!ret && -+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) { - g_warning ("failed to create directory on startup: %s",= error->message); -- g_error_free (error); - } else { - gcm_profile_store_search_path (profile_store, path, 0); - } - g_free (path); -+ g_clear_error (&error); -=20 - /* get per-user profiles from obsolete location */ - path =3D g_build_filename (g_get_home_dir (), ".color", "icc", = NULL); ---=20 -1.7.7 - diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon= -3.2.1-WEXITSTATUS.patch b/gnome-base/gnome-settings-daemon/files/gnome-s= ettings-daemon-3.2.1-WEXITSTATUS.patch deleted file mode 100644 index 2c3e59f..0000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-= WEXITSTATUS.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9b141728c889a6d2f88767655661318e3d8d82da Mon Sep 17 00:00:00 2001 -From: Malcolm Lewis -Date: Mon, 17 Oct 2011 16:43:06 +0000 -Subject: power: Fix "undefined symbol: WEXITSTATUS" error. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D662020 ---- -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power= -manager.c -index 010d14a..3f10c22 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1= .ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.eb= uild deleted file mode 100644 index 4be6b2d..0000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnom= e-settings-daemon-2.32.1.ebuild,v 1.1 2010/12/04 16:50:12 pacho Exp $ - -EAPI=3D"4" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" - -inherit autotools eutils gnome2 virtualx -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"Gnome Settings Daemon" -HOMEPAGE=3D"http://www.gnome.org" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -fi -IUSE=3D"+colord +cups debug packagekit policykit short-touchpad-timeout = smartcard +udev" - -# Latest gsettings-desktop-schemas is needed due to commit e8d1de92 -# Latest gnome-desktop needed to fix the DPMS timeout bug #385063 -# colord-0.1.13 needed to avoid polkit errors in CreateProfile and Creat= eDevice -# upower-0.9.11 needed for UpSleepKind -COMMON_DEPEND=3D">=3Ddev-libs/dbus-glib-0.74 - >=3Ddev-libs/glib-2.29.14:2 - >=3Dx11-libs/gtk+-2.99.3:3 - >=3Dgnome-base/gconf-2.6.1:2 - >=3Dgnome-base/libgnomekbd-2.91.1 - >=3Dgnome-base/gnome-desktop-3.2.0-r1:3 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.7.1 - media-fonts/cantarell - media-libs/fontconfig - >=3Dmedia-libs/lcms-2.2:2 - media-libs/libcanberra[gtk3] - >=3Dmedia-sound/pulseaudio-0.9.16 - >=3Dsys-power/upower-0.9.11 - >=3Dx11-libs/libnotify-0.7.3 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXxf86misc - >=3Dx11-libs/libxklavier-5.0 - >=3Dmedia-sound/pulseaudio-0.9.16 - - colord? ( >=3Dx11-misc/colord-0.1.13 ) - cups? ( >=3Dnet-print/cups-1.4[dbus] ) - packagekit? ( - || ( sys-fs/udev[gudev] - sys-fs/udev[extras] ) - >=3Dapp-admin/packagekit-base-0.6.12 ) - policykit? ( - >=3Dsys-auth/polkit-0.97 - >=3Dsys-apps/dbus-1.1.2 ) - smartcard? ( >=3Ddev-libs/nss-3.11.2 ) - udev? ( || ( sys-fs/udev[gudev] - sys-fs/udev[extras] ) )" -# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly -# =3Dx11-themes/gnome-themes-standard-2.91 - >=3Dx11-themes/gnome-icon-theme-2.91 - >=3Dx11-themes/gnome-icon-theme-symbolic-2.91 - !=3Ddev-util/intltool-0.40 - >=3Ddev-util/pkgconfig-0.19 - x11-proto/inputproto - x11-proto/kbproto - x11-proto/xf86miscproto - >=3Dx11-proto/xproto-7.0.15" - -pkg_setup() { - # README is empty - DOCS=3D"AUTHORS NEWS ChangeLog MAINTAINERS" - G2CONF=3D"${G2CONF} - --disable-static - --disable-schemas-compile - --enable-gconf-bridge - --with-pnpids=3D${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids - $(use_enable colord color) - $(use_enable cups) - $(use_enable debug) - $(use_enable debug more-warnings) - $(use_enable packagekit) - $(use_enable policykit polkit) - $(use_enable smartcard smartcard-support) - $(use_enable udev gudev)" -} - -src_prepare() { - # Upstream patch to fix undefined symbol, will be in next release - epatch "${FILESDIR}/${P}-WEXITSTATUS.patch" - - # Backport patch from git master branch (not in gnome-3-2 branch yet) - # fixing loading color profiles at startup - epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=3D621836 - # Apparently this change severely affects touchpad usability for some - # people, so revert it if USE=3Dshort-touchpad-timeout. - # Revisit if/when upstream adds a setting for customizing the timeout. - use short-touchpad-timeout && - epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch" - - # Make colord optional; requires eautoreconf - epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch" - eautoreconf - - gnome2_src_prepare -} - -src_test() { - Xemake check -} - -src_install() { - gnome2_src_install - - echo 'GSETTINGS_BACKEND=3D"dconf"' >> 51gsettings-dconf - doenvd 51gsettings-dconf || die "doenvd failed" -} diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.= ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebui= ld index d1f9a64..53eed8e 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild @@ -57,7 +57,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/dbus-glib-0.74 >=3Dapp-admin/packagekit-base-0.6.12 ) policykit? ( >=3Dsys-auth/polkit-0.97 - >=3Dsys-apps/dbus-1.1.2 ) + >=3Dsys-apps/dbus-1.1.2[X] ) smartcard? ( >=3Ddev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )"