SHA256
1
0
forked from pool/pidgin

Accepting request 813338 from network:pidgin

- Update to version 2.14.0.

OBS-URL: https://build.opensuse.org/request/show/813338
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=132
This commit is contained in:
Dominique Leuenberger 2020-06-11 12:47:55 +00:00 committed by Git OBS Bridge
commit e2ddc4b517
11 changed files with 138 additions and 259 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
size 8994457

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQQ2Ti6zjqao1h+5Y611/iWaqKyAMgUCWqDeeAAKCRB1/iWaqKyA
MpUVAJ98lMjMah4iPim/k+bmhhBsr8StqACfVvyvxW+nQyoMc+M8JDMlgm43zn4=
=LLw/
-----END PGP SIGNATURE-----

3
pidgin-2.14.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d06ec08b1174c1a9534664ac3e997ee9b6a67eded126dfca9041c2f7db56c82f
size 8852009

16
pidgin-2.14.0.tar.bz2.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEQN4dxyiP4/UKuTjFSPZq/9m9tykFAl7gWHEACgkQSPZq/9m9
tym1NQ/9Hg8zq6v85C5RVCBUec9uN0hSKPX7Y79YY8TInuixekCr4SXwFp6KK6/Z
0/c10QB3dt4yzKZSV4PBSbg1DyrhT5BOIyLhs1XyTeFmy1hIaxf6kxYBRDY5UGJr
Q6ZpjOIb9leikFX8m7YfP8QmBbgRmJq9qc6MKPUzMEkbZL0wffKlfFImNHP7//m/
hWmsPGGZPJvAM2OXgCU/NDpSQly5vl0m7TEeF0rtYd6XJEw4OpODTn+B0TkW9JUc
AGR0T4Gw5N4DMqq4TzmSupy8yJg4nZ2JFWCwlK7l5zA6byVJzBLRVT0J8gccB0MK
NoVNpfvSsYsKmAmhuEIDtfYiaBvUXuasDriJ2oY14oZtiwVcqnxD+Fi1EFW1agoS
v366WxHHiJFA0ZaqVvoMQ8MBRs07Oveyup1v1Ilvg4epQfq0VqohoOnauVcUAerE
qwdVqSZGoIx88qI6Nz6uhgzhb0xkBBPcwK8baUoTUfIsOixbF3RcdCO2V7ZrduB4
xH2WB20E08zPpHImbCTYHnDrZBym4hTcdhN/MojQV2wGBvHnL4JvRpJkl++DHDDQ
KaTdSQ3qMB6d3jEYdp1YUzHvhUf341p0tz0nuntGtt0AysZPWQQNaaseLfYTf9ak
YnA6ugMS/XfG8pzLR6sfsmYaAGvo82osdNHCpkP/0x4WeK8WgkY=
=Riux
-----END PGP SIGNATURE-----

View File

@ -1,69 +0,0 @@
# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# 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 <grim@reaperworld.com>
# 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

View File

@ -1,13 +0,0 @@
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -403,6 +403,10 @@ ssl_gnutls_connect(PurpleSslConnection *gsc)
gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd));
+ if (gsc->host) {
+ gnutls_server_name_set (gnutls_data->session, GNUTLS_NAME_DNS, gsc->host, strlen(gsc->host));
+ }
+
gnutls_data->handshake_handler = purple_input_add(gsc->fd,
PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc);

View File

