diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-02-17 06:03:43 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-02-17 17:59:51 +0100 |
commit | 8ea9f1e02e85e3cc2b4ccda52639e96651d21653 (patch) | |
tree | dacfd5fff40a77f9335c18e572a6587149bb0abc /source/l/qt5/patches/qt5.qtbug-69310.patch | |
parent | 6087aff6cae8d8d4c46ce086cb7b70a5af412d2b (diff) | |
download | current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.gz current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.xz |
Mon Feb 17 06:03:43 UTC 202020200217060343
ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded.
ap/zsh-5.8-x86_64-1.txz: Upgraded.
l/brotli-1.0.7-x86_64-1.txz: Added.
l/gmime-3.2.6-x86_64-1.txz: Upgraded.
l/hyphen-2.8.8-x86_64-1.txz: Added.
l/openal-soft-1.20.1-x86_64-1.txz: Upgraded.
Thanks to Skaendo and Willy Sudiarto Raharjo.
l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added.
Thanks to alienBOB.
l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added.
n/bluez-5.53-x86_64-1.txz: Upgraded.
n/mutt-1.13.4-x86_64-1.txz: Upgraded.
n/samba-4.11.6-x86_64-3.txz: Rebuilt.
n/socat-1.7.3.4-x86_64-1.txz: Added.
n/whois-5.5.6-x86_64-1.txz: Upgraded.
testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt.
Added patches to fix joining a DC when using krb5. Looks like the patches are
already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai.
Diffstat (limited to 'source/l/qt5/patches/qt5.qtbug-69310.patch')
-rw-r--r-- | source/l/qt5/patches/qt5.qtbug-69310.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/source/l/qt5/patches/qt5.qtbug-69310.patch b/source/l/qt5/patches/qt5.qtbug-69310.patch deleted file mode 100644 index b92462733..000000000 --- a/source/l/qt5/patches/qt5.qtbug-69310.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fcba9fa861574f33e1d2e54d8c8d6da8062927cd Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 23 Jan 2019 10:42:12 +0100 -Subject: Fix regression in QPlainTextEdit updating - -It was incorrectly counting a block having more than one line as having -changed visibility. - -Fixes: QTBUG-69310 -Change-Id: I502cda1d3e8a4efb1c14122353cc0a4731d8581c -Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> ---- - src/widgets/widgets/qplaintextedit.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp -index d6f6a364a8..57f2dec8f7 100644 ---- a/src/widgets/widgets/qplaintextedit.cpp -+++ b/src/widgets/widgets/qplaintextedit.cpp -@@ -312,10 +312,11 @@ void QPlainTextDocumentLayout::documentChanged(int from, int charsRemoved, int c - QTextBlock block = changeStartBlock; - do { - block.clearLayout(); -- const int lineCount = block.isVisible() ? 1 : 0; -- if (block.lineCount() != lineCount) { -+ if (block.isVisible() -+ ? (block.lineCount() == 0) -+ : (block.lineCount() > 0)) { - blockVisibilityChanged = true; -- block.setLineCount(lineCount); -+ block.setLineCount(block.isVisible() ? 1 : 0); - } - if (block == changeEndBlock) - break; --- -cgit v1.2.1 - |