From 059dca596eab63ad0165a9a045616a6b07604c16b9176dba06c991638160d3a7 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 8 May 2021 20:41:31 +0000 Subject: [PATCH] Accepting request 891598 from home:dirkmueller:Factory - update to 2.14.4: * Use LT_LIB_M to find the math library. This should simplify things for various distros including the BSD's. (RR #608) (and, Justin Lechner) libpurple: * Update purple-remote and purple-url-handler to have a Python 3 shebang. Pidgin: * Install our AppData file into the $prefix/share/metainfo. Windows-Specific Changes: * Output pkg-config files so that our Windows builds can be seen by meson. Grim owes a blog post on how this works. * Update the debug symbols download in the installer to the inetc plugin. * Make sure the uninstaller removes all files that we install. libpurple: * Removed the AIM protocol plugin. AIM has been shut down since December 15th of 2017. We left it around because of a third party server, but our plugin no longer works with it. (RR #598) (Gary Kramlich) * Standardize on wprintf in pidgin/win32/winpidgin.c * Use the inetc nsis plugin that supports https * If building under msys2 copy libgcc_s_dw2-1.dll and libwinpthread to the install directory. (RR #593) (PIDGIN-17511) (Gary Kramlich) * Fix a build issue when compiling with gstreamer but without voice and video. * Enable cyrus-sasl by default. * Fix an issue with opening link in Firefox. * Fix a regression from 2.14.0 where extra whitespace would be displayed when pasting

elements from HTML. * Require Python 3 for generating the D-Bus bindings. * Fix an issue where pasting

's and other HTML elements would eventually lead to a crash. OBS-URL: https://build.opensuse.org/request/show/891598 OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=44 --- pidgin-2.14.1.tar.bz2 | 3 -- pidgin-2.14.1.tar.bz2.asc | 16 --------- pidgin-2.14.4.tar.bz2 | 3 ++ pidgin-2.14.4.tar.bz2.asc | 16 +++++++++ pidgin-always-enable-intltool.patch | 15 +++++---- pidgin-nonblock-common.patch | 50 ++++++++++++++++++++--------- pidgin.changes | 38 ++++++++++++++++++++++ pidgin.spec | 8 ++--- 8 files changed, 102 insertions(+), 47 deletions(-) delete mode 100644 pidgin-2.14.1.tar.bz2 delete mode 100644 pidgin-2.14.1.tar.bz2.asc create mode 100644 pidgin-2.14.4.tar.bz2 create mode 100644 pidgin-2.14.4.tar.bz2.asc diff --git a/pidgin-2.14.1.tar.bz2 b/pidgin-2.14.1.tar.bz2 deleted file mode 100644 index a282675..0000000 --- a/pidgin-2.14.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780 -size 8849275 diff --git a/pidgin-2.14.1.tar.bz2.asc b/pidgin-2.14.1.tar.bz2.asc deleted file mode 100644 index 3261229..0000000 --- a/pidgin-2.14.1.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEQN4dxyiP4/UKuTjFSPZq/9m9tykFAl7h9/IACgkQSPZq/9m9 -tymq5hAAwDfadPL7akPmqdEeqWf1VTTOE9WO100i1szM0CCNrfgUk2URxP63yBAL -vV06Lwisa5L8AGfRaFjkU/N5epYu0VPs7iADm5nKH+y17UYZ7fVQBo4CC9/HNbmM -Q2JGAIBep6igpb9rdAi6qWQydOVSrrETT8Qv7g8nmSxR/NNMqjd5hkUKkWNFcZQa -C+h3XbIkXQp+qIBOwaCEgMtYdoh3gjBOao5656Zv2S7j1KdJPxpkoerErrqtU4Nv -0ACO4JCeykKpkPJ9YwnTB5XdLYXXoVysVIj1FGyVrbJmAzyjoNcIJqexAj4lhPgJ -+1wvEOh2o7l7glankoFir1dZgdcjdeaPQ+1aU8wJru0AtvmEGLEuFfadFUt0IfA2 -SkapCxbmubQiATpSZI+VcV3TZ28HTUtIPIgT810fd3Y1uTtNS9qPgU5T7b3DxP6M -fXLK34sfgHz0tX7VBNTIW4a6wOyAkw1+HMztCGQs7m6prLfEA4CLnPLpk5Il7tVF -Uhu400lPQzl91jauyeqemOUkbhuaDYOU4Yr1RkFgJT6y46tZ6iMxHfOyhyfhxuiw -5T6Juj2BruPhRRqxBUfwTSgI4XMIFwwxQIYzBW7GMaAu0D9TBv0ZDrvUtogh/JtO -+WgEF8AQNKef7wB+PGtEKX4Gt9wODhr1GaykfZzeHt4+SLojgZ4= -=XIaI ------END PGP SIGNATURE----- diff --git a/pidgin-2.14.4.tar.bz2 b/pidgin-2.14.4.tar.bz2 new file mode 100644 index 0000000..70f21a9 --- /dev/null +++ b/pidgin-2.14.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67c1a0104b0624a50100c6d73cd5504d53c9d221922b1b28fa86020531a9904e +size 8724096 diff --git a/pidgin-2.14.4.tar.bz2.asc b/pidgin-2.14.4.tar.bz2.asc new file mode 100644 index 0000000..eef6332 --- /dev/null +++ b/pidgin-2.14.4.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEQN4dxyiP4/UKuTjFSPZq/9m9tykFAmCLa4IACgkQSPZq/9m9 +tynHcw//boFwQiiRwXoUxkDjggKAShpDkA/urzf56qIkfNwTW7XuaWwqaMewsKps +aVPrLOAvGEeu9ssZiIZ/ELOdaUCYbdwlTPDj8jEMqAD8PNacAuLElDCsFpP1wpsX +MOvG1OAGKe7M2mGbcgGVVKfTilfDsS6+1GI2AGQZstyoufGPsECwHYb+jItNneCq +909KxMTtIqDUSVTiGV8F2+JHJBP0gq+UkM075FgiXpP3vcuUzb3oreo9dgt+Bpzc +iO+G2z2LRhcHHZ18koFbCCkhE5OKCUn1ZQgicObVhaZYeeN+5Wyh02KlhTaVcFpR +VGjs1Bhm8gv5nw64m0dVmKNhpXxgCBAdKCVuK7kKNMrA0CTNTh2QN9bU5RE6Vwoi +DZRVJQIlNkmXNbpVUVPZKh1NIycyicfS/y0rCTPLH/0R1nCOi33dL+F3GPTBp59k +tGiTApHyrQNgnjL3vbBwrxy277fn3GDGlQutcfdCrU7VPSlzM0v1xgoGcDfidIqF +ECIpEvK5YlH7tQ3iPBfJSBXdss/QCTfifeOvgTYWawOE9LiorpmitStFJfH/UVXw +14kPYefL9CLLrnBG78Wv/c9TKyAoG7DuM6UVXyaOkyObuktn1Jd1RA4idflK4YN6 +rcG/++3RnozI+kZEaTGV9HtvuYAYNoCtZj7F286ktQpZ3o8uR/U= +=pRVi +-----END PGP SIGNATURE----- diff --git a/pidgin-always-enable-intltool.patch b/pidgin-always-enable-intltool.patch index abb5930..bae8b97 100644 --- a/pidgin-always-enable-intltool.patch +++ b/pidgin-always-enable-intltool.patch @@ -1,13 +1,14 @@ -diff -urp pidgin-2.14.1.orig/configure.ac pidgin-2.14.1/configure.ac ---- pidgin-2.14.1.orig/configure.ac 2020-06-11 03:50:29.000000000 -0500 -+++ pidgin-2.14.1/configure.ac 2021-02-12 09:05:32.013284982 -0600 -@@ -256,8 +256,8 @@ dnl # Disable creation and installation +Index: pidgin-2.14.4/configure.ac +=================================================================== +--- pidgin-2.14.4.orig/configure.ac ++++ pidgin-2.14.4/configure.ac +@@ -259,8 +259,8 @@ dnl # Disable creation and installation dnl ####################################################################### AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes) -+AC_PROG_INTLTOOL - if test x$enable_i18n = xyes; then -- AC_PROG_INTLTOOL +-if test x$enable_i18n = xyes; then + AC_PROG_INTLTOOL ++if test x$enable_i18n = xyes; then GETTEXT_PACKAGE=pidgin AC_SUBST(GETTEXT_PACKAGE) diff --git a/pidgin-nonblock-common.patch b/pidgin-nonblock-common.patch index 097176a..04c6e3f 100644 --- a/pidgin-nonblock-common.patch +++ b/pidgin-nonblock-common.patch @@ -1,15 +1,17 @@ ---- a/libpurple/Makefile.am -+++ b/libpurple/Makefile.am +Index: pidgin-2.14.4/libpurple/Makefile.am +=================================================================== +--- pidgin-2.14.4.orig/libpurple/Makefile.am ++++ pidgin-2.14.4/libpurple/Makefile.am @@ -47,6 +47,8 @@ purple_coresources = \ desktopitem.c \ eventloop.c \ ft.c \ + purple-fifo.c \ + purple-io.c \ - glibcompat.c \ idle.c \ imgstore.c \ -@@ -115,6 +117,8 @@ purple_coreheaders = \ + log.c \ +@@ -114,6 +116,8 @@ purple_coreheaders = \ desktopitem.h \ eventloop.h \ ft.h \ @@ -18,8 +20,10 @@ gaim-compat.h \ glibcompat.h \ idle.h \ ---- a/libpurple/plugins/ssl/ssl-gnutls.c -+++ b/libpurple/plugins/ssl/ssl-gnutls.c +Index: pidgin-2.14.4/libpurple/plugins/ssl/ssl-gnutls.c +=================================================================== +--- pidgin-2.14.4.orig/libpurple/plugins/ssl/ssl-gnutls.c ++++ pidgin-2.14.4/libpurple/plugins/ssl/ssl-gnutls.c @@ -439,8 +439,6 @@ ssl_gnutls_close(PurpleSslConnection *gs if (gnutls_data->handshake_timer) purple_timeout_remove(gnutls_data->handshake_timer); @@ -86,8 +90,10 @@ ssl_gnutls_get_peer_certificates, /* padding */ ---- a/libpurple/plugins/ssl/ssl-nss.c -+++ b/libpurple/plugins/ssl/ssl-nss.c +Index: pidgin-2.14.4/libpurple/plugins/ssl/ssl-nss.c +=================================================================== +--- pidgin-2.14.4.orig/libpurple/plugins/ssl/ssl-nss.c ++++ pidgin-2.14.4/libpurple/plugins/ssl/ssl-nss.c @@ -1174,6 +1174,8 @@ static PurpleSslOps ssl_ops = ssl_nss_connect, ssl_nss_close, @@ -97,8 +103,10 @@ ssl_nss_write, ssl_nss_peer_certs, +Index: pidgin-2.14.4/libpurple/purple-fifo.c +=================================================================== --- /dev/null -+++ b/libpurple/purple-fifo.c ++++ pidgin-2.14.4/libpurple/purple-fifo.c @@ -0,0 +1,232 @@ +/* + * @file purple-fifo.c A FIFO byte queue. @@ -332,8 +340,10 @@ + + return TRUE; +} +Index: pidgin-2.14.4/libpurple/purple-fifo.h +=================================================================== --- /dev/null -+++ b/libpurple/purple-fifo.h ++++ pidgin-2.14.4/libpurple/purple-fifo.h @@ -0,0 +1,54 @@ +/** + * @file purple-fifo.h A FIFO byte queue. @@ -389,8 +399,10 @@ +G_END_DECLS + +#endif /* _purple_fifo_H_ */ +Index: pidgin-2.14.4/libpurple/purple-io.c +=================================================================== --- /dev/null -+++ b/libpurple/purple-io.c ++++ pidgin-2.14.4/libpurple/purple-io.c @@ -0,0 +1,391 @@ +/* + * @file purple-io.c Buffering I/O layer. @@ -783,8 +795,10 @@ +{ + return purple_fifo_get_used (io->write_fifo); +} +Index: pidgin-2.14.4/libpurple/purple-io.h +=================================================================== --- /dev/null -+++ b/libpurple/purple-io.h ++++ pidgin-2.14.4/libpurple/purple-io.h @@ -0,0 +1,87 @@ +/** + * @file purple-io.h Buffering I/O layer. @@ -873,8 +887,10 @@ +G_END_DECLS + +#endif /* _PURPLE_IO_H_ */ ---- a/libpurple/sslconn.c -+++ b/libpurple/sslconn.c +Index: pidgin-2.14.4/libpurple/sslconn.c +=================================================================== +--- pidgin-2.14.4.orig/libpurple/sslconn.c ++++ pidgin-2.14.4/libpurple/sslconn.c @@ -273,6 +273,27 @@ purple_ssl_read(PurpleSslConnection *gsc } @@ -931,8 +947,10 @@ void purple_ssl_set_ops(PurpleSslOps *ops) { ---- a/libpurple/sslconn.h -+++ b/libpurple/sslconn.h +Index: pidgin-2.14.4/libpurple/sslconn.h +=================================================================== +--- pidgin-2.14.4.orig/libpurple/sslconn.h ++++ pidgin-2.14.4/libpurple/sslconn.h @@ -34,6 +34,12 @@ typedef enum PURPLE_SSL_CERTIFICATE_INVALID = 3 } PurpleSslErrorType; diff --git a/pidgin.changes b/pidgin.changes index 2904fa4..ab236b0 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Sat May 8 19:44:18 UTC 2021 - Dirk Müller + +- update to 2.14.4: + * Use LT_LIB_M to find the math library. This should simplify things for + various distros including the BSD's. (RR #608) (and, Justin Lechner) + libpurple: + * Update purple-remote and purple-url-handler to have a Python 3 shebang. + Pidgin: + * Install our AppData file into the $prefix/share/metainfo. + Windows-Specific Changes: + * Output pkg-config files so that our Windows builds can be seen by meson. + Grim owes a blog post on how this works. + * Update the debug symbols download in the installer to the inetc plugin. + * Make sure the uninstaller removes all files that we install. + libpurple: + * Removed the AIM protocol plugin. AIM has been shut down since December + 15th of 2017. We left it around because of a third party server, but our + plugin no longer works with it. (RR #598) (Gary Kramlich) + * Standardize on wprintf in pidgin/win32/winpidgin.c + * Use the inetc nsis plugin that supports https + * If building under msys2 copy libgcc_s_dw2-1.dll and libwinpthread to the + install directory. (RR #593) (PIDGIN-17511) (Gary Kramlich) + * Fix a build issue when compiling with gstreamer but without voice and + video. + * Enable cyrus-sasl by default. + * Fix an issue with opening link in Firefox. + * Fix a regression from 2.14.0 where extra whitespace would be displayed + when pasting

elements from HTML. + * Require Python 3 for generating the D-Bus bindings. + * Fix an issue where pasting

's and other HTML elements would + eventually lead to a crash. + +------------------------------------------------------------------- +Fri Apr 16 15:47:43 UTC 2021 - Dirk Müller + +- don't package directories owned by filesystem rpm (bsc#1184786) + ------------------------------------------------------------------- Fri Feb 12 15:08:12 UTC 2021 - Michael Gorse diff --git a/pidgin.spec b/pidgin.spec index 0a2220b..ae3e5cb 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -18,7 +18,7 @@ %define _name Pidgin Name: pidgin -Version: 2.14.1 +Version: 2.14.4 Release: 0 Summary: Multiprotocol Instant Messaging Client License: GPL-2.0-only @@ -241,6 +241,7 @@ export PYTHON=python3 autoreconf -fi %configure \ --disable-static \ + --disable-gevolution \ --enable-plugins \ --enable-cyrus-sasl \ --enable-dbus \ @@ -287,9 +288,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/%{name}/ -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/pidgin.appdata.xml %{_mandir}/man1/%{name}.1%{?ext_man} +%{_datadir}/metainfo/pidgin.appdata.xml %files devel %{_includedir}/%{name}/ @@ -307,7 +307,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libpurple-client.so.* %{_libdir}/purple-2/ %exclude %{_libdir}/purple-2/libjabber.so -%exclude %{_libdir}/purple-2/liboscar.so %exclude %{_libdir}/purple-2/libsametime.so %exclude %{_libdir}/purple-2/tcl.so @@ -330,7 +329,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libpurple.so %{_libdir}/libpurple-client.so %{_libdir}/purple-2/libjabber.so -%{_libdir}/purple-2/liboscar.so %{_libdir}/pkgconfig/purple.pc %{_mandir}/man3/Purple.3pm%{?ext_man}