* [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/libepc/, x11-libs/gdk-pixbuf/, gnome-extra/nautilus-sendto/, ...
@ 2011-08-18 21:03 Alexandre Restovtsev
0 siblings, 0 replies; only message in thread
From: Alexandre Restovtsev @ 2011-08-18 21:03 UTC (permalink / raw
To: gentoo-commits
commit: fdea5a63d11db9097b573a81bab6bf1776511a28
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Aug 18 19:57:35 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Aug 18 19:57:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fdea5a63
Lots of packages: moved to gx86
---
| 62 -----------
| 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-extra/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="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Unicode character map viewer library"
-HOMEPAGE="http://live.gnome.org/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk doc +introspection"
-
-RDEPEND=">=dev-libs/glib-2.16.3[introspection?]
- >=x11-libs/pango-1.2.1[introspection?]
- >=x11-libs/gtk+-2.14.0:2[introspection?]
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
-DEPEND="${RDEPEND}
- app-text/scrollkeeper
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.40
-
- sys-devel/gettext
-
- doc? ( >=dev-util/gtk-doc-1.0 )"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-static
- --disable-scrollkeeper
- --disable-maintainer-mode
- --with-gtk=2.0
- --disable-charmap
- --disable-gconf
- $(use_enable introspection)
- $(use_enable cjk unihan)"
- # gconf is only needed for the gucharmap program
- DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
- # .desktop and schema files are only needed for the gucharmap program
- sed -e 's:desktop_DATA\s*=.*:desktop_DATA = :' \
- -e 's:schema_DATA\s*=.*:schema_DATA = :' \
- -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-extra/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="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="http://live.gnome.org/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk doc gnome +introspection test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16.3[introspection?]
- >=x11-libs/pango-1.2.1[introspection?]
- >=x11-libs/gtk+-3.0.0:3[introspection?]
-
- gnome? ( gnome-base/gconf:2 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
-RDEPEND="${COMMON_DEPEND}
- !!<gnome-extra/gucharmap-3:0"
-DEPEND="${RDEPEND}
- app-text/scrollkeeper
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.40
- >=app-text/gnome-doc-utils-0.9.0
-
- sys-devel/gettext
-
- doc? ( >=dev-util/gtk-doc-1.0 )
- test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-static
- --disable-scrollkeeper
- --disable-maintainer-mode
- --with-gtk=3.0
- $(use_enable gnome gconf)
- $(use_enable introspection)
- $(use_enable cjk unihan)"
- DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
- # prevent file collisions with slot 0
- sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
- -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/gnome-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="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="A nautilus extension for sending files to locations"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="cdr doc gajim +mail pidgin upnp"
-
-RDEPEND=">=x11-libs/gtk+-2.90.3:3
- >=dev-libs/glib-2.25.9:2
- >=gnome-base/nautilus-2.31.3
- cdr? ( >=app-cdr/brasero-2.26.0[nautilus] )
- gajim? (
- net-im/gajim
- >=dev-libs/dbus-glib-0.60 )
- mail? ( >=gnome-extra/evolution-data-server-1.5.3 )
- pidgin? (
- >=net-im/pidgin-2.0.0
- >=dev-libs/dbus-glib-0.60 )
- upnp? ( >=net-libs/gupnp-0.13.0 )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.19
- >=dev-util/intltool-0.35
- doc? ( >=dev-util/gtk-doc-1.9 )"
-# Needed for eautoreconf
-# >=gnome-base/gnome-common-0.12
-# dev-util/gtk-doc-am
-
-_use_plugin() {
- if use ${1}; then
- G2CONF="${G2CONF}${2:-"${1}"},"
- fi
-}
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- --with-plugins=removable-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/libepc-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="2"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Easy Publish and Consume library for network discovered services."
-HOMEPAGE="http://live.gnome.org/libepc/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=net-dns/avahi-0.6[dbus,gtk]
- >=dev-libs/glib-2.15.1
- >=net-libs/gnutls-1.4
- >=sys-libs/e2fsprogs-libs-1.36
- >=x11-libs/gtk+-2.10:2
- >=net-libs/libsoup-2.3:2.4"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.14
- >=dev-util/intltool-0.35.0
- doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# FIXME: 2 out of 16 tests fail, upstream bug #578792
-RESTRICT="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="2"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Easy Publish and Consume library for network discovered services."
-HOMEPAGE="http://live.gnome.org/libepc/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=net-dns/avahi-0.6[dbus,gtk3]
- >=dev-libs/glib-2.15.1
- >=net-libs/gnutls-1.4
- >=sys-libs/e2fsprogs-libs-1.36
- >=x11-libs/gtk+-2.10:2
- >=net-libs/libsoup-2.3:2.4"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.14
- >=dev-util/intltool-0.35.0
- doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# FIXME: 2 out of 16 tests fail, upstream bug #578792
-RESTRICT="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="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 systemd
-
-DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
-HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/dbus-glib
- sys-auth/polkit
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- dev-util/pkgconfig
- sys-devel/gettext
- >=dev-util/intltool-0.40"
-
-# Documentaton doesn't validate
-RESTRICT="test"
-
-pkg_setup() {
- # docbook docs don't validate, disable doc rebuild
- G2CONF="${G2CONF}
- --disable-static
- --localstatedir=/var
- --disable-docbook-docs
- --disable-maintainer-mode
- --disable-more-warnings
- $(systemd_with_unitdir)
- $(use_enable introspection)"
- DOCS="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_GDM_CUSTOM.patch b/sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_GDM_CUSTOM.patch
deleted file mode 100644
index 8f57cf1..0000000
--- a/sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_GDM_CUSTOM.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0c32736980a4f02d4eacf90d145bf937bf29dea6 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Thu, 21 Jul 2011 16:04:13 -0400
-Subject: [PATCH 2/4] daemon: use PATH_GDM_CUSTOM instead of string literal
-
-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"
-
- #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;
-
-- filename = "/etc/gdm/custom.conf";
--
- keyfile = 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;
-
-- filename = "/etc/gdm/custom.conf";
--
- keyfile = 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", name);
-
- data = g_key_file_to_data (keyfile, NULL, NULL);
-- result = g_file_set_contents (filename, data, -1, error);
-+ result = g_file_set_contents (PATH_GDM_CUSTOM, data, -1, error);
-
- g_key_file_free (keyfile);
- g_free (data);
---
-1.7.6
-
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-SetAutomaticLogin-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-SetAutomaticLogin-false.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From df8e8831131663efc7ca42c4016e445362bee843 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-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 <vuntz@gnome.org>
-
-https://bugs.freedesktop.org/show_bug.cgi?id=39402
----
- 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 *daemon,
- return TRUE;
- }
-
-+ if (daemon->priv->autologin != user && !enabled) {
-+ return TRUE;
-+ }
-+
- if (!save_autologin (daemon, user_local_get_user_name (user), enabled, error)) {
- return FALSE;
- }
---
-1.7.6
-
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-timeout.patch b/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-timeout.patch
deleted file mode 100644
index 36e3f5a..0000000
--- a/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-timeout.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4e3fad33442dfd908561960921aad335fad6b5a8 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 21 Jul 2011 16:09:13 -0400
-Subject: [PATCH 4/4] daemon: call reload_users after timeout on passwd/shadow
- 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=39413
----
- 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)
- }
-
- 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 = g_timeout_add (500, (GSourceFunc)reload_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 *monitor,
- return;
- }
-
-- reload_users (daemon);
-+ queue_reload_users_soon (daemon);
- }
-
- static void
---
-1.7.6
-
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-monitor-etc-gdm-custom.conf.patch b/sys-apps/accountsservice/files/accountsservice-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-gdm-custom.conf.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 07ea415a5ea0fc5039c947f967c5683ef0e31201 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-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=39413
----
- 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 {
-
- GFileMonitor *passwd_monitor;
- GFileMonitor *shadow_monitor;
-+ GFileMonitor *gdm_monitor;
-
- guint reload_id;
- guint autologin_id;
-@@ -451,7 +452,7 @@ reload_autologin_timeout (Daemon *daemon)
- gboolean enabled;
- gchar *name = NULL;
- GError *error = NULL;
-- User *user;
-+ User *user = NULL;
-
- daemon->priv->autologin_id = 0;
-
-@@ -463,11 +464,23 @@ reload_autologin_timeout (Daemon *daemon)
- return FALSE;
- }
-
-+ if (enabled && name)
-+ user = daemon_local_find_user_by_name (daemon, name);
-+
-+ if (daemon->priv->autologin != NULL && daemon->priv->autologin != user) {
-+ g_object_set (daemon->priv->autologin, "automatic-login", FALSE, NULL);
-+ g_signal_emit_by_name (daemon->priv->autologin, "changed", 0);
-+ g_object_unref (daemon->priv->autologin);
-+ daemon->priv->autologin = NULL;
-+ }
-+
- if (enabled) {
- g_debug ("automatic login is enabled for '%s'\n", name);
-- user = daemon_local_find_user_by_name (daemon, name);
-- g_object_set (user, "automatic-login", TRUE, NULL);
-- daemon->priv->autologin = g_object_ref (user);
-+ if (daemon->priv->autologin != user) {
-+ g_object_set (user, "automatic-login", TRUE, NULL);
-+ daemon->priv->autologin = 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 *monitor,
- reload_users (daemon);
- }
-
-+static void
-+on_gdm_monitor_changed (GFileMonitor *monitor,
-+ GFile *file,
-+ GFile *other_file,
-+ GFileMonitorEvent event_type,
-+ Daemon *daemon)
-+{
-+ if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
-+ event_type != 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 = g_file_new_for_path (PATH_GDM_CUSTOM);
-+ daemon->priv->gdm_monitor = g_file_monitor_file (file,
-+ G_FILE_MONITOR_NONE,
-+ NULL,
-+ &error);
-+ g_object_unref (file);
-
- if (daemon->priv->passwd_monitor != 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, error->message);
- g_error_free (error);
- }
-+ if (daemon->priv->gdm_monitor != 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);
-+ }
-
- queue_reload_users (daemon);
- queue_reload_autologin (daemon);
---
-1.7.6
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
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=
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
- GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
--if $PKG_CONFIG --exists x11; then
-+AC_ARG_WITH(x11,
-+ AC_HELP_STRING([--with-x11=@<:@no/auto/yes@:>@],
-+ [build X11 support @<:@default=auto@:>@]),,
-+ [
-+ if $PKG_CONFIG --exists x11; then
-+ with_x11=yes
-+ else
-+ with_x11=no
-+ fi
-+ ])
-+
-+if test x$with_x11 = 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="4"
-
-inherit gnome.org multilib libtool autotools
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.27.2
- >=media-libs/libpng-1.2.43-r2:0
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- tiff? ( >=media-libs/tiff-3.9.2 )
- X? ( x11-libs/libX11 )"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/pkgconfig-0.9
- >=sys-devel/gettext-0.17
- >=dev-util/gtk-doc-am-1.11
- doc? (
- >=dev-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 otherwise
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gail-1000
- !<gnome-base/librsvg-2.31.0
- !<x11-libs/gtk+-2.21.3:2
- !<x11-libs/gtk+-2.90.4:3"
-
-src_prepare() {
- # Only build against libX11 if the user wants to do so
- epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
-
- elibtoolize
- eautoreconf
-}
-
-src_configure() {
- # png always on to display icons (foser)
- local myconf="
- $(use_enable doc gtk-doc)
- $(use_with jpeg libjpeg)
- $(use_with jpeg2k libjasper)
- $(use_with tiff libtiff)
- $(use_enable introspection)
- $(use_with X x11)
- --with-libpng"
-
- # Passing --disable-debug is not recommended for production use
- use debug && myconf="${myconf} --enable-debug=yes"
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Installation failed"
-
- dodoc AUTHORS NEWS* README* || die "dodoc failed"
-
- # New library, remove .la files
- find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
- gdk-pixbuf-query-loaders > "${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/lib/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
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-18 21:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-18 21:03 [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/libepc/, x11-libs/gdk-pixbuf/, gnome-extra/nautilus-sendto/, Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox