r31473 - in /packages/unstable/libunique/debian: changelog patches/00git_g_const_return.patch patches/series
mpitt at users.alioth.debian.org
mpitt at users.alioth.debian.org
Thu Nov 17 10:35:47 UTC 2011
Author: mpitt
Date: Thu Nov 17 10:35:46 2011
New Revision: 31473
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31473
Log:
Add 00git_g_const_return.patch: Drop usage of G_CONST_RETURN, to fix
building with current glib versions. Backported from current 3.x release.
Added:
packages/unstable/libunique/debian/patches/00git_g_const_return.patch
Modified:
packages/unstable/libunique/debian/changelog
packages/unstable/libunique/debian/patches/series
Modified: packages/unstable/libunique/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libunique/debian/changelog?rev=31473&op=diff
==============================================================================
--- packages/unstable/libunique/debian/changelog [utf-8] (original)
+++ packages/unstable/libunique/debian/changelog [utf-8] Thu Nov 17 10:35:46 2011
@@ -1,3 +1,10 @@
+libunique (1.1.6-4) UNRELEASED; urgency=low
+
+ * Add 00git_g_const_return.patch: Drop usage of G_CONST_RETURN, to fix
+ building with current glib versions. Backported from current 3.x release.
+
+ -- Martin Pitt <mpitt at debian.org> Thu, 17 Nov 2011 11:35:01 +0100
+
libunique (1.1.6-3) unstable; urgency=low
* Switch to dpkg source format 3.0 (quilt).
Added: packages/unstable/libunique/debian/patches/00git_g_const_return.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libunique/debian/patches/00git_g_const_return.patch?rev=31473&op=file
==============================================================================
--- packages/unstable/libunique/debian/patches/00git_g_const_return.patch (added)
+++ packages/unstable/libunique/debian/patches/00git_g_const_return.patch [utf-8] Thu Nov 17 10:35:46 2011
@@ -1,0 +1,130 @@
+From 03526f8d95910c207170391c1b6594905a71e4e9 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at collabora.co.uk>
+Date: Tue, 14 Jun 2011 11:33:45 +0000
+Subject: Remove G_CONST_RETURN usage, now that its gone in glib.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652545
+---
+Index: libunique/unique/uniqueapp.c
+===================================================================
+--- libunique.orig/unique/uniqueapp.c 2009-11-01 19:33:13.000000000 +0100
++++ libunique/unique/uniqueapp.c 2011-11-17 11:34:02.799752362 +0100
+@@ -781,7 +781,7 @@
+ }
+
+
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_command_to_string (UniqueApp *app,
+ gint command)
+ {
+@@ -863,7 +863,7 @@
+ return retval;
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_response_to_string (UniqueResponse response)
+ {
+ GEnumClass *enum_class;
+Index: libunique/unique/uniquebackend.c
+===================================================================
+--- libunique.orig/unique/uniquebackend.c 2009-11-09 12:02:06.000000000 +0100
++++ libunique/unique/uniquebackend.c 2011-11-17 11:34:02.799752362 +0100
+@@ -111,7 +111,7 @@
+ *
+ * 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 @@
+ *
+ * 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);
+Index: libunique/unique/uniquebackend.h
+===================================================================
+--- libunique.orig/unique/uniquebackend.h 2009-09-21 14:31:14.000000000 +0200
++++ libunique/unique/uniquebackend.h 2011-11-17 11:34:02.799752362 +0100
+@@ -94,10 +94,10 @@
+
+ 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);
+Index: libunique/unique/uniqueinternals.h
+===================================================================
+--- libunique.orig/unique/uniqueinternals.h 2009-09-21 14:31:14.000000000 +0200
++++ libunique/unique/uniqueinternals.h 2011-11-17 11:34:02.799752362 +0100
+@@ -44,11 +44,11 @@
+ * 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
+Index: libunique/unique/uniquemessage.c
+===================================================================
+--- libunique.orig/unique/uniquemessage.c 2009-11-09 12:02:06.000000000 +0100
++++ libunique/unique/uniquemessage.c 2011-11-17 11:34:02.799752362 +0100
+@@ -185,7 +185,7 @@
+ *
+ * Since: 1.0.2
+ */
+-G_CONST_RETURN guchar *
++const guchar *
+ unique_message_data_get (UniqueMessageData *message_data,
+ gsize *length)
+ {
+@@ -525,7 +525,7 @@
+ * 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);
+Index: libunique/unique/uniquemessage.h
+===================================================================
+--- libunique.orig/unique/uniquemessage.h 2009-09-21 14:31:14.000000000 +0200
++++ libunique/unique/uniquemessage.h 2011-11-17 11:34:27.659753565 +0100
+@@ -48,7 +48,7 @@
+ 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 @@
+ 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
Modified: packages/unstable/libunique/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libunique/debian/patches/series?rev=31473&op=diff
==============================================================================
--- packages/unstable/libunique/debian/patches/series [utf-8] (original)
+++ packages/unstable/libunique/debian/patches/series [utf-8] Thu Nov 17 10:35:46 2011
@@ -1,2 +1,3 @@
+00git_g_const_return.patch
01_format-security.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list