@ -1,57 +0,0 @@
Index: pidgin-2.13.0/finch/libgnt/gntwm.c
===================================================================
--- pidgin-2.13.0.orig/finch/libgnt/gntwm.c
+++ pidgin-2.13.0/finch/libgnt/gntwm.c
@@ -174,37 +174,37 @@ work_around_for_ncurses_bug(void)
cchar_t ch;
PANEL *below = panel;
- sx = getbegx(panel->win);
- ex = getmaxx(panel->win) + sx;
- sy = getbegy(panel->win);
- ey = getmaxy(panel->win) + sy;
+ sx = getbegx(panel_window(panel));
+ ex = getmaxx(panel_window(panel)) + sx;
+ sy = getbegy(panel_window(panel));
+ ey = getmaxy(panel_window(panel)) + sy;
while ((below = panel_below(below)) != NULL) {
- if (sy > getbegy(below->win) + getmaxy(below->win) ||
- ey < getbegy(below->win))
+ if (sy > getbegy(panel_window(below)) + getmaxy(panel_window(below)) ||
+ ey < getbegy(panel_window(below)))
continue;
- if (sx > getbegx(below->win) + getmaxx(below->win) ||
- ex < getbegx(below->win))
+ if (sx > getbegx(panel_window(below)) + getmaxx(panel_window(below)) ||
+ ex < getbegx(panel_window(below)))
continue;
- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) {
- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK)
+ for (y = MAX(sy, getbegy(panel_window(below))); y <= MIN(ey, getbegy(panel_window(below)) + getmaxy(panel_window(below))); y++) {
+ if (mvwin_wch(panel_window(below), y - getbegy(panel_window(below)), sx - 1 - getbegx(panel_window(below)), &ch) != OK)
goto right;
w = widestringwidth(ch.chars);
if (w > 1 && (ch.attr & 1)) {
ch.chars[0] = ' ';
ch.attr &= ~ A_CHARTEXT;
- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch);
- touchline(below->win, y - getbegy(below->win), 1);
+ mvwadd_wch(panel_window(below), y - getbegy(panel_window(below)), sx - 1 - getbegx(panel_window(below)), &ch);
+ touchline(panel_window(below), y - getbegy(panel_window(below)), 1);
}
right:
- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK)
+ if (mvwin_wch(panel_window(below), y - getbegy(panel_window(below)), ex + 1 - getbegx(panel_window(below)), &ch) != OK)
continue;
w = widestringwidth(ch.chars);
if (w > 1 && !(ch.attr & 1)) {
ch.chars[0] = ' ';
ch.attr &= ~ A_CHARTEXT;
- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch);
- touchline(below->win, y - getbegy(below->win), 1);
+ mvwadd_wch(panel_window(below), y - getbegy(panel_window(below)), ex + 1 - getbegx(panel_window(below)), &ch);
+ touchline(panel_window(below), y - getbegy(panel_window(below)), 1);
}
}
}

View File

