Include upstream patches committed to 1.1 branch and backport by tetromino for working ok with latest glib-2.29.x (bug #376259 by Alexandre Rostovtsev). Remove old.

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

7 files changed, 318 insertions, 18 deletions

diff --git a/dev-libs/libunique/ChangeLog b/dev-libs/libunique/ChangeLog
index 7c192199ba4c..892602b0f6d5 100644
--- a/dev-libs/libunique/ChangeLog
+++ b/dev-libs/libunique/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/libunique
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.42 2011/07/11 15:40:12 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.43 2011/07/25 15:18:41 pacho Exp $
+
+*libunique-1.1.6-r1 (25 Jul 2011)
+
+  25 Jul 2011; Pacho Ramos <pacho@gentoo.org> +libunique-1.1.6-r1.ebuild,
+  +files/libunique-1.1.6-G_CONST_RETURN.patch,
+  +files/libunique-1.1.6-compiler-warnings.patch,
+  +files/libunique-1.1.6-fix-test.patch,
+  +files/libunique-1.1.6-include-terminator.patch, -libunique-3.0.0.ebuild:
+  Include upstream patches committed to 1.1 branch and backport by tetromino
+  for working ok with latest glib-2.29.x (bug #376259 by Alexandre Rostovtsev).
+  Remove old.
 
   11 Jul 2011; Matt Turner <mattst88@gentoo.org> libunique-3.0.2.ebuild:
   Added ~mips, bug 364693
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index b07728c6a1b5..3d7e74e2b549 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libunique-1.1.6-G_CONST_RETURN.patch 6055 RMD160 da49b15c5876d8aa5d64755cef2bcce1a7287ee3 SHA1 b31c003ab155081901d52ca945168f03d6533b37 SHA256 69cce7257d144e9a6ed9f402196d79ff52013d710e40101f8ef20481876692b2
+AUX libunique-1.1.6-compiler-warnings.patch 1651 RMD160 16b15591f7a658976293a0f1c67c1cfd7002d040 SHA1 4823a79b231b3dae69d07af19cfdcbcb0d32c6ca SHA256 1365451d30af820ba14b54ab27becdbba4cec3ade29e63e2cdecdc23d404bfc6
+AUX libunique-1.1.6-fix-test.patch 1041 RMD160 c22e9811e1b3c8f3cd4f6a7dbf1f9b3f8e324358 SHA1 bcc06deb887f3b95a4e9bea3cd67ae3ad6b12e5f SHA256 1e9fcc4189fb4080c6eae1dd97a68a9dc46f8e1a71be1a348ed6c39f9f02f67e
+AUX libunique-1.1.6-include-terminator.patch 1150 RMD160 190d1d2c5291fa4cebc986f9193686e7e4a883e7 SHA1 0c1782b046304fe3588807e6b1a84c9b9bbaa245 SHA256 32ade6dbddac23e3ff181d14bc1e59e6dbff14f9a7c0ac0afc0a657850714d4d
 AUX run-tests 500 RMD160 e299f662ca2a79cad7fafd5aa186b2ac9ca3752a SHA1 b0dc327cd70ff0c721bb7ad1ca8b5ac46bf70455 SHA256 586a7bea8db8c69761549d4d27024d08d68c4e2dafd59e50efb35bfc42a9afc2
 DIST libunique-1.1.6.tar.bz2 335534 RMD160 2c6894a574eb0f5c91b47cd6214b3f9da63cbcde SHA1 d44ad06503efaaa0c660c5f8a817e90fbe254d1f SHA256 e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb
-DIST libunique-3.0.0.tar.bz2 342590 RMD160 30de57671eaa46d18a6e2813b832fd36951f1e6a SHA1 6833fad7ef1ef15cf5c15a0fea6d9de3630e7381 SHA256 e945ff3d3bb7d4085ed73b5418f2935097bb0afc07287739c8f0d6fc049202e1
 DIST libunique-3.0.2.tar.xz 294712 RMD160 dca2ee6d37f459acf38b5623626e3885c942353f SHA1 e0d0db598159ed5bad53ad5f9e4469c2d458267c SHA256 a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038
+EBUILD libunique-1.1.6-r1.ebuild 1984 RMD160 102a4fb610c20f2da72451738d758254d1992ac0 SHA1 1ffb70cc94f4a3ea6d3d5d6ea4cd27345770106d SHA256 2e4acc5d2d79104f9c44f3ebf3d8e9f74a97cba9397095fb2f0b3e63aae40345
 EBUILD libunique-1.1.6.ebuild 1418 RMD160 843fc1d56c3d58e8bf59cb5de2405fb7d4d61019 SHA1 5e623e5e2e589748c42a47b630535478ae34c83a SHA256 b0fc4699cd15b44cbe45d673c15411b5908cc668c8b9b20488bf9bb99162b057
-EBUILD libunique-3.0.0.ebuild 1422 RMD160 4004228a4b9200de7206aac33a7f9d441a3f2347 SHA1 e62f8f30de4e7657d1f8503940b2582edc2b8fc6 SHA256 4cdc955658248344b2034d5d5fea48816d552b93ec1683fc8e1a8d3c4f0560dd
 EBUILD libunique-3.0.2.ebuild 1459 RMD160 8a38bb7585bd325117890c11e14a1b19f831f3cc SHA1 ca2ab62ebf865bb0937d7d468471ae8106670860 SHA256 8e5b0782610232a3ec73ab00ed35db3425dd7ffd1f51ec86b94936609bfd059f
-MISC ChangeLog 5429 RMD160 1908f5b77213b75945b4bb4e7e02d195393fbd22 SHA1 ed44030ae5b002c506a0ac20294327d14100792d SHA256 2dcd7ec67bb273b24f9dad052ea52ab3e8b9b06e5182c40b90fbd10e559d5939
+MISC ChangeLog 5921 RMD160 430ede9e07f0a621671c53326669df50b92fe973 SHA1 5727beed7680807f5c9d9c616e70c81732899c81 SHA256 23b43e130a7e0550e2047944eb48f2757c093e5c72c81bcaa399fc2ba412e60c
 MISC metadata.xml 524 RMD160 e577176f51e67fe729cd025a5bdf1b1f79eeae0a SHA1 ebde47d0175507854c365ffa5c4052e600b28749 SHA256 3fed9bec27e312e7f8a69a581b5d7b931d53137631b65f401ee149818daf9116
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4tiVYACgkQCaWpQKGI+9RsegCgh85KbrWvVHHAKQUsLBKxJWAr
+43EAn2o2G822TZDdxT6tElTYT/YUuMhB
+=Jrk5
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libunique/files/libunique-1.1.6-G_CONST_RETURN.patch b/dev-libs/libunique/files/libunique-1.1.6-G_CONST_RETURN.patch
new file mode 100644
index 000000000000..1cc5b6e01be4
--- /dev/null
+++ b/dev-libs/libunique/files/libunique-1.1.6-G_CONST_RETURN.patch
@@ -0,0 +1,143 @@
+From 557b0e5045c9eadb556ce11e16965cf0d0787438 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@collabora.co.uk>
+Date: Tue, 14 Jun 2011 12:33:45 +0100
+Subject: [PATCH] Remove G_CONST_RETURN usage, now that its gone in glib.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652545
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: backported to unique-1.1]
+---
+ unique/uniqueapp.c       |    4 ++--
+ unique/uniquebackend.c   |    4 ++--
+ unique/uniquebackend.h   |    4 ++--
+ unique/uniqueinternals.h |    4 ++--
+ unique/uniquemessage.c   |    4 ++--
+ unique/uniquemessage.h   |    4 ++--
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c
+index b40a86c..e8edc94 100644
+--- a/unique/uniqueapp.c
++++ b/unique/uniqueapp.c
+@@ -781,7 +781,7 @@ unique_app_watch_window (UniqueApp *app,
+ }
+ 
+ 
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_command_to_string (UniqueApp *app,
+                           gint       command)
+ {
+@@ -863,7 +863,7 @@ unique_command_from_string (UniqueApp   *app,
+   return retval;
+ }
+ 
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_response_to_string (UniqueResponse response)
+ {
+   GEnumClass *enum_class;
+diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c
+index a76e42e..68e2735 100644
+--- a/unique/uniquebackend.c
++++ b/unique/uniquebackend.c
+@@ -111,7 +111,7 @@ unique_backend_set_name (UniqueBackend *backend,
+  *
+  * Return value: FIXME
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_name (UniqueBackend *backend)
+ {
+   g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+@@ -154,7 +154,7 @@ unique_backend_set_startup_id (UniqueBackend *backend,
+  *
+  * Return value: FIXME
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_startup_id (UniqueBackend *backend)
+ {
+   g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+diff --git a/unique/uniquebackend.h b/unique/uniquebackend.h
+index a50ce4e..b19ad3e 100644
+--- a/unique/uniquebackend.h
++++ b/unique/uniquebackend.h
+@@ -94,10 +94,10 @@ GType                 unique_backend_get_type       (void) G_GNUC_CONST;
+ 
+ UniqueBackend *       unique_backend_create         (void);
+ 
+-G_CONST_RETURN gchar *unique_backend_get_name       (UniqueBackend     *backend);
++const gchar *         unique_backend_get_name       (UniqueBackend     *backend);
+ void                  unique_backend_set_name       (UniqueBackend     *backend,
+                                                      const gchar       *name);
+-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend     *backend);
++const gchar *         unique_backend_get_startup_id (UniqueBackend     *backend);
+ void                  unique_backend_set_startup_id (UniqueBackend     *backend,
+                                                      const gchar       *startup_id);
+ GdkScreen *           unique_backend_get_screen     (UniqueBackend     *backend);
+diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h
+index 3cec152..ccae0cd 100644
+--- a/unique/uniqueinternals.h
++++ b/unique/uniqueinternals.h
+@@ -44,11 +44,11 @@ UniqueResponse unique_app_emit_message_received (UniqueApp         *app,
+  * and then back into an id
+  */
+ UniqueResponse        unique_response_from_string  (const gchar    *response);
+-G_CONST_RETURN gchar *unique_response_to_string    (UniqueResponse  response);
++const gchar *         unique_response_to_string    (UniqueResponse  response);
+ 
+ gint                  unique_command_from_string   (UniqueApp      *app,
+                                                     const gchar    *command);
+-G_CONST_RETURN gchar *unique_command_to_string     (UniqueApp      *app,
++const gchar *         unique_command_to_string     (UniqueApp      *app,
+                                                     gint            command);
+ 
+ G_END_DECLS
+diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c
+index c74392d..2b2a9fc 100644
+--- a/unique/uniquemessage.c
++++ b/unique/uniquemessage.c
+@@ -185,7 +185,7 @@ unique_message_data_set (UniqueMessageData *message_data,
+  *
+  * Since: 1.0.2
+  */
+-G_CONST_RETURN guchar *
++const guchar *
+ unique_message_data_get (UniqueMessageData *message_data,
+                          gsize             *length)
+ {
+@@ -525,7 +525,7 @@ unique_message_data_get_screen (UniqueMessageData *message_data)
+  *   owned by the #UniqueMessageData structure and should not be
+  *   modified or freed
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_message_data_get_startup_id (UniqueMessageData *message_data)
+ {
+   g_return_val_if_fail (message_data != NULL, NULL);
+diff --git a/unique/uniquemessage.h b/unique/uniquemessage.h
+index d3e9c3c..93eee21 100644
+--- a/unique/uniquemessage.h
++++ b/unique/uniquemessage.h
+@@ -48,7 +48,7 @@ void                   unique_message_data_free           (UniqueMessageData *me
+ void                   unique_message_data_set            (UniqueMessageData *message_data,
+                                                            const guchar      *data,
+                                                            gsize              length);
+-G_CONST_RETURN guchar *unique_message_data_get            (UniqueMessageData *message_data,
++const guchar *         unique_message_data_get            (UniqueMessageData *message_data,
+                                                            gsize             *length);
+ 
+ gboolean               unique_message_data_set_text       (UniqueMessageData *message_data,
+@@ -63,7 +63,7 @@ void                   unique_message_data_set_filename   (UniqueMessageData *me
+ gchar *                unique_message_data_get_filename   (UniqueMessageData *message_data);
+ 
+ GdkScreen *            unique_message_data_get_screen     (UniqueMessageData *message_data);
+-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
++const gchar *          unique_message_data_get_startup_id (UniqueMessageData *message_data);
+ guint                  unique_message_data_get_workspace  (UniqueMessageData *message_data);
+ 
+ G_END_DECLS
+-- 
+1.7.6
+
diff --git a/dev-libs/libunique/files/libunique-1.1.6-compiler-warnings.patch b/dev-libs/libunique/files/libunique-1.1.6-compiler-warnings.patch
new file mode 100644
index 000000000000..f47e66267d50
--- /dev/null
+++ b/dev-libs/libunique/files/libunique-1.1.6-compiler-warnings.patch
@@ -0,0 +1,50 @@
+From 9df132a70d54b768a8e1d0335d24b85ac9b3fb76 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@linux.intel.com>
+Date: Sun, 27 Mar 2011 08:42:22 +0000
+Subject: Remove compiler warnings
+
+(cherry picked from commit f791ed16b19dddc7fbaf90d8f797520e67883021)
+
+Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
+---
+diff --git a/unique/dbus/uniquebackend-dbus.c b/unique/dbus/uniquebackend-dbus.c
+index 3ae1bed..69faa00 100644
+--- a/unique/dbus/uniquebackend-dbus.c
++++ b/unique/dbus/uniquebackend-dbus.c
+@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (UniqueBackendDBus *backend_dbus)
+ static gboolean
+ unique_backend_dbus_request_name (UniqueBackend *backend)
+ {
+-  UniqueBackendDBus *backend_dbus;
+   const gchar *name;
+   DBusGConnection *connection;
+   DBusGProxy *proxy;
+@@ -97,8 +96,6 @@ unique_backend_dbus_request_name (UniqueBackend *backend)
+   if (!connection)
+     return FALSE;
+ 
+-  backend_dbus = UNIQUE_BACKEND_DBUS (backend);
+-
+   retval = TRUE;
+   name = unique_backend_get_name (backend);
+   g_assert (name != NULL);
+@@ -207,10 +204,14 @@ unique_backend_dbus_send_message (UniqueBackend     *backend,
+                                         cmd, data, time_,
+                                         &resp,
+                                         &error);
+-  if (error)
++  if (!res)
+     {
+-      g_warning ("Error while sending message: %s", error->message);
+-      g_error_free (error);
++      if (error)
++        {
++          g_warning ("Error while sending message: %s", error->message);
++          g_error_free (error);
++        }
++
+       g_free (cmd);
+       
+       return UNIQUE_RESPONSE_INVALID;
+--
+cgit v0.9
diff --git a/dev-libs/libunique/files/libunique-1.1.6-fix-test.patch b/dev-libs/libunique/files/libunique-1.1.6-fix-test.patch
new file mode 100644
index 000000000000..b2e85e4d71a5
--- /dev/null
+++ b/dev-libs/libunique/files/libunique-1.1.6-fix-test.patch
@@ -0,0 +1,26 @@
+From caf736f4b84808393b0d7030ae6128a3322a71e2 Mon Sep 17 00:00:00 2001
+From: Tobias Mueller <tobiasmue@gnome.org>
+Date: Mon, 12 Apr 2010 13:01:42 +0000
+Subject: test-unique: Resolve format string issues
+
+Provide a proper literal format string to not expose potential vulnerabilites.
+Fixes bug 615522.
+---
+diff --git a/tests/test-unique.c b/tests/test-unique.c
+index b7cde45..c9958c9 100644
+--- a/tests/test-unique.c
++++ b/tests/test-unique.c
+@@ -82,9 +82,11 @@ app_message_cb (UniqueApp         *app,
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    GTK_MESSAGE_INFO,
+                                    GTK_BUTTONS_CLOSE,
++                                   "%s",
+                                    title);
+   if (message)
+     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
++                                              "%s",
+                                               message);
+ 
+   gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
+--
+cgit v0.9
diff --git a/dev-libs/libunique/files/libunique-1.1.6-include-terminator.patch b/dev-libs/libunique/files/libunique-1.1.6-include-terminator.patch
new file mode 100644
index 000000000000..927771e7311b
--- /dev/null
+++ b/dev-libs/libunique/files/libunique-1.1.6-include-terminator.patch
@@ -0,0 +1,37 @@
+From 30ca2903a8ed4eed974ea744e4b9bd96198c425d Mon Sep 17 00:00:00 2001
+From: Rodney Lorrimar <r.lorrimar@fugro-fsi.com.au>
+Date: Mon, 21 Dec 2009 02:07:46 +0000
+Subject: Include NUL terminator in unique_message_data_get_filename()
+
+https://bugzilla.gnome.org/show_bug.cgi?id=605104
+
+Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
+---
+diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h
+index ace40ed..3cec152 100644
+--- a/unique/uniqueinternals.h
++++ b/unique/uniqueinternals.h
+@@ -13,7 +13,7 @@ G_BEGIN_DECLS
+ struct _UniqueMessageData
+ {
+   guchar *data;
+-  gint length;
++  gint length;  /* length of data not including NUL terminator */
+ 
+   GdkScreen *screen;
+   gchar *startup_id;
+diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c
+index 10f6df5..c74392d 100644
+--- a/unique/uniquemessage.c
++++ b/unique/uniquemessage.c
+@@ -493,7 +493,7 @@ unique_message_data_get_filename (UniqueMessageData *message_data)
+ {
+   g_return_val_if_fail (message_data != NULL, NULL);
+ 
+-  return g_memdup (message_data->data, message_data->length);
++  return g_memdup (message_data->data, message_data->length + 1);
+ }
+ 
+ /**
+--
+cgit v0.9
diff --git a/dev-libs/libunique/libunique-3.0.0.ebuild b/dev-libs/libunique/libunique-1.1.6-r1.ebuild
index 3a064bda3b83..3e66d9e4df88 100644
--- a/dev-libs/libunique/libunique-3.0.0.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-3.0.0.ebuild,v 1.2 2011/04/29 00:59:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-1.1.6-r1.ebuild,v 1.1 2011/07/25 15:18:41 pacho Exp $
 
-EAPI="3"
-GCONF_DEBUF="yes"
+EAPI="4"
 GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2 virtualx
 
@@ -12,29 +12,49 @@ DESCRIPTION="a library for writing single instance application"
 HOMEPAGE="http://live.gnome.org/LibUnique"
 
 LICENSE="LGPL-2.1"
-SLOT="3"
+SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +introspection"
+IUSE="dbus doc +introspection"
 
-RDEPEND=">=dev-libs/glib-2.25.7:2
-	>=x11-libs/gtk+-2.90.0:3[introspection?]
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=x11-libs/gtk+-2.11:2[introspection?]
 	x11-libs/libX11
-"
+	dbus? ( >=dev-libs/dbus-glib-0.70 )"
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
+	doc? ( >=dev-util/gtk-doc-1.11 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
 # For eautoreconf
 #	dev-util/gtk-doc-am
 
 pkg_setup() {
 	DOCS="AUTHORS NEWS ChangeLog README TODO"
-	# --disable-dbus means gdbus is used instead of dbus-glib
 	G2CONF="${G2CONF}
-		--disable-static
 		--disable-maintainer-flags
-		--disable-dbus
-		$(use_enable introspection)"
+		--disable-static
+		--enable-bacon
+		$(use_enable introspection)
+		$(use_enable dbus)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Include NUL terminator in unique_message_data_get_filename()
+	epatch "${FILESDIR}/${P}-include-terminator.patch"
+
+	# test-unique: Resolve format string issues
+	epatch "${FILESDIR}/${P}-fix-test.patch"
+
+	# Remove compiler warnings
+	epatch "${FILESDIR}/${P}-compiler-warnings.patch"
+
+	# Remove G_CONST_RETURN usage, now that its gone in glib.
+	epatch "${FILESDIR}/${PN}-1.1.6-G_CONST_RETURN.patch"
+
+	sed -e 's/-D.*_DISABLE_DEPRECATED//' -i unique/Makefile.am \
+		unique/Makefile.in || die
 }
 
 src_test() {