Mailinglist Archive: opensuse-commit (1029 mails)
| < Previous | Next > |
commit libunique1 for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 08 Jul 2011 10:48:42 +0200
- Message-id: <20110708084842.A51AD202AE@hilbert.suse.de>
Hello community,
here is the log from the commit of package libunique1 for openSUSE:Factory
checked in at Fri Jul 8 10:48:42 CEST 2011.
--------
--- libunique1/libunique1.changes 2011-05-19 18:27:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/libunique1/libunique1.changes 2011-06-17
16:26:52.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 17 10:57:55 UTC 2011 - dimstar@xxxxxxxxxxxx
+
+- Add libunique1-no_g_const_return.patch: Use const instead of
+ G_CONST_RETURN. This is needed because of the G_CONST_RETURN
+ deprecation in recent glib 2.29.x.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
libunique1-no_g_const_return.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libunique1.spec ++++++
--- /var/tmp/diff_new_pack.MeYSYs/_old 2011-07-08 10:48:03.000000000 +0200
+++ /var/tmp/diff_new_pack.MeYSYs/_new 2011-07-08 10:48:03.000000000 +0200
@@ -20,7 +20,7 @@
Name: libunique1
%define _name libunique
Version: 1.1.6
-Release: 10
+Release: 12
License: LGPLv2.1+
Summary: A library for writing single instance application
Url: http://live.gnome.org/LibUnique
@@ -28,6 +28,8 @@
Source: %{_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM libunique1-gcc46.patch dimstar@xxxxxxxxxxxx -- Backport
commit f791ed from master to unique-1.1.
Patch0: libunique1-gcc46.patch
+# PATCH-FIX-UPSTREAM libunique1-no_g_const_return.patch dimstar@xxxxxxxxxxxx
-- Use const instead of G_CONST_RETURN. Not send upstream, as libunique1 is
obsoleted.
+Patch1: libunique1-no_g_const_return.patch
BuildRequires: gobject-introspection-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: gtk-doc
@@ -70,6 +72,7 @@
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
%configure --enable-debug=no --enable-static=no --enable-dbus=yes
++++++ libunique1-no_g_const_return.patch ++++++
diff -ur libunique-1.1.6.orig/unique/uniqueapp.c
libunique-1.1.6/unique/uniqueapp.c
--- libunique-1.1.6.orig/unique/uniqueapp.c 2009-11-01 19:33:13.000000000
+0100
+++ libunique-1.1.6/unique/uniqueapp.c 2011-06-17 12:53:52.346788995 +0200
@@ -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 -ur libunique-1.1.6.orig/unique/uniquebackend.c
libunique-1.1.6/unique/uniquebackend.c
--- libunique-1.1.6.orig/unique/uniquebackend.c 2009-11-09 12:02:06.000000000
+0100
+++ libunique-1.1.6/unique/uniquebackend.c 2011-06-17 12:53:52.346788995
+0200
@@ -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 -ur libunique-1.1.6.orig/unique/uniquebackend.h
libunique-1.1.6/unique/uniquebackend.h
--- libunique-1.1.6.orig/unique/uniquebackend.h 2009-09-21 14:31:14.000000000
+0200
+++ libunique-1.1.6/unique/uniquebackend.h 2011-06-17 12:53:52.346788995
+0200
@@ -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 -ur libunique-1.1.6.orig/unique/uniqueinternals.h
libunique-1.1.6/unique/uniqueinternals.h
--- libunique-1.1.6.orig/unique/uniqueinternals.h 2009-09-21
14:31:14.000000000 +0200
+++ libunique-1.1.6/unique/uniqueinternals.h 2011-06-17 12:53:52.350789062
+0200
@@ -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 -ur libunique-1.1.6.orig/unique/uniquemessage.c
libunique-1.1.6/unique/uniquemessage.c
--- libunique-1.1.6.orig/unique/uniquemessage.c 2009-11-09 12:02:06.000000000
+0100
+++ libunique-1.1.6/unique/uniquemessage.c 2011-06-17 12:53:52.354789129
+0200
@@ -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 -ur libunique-1.1.6.orig/unique/uniquemessage.h
libunique-1.1.6/unique/uniquemessage.h
--- libunique-1.1.6.orig/unique/uniquemessage.h 2009-09-21 14:31:14.000000000
+0200
+++ libunique-1.1.6/unique/uniquemessage.h 2011-06-17 12:53:52.354789129
+0200
@@ -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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |