* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/libgnome-keyring/files/, gnome-base/libgnome-keyring/
@ 2011-07-07 9:24 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-07-07 9:24 UTC (permalink / raw
To: gentoo-commits
commit: f1c102a60dfc1648e0749ef2e80121fe98b2424a
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 7 07:14:47 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 7 07:14:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f1c102a6
gnome-base/libgnome-keyring: 3.0.3 → 3.1.1
Bump to gnome-3.1.x version, add patches to fix memory leaks, punt .la
files, change sed to use configure.ac instead of configure.in.
---
...libgnome-keyring-3.1.1-memory-leaks-crash.patch | 35 ++++++++++++
.../libgnome-keyring-3.1.1-memory-leaks.patch | 58 ++++++++++++++++++++
...-3.0.3.ebuild => libgnome-keyring-3.1.1.ebuild} | 11 +++-
3 files changed, 101 insertions(+), 3 deletions(-)
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks-crash.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks-crash.patch
new file mode 100644
index 0000000..1e28cdb
--- /dev/null
+++ b/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks-crash.patch
@@ -0,0 +1,35 @@
+From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Mon, 23 May 2011 08:58:49 +0000
+Subject: Fix crash from recent memleak fix (b49e32b)
+
+make_attribute_list_va() statically copies the caller's method arguments into
+the GnomeKeyringAttributeList, so we must only free the array itself, not the
+GnomeKeyringAttribute strings.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
+---
+diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
+index dc271dd..4febf47 100644
+--- a/library/gnome-keyring.c
++++ b/library/gnome-keyring.c
+@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type,
+ va_end (args);
+
+ ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
+- gnome_keyring_attribute_list_free (attributes);
++ g_array_free (attributes, TRUE);
+ return ret;
+ }
+
+@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
+ va_end (args);
+
+ ret = gnome_keyring_find_items_sync (type, attributes, found);
+- gnome_keyring_attribute_list_free (attributes);
++ g_array_free (attributes, TRUE);
+ return ret;
+ }
+
+--
+cgit v0.9
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks.patch
new file mode 100644
index 0000000..5644dd8
--- /dev/null
+++ b/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks.patch
@@ -0,0 +1,58 @@
+From b49e32b32d4d7c326c3bd7dd44ca1c35944a94c4 Mon Sep 17 00:00:00 2001
+From: landijk <landijk-user@yahoo.com>
+Date: Sun, 22 May 2011 11:27:10 +0000
+Subject: Fix memory leaks.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650606
+---
+diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
+index d25ad0c..dc271dd 100644
+--- a/library/gnome-keyring.c
++++ b/library/gnome-keyring.c
+@@ -2279,6 +2279,8 @@ find_items_1_reply (GkrOperation *op, DBusMessage *reply, gpointer data)
+ /* Did we find anything? */
+ if (!n_unlocked && !n_locked) {
+ gkr_operation_complete (op, GNOME_KEYRING_RESULT_NO_MATCH);
++ dbus_free_string_array (locked);
++ dbus_free_string_array (unlocked);
+ return;
+ }
+
+@@ -2434,12 +2436,15 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type,
+ {
+ GnomeKeyringAttributeList *attributes;
+ va_list args;
++ gpointer ret;
+
+ va_start (args, destroy_data);
+ attributes = make_attribute_list_va (args);
+ va_end (args);
+
+- return gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
++ ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
++ gnome_keyring_attribute_list_free (attributes);
++ return ret;
+ }
+
+ /**
+@@ -2506,6 +2511,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
+ {
+ GnomeKeyringAttributeList *attributes;
+ va_list args;
++ GnomeKeyringResult ret;
+
+ g_return_val_if_fail (found, GNOME_KEYRING_RESULT_BAD_ARGUMENTS);
+
+@@ -2513,7 +2519,9 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
+ attributes = make_attribute_list_va (args);
+ va_end (args);
+
+- return gnome_keyring_find_items_sync (type, attributes, found);
++ ret = gnome_keyring_find_items_sync (type, attributes, found);
++ gnome_keyring_attribute_list_free (attributes);
++ return ret;
+ }
+
+ /**
+--
+cgit v0.9
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.0.3.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.1.1.ebuild
similarity index 80%
rename from gnome-base/libgnome-keyring/libgnome-keyring-3.0.3.ebuild
rename to gnome-base/libgnome-keyring/libgnome-keyring-3.1.1.ebuild
index b44c680..46040f0 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.0.3.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.1.1.ebuild
@@ -4,8 +4,9 @@
EAPI="3"
GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
-inherit gnome2
+inherit eutils gnome2
DESCRIPTION="Compatibility library for accessing secrets"
HOMEPAGE="http://live.gnome.org/GnomeKeyring"
@@ -34,14 +35,18 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
+ # Memory leak fixes, will be in next release
+ epatch "${FILESDIR}/${P}-memory-leaks.patch"
+ epatch "${FILESDIR}/${P}-memory-leaks-crash.patch"
+
# FIXME: Remove silly CFLAGS
sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
- -i configure.in configure || die "sed failed"
+ -i configure.ac configure || die "sed failed"
# FIXME: Remove DISABLE_DEPRECATED flags
sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
- -i configure.in configure || die "sed 2 failed"
+ -i configure.ac configure || die "sed 2 failed"
}
src_test() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/libgnome-keyring/files/, gnome-base/libgnome-keyring/
@ 2011-07-26 3:17 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-07-26 3:17 UTC (permalink / raw
To: gentoo-commits
commit: b031ec6692d86c2e6d2704c94e4f79763261dfd7
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 01:31:25 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 01:31:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b031ec66
gnome-base/libgnome-keyring: 3.1.1 → 3.1.4
Version bump. Patches were applied upstream.
---
...libgnome-keyring-3.1.1-memory-leaks-crash.patch | 35 ------------
.../libgnome-keyring-3.1.1-memory-leaks.patch | 58 --------------------
...-3.1.1.ebuild => libgnome-keyring-3.1.4.ebuild} | 6 +--
3 files changed, 1 insertions(+), 98 deletions(-)
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks-crash.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks-crash.patch
deleted file mode 100644
index 1e28cdb..0000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 23 May 2011 08:58:49 +0000
-Subject: Fix crash from recent memleak fix (b49e32b)
-
-make_attribute_list_va() statically copies the caller's method arguments into
-the GnomeKeyringAttributeList, so we must only free the array itself, not the
-GnomeKeyringAttribute strings.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
----
-diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
-index dc271dd..4febf47 100644
---- a/library/gnome-keyring.c
-+++ b/library/gnome-keyring.c
-@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type,
- va_end (args);
-
- ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
-- gnome_keyring_attribute_list_free (attributes);
-+ g_array_free (attributes, TRUE);
- return ret;
- }
-
-@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
- va_end (args);
-
- ret = gnome_keyring_find_items_sync (type, attributes, found);
-- gnome_keyring_attribute_list_free (attributes);
-+ g_array_free (attributes, TRUE);
- return ret;
- }
-
---
-cgit v0.9
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks.patch
deleted file mode 100644
index 5644dd8..0000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-3.1.1-memory-leaks.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b49e32b32d4d7c326c3bd7dd44ca1c35944a94c4 Mon Sep 17 00:00:00 2001
-From: landijk <landijk-user@yahoo.com>
-Date: Sun, 22 May 2011 11:27:10 +0000
-Subject: Fix memory leaks.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650606
----
-diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
-index d25ad0c..dc271dd 100644
---- a/library/gnome-keyring.c
-+++ b/library/gnome-keyring.c
-@@ -2279,6 +2279,8 @@ find_items_1_reply (GkrOperation *op, DBusMessage *reply, gpointer data)
- /* Did we find anything? */
- if (!n_unlocked && !n_locked) {
- gkr_operation_complete (op, GNOME_KEYRING_RESULT_NO_MATCH);
-+ dbus_free_string_array (locked);
-+ dbus_free_string_array (unlocked);
- return;
- }
-
-@@ -2434,12 +2436,15 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type,
- {
- GnomeKeyringAttributeList *attributes;
- va_list args;
-+ gpointer ret;
-
- va_start (args, destroy_data);
- attributes = make_attribute_list_va (args);
- va_end (args);
-
-- return gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
-+ ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
-+ gnome_keyring_attribute_list_free (attributes);
-+ return ret;
- }
-
- /**
-@@ -2506,6 +2511,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
- {
- GnomeKeyringAttributeList *attributes;
- va_list args;
-+ GnomeKeyringResult ret;
-
- g_return_val_if_fail (found, GNOME_KEYRING_RESULT_BAD_ARGUMENTS);
-
-@@ -2513,7 +2519,9 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type,
- attributes = make_attribute_list_va (args);
- va_end (args);
-
-- return gnome_keyring_find_items_sync (type, attributes, found);
-+ ret = gnome_keyring_find_items_sync (type, attributes, found);
-+ gnome_keyring_attribute_list_free (attributes);
-+ return ret;
- }
-
- /**
---
-cgit v0.9
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.1.1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.1.4.ebuild
similarity index 89%
rename from gnome-base/libgnome-keyring/libgnome-keyring-3.1.1.ebuild
rename to gnome-base/libgnome-keyring/libgnome-keyring-3.1.4.ebuild
index 46040f0..2c57a81 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.1.1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.1.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.5 2011/02/24 19:18:29 tomka Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -35,10 +35,6 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
- # Memory leak fixes, will be in next release
- epatch "${FILESDIR}/${P}-memory-leaks.patch"
- epatch "${FILESDIR}/${P}-memory-leaks-crash.patch"
-
# FIXME: Remove silly CFLAGS
sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-26 3:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-26 3:17 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/libgnome-keyring/files/, gnome-base/libgnome-keyring/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-07-07 9:24 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox