1 |
commit: 1a66f03d2eb38a77201af07cf0e23e854db89530 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue May 24 03:26:50 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 30 15:45:18 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1a66f03d |
7 |
|
8 |
gnome-base/gdm-3.0.2 and sys-apps/accountsservice-0.6.12 bump |
9 |
|
10 |
* gdm-3.0.2 now requires >=accountsservice-0.6.12 |
11 |
* Our accountsservice patches have been merged upstream |
12 |
|
13 |
Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org> |
14 |
|
15 |
--- |
16 |
.../gdm/{gdm-3.0.0-r1.ebuild => gdm-3.0.2.ebuild} | 2 +- |
17 |
...6.6-r3.ebuild => accountsservice-0.6.12.ebuild} | 10 ------- |
18 |
.../accountsservice-fix-nameless-users-crash.patch | 29 -------------------- |
19 |
.../files/accountsservice-fix-useradd.patch | 23 --------------- |
20 |
4 files changed, 1 insertions(+), 63 deletions(-) |
21 |
|
22 |
diff --git a/gnome-base/gdm/gdm-3.0.0-r1.ebuild b/gnome-base/gdm/gdm-3.0.2.ebuild |
23 |
similarity index 99% |
24 |
rename from gnome-base/gdm/gdm-3.0.0-r1.ebuild |
25 |
rename to gnome-base/gdm/gdm-3.0.2.ebuild |
26 |
index 70cbe3e..00d4cc6 100644 |
27 |
--- a/gnome-base/gdm/gdm-3.0.0-r1.ebuild |
28 |
+++ b/gnome-base/gdm/gdm-3.0.2.ebuild |
29 |
@@ -34,7 +34,7 @@ COMMON_DEPEND=" |
30 |
>=gnome-base/gconf-2.31.3 |
31 |
>=x11-misc/xdg-utils-1.0.2-r3 |
32 |
>=sys-power/upower-0.9 |
33 |
- >=sys-apps/accountsservice-0.6.5 |
34 |
+ >=sys-apps/accountsservice-0.6.12 |
35 |
|
36 |
app-text/iso-codes |
37 |
|
38 |
|
39 |
diff --git a/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild b/sys-apps/accountsservice/accountsservice-0.6.12.ebuild |
40 |
similarity index 80% |
41 |
rename from sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild |
42 |
rename to sys-apps/accountsservice/accountsservice-0.6.12.ebuild |
43 |
index dfa66af..3f2b469 100644 |
44 |
--- a/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild |
45 |
+++ b/sys-apps/accountsservice/accountsservice-0.6.12.ebuild |
46 |
@@ -44,13 +44,3 @@ pkg_setup() { |
47 |
$(use_enable introspection)" |
48 |
DOCS="AUTHORS NEWS README TODO" |
49 |
} |
50 |
- |
51 |
-src_prepare() { |
52 |
- # Taken from upstream trunk, remove for next release |
53 |
- epatch "${FILESDIR}/${PN}-fix-useradd.patch" |
54 |
- |
55 |
- # Taken from upstream trunk, remove for next release |
56 |
- epatch "${FILESDIR}/${PN}-fix-nameless-users-crash.patch" |
57 |
- |
58 |
- gnome2_src_prepare |
59 |
-} |
60 |
|
61 |
diff --git a/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch b/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch |
62 |
deleted file mode 100644 |
63 |
index 28e3f02..0000000 |
64 |
--- a/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch |
65 |
+++ /dev/null |
66 |
@@ -1,29 +0,0 @@ |
67 |
-From 74c01ff9e3a3b00810ae69db2f2d089b68c5220a Mon Sep 17 00:00:00 2001 |
68 |
-From: Matthias Clasen <mclasen@××××××.com> |
69 |
-Date: Fri, 15 Apr 2011 16:24:51 +0000 |
70 |
-Subject: Don't crash when removing nameless users |
71 |
- |
72 |
-Every person had in the beginning one only proper name, except the savages |
73 |
-of Mount Atlas in Barbary, which were reported to be both nameless and |
74 |
-dreamless. |
75 |
- |
76 |
-https://bugs.freedesktop.org/show_bug.cgi?id=35872 |
77 |
---- |
78 |
-diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c |
79 |
-index 4e25bf9..7202b07 100644 |
80 |
---- a/src/libaccountsservice/act-user-manager.c |
81 |
-+++ b/src/libaccountsservice/act-user-manager.c |
82 |
-@@ -732,7 +732,10 @@ remove_user (ActUserManager *manager, |
83 |
- if (act_user_get_object_path (user) != NULL) { |
84 |
- g_hash_table_remove (manager->priv->users_by_object_path, act_user_get_object_path (user)); |
85 |
- } |
86 |
-- g_hash_table_remove (manager->priv->users_by_name, act_user_get_user_name (user)); |
87 |
-+ if (act_user_get_user_name (user) != NULL) { |
88 |
-+ g_hash_table_remove (manager->priv->users_by_name, act_user_get_user_name (user)); |
89 |
-+ |
90 |
-+ } |
91 |
- |
92 |
- if (manager->priv->is_loaded) { |
93 |
- g_signal_emit (manager, signals[USER_REMOVED], 0, user); |
94 |
--- |
95 |
-cgit v0.8.3-6-g21f6 |
96 |
|
97 |
diff --git a/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch b/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch |
98 |
deleted file mode 100644 |
99 |
index 7022125..0000000 |
100 |
--- a/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch |
101 |
+++ /dev/null |
102 |
@@ -1,23 +0,0 @@ |
103 |
-From f30ba8c977d35c2c74b61c3ae14c492e28e02175 Mon Sep 17 00:00:00 2001 |
104 |
-From: Frédéric Péters <fpeters@××.be> |
105 |
-Date: Fri, 18 Mar 2011 13:16:34 +0000 |
106 |
-Subject: daemon: fix call to useradd for normal users |
107 |
- |
108 |
---- |
109 |
-diff --git a/src/daemon.c b/src/daemon.c |
110 |
-index 32e9c97..755ada5 100644 |
111 |
---- a/src/daemon.c |
112 |
-+++ b/src/daemon.c |
113 |
-@@ -1111,8 +1111,8 @@ daemon_create_user_authorized_cb (Daemon *daemon, |
114 |
- argv[7] = NULL; |
115 |
- } |
116 |
- else if (cd->account_type == ACCOUNT_TYPE_STANDARD) { |
117 |
-- argv[6] = cd->user_name; |
118 |
-- argv[7] = NULL; |
119 |
-+ argv[4] = cd->user_name; |
120 |
-+ argv[5] = NULL; |
121 |
- } |
122 |
- else { |
123 |
- throw_error (context, ERROR_FAILED, "Don't know how to add user of type %d", cd->account_type); |
124 |
--- |
125 |
-cgit v0.8.3-6-g21f6 |