Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (acac9f46ca4112f555ff5709ace805f010d6ad5a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (acac9f46ca4112f555ff5709ace805f010d6ad5a)
  • Date: Mon, 25 Jun 2012 00:33:49 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

gnome2-libs/unique/HISTORY | 5 +
gnome2-libs/unique/PRE_BUILD | 3 -
gnome2-libs/unique/glib.patch | 117
++++++++++++++++++++++++++++++++++++++++++
3 files changed, 124 insertions(+), 1 deletion(-)

New commits:
commit acac9f46ca4112f555ff5709ace805f010d6ad5a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

unique: fix compilation with glib >= 2.31

diff --git a/gnome2-libs/unique/HISTORY b/gnome2-libs/unique/HISTORY
index d5def6c..10a5f21 100644
--- a/gnome2-libs/unique/HISTORY
+++ b/gnome2-libs/unique/HISTORY
@@ -1,3 +1,8 @@
+2012-06-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply glib.patch
+ * glib.patch: added, remove depreciated G_CONST_RETURN
+ from Arch Linux
+
2011-08-17 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply patch to remove -Werror

diff --git a/gnome2-libs/unique/PRE_BUILD b/gnome2-libs/unique/PRE_BUILD
index f9ee958..b565962 100755
--- a/gnome2-libs/unique/PRE_BUILD
+++ b/gnome2-libs/unique/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < $SCRIPT_DIRECTORY/Werror.patch
+patch -p1 < $SPELL_DIRECTORY/Werror.patch &&
+patch -p1 < $SPELL_DIRECTORY/glib.patch
diff --git a/gnome2-libs/unique/glib.patch b/gnome2-libs/unique/glib.patch
new file mode 100644
index 0000000..8a72e7d
--- /dev/null
+++ b/gnome2-libs/unique/glib.patch
@@ -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



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (acac9f46ca4112f555ff5709ace805f010d6ad5a), Sukneet Basuta, 06/25/2012

Archive powered by MHonArc 2.6.24.

Top of Page