Date: Thursday, December 1, 2011 @ 02:44:42
Author: ibiru
Revision: 143971
fix compilation with newer glib2. FS#27365
Added:
libunique/trunk/remove_G_CONST_RETURN.patch
Modified:
libunique/trunk/PKGBUILD
-----------------------------+
PKGBUILD | 9 ++-
remove_G_CONST_RETURN.patch | 117 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 123 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-01 02:01:56 UTC (rev 143970)
+++ PKGBUILD 2011-12-01 07:44:42 UTC (rev 143971)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <j...@archlinux.org>
pkgname=libunique
pkgver=1.1.6
-pkgrel=4
+pkgrel=5
pkgdesc="Library for writing single instance applications"
arch=('i686' 'x86_64')
license=('LGPL')
@@ -11,13 +11,16 @@
options=('!libtool')
url="http://live.gnome.org/LibUnique";
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.1/${pkgname}-${pkgver}.tar.bz2
- unique-gdbus.patch)
+ unique-gdbus.patch
+ remove_G_CONST_RETURN.patch)
sha256sums=('e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb'
- 'bf99ddbf9104502ea498a6812ec2d700f61f4dbbaa2471cd52174b0b27070769')
+ 'bf99ddbf9104502ea498a6812ec2d700f61f4dbbaa2471cd52174b0b27070769'
+ '194ebfcc4c9297c44bbcfe5d45474310983121cdad881b72265d79cf4ec44235')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/unique-gdbus.patch"
+ patch -Np1 -i "${srcdir}/remove_G_CONST_RETURN.patch"
autoreconf
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
Added: remove_G_CONST_RETURN.patch
===================================================================
--- remove_G_CONST_RETURN.patch (rev 0)
+++ remove_G_CONST_RETURN.patch 2011-12-01 07:44:42 UTC (rev 143971)
@@ -0,0 +1,117 @@
+diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c
libunique-1.1.6/unique/uniqueapp.c
+--- libunique-1.1.6.orig/unique/uniqueapp.c 2011-12-01 07:38:17.748122298
+0000
++++ libunique-1.1.6/unique/uniqueapp.c 2011-12-01 07:39:59.132319788 +0000
+@@ -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;
+diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c
libunique-1.1.6/unique/uniquebackend.c
+--- libunique-1.1.6.orig/unique/uniquebackend.c 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquebackend.c 2011-12-01 07:39:24.418677950
+0000
+@@ -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);
+diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h
libunique-1.1.6/unique/uniquebackend.h
+--- libunique-1.1.6.orig/unique/uniquebackend.h 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquebackend.h 2011-12-01 07:42:13.833467492
+0000
+@@ -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);
+diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h
libunique-1.1.6/unique/uniqueinternals.h
+--- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniqueinternals.h 2011-12-01 07:41:17.142977914
+0000
+@@ -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
+diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c
libunique-1.1.6/unique/uniquemessage.c
+--- libunique-1.1.6.orig/unique/uniquemessage.c 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquemessage.c 2011-12-01 07:41:45.743225713
+0000
+@@ -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);
+diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h
libunique-1.1.6/unique/uniquemessage.h
+--- libunique-1.1.6.orig/unique/uniquemessage.h 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquemessage.h 2011-12-01 07:40:47.576064565
+0000
+@@ -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
