public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
Date: Tue, 12 Jul 2011 00:28:06 +0000 (UTC)	[thread overview]
Message-ID: <eb677ec98eb7aef873b5a911951aefcc52518f88.tetromino@gentoo> (raw)

commit:     eb677ec98eb7aef873b5a911951aefcc52518f88
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 00:25:45 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 12 00:25:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eb677ec9

gnome-base/gnome-control-center: 3.0.2-r1 → 3.0.2-r2

Add upstream patch allowing users to be deleted on 32-bit systems.

---
 ...-control-center-3.0.2-delete-users-32-bit.patch |   22 ++++++++++++++++++++
 ...ebuild => gnome-control-center-3.0.2-r2.ebuild} |    7 ++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
new file mode 100644
index 0000000..d773408
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
@@ -0,0 +1,22 @@
+From 6ee7b75e0f87bc39baa262b270c73f7de699c406 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sat, 11 Jun 2011 11:40:39 +0000
+Subject: user-accounts: Fix deleting users on 32-bit systems
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652073
+---
+diff --git a/panels/user-accounts/um-user-manager.c b/panels/user-accounts/um-user-manager.c
+index 6bf8b42..442809a 100644
+--- a/panels/user-accounts/um-user-manager.c
++++ b/panels/user-accounts/um-user-manager.c
+@@ -577,7 +577,7 @@ um_user_manager_delete_user (UmUserManager       *manager,
+                                  delete_user_done,
+                                  data,
+                                  async_user_op_data_free,
+-                                 G_TYPE_INT64, um_user_get_uid (user),
++                                 G_TYPE_INT64, (gint64) um_user_get_uid (user),
+                                  G_TYPE_BOOLEAN, remove_files,
+                                  G_TYPE_INVALID);
+ }
+--
+cgit v0.9

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild
similarity index 92%
rename from gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild
index 69e422b..a54b227 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild
@@ -107,8 +107,11 @@ src_prepare() {
 	# cups-1.5 compatibility; will be in next release
 	epatch "${FILESDIR}/${P}-cups-ppd.h.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653211
-	epatch "${FILESDIR}/${PN}-3.0.2-https-handler.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653211, will be in next release
+	epatch "${FILESDIR}/${P}-https-handler.patch"
+
+	# fix deleting users on 32-bit systems, will be in next release
+	epatch "${FILESDIR}/${P}-delete-users-32-bit.patch"
 
 	gnome2_src_prepare
 }



             reply	other threads:[~2011-07-12  0:28 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-12  0:28 Alexandre Restovtsev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-03-25  0:56 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ Ole Reifschneider
2015-10-02 12:50 Ole Reifschneider
2015-05-10 17:20 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-04-25 21:07 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-09 23:06 Gilles Dartiguelongue
2012-12-07 20:02 Arun Raghavan
2012-10-27  8:43 Priit Laes
2012-09-21  0:27 Nirbheek Chauhan
2012-09-10 16:13 Priit Laes
2012-09-10  5:08 Nirbheek Chauhan
2012-07-19  2:47 Alexandre Restovtsev
2012-05-25  8:22 Alexandre Restovtsev
2012-03-26  8:20 Nirbheek Chauhan
2011-10-28  5:28 Alexandre Restovtsev
2011-06-24 17:35 Alexandre Restovtsev
2011-03-29  8:35 Nirbheek Chauhan
2011-03-26  0:37 Nirbheek Chauhan
2011-02-28  7:48 Nirbheek Chauhan
2011-02-18  6:31 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eb677ec98eb7aef873b5a911951aefcc52518f88.tetromino@gentoo \
    --to=tetromino@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox