changed debian/source/format to native
This commit is contained in:
openKylinBot
parent
0b63f932ca
commit
1bd8768550
|
|
@ -1,137 +0,0 @@
|
|||
From: Stef Walter <stefw@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
|
||||
---
|
||||
unique/uniqueapp.c | 4 ++--
|
||||
unique/uniquebackend.c | 4 ++--
|
||||
unique/uniquebackend.h | 4 ++--
|
||||
unique/uniqueinternals.h | 4 ++--
|
||||
unique/uniquemessage.c | 4 ++--
|
||||
unique/uniquemessage.h | 4 ++--
|
||||
6 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
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 18a0c45..6a9500a 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 ace40ed..be5d75d 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 10f6df5..b13be7f 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
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From: Debian GNOME Maintainers
|
||||
<pkg-gnome-maintainers@lists.alioth.debian.org>
|
||||
Date: Sat, 14 May 2022 03:38:37 +0800
|
||||
Subject: _format-security
|
||||
|
||||
===================================================================
|
||||
---
|
||||
tests/test-unique.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tests/test-unique.c b/tests/test-unique.c
|
||||
index b7cde45..c9958c9 100644
|
||||
--- a/tests/test-unique.c
|
||||
+++ b/tests/test-unique.c
|
||||
@@ -82,9 +82,11 @@ app_message_cb (UniqueApp *app,
|
||||
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),
|
||||
+ "%s",
|
||||
message);
|
||||
|
||||
gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From: Debian GNOME Maintainers
|
||||
<pkg-gnome-maintainers@lists.alioth.debian.org>
|
||||
Date: Sat, 14 May 2022 03:38:37 +0800
|
||||
Subject: _ltmain_as-needed
|
||||
|
||||
===================================================================
|
||||
---
|
||||
ltmain.sh | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/ltmain.sh b/ltmain.sh
|
||||
index 6939dcc..ef9931e 100755
|
||||
--- a/ltmain.sh
|
||||
+++ b/ltmain.sh
|
||||
@@ -4716,6 +4716,11 @@ func_mode_link ()
|
||||
arg=$func_stripname_result
|
||||
;;
|
||||
|
||||
+ -Wl,--as-needed)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ continue
|
||||
+ ;;
|
||||
+
|
||||
-Wl,*)
|
||||
func_stripname '-Wl,' '' "$arg"
|
||||
args=$func_stripname_result
|
||||
@@ -5067,6 +5072,15 @@ func_mode_link ()
|
||||
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"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
00git_g_const_return.patch
|
||||
01_format-security.patch
|
||||
99_ltmain_as-needed.patch
|
||||
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
|
|||
Loading…
Reference in New Issue