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 1Qu9l0-0002NI-Ib for garchives@archives.gentoo.org; Thu, 18 Aug 2011 21:04:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DFF321C10B; Thu, 18 Aug 2011 21:03:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CFE3021C10B for ; Thu, 18 Aug 2011 21:03:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F41E51B4033 for ; Thu, 18 Aug 2011 21:03:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2C27780040 for ; Thu, 18 Aug 2011 21:03:56 +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: Subject: [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/libepc/, x11-libs/gdk-pixbuf/, gnome-extra/nautilus-sendto/, ... X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild gnome-extra/gucharmap/gucharmap-3.0.1-r300.ebuild gnome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild net-libs/libepc/libepc-0.3.11.ebuild net-libs/libepc/libepc-0.4.0.ebuild sys-apps/accountsservice/accountsservice-0.6.13.ebuild sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_GDM_CUSTOM.patch sys-apps/accountsservice/files/accountsservice-0.6.13-SetAutomaticLogin-false.patch sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-timeout.patch sys-apps/accountsservice/files/accountsservice-0.6.13-monitor-etc-gdm-custom.conf.patch x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild X-VCS-Directories: net-libs/libepc/ x11-libs/gdk-pixbuf/ gnome-extra/nautilus-sendto/ x11-libs/gdk-pixbuf/files/ sys-apps/accountsservice/files/ sys-apps/accountsservice/ gnome-extra/gucharmap/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: fdea5a63d11db9097b573a81bab6bf1776511a28 Date: Thu, 18 Aug 2011 21:03:56 +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: 8a9aff6390aca51c0b5e8fdb97013192 commit: fdea5a63d11db9097b573a81bab6bf1776511a28 Author: Alexandre Rostovtsev gmail com> AuthorDate: Thu Aug 18 19:57:35 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu Aug 18 19:57:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dfdea5a63 Lots of packages: moved to gx86 --- gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild | 62 ----------- gnome-extra/gucharmap/gucharmap-3.0.1-r300.ebuild | 56 ---------- .../nautilus-sendto/nautilus-sendto-3.0.0.ebuild | 56 ---------- net-libs/libepc/libepc-0.3.11.ebuild | 38 ------- net-libs/libepc/libepc-0.4.0.ebuild | 38 ------- .../accountsservice/accountsservice-0.6.13.ebuild | 56 ---------- .../accountsservice-0.6.13-PATH_GDM_CUSTOM.patch | 69 ------------ ...ntsservice-0.6.13-SetAutomaticLogin-false.patch | 40 ------- ...accountsservice-0.6.13-etc-passwd-timeout.patch | 52 --------- ...ervice-0.6.13-monitor-etc-gdm-custom.conf.patch | 115 --------------= ------ .../gdk-pixbuf-2.21.4-fix-automagic-x11.patch | 24 ---- x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild | 81 -------------- 12 files changed, 0 insertions(+), 687 deletions(-) diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-ex= tra/gucharmap/gucharmap-3.0.1-r200.ebuild deleted file mode 100644 index b718b9c..0000000 --- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.32.= 1.ebuild,v 1.1 2010/11/19 21:53:00 pacho Exp $ - -EAPI=3D"3" -GCONF_DEBUG=3D"yes" -GNOME2_LA_PUNT=3D"yes" - -inherit gnome2 - -DESCRIPTION=3D"Unicode character map viewer library" -HOMEPAGE=3D"http://live.gnome.org/Gucharmap" - -LICENSE=3D"GPL-3" -SLOT=3D"0" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd" -IUSE=3D"cjk doc +introspection" - -RDEPEND=3D">=3Ddev-libs/glib-2.16.3[introspection?] - >=3Dx11-libs/pango-1.2.1[introspection?] - >=3Dx11-libs/gtk+-2.14.0:2[introspection?] - - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.0 )" -DEPEND=3D"${RDEPEND} - app-text/scrollkeeper - >=3Ddev-util/pkgconfig-0.9 - >=3Ddev-util/intltool-0.40 - - sys-devel/gettext - - doc? ( >=3Ddev-util/gtk-doc-1.0 )" - -pkg_setup() { - G2CONF=3D"${G2CONF} - --disable-static - --disable-scrollkeeper - --disable-maintainer-mode - --with-gtk=3D2.0 - --disable-charmap - --disable-gconf - $(use_enable introspection) - $(use_enable cjk unihan)" - # gconf is only needed for the gucharmap program - DOCS=3D"AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - # .desktop and schema files are only needed for the gucharmap program - sed -e 's:desktop_DATA\s*=3D.*:desktop_DATA =3D :' \ - -e 's:schema_DATA\s*=3D.*:schema_DATA =3D :' \ - -i Makefile.* || die "sed Makefile.* failed" - - gnome2_src_prepare -} - -pkg_postinst() { - gnome2_pkg_postinst - if ! has_version "gnome-extra/gucharmap:2.90" ; then - ewarn "Note: ${PF} includes only the gucharmap-2 library." - ewarn "If you need the gucharmap program, emerge gucharmap:2.90" - fi -} diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r300.ebuild b/gnome-ex= tra/gucharmap/gucharmap-3.0.1-r300.ebuild deleted file mode 100644 index bccb8df..0000000 --- a/gnome-extra/gucharmap/gucharmap-3.0.1-r300.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.32.= 1.ebuild,v 1.1 2010/11/19 21:53:00 pacho Exp $ - -EAPI=3D"3" -GCONF_DEBUG=3D"yes" -GNOME2_LA_PUNT=3D"yes" - -inherit gnome2 - -DESCRIPTION=3D"Unicode character map viewer and library" -HOMEPAGE=3D"http://live.gnome.org/Gucharmap" - -LICENSE=3D"GPL-3" -SLOT=3D"2.90" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd" -IUSE=3D"cjk doc gnome +introspection test" - -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.16.3[introspection?] - >=3Dx11-libs/pango-1.2.1[introspection?] - >=3Dx11-libs/gtk+-3.0.0:3[introspection?] - - gnome? ( gnome-base/gconf:2 ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.0 )" -RDEPEND=3D"${COMMON_DEPEND} - !!=3Ddev-util/pkgconfig-0.9 - >=3Ddev-util/intltool-0.40 - >=3Dapp-text/gnome-doc-utils-0.9.0 - - sys-devel/gettext - - doc? ( >=3Ddev-util/gtk-doc-1.0 ) - test? ( ~app-text/docbook-xml-dtd-4.1.2 )" - -pkg_setup() { - G2CONF=3D"${G2CONF} - --disable-static - --disable-scrollkeeper - --disable-maintainer-mode - --with-gtk=3D3.0 - $(use_enable gnome gconf) - $(use_enable introspection) - $(use_enable cjk unihan)" - DOCS=3D"AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - # prevent file collisions with slot 0 - sed -e "s:GETTEXT_PACKAGE=3Dgucharmap$:GETTEXT_PACKAGE=3Dgucharmap-${SL= OT}:" \ - -i configure.ac configure || die "sed configure.ac configure failed" - - gnome2_src_prepare -} diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild b/g= nome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild deleted file mode 100644 index 119da29..0000000 --- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-= sendto-2.32.0.ebuild,v 1.5 2011/03/22 19:32:09 ranger Exp $ - -EAPI=3D"4" -GCONF_DEBUG=3D"yes" -GNOME_TARBALL_SUFFIX=3D"bz2" -GNOME2_LA_PUNT=3D"yes" - -inherit eutils gnome2 multilib - -DESCRIPTION=3D"A nautilus extension for sending files to locations" -HOMEPAGE=3D"http://www.gnome.org" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE=3D"cdr doc gajim +mail pidgin upnp" - -RDEPEND=3D">=3Dx11-libs/gtk+-2.90.3:3 - >=3Ddev-libs/glib-2.25.9:2 - >=3Dgnome-base/nautilus-2.31.3 - cdr? ( >=3Dapp-cdr/brasero-2.26.0[nautilus] ) - gajim? ( - net-im/gajim - >=3Ddev-libs/dbus-glib-0.60 ) - mail? ( >=3Dgnome-extra/evolution-data-server-1.5.3 ) - pidgin? ( - >=3Dnet-im/pidgin-2.0.0 - >=3Ddev-libs/dbus-glib-0.60 ) - upnp? ( >=3Dnet-libs/gupnp-0.13.0 )" -DEPEND=3D"${RDEPEND} - sys-devel/gettext - >=3Ddev-util/pkgconfig-0.19 - >=3Ddev-util/intltool-0.35 - doc? ( >=3Ddev-util/gtk-doc-1.9 )" -# Needed for eautoreconf -# >=3Dgnome-base/gnome-common-0.12 -# dev-util/gtk-doc-am - -_use_plugin() { - if use ${1}; then - G2CONF=3D"${G2CONF}${2:-"${1}"}," - fi -} - -pkg_setup() { - DOCS=3D"AUTHORS ChangeLog NEWS README" - G2CONF=3D"${G2CONF} - --with-plugins=3Dremovable-devices," - _use_plugin cdr nautilus-burn - _use_plugin mail evolution - _use_plugin pidgin - _use_plugin gajim - _use_plugin upnp -} diff --git a/net-libs/libepc/libepc-0.3.11.ebuild b/net-libs/libepc/libep= c-0.3.11.ebuild deleted file mode 100644 index 2a9481a..0000000 --- a/net-libs/libepc/libepc-0.3.11.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" - -inherit gnome2 - -DESCRIPTION=3D"Easy Publish and Consume library for network discovered s= ervices." -HOMEPAGE=3D"http://live.gnome.org/libepc/" - -LICENSE=3D"LGPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"doc" - -RDEPEND=3D">=3Dnet-dns/avahi-0.6[dbus,gtk] - >=3Ddev-libs/glib-2.15.1 - >=3Dnet-libs/gnutls-1.4 - >=3Dsys-libs/e2fsprogs-libs-1.36 - >=3Dx11-libs/gtk+-2.10:2 - >=3Dnet-libs/libsoup-2.3:2.4" -DEPEND=3D"${RDEPEND} - >=3Ddev-util/pkgconfig-0.14 - >=3Ddev-util/intltool-0.35.0 - doc? ( >=3Ddev-util/gtk-doc-1.4 )" - -DOCS=3D"AUTHORS ChangeLog NEWS README" - -# FIXME: 2 out of 16 tests fail, upstream bug #578792 -RESTRICT=3D"test" - -src_test() { - unset DBUS_SYSTEM_BUS_ADDRESS - emake check || die "emake check failed" -} diff --git a/net-libs/libepc/libepc-0.4.0.ebuild b/net-libs/libepc/libepc= -0.4.0.ebuild deleted file mode 100644 index f7c13b5..0000000 --- a/net-libs/libepc/libepc-0.4.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" - -inherit gnome2 - -DESCRIPTION=3D"Easy Publish and Consume library for network discovered s= ervices." -HOMEPAGE=3D"http://live.gnome.org/libepc/" - -LICENSE=3D"LGPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"doc" - -RDEPEND=3D">=3Dnet-dns/avahi-0.6[dbus,gtk3] - >=3Ddev-libs/glib-2.15.1 - >=3Dnet-libs/gnutls-1.4 - >=3Dsys-libs/e2fsprogs-libs-1.36 - >=3Dx11-libs/gtk+-2.10:2 - >=3Dnet-libs/libsoup-2.3:2.4" -DEPEND=3D"${RDEPEND} - >=3Ddev-util/pkgconfig-0.14 - >=3Ddev-util/intltool-0.35.0 - doc? ( >=3Ddev-util/gtk-doc-1.4 )" - -DOCS=3D"AUTHORS ChangeLog NEWS README" - -# FIXME: 2 out of 16 tests fail, upstream bug #578792 -RESTRICT=3D"test" - -src_test() { - unset DBUS_SYSTEM_BUS_ADDRESS - emake check || die "emake check failed" -} diff --git a/sys-apps/accountsservice/accountsservice-0.6.13.ebuild b/sys= -apps/accountsservice/accountsservice-0.6.13.ebuild deleted file mode 100644 index 455a342..0000000 --- a/sys-apps/accountsservice/accountsservice-0.6.13.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"3" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" - -inherit eutils gnome2 systemd - -DESCRIPTION=3D"D-Bus interfaces for querying and manipulating user accou= nt information" -HOMEPAGE=3D"http://www.fedoraproject.org/wiki/Features/UserAccountDialog= " -SRC_URI=3D"http://www.freedesktop.org/software/${PN}/${P}.tar.xz" - -LICENSE=3D"GPL-3" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"+introspection" - -RDEPEND=3D" - dev-libs/glib:2 - dev-libs/dbus-glib - sys-auth/polkit - - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.12 )" -DEPEND=3D"${RDEPEND} - dev-libs/libxslt - dev-util/pkgconfig - sys-devel/gettext - >=3Ddev-util/intltool-0.40" - -# Documentaton doesn't validate -RESTRICT=3D"test" - -pkg_setup() { - # docbook docs don't validate, disable doc rebuild - G2CONF=3D"${G2CONF} - --disable-static - --localstatedir=3D/var - --disable-docbook-docs - --disable-maintainer-mode - --disable-more-warnings - $(systemd_with_unitdir) - $(use_enable introspection)" - DOCS=3D"AUTHORS NEWS README TODO" -} - -src_prepare() { - # Useful patches from upstream git, will be in next release - epatch "${FILESDIR}/${P}-SetAutomaticLogin-false.patch" \ - "${FILESDIR}/${P}-PATH_GDM_CUSTOM.patch" \ - "${FILESDIR}/${P}-monitor-etc-gdm-custom.conf.patch" \ - "${FILESDIR}/${P}-etc-passwd-timeout.patch" - - gnome2_src_prepare -} diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_G= DM_CUSTOM.patch b/sys-apps/accountsservice/files/accountsservice-0.6.13-P= ATH_GDM_CUSTOM.patch deleted file mode 100644 index 8f57cf1..0000000 --- a/sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_GDM_CUST= OM.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0c32736980a4f02d4eacf90d145bf937bf29dea6 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Thu, 21 Jul 2011 16:04:13 -0400 -Subject: [PATCH 2/4] daemon: use PATH_GDM_CUSTOM instead of string liter= al - -It's better to consolidate references to file path in one -place up top. ---- - src/daemon.c | 13 ++++--------- - 1 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/src/daemon.c b/src/daemon.c -index f8753d6..eb9aa61 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -50,6 +50,7 @@ - #define PATH_PASSWD "/etc/passwd" - #define PATH_SHADOW "/etc/shadow" - #define PATH_LOGIN_DEFS "/etc/login.defs" -+#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf" -=20 - #ifndef FALLBACK_MINIMAL_UID - #define FALLBACK_MINIMAL_UID 500 -@@ -1207,15 +1208,12 @@ load_autologin (Daemon *daemon, - GError **error) - { - GKeyFile *keyfile; -- const gchar *filename; - GError *local_error; - gchar *string; -=20 -- filename =3D "/etc/gdm/custom.conf"; -- - keyfile =3D g_key_file_new (); - if (!g_key_file_load_from_file (keyfile, -- filename, -+ PATH_GDM_CUSTOM, - G_KEY_FILE_KEEP_COMMENTS, - error)) { - g_key_file_free (keyfile); -@@ -1257,15 +1255,12 @@ save_autologin (Daemon *daemon, - GError **error) - { - GKeyFile *keyfile; -- const gchar *filename; - gchar *data; - gboolean result; -=20 -- filename =3D "/etc/gdm/custom.conf"; -- - keyfile =3D g_key_file_new (); - if (!g_key_file_load_from_file (keyfile, -- filename, -+ PATH_GDM_CUSTOM, - G_KEY_FILE_KEEP_COMMENTS, - error)) { - g_key_file_free (keyfile); -@@ -1276,7 +1271,7 @@ save_autologin (Daemon *daemon, - g_key_file_set_string (keyfile, "daemon", "AutomaticLogin", nam= e); -=20 - data =3D g_key_file_to_data (keyfile, NULL, NULL); -- result =3D g_file_set_contents (filename, data, -1, error); -+ result =3D g_file_set_contents (PATH_GDM_CUSTOM, data, -1, erro= r); -=20 - g_key_file_free (keyfile); - g_free (data); ---=20 -1.7.6 - diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-SetAut= omaticLogin-false.patch b/sys-apps/accountsservice/files/accountsservice-= 0.6.13-SetAutomaticLogin-false.patch deleted file mode 100644 index 9afafc2..0000000 --- a/sys-apps/accountsservice/files/accountsservice-0.6.13-SetAutomaticL= ogin-false.patch +++ /dev/null @@ -1,40 +0,0 @@ -From df8e8831131663efc7ca42c4016e445362bee843 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 20 Jul 2011 10:54:35 -0400 -Subject: [PATCH 1/4] daemon: ignore extraneous SetAutomaticLogin(false) = calls - for a user - -Right now, if a user is not configured for automatic login, and -SetAutomaticLogin(false) is called for that user then we disable -automatic login system wide even if someone else is configured -for automatic login. - -This commit changes the semantics of the call such that -SetAutomaticLogin(false) is a no op for users where automatic login -isn't already enabled. - -Spotted by Vincent Untz - -https://bugs.freedesktop.org/show_bug.cgi?id=3D39402 ---- - src/daemon.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/daemon.c b/src/daemon.c -index ec319a9..f8753d6 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -1294,6 +1294,10 @@ daemon_local_set_automatic_login (Daemon *daem= on, - return TRUE; - } -=20 -+ if (daemon->priv->autologin !=3D user && !enabled) { -+ return TRUE; -+ } -+ - if (!save_autologin (daemon, user_local_get_user_name (user), e= nabled, error)) { - return FALSE; - } ---=20 -1.7.6 - diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-pa= sswd-timeout.patch b/sys-apps/accountsservice/files/accountsservice-0.6.1= 3-etc-passwd-timeout.patch deleted file mode 100644 index 36e3f5a..0000000 --- a/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-ti= meout.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4e3fad33442dfd908561960921aad335fad6b5a8 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Thu, 21 Jul 2011 16:09:13 -0400 -Subject: [PATCH 4/4] daemon: call reload_users after timeout on passwd/s= hadow - changes - -Often the two files are changed in concert, so it makes sense to -wait a bit before doing a heavy reload operation. - -Suggested by Vincent. - -https://bugs.freedesktop.org/show_bug.cgi?id=3D39413 ---- - src/daemon.c | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) - -diff --git a/src/daemon.c b/src/daemon.c -index 882fb2f..79915a7 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -492,6 +492,19 @@ reload_autologin_timeout (Daemon *daemon) - } -=20 - static void -+queue_reload_users_soon (Daemon *daemon) -+{ -+ if (daemon->priv->reload_id > 0) { -+ return; -+ } -+ -+ /* we wait half a second or so in case /etc/passwd and -+ * /etc/shadow are changed at the same time, or repeatedly. -+ */ -+ daemon->priv->reload_id =3D g_timeout_add (500, (GSourceFunc)re= load_users_timeout, daemon); -+} -+ -+static void - queue_reload_users (Daemon *daemon) - { - if (daemon->priv->reload_id > 0) { -@@ -523,7 +536,7 @@ on_passwd_monitor_changed (GFileMonitor *monito= r, - return; - } -=20 -- reload_users (daemon); -+ queue_reload_users_soon (daemon); - } -=20 - static void ---=20 -1.7.6 - diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-monito= r-etc-gdm-custom.conf.patch b/sys-apps/accountsservice/files/accountsserv= ice-0.6.13-monitor-etc-gdm-custom.conf.patch deleted file mode 100644 index 0389c7e..0000000 --- a/sys-apps/accountsservice/files/accountsservice-0.6.13-monitor-etc-g= dm-custom.conf.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 07ea415a5ea0fc5039c947f967c5683ef0e31201 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Thu, 21 Jul 2011 08:20:08 +0200 -Subject: [PATCH 3/4] daemon: Monitor /etc/gdm/custom.conf for changes in - autologin config - -We also emit relevant signals when loading the file. - -https://bugs.freedesktop.org/show_bug.cgi?id=3D39413 ---- - src/daemon.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 47 insertions(+), 4 deletions(-) - -diff --git a/src/daemon.c b/src/daemon.c -index eb9aa61..882fb2f 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -107,6 +107,7 @@ struct DaemonPrivate { -=20 - GFileMonitor *passwd_monitor; - GFileMonitor *shadow_monitor; -+ GFileMonitor *gdm_monitor; -=20 - guint reload_id; - guint autologin_id; -@@ -451,7 +452,7 @@ reload_autologin_timeout (Daemon *daemon) - gboolean enabled; - gchar *name =3D NULL; - GError *error =3D NULL; -- User *user; -+ User *user =3D NULL; -=20 - daemon->priv->autologin_id =3D 0; -=20 -@@ -463,11 +464,23 @@ reload_autologin_timeout (Daemon *daemon) - return FALSE; - } -=20 -+ if (enabled && name) -+ user =3D daemon_local_find_user_by_name (daemon, name); -+ -+ if (daemon->priv->autologin !=3D NULL && daemon->priv->autologi= n !=3D user) { -+ g_object_set (daemon->priv->autologin, "automatic-login= ", FALSE, NULL); -+ g_signal_emit_by_name (daemon->priv->autologin, "change= d", 0); -+ g_object_unref (daemon->priv->autologin); -+ daemon->priv->autologin =3D NULL; -+ } -+ - if (enabled) { - g_debug ("automatic login is enabled for '%s'\n", name)= ; -- user =3D daemon_local_find_user_by_name (daemon, name); -- g_object_set (user, "automatic-login", TRUE, NULL); -- daemon->priv->autologin =3D g_object_ref (user); -+ if (daemon->priv->autologin !=3D user) { -+ g_object_set (user, "automatic-login", TRUE, NU= LL); -+ daemon->priv->autologin =3D g_object_ref (user)= ; -+ g_signal_emit_by_name (daemon->priv->autologin,= "changed", 0); -+ } - } - else { - g_debug ("automatic login is disabled\n"); -@@ -513,6 +526,21 @@ on_passwd_monitor_changed (GFileMonitor *monit= or, - reload_users (daemon); - } -=20 -+static void -+on_gdm_monitor_changed (GFileMonitor *monitor, -+ GFile *file, -+ GFile *other_file, -+ GFileMonitorEvent event_type, -+ Daemon *daemon) -+{ -+ if (event_type !=3D G_FILE_MONITOR_EVENT_CHANGED && -+ event_type !=3D G_FILE_MONITOR_EVENT_CREATED) { -+ return; -+ } -+ -+ queue_reload_autologin (daemon); -+} -+ - static uid_t - get_minimal_uid (void) - { -@@ -603,6 +631,12 @@ daemon_init (Daemon *daemon) - NULL, - &error); - g_object_unref (file); -+ file =3D g_file_new_for_path (PATH_GDM_CUSTOM); -+ daemon->priv->gdm_monitor =3D g_file_monitor_file (file, -+ G_FILE_MONITOR= _NONE, -+ NULL, -+ &error); -+ g_object_unref (file); -=20 - if (daemon->priv->passwd_monitor !=3D NULL) { - g_signal_connect (daemon->priv->passwd_monitor, -@@ -622,6 +656,15 @@ daemon_init (Daemon *daemon) - g_warning ("Unable to monitor %s: %s", PATH_SHADOW, err= or->message); - g_error_free (error); - } -+ if (daemon->priv->gdm_monitor !=3D NULL) { -+ g_signal_connect (daemon->priv->gdm_monitor, -+ "changed", -+ G_CALLBACK (on_gdm_monitor_changed), -+ daemon); -+ } else { -+ g_warning ("Unable to monitor %s: %s", PATH_GDM_CUSTOM,= error->message); -+ g_error_free (error); -+ } -=20 - queue_reload_users (daemon); - queue_reload_autologin (daemon); ---=20 -1.7.6 - diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x1= 1.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.p= atch deleted file mode 100644 index ae7ec2c..0000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch +++ /dev/null @@ -1,24 +0,0 @@ -Adds a new configure option to remove the automagic dependency on libX11= . - ---- configure.ac -+++ configure.ac -@@ -929,7 +929,18 @@ GDK_PIXBUF_XLIB_PACKAGES=3D - GDK_PIXBUF_XLIB_EXTRA_CFLAGS=3D - GDK_PIXBUF_XLIB_EXTRA_LIBS=3D -=20 --if $PKG_CONFIG --exists x11; then -+AC_ARG_WITH(x11, -+ AC_HELP_STRING([--with-x11=3D@<:@no/auto/yes@:>@], -+ [build X11 support @<:@default=3Dauto@:>@]),= , -+ [ -+ if $PKG_CONFIG --exists x11; then -+ with_x11=3Dyes -+ else -+ with_x11=3Dno -+ fi -+ ]) -+ -+if test x$with_x11 =3D xyes; then - AM_CONDITIONAL(USE_X11, true) - PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0) - else diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild b/x11-libs/gdk-= pixbuf/gdk-pixbuf-2.23.5.ebuild deleted file mode 100644 index a2f7f30..0000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1= .ebuild,v 1.1 2010/11/08 23:22:59 eva Exp $ - -EAPI=3D"4" - -inherit gnome.org multilib libtool autotools - -DESCRIPTION=3D"Image loading library for GTK+" -HOMEPAGE=3D"http://www.gtk.org/" - -LICENSE=3D"LGPL-2" -SLOT=3D"2" -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc = ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-mac= os ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE=3D"+X debug doc +introspection jpeg jpeg2k tiff test" - -COMMON_DEPEND=3D" - >=3Ddev-libs/glib-2.27.2 - >=3Dmedia-libs/libpng-1.2.43-r2:0 - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.3 ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=3Dmedia-libs/tiff-3.9.2 ) - X? ( x11-libs/libX11 )" -DEPEND=3D"${COMMON_DEPEND} - >=3Ddev-util/pkgconfig-0.9 - >=3Dsys-devel/gettext-0.17 - >=3Ddev-util/gtk-doc-am-1.11 - doc? ( - >=3Ddev-util/gtk-doc-1.11 - ~app-text/docbook-xml-dtd-4.1.2 )" -# librsvg blocker is for the new pixbuf loader API, you lose icons other= wise -RDEPEND=3D"${COMMON_DEPEND} - ! "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.= 10.0/loaders.cache" - - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/l= ib/gtk-2.0/2.*/loaders - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)= " - fi -}