[SCM] libaccounts-glib packaging branch, master, updated. debian/1.18+20150112-2-9-g5c55c94
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Apr 26 11:40:18 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libaccounts-glib.git;a=commitdiff;h=b4f9a52
The following commit has been merged in the master branch:
commit b4f9a52532c8857bd7a38b47cf55a0903677436a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Apr 26 11:18:49 2016 +0200
Drop upstream applied patches
---
debian/patches/disable-deprecation-errors.patch | 143 ------------------------
debian/patches/fix-endianness-issues.patch | 54 ---------
debian/patches/series | 2 -
3 files changed, 199 deletions(-)
diff --git a/debian/patches/disable-deprecation-errors.patch b/debian/patches/disable-deprecation-errors.patch
deleted file mode 100644
index 9094ded..0000000
--- a/debian/patches/disable-deprecation-errors.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Author: Alberto Mardegan
-Subject: Disable deprecation erros
-Origin: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/6
-Bug-accounts-sso: https://gitlab.com/accounts-sso/libaccounts-glib/issues/1
-
---- a/libaccounts-glib/Makefile.am
-+++ b/libaccounts-glib/Makefile.am
-@@ -9,7 +9,7 @@ libaccounts_glib_la_CPPFLAGS = \
- libaccounts_glib_la_CFLAGS = \
- $(LIBACCOUNTS_CFLAGS) \
- $(COVERAGE_CFLAGS) \
-- -Wall -Werror
-+ -Wall -Werror -Wno-error=deprecated-declarations
- libaccounts_glib_la_LIBADD = \
- $(LIBACCOUNTS_LIBS)
- libaccounts_glib_la_LDFLAGS = \
-
-diff --git a/libaccounts-glib/ag-account.c b/libaccounts-glib/ag-account.c
-index 93edb32..165ae25 100644
---- a/libaccounts-glib/ag-account.c
-+++ b/libaccounts-glib/ag-account.c
-@@ -695,7 +695,9 @@ _ag_account_store_completed (AgAccount *account, AgAccountChanges *changes)
- {
- AgAccountPrivate *priv = account->priv;
-
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_simple_async_result_complete_in_idle (priv->store_async_result);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- g_clear_object (&priv->store_async_result);
-
- _ag_account_changes_free (changes);
-@@ -2485,28 +2487,34 @@ ag_account_store_async (AgAccount *account, GCancellable *cancellable,
- if (G_UNLIKELY (priv->store_async_result != NULL))
- {
- g_critical ("ag_account_store_async called again before completion");
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_simple_async_report_error_in_idle ((GObject *)account,
- callback, user_data,
- AG_ACCOUNTS_ERROR,
- AG_ACCOUNTS_ERROR_STORE_IN_PROGRESS,
- "Store operation already "
- "in progress");
-+G_GNUC_END_IGNORE_DEPRECATIONS
- return;
- }
-
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- priv->store_async_result =
- g_simple_async_result_new ((GObject *)account,
- callback, user_data,
- ag_account_store_async);
- g_simple_async_result_set_check_cancellable (priv->store_async_result,
- cancellable);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- g_object_add_weak_pointer ((GObject *)priv->store_async_result,
- (gpointer *)&priv->store_async_result);
-
- if (G_UNLIKELY (priv->changes == NULL))
- {
- /* Nothing to do: invoke the callback immediately */
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_simple_async_result_complete_in_idle (priv->store_async_result);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- g_clear_object (&priv->store_async_result);
- return;
- }
-@@ -2537,7 +2545,9 @@ ag_account_store_finish (AgAccount *account, GAsyncResult *res,
- g_return_val_if_fail (AG_IS_ACCOUNT (account), FALSE);
-
- async_result = (GSimpleAsyncResult *)res;
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- return !g_simple_async_result_propagate_error (async_result, error);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- }
-
- /**
-
-diff --git a/libaccounts-glib/ag-manager.c b/libaccounts-glib/ag-manager.c
-index 3cf02e1..8e6a891 100644
---- a/libaccounts-glib/ag-manager.c
-+++ b/libaccounts-glib/ag-manager.c
-@@ -187,6 +187,7 @@ on_dbus_store_done (GObject *object, GAsyncResult *res,
- GVariant *result;
- GError *error_int = NULL;
-
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- result = g_dbus_connection_call_finish (conn, res, &error_int);
- if (G_UNLIKELY (error_int))
- {
-@@ -221,6 +222,7 @@ on_dbus_store_done (GObject *object, GAsyncResult *res,
-
- g_simple_async_result_complete_in_idle (async_result);
- g_object_unref (async_result);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- }
-
- static void
-@@ -233,11 +235,13 @@ ag_manager_store_dbus_async (AgManager *manager, AgAccount *account,
- GVariant *dbus_changes;
-
- if (G_UNLIKELY (!priv->use_dbus)) {
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_simple_async_result_set_error (async_result,
- AG_ACCOUNTS_ERROR,
- AG_ACCOUNTS_ERROR_READONLY,
- "DB read-only and D-Bus disabled");
- g_simple_async_result_complete_in_idle (async_result);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- g_object_unref (async_result);
- return;
- }
-@@ -1104,7 +1108,9 @@ exec_transaction_idle (StoreCbData *sd)
- finish:
- if (error != NULL)
- {
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_simple_async_result_take_error (sd->async_result, error);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- }
-
- _ag_account_store_completed (account, sd->changes);
-@@ -2409,7 +2415,9 @@ _ag_manager_exec_transaction (AgManager *manager, const gchar *sql,
- finish:
- if (error != NULL)
- {
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_simple_async_result_take_error (async_result, error);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- }
-
- _ag_account_store_completed (account, changes);
-@@ -2470,9 +2478,11 @@ ag_manager_store_local_async (AgManager *manager, AgAccount *account,
- sql = _ag_account_get_store_sql (account, &error);
- if (G_UNLIKELY (error))
- {
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_simple_async_result_take_error (async_result,
- error);
- g_simple_async_result_complete_in_idle (async_result);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- g_object_unref (async_result);
- return;
- }
diff --git a/debian/patches/fix-endianness-issues.patch b/debian/patches/fix-endianness-issues.patch
deleted file mode 100644
index 5a23f55..0000000
--- a/debian/patches/fix-endianness-issues.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Author: Alberto Mardegan <alberto.mardegan at canonical.com>
-Date: Fri, 18 Dec 2015 18:16:14 +0300
-commit: a6c28fea9fa791a85b1809f00cc43d16b87f2b77
-Subject: [PATCH] Fix endianness issues
- We cannot safely load a 32 bit integer into a struct field which expects
- a 64 bit value: we must load it into a 32 bit integer first, and then
- assign the value to the structure field.
- .
- This bug was causing test failures on s390x:
-Bug: https://gitlab.com/accounts-sso/libaccounts-glib/issues/2
---- a/libaccounts-glib/ag-account.c
-+++ b/libaccounts-glib/ag-account.c
-@@ -291,8 +291,10 @@ _ag_account_build_dbus_changes (AgAccount *account, AgAccountChanges *changes,
-
- if (ts)
- {
-- g_variant_builder_add (&builder, "u", ts->tv_sec);
-- g_variant_builder_add (&builder, "u", ts->tv_nsec);
-+ guint32 sec = ts->tv_sec;
-+ guint32 nsec = ts->tv_nsec;
-+ g_variant_builder_add (&builder, "u", sec);
-+ g_variant_builder_add (&builder, "u", nsec);
- }
- g_variant_builder_add (&builder, "u", account->id);
- g_variant_builder_add (&builder, "b", changes->created);
-diff --git a/libaccounts-glib/ag-manager.c b/libaccounts-glib/ag-manager.c
-index 8e6a891..7c8673b 100644
---- a/libaccounts-glib/ag-manager.c
-+++ b/libaccounts-glib/ag-manager.c
-@@ -699,16 +699,18 @@ dbus_filter_callback (G_GNUC_UNUSED GDBusConnection *dbus_conn,
- if (!object_path_is_interesting (object_path, priv->object_paths))
- return;
-
-- memset (&ts, 0, sizeof (struct timespec));
-+ guint32 sec, nsec;
- g_variant_get (msg,
- "(uuubb&s@*)",
-- &ts.tv_sec,
-- &ts.tv_nsec,
-+ &sec,
-+ &nsec,
- &account_id,
- &created,
- &deleted,
- &provider_name,
- &v_services);
-+ ts.tv_sec = sec;
-+ ts.tv_nsec = nsec;
-
- DEBUG_INFO ("path = %s, time = %lu-%lu (%p)",
- object_path, ts.tv_sec, ts.tv_nsec,
---
-2.6.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 456db37..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-disable-deprecation-errors.patch
-fix-endianness-issues.patch
--
libaccounts-glib packaging
More information about the pkg-kde-commits
mailing list