@ -6,21 +6,21 @@
ft.c \
+ purple-fifo.c \
+ purple-io.c \
glibcompat.c \
idle.c \
imgstore.c \
log.c \
@@ -114,6 +116,8 @@ purple_coreheaders = \
@@ -115,6 +117,8 @@ purple_coreheaders = \
desktopitem.h \
eventloop.h \
ft.h \
+ purple-fifo.h \
+ purple-io.h \
gaim-compat.h \
glibcompat.h \
idle.h \
imgstore.h \
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -435,8 +435,6 @@ ssl_gnutls_close(PurpleSslConnection *gs
@@ -439,8 +439,6 @@ ssl_gnutls_close(PurpleSslConnection *gs
if (gnutls_data->handshake_timer)
purple_timeout_remove(gnutls_data->handshake_timer);
@ -29,7 +29,7 @@
gnutls_deinit(gnutls_data->session);
g_free(gnutls_data);
@@ -524,6 +522,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc
@@ -529,6 +527,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc
}
static size_t
@ -52,7 +52,7 @@
ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len)
{
PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
@@ -1296,6 +1310,23 @@ static PurpleCertificateScheme x509_gnut
@@ -1301,6 +1315,23 @@ static PurpleCertificateScheme x509_gnut
x509_compare_pubkeys, /* Compare public keys */
};
@ -76,7 +76,7 @@
static PurpleSslOps ssl_ops =
{
ssl_gnutls_init,
@@ -1303,7 +1334,9 @@ static PurpleSslOps ssl_ops =
@@ -1308,7 +1339,9 @@ static PurpleSslOps ssl_ops =
ssl_gnutls_connect,
ssl_gnutls_close,
ssl_gnutls_read,
@ -88,7 +88,7 @@
/* padding */
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -1235,6 +1235,8 @@ static PurpleSslOps ssl_ops =
@@ -1174,6 +1174,8 @@ static PurpleSslOps ssl_ops =
ssl_nss_connect,
ssl_nss_close,
ssl_nss_read,

View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Wed Jun 10 15:19:12 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
- Update to version 2.14.0:
+ General:
* Fixed a memory leak in search results (pidgin.im#17292).
* Support SNI with GnuTLS (pidgin.im#17300 tiagosalem).
* Add additional error handling to NSS and GnuTLS.
+ libpurple:
* Add invisible buddy support to support presence/name/photos
for non-buddies (pidgin.im#17295).
* Make purple-remote compatible with both Python 2 and Python 3.
* Fix some leaky deprecation warnings.
* Fix HTML logs which were writing invalid HTML
(pidgin.im#17280).
* Fix use after free in purple_smiley_set_data_impl.
* Added the chat_send_file ability to protocol plugins.
+ Pidgin:
* Treat <p> tags as line breaks when pasting.
* Reverted pidgin.im#17232.
It caused more harm than good.
+ Bonjour:
* Always use port fallback for IPv4 addresses.
+ XMPP:
* Support for XEP-0198 Stream Management.
* Decrease delay for file transfer using streamhosts.
+ Voice & Video:
* Improve webcam failure handling.
* Show error when creating media pipeline fails.
* Clip audio level reporting (pidgin.im#14426).
* Keep track of devices managed by GstDeviceMonitor.
* Ignore PulseAudio monitors.
* Backport native Voice & Video prefs from 3.0.
* Fix building against GStreamer 0.10.
* Fix initial delay on incoming audio.
* Properly cleanup timeouts.
* Add an audio mixer so mixed sources don't cause a pipe
failure.
* Add screen share support for Wayland via XDP Portal.
* Handle unplug and replug events of selected media device.
- Rebase pidgin-nonblock-common.patch.
- Drop pidgin-enable-sni-gnutls.patch,
pidgin-Leaky-deprecation-clean-ups.patch: fixed upstream.
- Drop pidgin-ncurses-6.0-accessors.patch: moved to the libgnt
package.
- Drop support for openSUSE older than Leap 15.0.
-------------------------------------------------------------------
Sat Jan 25 14:18:56 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,53 +1,56 @@
pub dsa1024/A8AC8032 2004-12-03
Key fingerprint = 364E 2EB3 8EA6 A8D6 1FB9 63AD 75FE 259A A8AC 8032
pub rsa4096 2019-07-25 [SC]
40DE 1DC7 288F E3F5 0AB9 38C5 48F6 6AFF D9BD B729
uid [ unknown] Gary Kramlich (grim) <grim@reaperworld.com>
sub elg2048/A471F9D3 2004-12-03
sub rsa4096 2019-07-25 [E]
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2
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
=+0NZ
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
=1LcS
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package pidgin
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define _name Pidgin
Name: pidgin
Version: 2.13.0
Version: 2.14.0
Release: 0
Summary: Multiprotocol Instant Messaging Client
License: GPL-2.0-only
@ -34,14 +34,8 @@ Patch0: pidgin-nonblock-common.patch
Patch1: pidgin-nonblock-gwim.patch
# PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert https://bitbucket.org/pidgin/main/commits/a083625 as it breaks the build.
Patch2: pidgin-fix-perl-build.patch
# PATCH-FIX-UPSTREAM pidgin-ncurses-6.0-accessors.patch pidgin.im#16764 dimstar@opensuse.org -- Fix build with NCurses 6.0 with WINDOW_OPAQUE set to 1.
Patch3: pidgin-ncurses-6.0-accessors.patch
# PATCH-FIX-SLE pidgin-use-default-alsa.patch bsc#886670 tiwai@suse.de -- Use ALSA as a default for avoiding broken volume control.
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
Patch3: pidgin-use-default-alsa.patch
BuildRequires: ca-certificates-mozilla
BuildRequires: doxygen
BuildRequires: fdupes
@ -58,8 +52,13 @@ BuildRequires: update-desktop-files
BuildRequires: pkgconfig(avahi-glib)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(farstream-0.2) >= 0.2.7
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnt) >= 2.14.0
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtkspell-2.0)
BuildRequires: pkgconfig(libgadu)
@ -80,17 +79,7 @@ BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xscrnsaver)
Requires: ca-certificates-mozilla
Requires: perl-base >= %{perl_version}
%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120200 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
BuildRequires: pkgconfig(farstream-0.2) >= 0.2.7
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
Recommends: gstreamer-plugins-good
%else
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
Recommends: gstreamer-0_10-plugins-good
%endif
%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse}
Recommends: purple-import-empathy
%endif
@ -127,11 +116,7 @@ Requires: cyrus-sasl-plain
Requires: libpurple-branding
Requires: perl >= %{perl_version}
# Needed for purple-url-handler.
%if 0%{?suse_version} >= 1500
Requires: python3-dbus-python
%else
Requires: dbus-1-python3
%endif
%description -n libpurple
libpurple is a library intended to be used by programmers seeking
@ -148,7 +133,7 @@ support many more with plugins.
Summary: GLib-based Instant Messenger Library -- Upstream default configuration
Group: System/Libraries
Requires: libpurple = %{version}
Supplements: packageand(libpurple:branding-upstream)
Supplements: (libpurple and branding-upstream)
Conflicts: otherproviders(libpurple-branding)
Provides: libpurple-branding = %{version}
BuildArch: noarch
@ -183,7 +168,7 @@ client.
Summary: TCL Plugin Support for Pidgin
Group: Productivity/Networking/Instant Messenger
Requires: libpurple = %{version}
Supplements: packageand(libpurple:tcl)
Supplements: (libpurple and tcl)
%description -n libpurple-tcl
TCL plugin loader for Pidgin. This package will allow you to write
@ -231,12 +216,9 @@ translation-update-upstream
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%if 0%{?sle_version} >= 120000 && !0%{?is_opensuse}
%patch4 -p1
%patch3 -p1
%endif
%patch5 -p1
%patch6 -p1
cp -f %{SOURCE3} %{name}-prefs.xml
@ -260,20 +242,15 @@ autoreconf -fi
--enable-cyrus-sasl \
--enable-dbus \
--enable-gstreamer \
%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120200
--with-gstreamer=1.0 \
--enable-vv \
%else
--with-gstreamer=0.10 \
--disable-vv \
%endif
--disable-nm \
--enable-dbus \
--enable-devhelp \
--with-tclconfig=%{_libdir} \
--with-tkconfig=%{_libdir} \
--with-system-ssl-certs=%{_sysconfdir}/ssl/certs/
make %{?_smp_mflags} V=1
%make_build
%install
%make_install
@ -298,22 +275,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
%postun -n finch -p /sbin/ldconfig
%if 0%{?suse_version} < 1500
%post
%desktop_database_post
%icon_theme_cache_post
%postun
%desktop_database_postun
%icon_theme_cache_postun
%endif
%files
%if 0%{?suse_version} >= 1500
%license COPYING
%else
%doc COPYING
%endif
%doc AUTHORS COPYRIGHT ChangeLog README doc/the_penguin.txt
%{_bindir}/%{name}
%{_libdir}/%{name}/
@ -371,16 +334,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n finch
%{_bindir}/finch
%{_libdir}/finch/
%{_libdir}/libgnt.so.*
%{_libdir}/gnt/
%dir %{_libdir}/finch/
%{_mandir}/man1/finch.1%{?ext_man}
%files -n finch-devel
%{_includedir}/finch/
%{_includedir}/gnt/
%{_libdir}/libgnt.so
%{_libdir}/pkgconfig/finch.pc
%{_libdir}/pkgconfig/gnt.pc
%changelog