openkylin
/
libunique
mirror of https://gitee.com/openkylin/libunique.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

apply patches

This commit is contained in:
openKylinBot 2022-05-14 03:38:37 +08:00
parent 06b0bf71c1 b13efcda83
commit 0b63f932ca
8 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ltmain.sh
View File

@ -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"

2
tests/test-unique.c
View File

@ -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);

4
unique/uniqueapp.c
View File

@ -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;

4
unique/uniquebackend.c
View File

@ -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);

4
unique/uniquebackend.h
View File

@ -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);

4
unique/uniqueinternals.h
View File

@ -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

4
unique/uniquemessage.c
View File

@ -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);

4
unique/uniquemessage.h
View File

@ -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