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 1QgQpk-0001bY-97 for garchives@archives.gentoo.org; Tue, 12 Jul 2011 00:28:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2DAF21C3C9; Tue, 12 Jul 2011 00:28:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A55ED21C3A8 for ; Tue, 12 Jul 2011 00:28:08 +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 D65AF2AC1CE for ; Tue, 12 Jul 2011 00:28:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F06218003D for ; Tue, 12 Jul 2011 00:28:06 +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:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: eb677ec98eb7aef873b5a911951aefcc52518f88 Date: Tue, 12 Jul 2011 00:28:06 +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: f1ca8978e3e48746ee8b49f0e005c56d commit: eb677ec98eb7aef873b5a911951aefcc52518f88 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Jul 12 00:25:45 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Jul 12 00:25:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Deb677ec9 gnome-base/gnome-control-center: 3.0.2-r1 =E2=86=92 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 =3D> 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/gn= ome-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-de= lete-users-32-bit.patch @@ -0,0 +1,22 @@ +From 6ee7b75e0f87bc39baa262b270c73f7de699c406 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +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=3D652073 +--- +diff --git a/panels/user-accounts/um-user-manager.c b/panels/user-accoun= ts/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 *ma= nager, + 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-r= 1.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.e= build index 69e422b..a54b227 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuil= d +++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuil= d @@ -107,8 +107,11 @@ src_prepare() { # cups-1.5 compatibility; will be in next release epatch "${FILESDIR}/${P}-cups-ppd.h.patch" =20 - # https://bugzilla.gnome.org/show_bug.cgi?id=3D653211 - epatch "${FILESDIR}/${PN}-3.0.2-https-handler.patch" + # https://bugzilla.gnome.org/show_bug.cgi?id=3D653211, 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" =20 gnome2_src_prepare }