Your message dated Tue, 16 Apr 2019 10:09:00 +0000
with message-id <[email protected]>
and subject line Re: Bug#927208: unblock: psi-plus/1.4.554-2
has caused the Debian Bug report #927208,
regarding unblock: psi-plus/1.4.554-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
927208: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927208
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
User: [email protected]
Usertags: unblock
Severity: normal
Dear Release Team,
Please unblock package psi-plus.
I uploaded updated package March 21, but forgot to send unblock request.
Fixing this now.
Changes in updated package:
* Add patch disable-usage-of-system-proxies. (Closes: #874561)
* Add patch fix-autoscroll-in-chats.
debdiff is attached.
Thanks!
unblock psi-plus/1.4.554-2
diff -Nru psi-plus-1.4.554/debian/changelog psi-plus-1.4.554/debian/changelog
--- psi-plus-1.4.554/debian/changelog 2019-02-17 03:07:36.000000000 +0300
+++ psi-plus-1.4.554/debian/changelog 2019-03-21 00:41:20.000000000 +0300
@@ -1,3 +1,10 @@
+psi-plus (1.4.554-2) unstable; urgency=medium
+
+ * Add patch disable-usage-of-system-proxies. (Closes: #874561)
+ * Add patch fix-autoscroll-in-chats.
+
+ -- Boris Pek <[email protected]> Thu, 21 Mar 2019 00:41:20 +0300
+
psi-plus (1.4.554-1) unstable; urgency=medium
* New upstream release.
diff -Nru psi-plus-1.4.554/debian/patches/disable-usage-of-system-proxies.patch psi-plus-1.4.554/debian/patches/disable-usage-of-system-proxies.patch
--- psi-plus-1.4.554/debian/patches/disable-usage-of-system-proxies.patch 1970-01-01 03:00:00.000000000 +0300
+++ psi-plus-1.4.554/debian/patches/disable-usage-of-system-proxies.patch 2019-03-21 00:41:20.000000000 +0300
@@ -0,0 +1,29 @@
+Description: Disable usage of system proxies
+Last-Update: 2019-03-21
+Origin: upstream,
+ https://github.com/psi-im/psi/commit/911880f1,
+ https://github.com/psi-im/iris/commit/ce6f4e58
+Bug: https://github.com/psi-plus/main/issues/758
+Bug-Debian: https://bugs.debian.org/874561
+
+
+--- a/iris/src/irisnet/noncore/cutestuff/bsocket.cpp
++++ b/iris/src/irisnet/noncore/cutestuff/bsocket.cpp
+@@ -141,6 +141,7 @@
+ SockData sd;
+ sd.state = Created;
+ sd.sock = new QTcpSocket(this);
++ sd.sock->setProxy(QNetworkProxy::NoProxy);
+ sd.sock->setReadBufferSize(READBUFSIZE);
+ sd.relay = new QTcpSocketSignalRelay(sd.sock, this);
+ sd.resolver = 0;
+--- a/src/psicon.cpp
++++ b/src/psicon.cpp
+@@ -482,6 +482,7 @@
+ }
+
+ // proxy
++ QNetworkProxyFactory::setUseSystemConfiguration(false); // we have qca-based own implementation
+ ProxyManager *proxy = ProxyManager::instance();
+ proxy->init(&d->accountTree);
+ if (accountMigration) proxy->migrateItemList(d->optionsMigration.proxyMigration);
diff -Nru psi-plus-1.4.554/debian/patches/fix-autoscroll-in-chats.patch psi-plus-1.4.554/debian/patches/fix-autoscroll-in-chats.patch
--- psi-plus-1.4.554/debian/patches/fix-autoscroll-in-chats.patch 1970-01-01 03:00:00.000000000 +0300
+++ psi-plus-1.4.554/debian/patches/fix-autoscroll-in-chats.patch 2019-03-21 00:41:20.000000000 +0300
@@ -0,0 +1,31 @@
+Description: Fix autoscroll in chats
+Last-Update: 2019-03-21
+Origin: upstream, https://github.com/psi-im/psi/commit/5140f191
+Bug: https://github.com/psi-im/psi/issues/430
+
+
+diff --git a/src/chatview_te.cpp b/src/chatview_te.cpp
+index 0def3505..08ea6969 100644
+--- a/src/chatview_te.cpp
++++ b/src/chatview_te.cpp
+@@ -318,6 +318,8 @@ void ChatView::dispatchMessage(const MessageView &mv)
+ switch (mv.type()) {
+ case MessageView::Message:
+ {
++ int scrollPos = verticalScrollBar()->value();
++ bool doScrollBottom = atBottom();
+ bool isReplace = !replaceId.isEmpty();
+ QTextCursor cursor = textCursor(), replaceCursor;
+ auto sel = PsiRichText::saveSelection(this, cursor);
+@@ -362,6 +364,11 @@ void ChatView::dispatchMessage(const MessageView &mv)
+ cursor.movePosition(QTextCursor::End); // ensure everything else is inserted into the end
+ PsiRichText::restoreSelection(this, cursor, sel);
+ setTextCursor(cursor);
++ if (doScrollBottom) {
++ scrollToBottom();
++ } else {
++ verticalScrollBar()->setValue(scrollPos);
++ }
+ break;
+ }
+ case MessageView::Subject:
diff -Nru psi-plus-1.4.554/debian/patches/series psi-plus-1.4.554/debian/patches/series
--- psi-plus-1.4.554/debian/patches/series 1970-01-01 03:00:00.000000000 +0300
+++ psi-plus-1.4.554/debian/patches/series 2019-03-21 00:41:20.000000000 +0300
@@ -0,0 +1,2 @@
+disable-usage-of-system-proxies.patch
+fix-autoscroll-in-chats.patch
--- End Message ---
--- Begin Message ---
Boris Pek:
> Package: release.debian.org
> User: [email protected]
> Usertags: unblock
> Severity: normal
>
>
> Dear Release Team,
>
> Please unblock package psi-plus.
>
> I uploaded updated package March 21, but forgot to send unblock request.
> Fixing this now.
>
> Changes in updated package:
> * Add patch disable-usage-of-system-proxies. (Closes: #874561)
> * Add patch fix-autoscroll-in-chats.
>
> debdiff is attached.
>
> Thanks!
>
>
> unblock psi-plus/1.4.554-2
>
Unblocked, thanks.
~Niels
--- End Message ---
