From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/libunique/Manifest | 10 ++ .../files/libunique-1.1.6-G_CONST_RETURN.patch | 143 +++++++++++++++++++++ .../files/libunique-1.1.6-compiler-warnings.patch | 50 +++++++ .../libunique/files/libunique-1.1.6-fix-test.patch | 26 ++++ .../files/libunique-1.1.6-include-terminator.patch | 37 ++++++ dev-libs/libunique/files/run-tests | 18 +++ dev-libs/libunique/libunique-1.1.6-r2.ebuild | 63 +++++++++ dev-libs/libunique/libunique-3.0.2-r1.ebuild | 45 +++++++ dev-libs/libunique/metadata.xml | 11 ++ 9 files changed, 403 insertions(+) create mode 100644 dev-libs/libunique/Manifest create mode 100644 dev-libs/libunique/files/libunique-1.1.6-G_CONST_RETURN.patch create mode 100644 dev-libs/libunique/files/libunique-1.1.6-compiler-warnings.patch create mode 100644 dev-libs/libunique/files/libunique-1.1.6-fix-test.patch create mode 100644 dev-libs/libunique/files/libunique-1.1.6-include-terminator.patch create mode 100644 dev-libs/libunique/files/run-tests create mode 100644 dev-libs/libunique/libunique-1.1.6-r2.ebuild create mode 100644 dev-libs/libunique/libunique-3.0.2-r1.ebuild create mode 100644 dev-libs/libunique/metadata.xml (limited to 'dev-libs/libunique') diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest new file mode 100644 index 000000000000..286b346385e6 --- /dev/null +++ b/dev-libs/libunique/Manifest @@ -0,0 +1,10 @@ +AUX libunique-1.1.6-G_CONST_RETURN.patch 6055 BLAKE2B afd9008f711fcd6e35c3a7ea5bd9e674f9e590e7c58a5fff808992b6cda8c4e031a0cce79dc39ce6138f5a2760d27f34926a5e9fef091de3740ca5d4d07f94b6 SHA512 b1df46be67911e2ddc8cb99f0dbf785121e1c4818f1327c03047d577a3ba2a845166c138873b4f5fde35682831cd099a88e28586db9b3db516facc851723bd7b +AUX libunique-1.1.6-compiler-warnings.patch 1651 BLAKE2B ce700e3a3a5ea849e154225314b68a60ba854047c6fef0f35060b435600dd1160f03fe5f95aa9db7bcfa0859d99b1f89865c5361634841eeac626a69eacd3507 SHA512 83ea201fa0ec4b010cc1bdd7d5b0b7018460173f16f448579d159d571c0e51a7abb081943763f4cd9856cf76b9a838c2baa9459f3441457120d3c6ff0a7740c7 +AUX libunique-1.1.6-fix-test.patch 1041 BLAKE2B 67dcdf890274e27dffffe4ee430661fe795010027c6973010dffee84024ef31cea050a2869d9d105aba0f62ed9878874ed36b59d174dee34e2119c9f87e46443 SHA512 648712d084fd1d4cbdac873dbedfed9693f07329ceea0d55db62a4cf2bf2faf305a44e33ca1332264618a7ea69bd01bba965d96bf87402ef364cf2794df0ee27 +AUX libunique-1.1.6-include-terminator.patch 1150 BLAKE2B 19bb13cc29b4aadd12c52cd2132315c023c0792c810f97132a2c837ddf98510e563fc41c156c4ffded2294f1df59b5f942134c4984accf2b74c01e39d8af7ad4 SHA512 d83bdea0e79634a233350ca9d81d7cf72b4a957753165e939c95678b26eff9b6c8e41c3e37c8ffe0ebf49c75a01e682a0f0266dfeeccf10f7bd29e868c6ae033 +AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170f6da63bcdedf7502549ad0dadacda7e36cf62695acd897be60d6cb4320438a5496adb0081d SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547 +DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde +DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4 +EBUILD libunique-1.1.6-r2.ebuild 1575 BLAKE2B 1677a23a247556b86d7e8a05bd05974e7f79a796fe7ea4d0cb21bf21b92e2cae78b5ec123bd5114c2f442c83f024c1549119856bdf76bd05c3d18e40bb4c1a28 SHA512 6bbe8d63b9b6124195fe7cb6570d6d2ec85eae96c1c1b8f32a5388968a575e403b7a4b0e677021ceb77e3e8114b627329a6378fbffcd2b0090e0af81c0c8e6ab +EBUILD libunique-3.0.2-r1.ebuild 1134 BLAKE2B 70ef69b22cd71b037aad41c4121e04b14b6f4874aa7e2c759bb846e7a6982789da0bbf1ce84e3a99a0e3aa57bd9ebca23ef311dc5ddac56157ff416b51f57228 SHA512 433ede24a80795a93f5299dd0ad6dbcd5961665881ceaac91a2d6444305db7afff039a5e2c449da05842f7f14e0617bfe8919f4b3da898d002cd84356a428c98 +MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169 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 +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 : 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 +Date: Sun, 27 Mar 2011 08:42:22 +0000 +Subject: Remove compiler warnings + +(cherry picked from commit f791ed16b19dddc7fbaf90d8f797520e67883021) + +Signed-off-by: Emmanuele Bassi +--- +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 +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 +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 +--- +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/files/run-tests b/dev-libs/libunique/files/run-tests new file mode 100644 index 000000000000..db9bcd4f0860 --- /dev/null +++ b/dev-libs/libunique/files/run-tests @@ -0,0 +1,18 @@ +BINARY = ./test-unique +TESTS = --new --activate --open-uri=http://localhost --foo + +all: + for test in $(TESTS); do \ + rm -f test_result; \ + $(BINARY) > test_result & \ + main_pid=$$!; \ + sleep 5; \ + $(BINARY) $$test & \ + test_pid=$$!; \ + sleep 5; \ + while ! test -s test_result; do sleep 0.5; done; \ + sleep 5; \ + kill $${test_pid} || exit 1; \ + kill $${main_pid} || exit 1; \ + grep -q 'Message received from.*' test_result || { echo "Test failed at $$test"; exit 1; }; \ + done diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild new file mode 100644 index 000000000000..be83f6a510cd --- /dev/null +++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit gnome2 virtualx + +DESCRIPTION="A library for writing single instance application" +HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique" + +LICENSE="LGPL-2.1" +SLOT="1" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="debug dbus +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 + sys-apps/dbus[X] ) + introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.11 + sys-devel/gettext + virtual/pkgconfig +" +# For eautoreconf +# dev-util/gtk-doc-am + +PATCHES=( + # Include NUL terminator in unique_message_data_get_filename() + "${FILESDIR}/${P}-include-terminator.patch" + + # test-unique: Resolve format string issues + "${FILESDIR}/${P}-fix-test.patch" + + # Remove compiler warnings + "${FILESDIR}/${P}-compiler-warnings.patch" + + # Remove G_CONST_RETURN usage, now that its gone in glib + "${FILESDIR}/${PN}-1.1.6-G_CONST_RETURN.patch" +) + +src_configure() { + gnome2_src_configure \ + --disable-maintainer-flags \ + --disable-static \ + --enable-bacon \ + $(use_enable introspection) \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable dbus) +} + +src_test() { + cd "${S}/tests" + cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests" + virtx emake -f run-tests || die "Tests failed" +} diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild new file mode 100644 index 000000000000..1688d8bfa665 --- /dev/null +++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 virtualx + +DESCRIPTION="A library for writing single instance application" +HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique" + +LICENSE="LGPL-2.1" +SLOT="3" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="debug +introspection" + +RDEPEND=" + >=dev-libs/glib-2.25.7:2 + sys-apps/dbus[X] + >=x11-libs/gtk+-2.90.0:3[introspection?] + x11-libs/libX11 + introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.11 + virtual/pkgconfig +" +# For eautoreconf +# dev-util/gtk-doc-am + +src_configure() { + # --disable-dbus means gdbus is used instead of dbus-glib + gnome2_src_configure \ + --disable-static \ + --disable-maintainer-flags \ + --disable-dbus \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable introspection) +} + +src_test() { + cd "${S}/tests" + cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests" + virtx emake -f run-tests || die "Tests failed" +} diff --git a/dev-libs/libunique/metadata.xml b/dev-libs/libunique/metadata.xml new file mode 100644 index 000000000000..b89a42c7196e --- /dev/null +++ b/dev-libs/libunique/metadata.xml @@ -0,0 +1,11 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + +Unique is a library for writing single instance application. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance. + + -- cgit v1.2.3