libvnck2,polkit-gnome,libunique add repo
This commit is contained in:
@@ -0,0 +1,30 @@
|
||||
--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
|
||||
+++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200
|
||||
@@ -1794,6 +1794,11 @@
|
||||
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
|
||||
;;
|
||||
|
||||
+ -Wl,--as-needed)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ continue
|
||||
+ ;;
|
||||
+
|
||||
-Wl,*)
|
||||
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
|
||||
arg=
|
||||
@@ -2137,6 +2142,15 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
+ -Wl,--as-needed)
|
||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
||||
+ compile_deplibs="$deplib $compile_deplibs"
|
||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
||||
+ else
|
||||
+ deplibs="$deplib $deplibs"
|
||||
+ fi
|
||||
+ continue
|
||||
+ ;;
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
@@ -0,0 +1,29 @@
|
||||
diff -urNp libunique-1.1.6.old/unique/Makefile.am libunique-1.1.6/unique/Makefile.am
|
||||
--- libunique-1.1.6.old/unique/Makefile.am 2011-07-06 10:54:38.403127656 +0100
|
||||
+++ libunique-1.1.6/unique/Makefile.am 2011-07-06 10:55:00.354127659 +0100
|
||||
@@ -19,11 +19,8 @@ INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = \
|
||||
-DG_DISABLE_SINGLE_INCLUDES \
|
||||
-DGTK_DISABLE_SINGLE_INCLUDES \
|
||||
- -DG_DISABLE_DEPRECATED \
|
||||
- -DGTK_DISABLE_DEPRECATED \
|
||||
-DG_LOG_DOMAIN=\"Unique\" \
|
||||
-DPREFIX=\""$(prefix)"\" \
|
||||
- $(DISABLE_DEPRECATED_FLAGS) \
|
||||
$(UNIQUE_DEBUG_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
diff -urNp libunique-1.1.6.old/unique/Makefile.in libunique-1.1.6/unique/Makefile.in
|
||||
--- libunique-1.1.6.old/unique/Makefile.in 2011-07-06 11:01:36.306127549 +0100
|
||||
+++ libunique-1.1.6/unique/Makefile.in 2011-07-06 11:01:58.311127546 +0100
|
||||
@@ -394,11 +394,8 @@ INCLUDES = -I$(top_srcdir)
|
||||
AM_CPPFLAGS = \
|
||||
-DG_DISABLE_SINGLE_INCLUDES \
|
||||
-DGTK_DISABLE_SINGLE_INCLUDES \
|
||||
- -DG_DISABLE_DEPRECATED \
|
||||
- -DGTK_DISABLE_DEPRECATED \
|
||||
-DG_LOG_DOMAIN=\"Unique\" \
|
||||
-DPREFIX=\""$(prefix)"\" \
|
||||
- $(DISABLE_DEPRECATED_FLAGS) \
|
||||
$(UNIQUE_DEBUG_CFLAGS) \
|
||||
$(NULL)
|
||||
@@ -0,0 +1,28 @@
|
||||
--- unique/dbus/uniquebackend-dbus.c.orig 2011-07-06 10:30:49.712128019 +0100
|
||||
+++ unique/dbus/uniquebackend-dbus.c 2011-07-06 10:32:11.026127998 +0100
|
||||
@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (Uniq
|
||||
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 (Unique
|
||||
if (!connection)
|
||||
return FALSE;
|
||||
|
||||
- backend_dbus = UNIQUE_BACKEND_DBUS (backend);
|
||||
-
|
||||
retval = TRUE;
|
||||
name = unique_backend_get_name (backend);
|
||||
g_assert (name != NULL);
|
||||
@@ -207,7 +204,7 @@ unique_backend_dbus_send_message (Unique
|
||||
cmd, data, time_,
|
||||
&resp,
|
||||
&error);
|
||||
- if (error)
|
||||
+ if (!res && error)
|
||||
{
|
||||
g_warning ("Error while sending message: %s", error->message);
|
||||
g_error_free (error);
|
||||
@@ -0,0 +1,124 @@
|
||||
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
|
||||
--
|
||||
@@ -0,0 +1,14 @@
|
||||
--- tests/test-unique.c.str 2009-02-02 16:10:03.000000000 +0100
|
||||
+++ tests/test-unique.c 2009-02-02 16:10:22.000000000 +0100
|
||||
@@ -97,10 +97,11 @@
|
||||
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),
|
||||
- message);
|
||||
+ "%s", message);
|
||||
|
||||
gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
|
||||
Reference in New Issue
Block a user