From 64ccfeec044799b76da7bed0967b5936478e8ea45b176c4e06f4454f90c73a65 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 22 Oct 2019 12:47:33 +0000 Subject: [PATCH] Accepting request 741674 from home:zhangxiaofei:branches:network:pidgin - Add pidgin-Leaky-deprecation-clean-ups.patch: Fix warnings of deprecation of GParameter that result in build failures of plugins that build with -Werror (pidgin.im#17415). OBS-URL: https://build.opensuse.org/request/show/741674 OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=34 --- pidgin-Leaky-deprecation-clean-ups.patch | 69 ++++++++++++++++++++++++ pidgin.changes | 7 +++ pidgin.spec | 3 ++ 3 files changed, 79 insertions(+) create mode 100644 pidgin-Leaky-deprecation-clean-ups.patch diff --git a/pidgin-Leaky-deprecation-clean-ups.patch b/pidgin-Leaky-deprecation-clean-ups.patch new file mode 100644 index 0000000..8be40d4 --- /dev/null +++ b/pidgin-Leaky-deprecation-clean-ups.patch @@ -0,0 +1,69 @@ +# HG changeset patch +# User Gary Kramlich +# Date 1570433439 18000 +# Mon Oct 07 02:30:39 2019 -0500 +# Branch release-2.x.y +# Node ID e3c4fde8a94a25bb571dc7932bdd6cca086f8ae8 +# Parent a8e08676e356c7d003852fddd3d9c3826dcfa1d6 +G_CONST_RETURN has been deprecated for awhile and honestly it's not necessary for us + +diff -r a8e08676e356 -r e3c4fde8a94a libpurple/util.c +--- a/libpurple/util.c Fri Aug 02 23:56:19 2019 +0000 ++++ b/libpurple/util.c Mon Oct 07 02:30:39 2019 -0500 +@@ -4695,7 +4695,7 @@ + * This function is copied from g_strerror() but changed to use + * gai_strerror(). + */ +-G_CONST_RETURN gchar * ++const gchar * + purple_gai_strerror(gint errnum) + { + #if GLIB_CHECK_VERSION(2, 32, 0) +diff -r a8e08676e356 -r e3c4fde8a94a libpurple/util.h +--- a/libpurple/util.h Fri Aug 02 23:56:19 2019 +0000 ++++ b/libpurple/util.h Mon Oct 07 02:30:39 2019 -0500 +@@ -1394,7 +1394,7 @@ + * @return The UTF-8 error message. + * @since 2.4.0 + */ +-G_CONST_RETURN gchar *purple_gai_strerror(gint errnum); ++const gchar *purple_gai_strerror(gint errnum); + + /** + * Compares two UTF-8 strings case-insensitively. This comparison is +# HG changeset patch +# User Gary Kramlich +# Date 1570433500 18000 +# Mon Oct 07 02:31:40 2019 -0500 +# Branch release-2.x.y +# Node ID 9d4485060df8bde34d576346f8e22663bc670fb9 +# Parent e3c4fde8a94a25bb571dc7932bdd6cca086f8ae8 +Disable deprecation warnings for the functions that have GParameter in their arguments + +diff -r e3c4fde8a94a -r 9d4485060df8 libpurple/media.h +--- a/libpurple/media.h Mon Oct 07 02:30:39 2019 -0500 ++++ b/libpurple/media.h Mon Oct 07 02:31:40 2019 -0500 +@@ -161,8 +161,10 @@ + * + * @since 2.8.0 + */ ++G_GNUC_BEGIN_IGNORE_DEPRECATIONS + void purple_media_set_params(PurpleMedia *media, + guint num_params, GParameter *params); ++G_GNUC_END_IGNORE_DEPRECATIONS + + /** + * Gets the list of optional parameters supported by the media backend. +@@ -208,10 +210,12 @@ + * + * @since 2.6.0 + */ ++G_GNUC_BEGIN_IGNORE_DEPRECATIONS + gboolean purple_media_add_stream(PurpleMedia *media, const gchar *sess_id, + const gchar *who, PurpleMediaSessionType type, + gboolean initiator, const gchar *transmitter, + guint num_params, GParameter *params); ++G_GNUC_END_IGNORE_DEPRECATIONS + + /** + * Gets the session type from a session diff --git a/pidgin.changes b/pidgin.changes index 2dbc5a7..e5f0a2b 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 22 06:15:35 UTC 2019 - Felix Zhang + +- Add pidgin-Leaky-deprecation-clean-ups.patch: Fix warnings of + deprecation of GParameter that result in build failures of + plugins that build with -Werror (pidgin.im#17415). + ------------------------------------------------------------------- Tue Apr 17 12:50:20 UTC 2018 - dimstar@opensuse.org diff --git a/pidgin.spec b/pidgin.spec index 1ecc42f..a6c765c 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -40,6 +40,8 @@ Patch3: pidgin-ncurses-6.0-accessors.patch Patch4: pidgin-use-default-alsa.patch # PATCH-FIX-UPSTREAM pidgin-enable-sni-gnutls.patch bsc#1086439 pidgin.im#17300 fezhang@suse.com -- Enable SNI extension in GnuTLS connections. Patch5: pidgin-enable-sni-gnutls.patch +# PATCH-FIX-UPSTREAM pidgin-Leaky-deprecation-clean-ups.patch pidgin.im#17415 fezhang@suse.com -- Fix warnings of deprecation of GParameter +Patch6: pidgin-Leaky-deprecation-clean-ups.patch BuildRequires: ca-certificates-mozilla BuildRequires: doxygen BuildRequires: fdupes @@ -235,6 +237,7 @@ translation-update-upstream %patch4 -p1 %endif %patch5 -p1 +%patch6 -p1 cp -f %{SOURCE3} %{name}-prefs.xml