[SCM] libsignon-glib packaging branch, master, updated. debian/1.12-2

Diane Trout diane at moszumanska.debian.org
Wed Dec 2 21:21:08 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libsignon-glib.git;a=commitdiff;h=0f307c9

The following commit has been merged in the master branch:
commit 0f307c9a3e5e3825a7b1c13cb577acfea74d13c2
Author: Diane Trout <diane at ghic.org>
Date:   Wed Dec 2 13:20:12 2015 -0800

    add skipped patch. part of 1.12-2 release
---
 debian/patches/disable-deprecation-error.patch | 79 ++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/debian/patches/disable-deprecation-error.patch b/debian/patches/disable-deprecation-error.patch
new file mode 100644
index 0000000..ab4827f
--- /dev/null
+++ b/debian/patches/disable-deprecation-error.patch
@@ -0,0 +1,79 @@
+Author: Alberto Mardegan
+Subject: Disable deprecation errors
+Origin: https://gitlab.com/accounts-sso/libsignon-glib/merge_requests/2/diffs
+Bug-accounts-sso: https://gitlab.com/accounts-sso/libsignon-glib/issues/2
+diff --git a/libsignon-glib/Makefile.am b/libsignon-glib/Makefile.am
+index e208101..f534d84 100644
+--- a/libsignon-glib/Makefile.am
++++ b/libsignon-glib/Makefile.am
+@@ -7,7 +7,7 @@ libsignon_glib_la_CPPFLAGS = \
+ 	-I$(top_builddir) \
+ 	-I$(builddir) \
+ 	$(DEPS_CFLAGS) \
+-	-Wall -Werror
++	-Wall -Werror -Wno-error=deprecated-declarations
+ libsignon_glib_la_LIBADD = $(DEPS_LIBS)
+ libsignon_glib_la_LDFLAGS = \
+ 	-version-info 1:0:0 \
+
+diff --git a/libsignon-glib/signon-auth-session.c b/libsignon-glib/signon-auth-session.c
+index f60d73d..adcb5ee 100644
+--- a/libsignon-glib/signon-auth-session.c
++++ b/libsignon-glib/signon-auth-session.c
+@@ -146,6 +146,7 @@ auth_session_process_reply (GObject *object, GAsyncResult *res,
+ 
+     sso_auth_session_call_process_finish (proxy, &reply, res, &error);
+ 
++G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+     self = SIGNON_AUTH_SESSION (g_async_result_get_source_object (
+         (GAsyncResult *)res_process));
+     self->priv->busy = FALSE;
+@@ -166,6 +167,7 @@ auth_session_process_reply (GObject *object, GAsyncResult *res,
+      * g_main_context_pop_thread_default: assertion `g_queue_peek_head (stack) == context' failed
+      */
+     g_simple_async_result_complete_in_idle (res_process);
++G_GNUC_END_IGNORE_DEPRECATIONS
+     g_object_unref (self);
+ }
+ 
+@@ -180,6 +182,7 @@ auth_session_process_ready_cb (gpointer object, const GError *error, gpointer us
+     g_return_if_fail (self != NULL);
+     priv = self->priv;
+ 
++G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+     if (error != NULL)
+     {
+         DEBUG ("AuthSessionError: %s", error->message);
+@@ -199,6 +202,7 @@ auth_session_process_ready_cb (gpointer object, const GError *error, gpointer us
+         g_simple_async_result_complete (res);
+         return;
+     }
++G_GNUC_END_IGNORE_DEPRECATIONS
+ 
+     process_data = g_object_get_data ((GObject *)res, data_key_process);
+     g_return_if_fail (process_data != NULL);
+@@ -592,9 +596,11 @@ signon_auth_session_process_async (SignonAuthSession *self,
+ 
+     g_return_if_fail (session_data != NULL);
+ 
++G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+     res = g_simple_async_result_new ((GObject *)self, callback, user_data,
+                                      signon_auth_session_process_async);
+     g_simple_async_result_set_check_cancellable (res, cancellable);
++G_GNUC_END_IGNORE_DEPRECATIONS
+ 
+     process_data = g_slice_new0 (AuthSessionProcessData);
+     process_data->session_data = g_variant_ref_sink (session_data);
+@@ -636,10 +642,12 @@ signon_auth_session_process_finish (SignonAuthSession *self, GAsyncResult *res,
+     g_return_val_if_fail (SIGNON_IS_AUTH_SESSION (self), NULL);
+ 
+     async_result = (GSimpleAsyncResult *)res;
++G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+     if (g_simple_async_result_propagate_error (async_result, error))
+         return NULL;
+ 
+     reply = g_simple_async_result_get_op_res_gpointer (async_result);
++G_GNUC_END_IGNORE_DEPRECATIONS
+     return g_variant_ref (reply);
+ }
+ 

-- 
libsignon-glib packaging



More information about the pkg-kde-commits mailing list