Commit b714691e authored by Martin's avatar Martin

Merge tag 'debian/1.0.3-1' into debian/stretch-backports and prepare 1.0.3-1~bpo9+1

parents 69d86e26 f44d01f0
Pipeline #7815 failed with stages
in 40 seconds
Gajim 1.0.3 (20 May 2018)
Bugs fixed:
* 8296 Fix errors on roster updates after stream management resume
* 9106 Convert font weight from pango to css values
* 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
Flatpak:
* Limit dbus access
Gajim 1.0.2 (30 April 2018)
Bugs fixed:
......
......@@ -18,7 +18,7 @@ clone_depth: 1
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
build_script:
- C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127
- C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20
- ps: |
$env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
$env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
......@@ -30,8 +30,8 @@ build_script:
bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim"
bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.1-$($env:ARCH)-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.1-$($env:ARCH)-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.3-$($env:ARCH)-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.3-$($env:ARCH)-$($env:TIME_STRING).exe"
# on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
......
gajim (1.0.2-1~bpo9+1) stretch-backports; urgency=medium
gajim (1.0.3-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- W. Martin Borgert <debacle@debian.org> Sun, 06 May 2018 21:10:44 +0000
-- W. Martin Borgert <debacle@debian.org> Sat, 26 May 2018 23:50:25 +0000
gajim (1.0.3-1) unstable; urgency=medium
* new upstream version
* remove unneeded recommends (Closes: #898434)
* remove upstream patch
* depend on latest python3-nbxmpp
-- W. Martin Borgert <debacle@debian.org> Sun, 20 May 2018 08:48:38 +0000
gajim (1.0.2-1) unstable; urgency=medium
......
......@@ -34,7 +34,7 @@ Depends:
python3-gi,
python3-gi-cairo,
python3-idna,
python3-nbxmpp (>= 0.6.4),
python3-nbxmpp (>= 0.6.6),
python3-openssl (>= 0.12),
python3-pyasn1,
Recommends:
......@@ -50,7 +50,6 @@ Recommends:
gir1.2-gst-plugins-base-1.0,
gir1.2-gstreamer-1.0,
gir1.2-gupnpigd-1.0,
gir1.2-networkmanager-1.0,
gir1.2-secret-1,
gstreamer0.10-plugins-ugly,
notification-daemon,
......
Description: fix gtk-css-provider-error-quark exception
Author: Philipp Hörist <forenjunkie@chello.at>
Origin: upstream
Bug: https://dev.gajim.org/gajim/gajim/issues/9106
Applied-Upstream: https://dev.gajim.org/gajim/gajim/commit/f99ec91fc29c7ae822856b318537e565ef225935
Last-Update: 2018-05-01
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -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
Description: do not call git when starting
Author: W. Martin Borgert <debacle@debian.org>
Origin: vendor
Last-Update: 2018-04-01
Last-Update: 2018-05-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/gajim/__init__.py
......@@ -9,7 +9,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@@ -1,12 +1 @@
-import subprocess
-
__version__ = "1.0.2"
__version__ = "1.0.3"
-
-try:
- p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,
......
fix-gtk-css-provider-error-quark.patch
do-not-use-distutils.patch
no-git-call.patch
stop-loading-plugins.patch
import subprocess
__version__ = "1.0.2"
__version__ = "1.0.3"
try:
p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,
......
......@@ -234,6 +234,7 @@ class AccountsWindow(Gtk.ApplicationWindow):
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
......
......@@ -1852,6 +1852,8 @@ class Connection(CommonConnection, ConnectionHandlers):
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 @@ class Connection(CommonConnection, ConnectionHandlers):
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 @@ class Connection(CommonConnection, ConnectionHandlers):
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)
......
......@@ -1497,10 +1497,7 @@ ConnectionHTTPUpload):
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
......
......@@ -842,10 +842,9 @@ class ConversationTextview(GObject.GObject):
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:
......
......@@ -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" />
......
......@@ -56,7 +56,7 @@ from gajim.common import i18n
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"
......
......@@ -37,6 +37,7 @@ from gi.repository import Pango
import cairo
import os
import sys
import math
try:
from PIL import Image
except:
......@@ -885,7 +886,7 @@ def add_css_font():
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 @@ def get_image_from_icon_name(icon_name, scale):
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
......@@ -1708,7 +1708,15 @@ class Interface:
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
......
......@@ -5,25 +5,34 @@
"sdk": "org.gnome.Sdk",
"command": "gajim",
"finish-args": [
/* X11 + XShm access */
"--share=ipc",
"--share=network",
"--socket=x11",
/* Wayland access */
"--socket=wayland",
/* Needs to talk to the network: */
"--share=network",
"--filesystem=home",
"--socket=pulseaudio",
"--socket=system-bus"
"--filesystem=home",
"--system-talk-name=org.freedesktop.GeoClue2",
"--system-talk-name=org.freedesktop.login1",
"--talk-name=org.gnome.ScreenSaver",
"--talk-name=org.mpris.MediaPlayer2.*",
/* Keyring */
"--talk-name=org.freedesktop.secrets",
/* dconf */
"--filesystem=xdg-run/dconf",
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"build-options": {
"cflags": "-O2 -g",
"cxxflags": "-O2 -g"
},
"cleanup": [
"/bin/easy*",
"/include",
"/lib/debug",
"/lib/pkgconfig",
"/lib/python2.7",
"/share/aclocal",
"/share/doc",
"/share/man",
......@@ -341,7 +350,7 @@
{
"type": "git",
"url": "https://dev.gajim.org/gajim/python-nbxmpp.git",
"branch": "nbxmpp-0.6.5"
"branch": "nbxmpp-0.6.6"
}
]
},
......
......@@ -285,7 +285,7 @@ setup(
package_data={'gajim': package_data},
data_files=data_files,
install_requires=[
'nbxmpp>=0.6.5',
'nbxmpp>=0.6.6',
'pyOpenSSL>=0.12',
'pyasn1',
],
......
......@@ -80,28 +80,27 @@ function install_deps {
mingw-w64-"${ARCH}"-goocanvas \
mingw-w64-"${ARCH}"-gspell \
mingw-w64-"${ARCH}"-hunspell \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools
build_pip install setuptools_scm
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six
PIP_REQUIREMENTS="\
pyasn1
certifi
git+https://dev.gajim.org/gajim/python-nbxmpp.git
git+https://github.com/dlitz/pycrypto.git
cryptography
pyopenssl
git+https://dev.gajim.org/lovetox/pybonjour-python3.git
keyring
python-gnupg
docutils
python-axolotl
qrcode
keyring
pillow==4.3.0
six
"
build_pip install --no-binary ":all:" \
--force-reinstall $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
build_pip install python-axolotl
build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
# remove the large png icons, they should be used rarely and svg works fine
rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment