From f6ed8bfe9e631d891abfdc151201fcf509f095d521f621d386b414dee22ae153 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 9 Mar 2018 23:42:48 +0000 Subject: [PATCH] - Update to version 2.13.0. OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=21 --- pidgin-2.10.11-purple-remote-python3.patch | 64 ---------------------- pidgin-2.12.0.tar.bz2 | 3 - pidgin-2.12.0.tar.bz2.asc | 6 -- pidgin-2.13.0.tar.bz2 | 3 + pidgin-2.13.0.tar.bz2.asc | 6 ++ pidgin-ncurses-6.0-accessors.patch | 36 ++++++------ pidgin.changes | 62 +++++++++++++++++++++ pidgin.spec | 9 +-- 8 files changed, 92 insertions(+), 97 deletions(-) delete mode 100644 pidgin-2.10.11-purple-remote-python3.patch delete mode 100644 pidgin-2.12.0.tar.bz2 delete mode 100644 pidgin-2.12.0.tar.bz2.asc create mode 100644 pidgin-2.13.0.tar.bz2 create mode 100644 pidgin-2.13.0.tar.bz2.asc diff --git a/pidgin-2.10.11-purple-remote-python3.patch b/pidgin-2.10.11-purple-remote-python3.patch deleted file mode 100644 index a2d9f98..0000000 --- a/pidgin-2.10.11-purple-remote-python3.patch +++ /dev/null @@ -1,64 +0,0 @@ -Actually make things work in python3. - -Author: Jan Synacek - ---- a/libpurple/purple-remote 2015-06-03 09:52:26.324668688 +0200 -+++ b/libpurple/purple-remote 2015-06-03 09:55:41.287253981 +0200 -@@ -3,13 +3,13 @@ - import codecs - import dbus - import re --import urllib -+import urllib.parse - import sys - - import xml.dom.minidom - - sys.stdin = codecs.getwriter('utf-8')(sys.stdin); --sys.stdout = codecs.getwriter('utf-8')(sys.stdout); -+sys.stdout = codecs.getwriter('utf-8')(sys.stdout.detach()); - - xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName - -@@ -41,7 +41,7 @@ class CheckedAttribute: - return result - - def show_help(requested=False): -- print """This program uses D-Bus to communicate with purple. -+ print("""This program uses D-Bus to communicate with purple. - - Usage: - -@@ -72,7 +72,7 @@ Examples of commands: - - PurpleAccountsFindConnected?name=&protocol=prpl-jabber - PurpleAccountsFindConnected(,prpl-jabber) --""" % sys.argv[0] -+""" % sys.argv[0]) - if (requested): - sys.exit(0) - else: -@@ -120,7 +120,7 @@ def execute(uri): - if paramstring is not None: - for param in paramstring.split("&"): - key, value = extendlist(param.split("=",1), 2, "") -- params[key] = urllib.unquote(value) -+ params[key] = urllib.parse.unquote(value) - - accountname = params.get("account", "") - -@@ -233,12 +233,12 @@ if len(sys.argv) == 1: - elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"): - show_help(True) - elif (obj == None): -- print "No existing libpurple instance detected." -+ print("No existing libpurple instance detected.") - sys.exit(1); - - for arg in sys.argv[1:]: - output = execute(arg) - - if (output != None): -- print output -+ print(output) - diff --git a/pidgin-2.12.0.tar.bz2 b/pidgin-2.12.0.tar.bz2 deleted file mode 100644 index 79860a8..0000000 --- a/pidgin-2.12.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8 -size 9270704 diff --git a/pidgin-2.12.0.tar.bz2.asc b/pidgin-2.12.0.tar.bz2.asc deleted file mode 100644 index c584ab8..0000000 --- a/pidgin-2.12.0.tar.bz2.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQQ2Ti6zjqao1h+5Y611/iWaqKyAMgUCWMIGggAKCRB1/iWaqKyA -MlX8AJ9cW8x1ICc75KDNN17Ph6wgV2MBVQCfXSLgNYq5qq7HwHYth9M6zZC99tg= -=zYnu ------END PGP SIGNATURE----- diff --git a/pidgin-2.13.0.tar.bz2 b/pidgin-2.13.0.tar.bz2 new file mode 100644 index 0000000..ee4c91e --- /dev/null +++ b/pidgin-2.13.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f +size 8994457 diff --git a/pidgin-2.13.0.tar.bz2.asc b/pidgin-2.13.0.tar.bz2.asc new file mode 100644 index 0000000..f5ebdf7 --- /dev/null +++ b/pidgin-2.13.0.tar.bz2.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQ2Ti6zjqao1h+5Y611/iWaqKyAMgUCWqDeeAAKCRB1/iWaqKyA +MpUVAJ98lMjMah4iPim/k+bmhhBsr8StqACfVvyvxW+nQyoMc+M8JDMlgm43zn4= +=LLw/ +-----END PGP SIGNATURE----- diff --git a/pidgin-ncurses-6.0-accessors.patch b/pidgin-ncurses-6.0-accessors.patch index a1feb4c..4baf91f 100644 --- a/pidgin-ncurses-6.0-accessors.patch +++ b/pidgin-ncurses-6.0-accessors.patch @@ -1,33 +1,33 @@ -Index: pidgin-2.12.0/finch/libgnt/gntwm.c +Index: pidgin-2.13.0/finch/libgnt/gntwm.c =================================================================== ---- pidgin-2.12.0.orig/finch/libgnt/gntwm.c -+++ pidgin-2.12.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 = panel->win->_begx; -- ex = panel->win->_maxx + sx; -- sy = panel->win->_begy; -- ey = panel->win->_maxy + sy; +- 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 > below->win->_begy + below->win->_maxy || -- ey < below->win->_begy) +- 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 > below->win->_begx + below->win->_maxx || -- ex < below->win->_begx) +- 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, below->win->_begy); y <= MIN(ey, below->win->_begy + below->win->_maxy); y++) { -- if (mvwin_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch) != OK) +- 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; @@ -35,21 +35,21 @@ Index: pidgin-2.12.0/finch/libgnt/gntwm.c if (w > 1 && (ch.attr & 1)) { ch.chars[0] = ' '; ch.attr &= ~ A_CHARTEXT; -- mvwadd_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch); -- touchline(below->win, y - below->win->_begy, 1); +- 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 - below->win->_begy, ex + 1 - below->win->_begx, &ch) != OK) +- 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 - below->win->_begy, ex + 1 - below->win->_begx, &ch); -- touchline(below->win, y - below->win->_begy, 1); +- 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); } diff --git a/pidgin.changes b/pidgin.changes index 5d2e4bb..03febaa 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Fri Mar 9 23:20:34 UTC 2018 - sor.alexei@meowr.ru + +- Update to version 2.13.0: + + libpurple: + * Unified string comparison. + * Properlly shell escape URI's when opening them. + * Fix a one byte buffer overread in function + purple_markup_linkify. + * Fix an issue were utf8 was incorrectly truncated which could + lead to crashes as we were potentially feeding garbage into + glib/gtk. + + libgnt: + * Partially fix building against curses 6.0 with opaque + structs set (pidgin.im#16764). + * Fix a crash when resizing the window (pidgin.im#16680). + + General: + * Fix a bashism in autotools (pidgin.im#16836). + + XMPP: + * Show XEP-0066 OOB URLs in any message, not just headlines. + * Fix a user after free (pidgin.im#17200). + * Remove pipelining from BOSH connections (pidgin.im#17025). + * Don't try to TLS already secured BOSH connections + (pidgin.im#17270). + + IRC: + * Fix "Registration timeout" on SASL auth with InspIRCd + servers (and possibly others not based on + charybdis/ratbox/ircd-seven). + * Fix issues with plugins that modify outgoing messages (such + as the custom PART/QUIT feature of the IRC More plugin). + * Fix IRC buffer handling (pidgin.im#12562). + * Properly handle AUTHENTICATE as a normal command with server + prefix. + * Fix a crash caused by a use after free of the MOTD. + * Fix an out of bounds read in irc_nick_skip_mode. + * Fix a write of a single byte before the start of a buffer in + irc_parse_ctcp. + + Pidgin: + * Better support for dark themes (pidgin.im#12572). + * Fix IPv6 links by not escaping []'s. (pidgin.im#16391). + * Only write buddy icons to the cache if they're not already + cached. + * Rejoin persistent chats after reconnect (pidgin.im#15687). + * Make the WIN32 Transparency plugin work on all platforms + (pidgin.im#3124). + * Ensure search results buttons are labelled. + * Fix matching unicode emoticons (pidgin.im#17232). + * Correctly update mute/unmute status when the remote side + mutes/unmutes us (pidgin.im#17273). + * Rework the status icon blinking to not use deprecated API + (pidgin.im#17174). + * Do not allow adding a buddy to protocols that don't have an + add_buddy callback. + + Finch: + * Fix handling of search results (pidgin.im#17238). + + Voice & Video: + * Port backend-fs to newer api for farstream relay-info + property (pidgin.im#17274). +- Rebase pidgin-ncurses-6.0-accessors.patch. +- Remove pidgin-2.10.11-purple-remote-python3.patch: fixed + upstream. + ------------------------------------------------------------------- Tue Mar 6 21:35:58 UTC 2018 - mgorse@suse.com diff --git a/pidgin.spec b/pidgin.spec index 4d9c015..2ce292b 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -18,7 +18,7 @@ %define _name Pidgin Name: pidgin -Version: 2.12.0 +Version: 2.13.0 Release: 0 Summary: Multiprotocol Instant Messaging Client License: GPL-2.0-only @@ -36,10 +36,8 @@ Patch1: pidgin-nonblock-gwim.patch 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-UPSTREAM pidgin-2.10.11-purple-remote-python3.patch bsc#1084147 mgorse@suse.com -- Port purple=-remote to Python 3. -Patch4: pidgin-2.10.11-purple-remote-python3.patch # PATCH-FIX-SLE pidgin-use-default-alsa.patch bsc#886670 tiwai@suse.de -- Use ALSA as a default for avoiding broken volume control. -Patch5: pidgin-use-default-alsa.patch +Patch4: pidgin-use-default-alsa.patch BuildRequires: ca-certificates-mozilla BuildRequires: doxygen BuildRequires: fdupes @@ -233,9 +231,8 @@ translation-update-upstream %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %if 0%{?sle_version} >= 120000 && !0%{?is_opensuse} -%patch5 -p1 +%patch4 -p1 %endif cp -f %{SOURCE3} %{name}-prefs.xml