Bug#952060: libsignon-glib: diff for NMU version 1.12-2.1
Control: tags 952060 + patch
Control: tags 952060 + pending
Dear maintainer,
I've prepared an NMU for libsignon-glib (versioned as 1.12-2.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I should
cancel it.
cu
Adrian
diff -Nru libsignon-glib-1.12/debian/changelog libsignon-glib-1.12/debian/changelog
--- libsignon-glib-1.12/debian/changelog 2015-12-02 20:37:16.000000000 +0200
+++ libsignon-glib-1.12/debian/changelog 2020-04-07 10:42:59.000000000 +0300
@@ -1,3 +1,10 @@
+libsignon-glib (1.12-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't build with -Werror. (Closes: #952060)
+
+ -- Adrian Bunk <bunk@debian.org> Tue, 07 Apr 2020 10:42:59 +0300
+
libsignon-glib (1.12-2) unstable; urgency=medium
[ Rohan Garg ]
diff -Nru libsignon-glib-1.12/debian/patches/disable-deprecation-error.patch libsignon-glib-1.12/debian/patches/disable-deprecation-error.patch
--- libsignon-glib-1.12/debian/patches/disable-deprecation-error.patch 2015-12-02 19:54:34.000000000 +0200
+++ libsignon-glib-1.12/debian/patches/disable-deprecation-error.patch 2020-04-07 10:41:07.000000000 +0300
@@ -1,7 +1,5 @@
-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
+Author: Adrian Bunk
+Subject: Don't build with -Werror
diff --git a/libsignon-glib/Makefile.am b/libsignon-glib/Makefile.am
index e208101..f534d84 100644
--- a/libsignon-glib/Makefile.am
@@ -11,69 +9,8 @@
-I$(builddir) \
$(DEPS_CFLAGS) \
- -Wall -Werror
-+ -Wall -Werror -Wno-error=deprecated-declarations
++ -Wall
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);
- }
-
Reply to: