Hello community, here is the log from the commit of package gajim for openSUSE:Factory checked in at 2018-05-30 12:22:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gajim (Old) and /work/SRC/openSUSE:Factory/.gajim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gajim" Wed May 30 12:22:44 2018 rev:22 rq:611730 version:1.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gajim/gajim.changes 2018-05-16 11:41:34.408342756 +0200 +++ /work/SRC/openSUSE:Factory/.gajim.new/gajim.changes 2018-05-30 13:09:59.195207342 +0200 @@ -1,0 +2,21 @@ +Wed May 23 14:42:41 UTC 2018 - sor.alexei@meowr.ru + +- Symlink the system PEM certfiicate to the path where + Plugin Installer expects it to be instead of patching + Plugin Installer as it can be updated locally unpatched and thus + fail to work (boo#1094343). +- Remove gajim-do_not_ship_certificate.patch.in: no longer needed. + +------------------------------------------------------------------- +Sat May 19 14:32:00 UTC 2018 - mvetter@suse.com + +- Update to 1.0.3: + * bug 8296 Fix errors on roster updates after stream management resume + * bug 9106 Convert font weight from pango to css values + * bug 9124 Bring ChatControl to front when notification is clicked + * Set no-store hint on groupchat chatstates + * Dont show OOB uri if message body is the same + * Add missing bybonjour dependency for Windows zeroconf +- Remove Require for pyasn1: not needed anymore + +------------------------------------------------------------------- Old: ---- gajim-1.0.2.tar.bz2 gajim-do_not_ship_certificate.patch.in New: ---- gajim-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gajim.spec ++++++ --- /var/tmp/diff_new_pack.FyRxDT/_old 2018-05-30 13:09:59.811184007 +0200 +++ /var/tmp/diff_new_pack.FyRxDT/_new 2018-05-30 13:09:59.811184007 +0200 @@ -18,30 +18,28 @@ %define _version 1.0 Name: gajim -Version: 1.0.2 +Version: 1.0.3 Release: 0 Summary: XMPP client written in Python and Gtk3 License: GPL-3.0-only Group: Productivity/Networking/Talk/Clients Url: https://gajim.org/ Source: https://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE gajim-do_not_ship_certificate.patch.in vilene@posteo.net -- do not package PEM certificate -Source1: gajim-do_not_ship_certificate.patch.in +BuildRequires: ca-certificates-mozilla BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: hicolor-icon-theme BuildRequires: p11-kit-devel BuildRequires: pkgconfig BuildRequires: python3 >= 3.5.0 -BuildRequires: python3-nbxmpp >= 0.6.5 +BuildRequires: python3-nbxmpp >= 0.6.6 BuildRequires: python3-setuptools BuildRequires: update-desktop-files Requires: ca-certificates-mozilla Requires: python3 >= 3.5.0 Requires: python3-docutils -Requires: python3-nbxmpp >= 0.6.5 +Requires: python3-nbxmpp >= 0.6.6 Requires: python3-pyOpenSSL >= 0.12 -Requires: python3-pyasn1 Requires: python3-pycurl Requires: python3-xml Recommends: %{name}-lang @@ -107,10 +105,6 @@ # FIXME: Some leftover. rm gajim/data/plugins/plugin_installer/config_dialog.ui~ -# Do not package PEM certificate -sed 's|@TRUSTDIR_STATIC@|%{trustdir_static}|' %{SOURCE1} | patch -F0 -p1 --no-backup-if-mismatch -rm gajim/data/plugins/plugin_installer/*.pem - %build python3 setup.py build @@ -122,6 +116,13 @@ mv %{buildroot}{%{python3_sitelib}/%{name}/data,%{_datadir}/%{name}}/ ln -s %{_datadir}/%{name} %{buildroot}%{python3_sitelib}/%{name}/data +# Do not package PEM certificates. +for cert in DST_Root_CA_X3.pem; do + [ -f "%{trustdir_static}/$cert" ] + rm "%{buildroot}%{_datadir}/%{name}/plugins/plugin_installer/$cert" + ln -s "%{trustdir_static}/$cert" %{buildroot}%{_datadir}/%{name}/plugins/plugin_installer/ +done + %suse_update_desktop_file -r org.gajim.Gajim Network InstantMessaging %fdupes %{buildroot}%{_prefix}/ %find_lang %{name} ++++++ gajim-1.0.2.tar.bz2 -> gajim-1.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/PKG-INFO new/gajim-1.0.3/PKG-INFO --- old/gajim-1.0.2/PKG-INFO 2018-04-30 17:12:48.000000000 +0200 +++ new/gajim-1.0.3/PKG-INFO 2018-05-19 21:42:32.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: gajim -Version: 1.0.2 +Version: 1.0.3 Summary: A GTK+ Jabber client Home-page: https://gajim.org Author: Philipp Hörist, Yann Leboulanger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/__init__.py new/gajim-1.0.3/gajim/__init__.py --- old/gajim-1.0.2/gajim/__init__.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/__init__.py 2018-05-19 11:02:48.000000000 +0200 @@ -1,6 +1,6 @@ import subprocess -__version__ = "1.0.2" +__version__ = "1.0.3" try: p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/accounts_window.py new/gajim-1.0.3/gajim/accounts_window.py --- old/gajim-1.0.2/gajim/accounts_window.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/accounts_window.py 2018-05-19 11:02:48.000000000 +0200 @@ -234,6 +234,7 @@ def select_account(self, account): for row in self.account_list.get_children(): if row.get_child().account == account: + self.account_list.select_row(row) self.account_list.emit('row-activated', row) break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/common/connection.py new/gajim-1.0.3/gajim/common/connection.py --- old/gajim-1.0.2/gajim/common/connection.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/common/connection.py 2018-05-19 11:02:48.000000000 +0200 @@ -1852,6 +1852,8 @@ our_server = app.config.get_per('accounts', self.name, 'hostname') self.discoverInfo(our_jid, id_prefix='Gajim_') self.discoverInfo(our_server, id_prefix='Gajim_') + else: + self.request_roster(resume=True) self.sm.resuming = False # back to previous state # Discover Stun server(s) @@ -2550,16 +2552,25 @@ iq3.addChild(name='meta', attrs=dict_) self.connection.send(iq) - def request_roster(self): + def request_roster(self, resume=False): version = None features = self.connection.Dispatcher.Stream.features - if features and features.getTag('ver', - namespace=nbxmpp.NS_ROSTER_VER): - version = app.config.get_per('accounts', self.name, - 'roster_version') + if features and features.getTag('ver', namespace=nbxmpp.NS_ROSTER_VER): + version = app.config.get_per( + 'accounts', self.name, 'roster_version') + + iq_id = self.connection.initRoster(version=version, + request=not resume) + if resume: + self._init_roster_from_db() + else: + self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) - iq_id = self.connection.initRoster(version=version) - self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) + def _init_roster_from_db(self): + account_jid = app.get_jid_from_account(self.name) + roster_data = app.logger.get_roster(account_jid) + roster = self.connection.getRoster(force=True) + roster.setRaw(roster_data) def send_agent_status(self, agent, ptype): if not app.account_is_connected(self.name): @@ -2683,6 +2694,8 @@ if obj.chatstate: msg_iq.setTag(obj.chatstate, namespace=nbxmpp.NS_CHATSTATES) + if not obj.message: + msg_iq.setTag('no-store', namespace=nbxmpp.NS_MSG_HINTS) if obj.label is not None: msg_iq.addChild(node=obj.label) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/common/connection_handlers.py new/gajim-1.0.3/gajim/common/connection_handlers.py --- old/gajim-1.0.2/gajim/common/connection_handlers.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/common/connection_handlers.py 2018-05-19 11:02:48.000000000 +0200 @@ -1497,10 +1497,7 @@ elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: if iq_obj.getType() == 'result': if not iq_obj.getTag('query'): - account_jid = app.get_jid_from_account(self.name) - roster_data = app.logger.get_roster(account_jid) - roster = self.connection.getRoster(force=True) - roster.setRaw(roster_data) + self._init_roster_from_db() self._getRoster() elif iq_obj.getType() == 'error': self.roster_supported = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/conversation_textview.py new/gajim-1.0.3/gajim/conversation_textview.py --- old/gajim-1.0.2/gajim/conversation_textview.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/conversation_textview.py 2018-05-19 11:02:48.000000000 +0200 @@ -842,10 +842,9 @@ except KeyError: pass else: - oob_desc = additional_data['gajim'].get('oob_desc', None) - if oob_desc is None: - oob_desc = _('URL:') - otext += '\n{} {}'.format(oob_desc, oob_url) + oob_desc = additional_data['gajim'].get('oob_desc', 'URL:') + if oob_url != otext: + otext += '\n{} {}'.format(oob_desc, oob_url) # basic: links + mail + formatting is always checked (we like that) if app.config.get('emoticons_theme') and graphics: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/data/other/servers.xml new/gajim-1.0.3/gajim/data/other/servers.xml --- old/gajim-1.0.2/gajim/data/other/servers.xml 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/data/other/servers.xml 2018-05-19 11:02:48.000000000 +0200 @@ -51,6 +51,7 @@ <item jid="jabbim.sk" /> <item jid="jabster.pl" /> <item jid="jaim.at" /> + <item jid="lightwitch.org" /> <item jid="linuxlovers.at" /> <item jid="lsd-25.ru" /> <item jid="njs.netlab.cz" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/gajim.py new/gajim-1.0.3/gajim/gajim.py --- old/gajim-1.0.2/gajim/gajim.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/gajim.py 2018-05-19 11:02:48.000000000 +0200 @@ -56,7 +56,7 @@ from gajim.common import logging_helpers from gajim.common import crypto -MIN_NBXMPP_VER = "0.6.5" +MIN_NBXMPP_VER = "0.6.6" MIN_GTK_VER = "3.22.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/gtkgui_helpers.py new/gajim-1.0.3/gajim/gtkgui_helpers.py --- old/gajim-1.0.2/gajim/gtkgui_helpers.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/gtkgui_helpers.py 2018-05-19 11:02:48.000000000 +0200 @@ -37,6 +37,7 @@ import cairo import os import sys +import math try: from PIL import Image except: @@ -885,7 +886,7 @@ family=font.get_family(), size=int(round(font.get_size() / Pango.SCALE)), unit=unit, - weight=int(font.get_weight())) + weight=pango_to_css_weight(font.get_weight())) css = css.replace("font-size: 0{unit};".format(unit=unit), "") css = css.replace("font-weight: 0;", "") css = "\n".join(filter(lambda x: x.strip(), css.splitlines())) @@ -910,3 +911,13 @@ icon = get_iconset_name_for(icon_name) surface = gtk_icon_theme.load_surface(icon, 16, scale, None, 0) return Gtk.Image.new_from_surface(surface) + +def pango_to_css_weight(number): + # Pango allows for weight values between 100 and 1000 + # CSS allows only full hundred numbers like 100, 200 .. + number = int(number) + if number < 100: + return 100 + if number > 900: + return 900 + return int(math.ceil(number / 100.0)) * 100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim/gui_interface.py new/gajim-1.0.3/gajim/gui_interface.py --- old/gajim-1.0.2/gajim/gui_interface.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/gajim/gui_interface.py 2018-05-19 11:02:48.000000000 +0200 @@ -1708,7 +1708,15 @@ if not event: event = app.events.get_first_event(account, jid, type_) if not event: - return + # If autopopup_chat_opened = True, then we send out + # notifications even if a control is open. This means the + # event is already deleted (because its printed to the + # control) when the notification is clicked. So try to + # get a control from account/jid + ctrl = self.msg_win_mgr.get_control(fjid, account) + if ctrl is None: + return + w = ctrl.parent_win if type_ == 'printed_chat': ctrl = event.control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim.egg-info/PKG-INFO new/gajim-1.0.3/gajim.egg-info/PKG-INFO --- old/gajim-1.0.2/gajim.egg-info/PKG-INFO 2018-04-30 17:12:47.000000000 +0200 +++ new/gajim-1.0.3/gajim.egg-info/PKG-INFO 2018-05-19 21:42:32.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: gajim -Version: 1.0.2 +Version: 1.0.3 Summary: A GTK+ Jabber client Home-page: https://gajim.org Author: Philipp Hörist, Yann Leboulanger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/gajim.egg-info/requires.txt new/gajim-1.0.3/gajim.egg-info/requires.txt --- old/gajim-1.0.2/gajim.egg-info/requires.txt 2018-04-30 17:12:47.000000000 +0200 +++ new/gajim-1.0.3/gajim.egg-info/requires.txt 2018-05-19 21:42:32.000000000 +0200 @@ -1,4 +1,4 @@ -nbxmpp>=0.6.5 +nbxmpp>=0.6.6 pyOpenSSL>=0.12 pyasn1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gajim-1.0.2/setup.py new/gajim-1.0.3/setup.py --- old/gajim-1.0.2/setup.py 2018-04-30 17:03:48.000000000 +0200 +++ new/gajim-1.0.3/setup.py 2018-05-19 11:02:48.000000000 +0200 @@ -285,7 +285,7 @@ package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'nbxmpp>=0.6.5', + 'nbxmpp>=0.6.6', 'pyOpenSSL>=0.12', 'pyasn1', ],