Qt 5.13 fixes from upstream. I have not tested it with 5.9.
Index: kdebugsettings/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kdebugsettings/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- kdebugsettings/Makefile 23 Nov 2019 08:05:04 -0000 1.1.1.1
+++ kdebugsettings/Makefile 25 Feb 2020 20:22:44 -0000
@@ -3,6 +3,7 @@
COMMENT = application to edit QLoggingCategory
DISTNAME = kdebugsettings-${VERSION}
CATEGORIES = x11 sysutils
+REVISION = 0
HOMEPAGE = https://kde.org/applications/development/org.kde.kdebugsettings
Index: kdebugsettings/patches/patch-src_customdebugsettingspage_cpp
===================================================================
RCS file: kdebugsettings/patches/patch-src_customdebugsettingspage_cpp
diff -N kdebugsettings/patches/patch-src_customdebugsettingspage_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdebugsettings/patches/patch-src_customdebugsettingspage_cpp 25 Feb
2020 20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/customdebugsettingspage.cpp
+--- src/customdebugsettingspage.cpp.orig
++++ src/customdebugsettingspage.cpp
+@@ -41,7 +41,7 @@ CustomDebugSettingsPage::CustomDebugSettingsPage(QWidg
+ mainLayout->addWidget(lab);
+
+ QHBoxLayout *horizontalLayout = new QHBoxLayout;
+- horizontalLayout->setMargin(0);
++ horizontalLayout->setContentsMargins(0, 0, 0, 0);
+ mainLayout->addLayout(horizontalLayout);
+
+ QVBoxLayout *vbox = new QVBoxLayout;
Index: kpimtextedit/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kpimtextedit/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- kpimtextedit/Makefile 24 Mar 2019 11:57:02 -0000 1.5
+++ kpimtextedit/Makefile 25 Feb 2020 20:22:44 -0000
@@ -3,7 +3,7 @@
COMMENT = textedit with PIM-specific features
DISTNAME = kpimtextedit-${VERSION}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
SHARED_LIBS += KF5PimTextEdit 0.0 # 5.6
Index: kpimtextedit/patches/patch-autotests_slidecontainertest_cpp
===================================================================
RCS file: kpimtextedit/patches/patch-autotests_slidecontainertest_cpp
diff -N kpimtextedit/patches/patch-autotests_slidecontainertest_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kpimtextedit/patches/patch-autotests_slidecontainertest_cpp 25 Feb 2020
20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: autotests/slidecontainertest.cpp
+--- autotests/slidecontainertest.cpp.orig
++++ autotests/slidecontainertest.cpp
+@@ -41,7 +41,7 @@ struct TestWindow : public QWidget {
+ mMainWidget = new QTextEdit();
+ QVBoxLayout *layout = new QVBoxLayout(this);
+ layout->setSpacing(0);
+- layout->setMargin(0);
++ layout->setContentsMargins(0, 0, 0, 0);
+ layout->addWidget(mMainWidget);
+ layout->addWidget(mContainer);
+ }
Index: kpimtextedit/patches/patch-src_composer-ng_richtextcomposerwidget_cpp
===================================================================
RCS file: kpimtextedit/patches/patch-src_composer-ng_richtextcomposerwidget_cpp
diff -N kpimtextedit/patches/patch-src_composer-ng_richtextcomposerwidget_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kpimtextedit/patches/patch-src_composer-ng_richtextcomposerwidget_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/composer-ng/richtextcomposerwidget.cpp
+--- src/composer-ng/richtextcomposerwidget.cpp.orig
++++ src/composer-ng/richtextcomposerwidget.cpp
+@@ -39,7 +39,7 @@ RichTextComposerWidget::RichTextComposerWidget(QWidget
+ , d(new KPIMTextEdit::RichTextComposerWidgetPrivate)
+ {
+ QHBoxLayout *layout = new QHBoxLayout(this);
+- layout->setMargin(0);
++ layout->setContentsMargins(0, 0, 0, 0);
+ d->richTextComposer = new KPIMTextEdit::RichTextComposer(this);
+ d->richTextComposer->setObjectName(QStringLiteral("richtextcomposer"));
+ RichTextEditorWidget *editorWidget = new
RichTextEditorWidget(d->richTextComposer, this);
Index: kpimtextedit/patches/patch-src_insertimagewidget_cpp
===================================================================
RCS file: kpimtextedit/patches/patch-src_insertimagewidget_cpp
diff -N kpimtextedit/patches/patch-src_insertimagewidget_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kpimtextedit/patches/patch-src_insertimagewidget_cpp 25 Feb 2020
20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/insertimagewidget.cpp
+--- src/insertimagewidget.cpp.orig
++++ src/insertimagewidget.cpp
+@@ -47,7 +47,7 @@ class InsertImageWidgetPrivate (public)
+ : q(qq)
+ {
+ QVBoxLayout *lay = new QVBoxLayout(q);
+- lay->setMargin(0);
++ lay->setContentsMargins(0, 0, 0, 0);
+ QHBoxLayout *hbox = new QHBoxLayout;
+ QLabel *lab = new QLabel(i18n("Image Location:"));
+ imageUrlRequester = new KUrlRequester;
Index: kpimtextedit/patches/patch-src_inserttablewidget_cpp
===================================================================
RCS file: kpimtextedit/patches/patch-src_inserttablewidget_cpp
diff -N kpimtextedit/patches/patch-src_inserttablewidget_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kpimtextedit/patches/patch-src_inserttablewidget_cpp 25 Feb 2020
20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/inserttablewidget.cpp
+--- src/inserttablewidget.cpp.orig
++++ src/inserttablewidget.cpp
+@@ -49,7 +49,7 @@ class InsertTableWidget::InsertTableWidgetPrivate (pub
+ mBorder->setSuffix(i18n(" px"));
+
+ QGridLayout *gridLayout = new QGridLayout;
+- gridLayout->setMargin(0);
++ gridLayout->setContentsMargins(0, 0, 0, 0);
+ gridLayout->addWidget(new QLabel(i18n("Rows:")), 0, 0);
+ gridLayout->addWidget(mRows, 0, 1);
+
Index: kpimtextedit/patches/patch-src_tableformatdialog_cpp
===================================================================
RCS file: kpimtextedit/patches/patch-src_tableformatdialog_cpp
diff -N kpimtextedit/patches/patch-src_tableformatdialog_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kpimtextedit/patches/patch-src_tableformatdialog_cpp 25 Feb 2020
20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/tableformatdialog.cpp
+--- src/tableformatdialog.cpp.orig
++++ src/tableformatdialog.cpp
+@@ -46,7 +46,7 @@ class TableFormatDialog::TableFormatDialogPrivate (pub
+
+ QWidget *page = new QWidget(q);
+ QVBoxLayout *lay = new QVBoxLayout(page);
+- lay->setMargin(0);
++ lay->setContentsMargins(0, 0, 0, 0);
+ tableWidget = new InsertTableWidget;
+ lay->addWidget(tableWidget);
+
Index:
kpimtextedit/patches/patch-src_texteditor_commonwidget_textfindreplacewidget_cpp
===================================================================
RCS file:
kpimtextedit/patches/patch-src_texteditor_commonwidget_textfindreplacewidget_cpp
diff -N
kpimtextedit/patches/patch-src_texteditor_commonwidget_textfindreplacewidget_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
kpimtextedit/patches/patch-src_texteditor_commonwidget_textfindreplacewidget_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: src/texteditor/commonwidget/textfindreplacewidget.cpp
+--- src/texteditor/commonwidget/textfindreplacewidget.cpp.orig
++++ src/texteditor/commonwidget/textfindreplacewidget.cpp
+@@ -36,8 +36,9 @@ TextReplaceWidget::TextReplaceWidget(QWidget *parent)
+ QHBoxLayout *lay = new QHBoxLayout(this);
+ QLabel *label = new QLabel(i18nc("Replace text", "Replace:"), this);
+ lay->addWidget(label);
+- const int marg = lay->margin();
+- lay->setContentsMargins(marg, 0, marg, 0);
++ const int marg1 = lay->contentsMargins().left();
++ const int marg2 = lay->contentsMargins().right();
++ lay->setContentsMargins(marg1, 0, marg2, 0);
+
+ mReplace = new QLineEdit(this);
+ mReplace->setClearButtonEnabled(true);
+@@ -71,8 +72,9 @@ TextFindWidget::TextFindWidget(QWidget *parent)
+ : QWidget(parent)
+ {
+ QHBoxLayout *lay = new QHBoxLayout(this);
+- const int marg = lay->margin();
+- lay->setContentsMargins(marg, 0, marg, 0);
++ const int marg1 = lay->contentsMargins().left();
++ const int marg2 = lay->contentsMargins().right();
++ lay->setContentsMargins(marg1, 0, marg2, 0);
+ QLabel *label = new QLabel(i18nc("Find text", "F&ind:"), this);
+ lay->addWidget(label);
+
Index:
kpimtextedit/patches/patch-src_texteditor_commonwidget_textgotolinewidget_cpp
===================================================================
RCS file:
kpimtextedit/patches/patch-src_texteditor_commonwidget_textgotolinewidget_cpp
diff -N
kpimtextedit/patches/patch-src_texteditor_commonwidget_textgotolinewidget_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
kpimtextedit/patches/patch-src_texteditor_commonwidget_textgotolinewidget_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/texteditor/commonwidget/textgotolinewidget.cpp
+--- src/texteditor/commonwidget/textgotolinewidget.cpp.orig
++++ src/texteditor/commonwidget/textgotolinewidget.cpp
+@@ -47,7 +47,7 @@ TextGoToLineWidget::TextGoToLineWidget(QWidget *parent
+ , d(new KPIMTextEdit::TextGoToLineWidgetPrivate)
+ {
+ QHBoxLayout *hbox = new QHBoxLayout(this);
+- hbox->setMargin(2);
++ hbox->setContentsMargins(2, 2, 2, 2);
+ QToolButton *closeBtn = new QToolButton(this);
+ closeBtn->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
+ closeBtn->setIconSize(QSize(16, 16));
Index:
kpimtextedit/patches/patch-src_texteditor_commonwidget_textmessageindicator_cpp
===================================================================
RCS file:
kpimtextedit/patches/patch-src_texteditor_commonwidget_textmessageindicator_cpp
diff -N
kpimtextedit/patches/patch-src_texteditor_commonwidget_textmessageindicator_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
kpimtextedit/patches/patch-src_texteditor_commonwidget_textmessageindicator_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/texteditor/commonwidget/textmessageindicator.cpp
+--- src/texteditor/commonwidget/textmessageindicator.cpp.orig
++++ src/texteditor/commonwidget/textmessageindicator.cpp
+@@ -186,7 +186,7 @@ void TextMessageIndicator::paintEvent(QPaintEvent * /*
+ painter.setPen(Qt::black);
+ painter.setBrush(palette().color(QPalette::Window));
+ painter.translate(0.5, 0.5);
+- painter.drawRoundRect(1, 1, width() - 2, height() - 2, 1600 / width(),
1600 / height());
++ painter.drawRoundedRect(1, 1, width() - 2, height() - 2, 1600 / width(),
1600 / height(), Qt::RelativeSize);
+
+ // draw icon if present
+ if (!mSymbol.isNull()) {
Index:
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditor_cpp
===================================================================
RCS file:
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditor_cpp
diff -N
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditor_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditor_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Index: src/texteditor/plaintexteditor/plaintexteditor.cpp
+--- src/texteditor/plaintexteditor/plaintexteditor.cpp.orig
++++ src/texteditor/plaintexteditor/plaintexteditor.cpp
+@@ -43,6 +43,7 @@
+ #include <QApplication>
+ #include <QClipboard>
+ #include <QShortcut>
++#include <QPalette>
+
+ #include <sonnet/spellcheckdecorator.h>
+
+@@ -320,16 +321,16 @@ void PlainTextEditor::setReadOnly(bool readOnly)
+
+ d->customPalette = testAttribute(Qt::WA_SetPalette);
+ QPalette p = palette();
+- QColor color = p.color(QPalette::Disabled, QPalette::Background);
++ QColor color = p.color(QPalette::Disabled, QPalette::Window);
+ p.setColor(QPalette::Base, color);
+- p.setColor(QPalette::Background, color);
++ p.setColor(QPalette::Window, color);
+ setPalette(p);
+ } else {
+ if (d->customPalette && testAttribute(Qt::WA_SetPalette)) {
+ QPalette p = palette();
+ QColor color = p.color(QPalette::Normal, QPalette::Base);
+ p.setColor(QPalette::Base, color);
+- p.setColor(QPalette::Background, color);
++ p.setColor(QPalette::Window, color);
+ setPalette(p);
+ } else {
+ setPalette(QPalette());
Index:
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditorwidget_cpp
===================================================================
RCS file:
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditorwidget_cpp
diff -N
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditorwidget_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
kpimtextedit/patches/patch-src_texteditor_plaintexteditor_plaintexteditorwidget_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
+--- src/texteditor/plaintexteditor/plaintexteditorwidget.cpp.orig
++++ src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
+@@ -92,7 +92,7 @@ QString PlainTextEditorWidget::toPlainText() const
+ void PlainTextEditorWidget::init(PlainTextEditor *customEditor)
+ {
+ QVBoxLayout *lay = new QVBoxLayout(this);
+- lay->setMargin(0);
++ lay->setContentsMargins(0, 0, 0, 0);
+ d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
+ lay->addWidget(d->mTextToSpeechWidget);
+ if (customEditor) {
Index:
kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditor_cpp
===================================================================
RCS file:
kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditor_cpp
diff -N
kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditor_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditor_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: src/texteditor/richtexteditor/richtexteditor.cpp
+--- src/texteditor/richtexteditor/richtexteditor.cpp.orig
++++ src/texteditor/richtexteditor/richtexteditor.cpp
+@@ -399,16 +399,16 @@ void RichTextEditor::setReadOnly(bool readOnly)
+
+ d->customPalette = testAttribute(Qt::WA_SetPalette);
+ QPalette p = palette();
+- QColor color = p.color(QPalette::Disabled, QPalette::Background);
++ QColor color = p.color(QPalette::Disabled, QPalette::Window);
+ p.setColor(QPalette::Base, color);
+- p.setColor(QPalette::Background, color);
++ p.setColor(QPalette::Window, color);
+ setPalette(p);
+ } else {
+ if (d->customPalette && testAttribute(Qt::WA_SetPalette)) {
+ QPalette p = palette();
+ QColor color = p.color(QPalette::Normal, QPalette::Base);
+ p.setColor(QPalette::Base, color);
+- p.setColor(QPalette::Background, color);
++ p.setColor(QPalette::Window, color);
+ setPalette(p);
+ } else {
+ setPalette(QPalette());
Index:
kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditorwidget_cpp
===================================================================
RCS file:
kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditorwidget_cpp
diff -N
kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditorwidget_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
kpimtextedit/patches/patch-src_texteditor_richtexteditor_richtexteditorwidget_cpp
25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/texteditor/richtexteditor/richtexteditorwidget.cpp
+--- src/texteditor/richtexteditor/richtexteditorwidget.cpp.orig
++++ src/texteditor/richtexteditor/richtexteditorwidget.cpp
+@@ -114,7 +114,7 @@ QString RichTextEditorWidget::toPlainText() const
+ void RichTextEditorWidget::init(RichTextEditor *customEditor)
+ {
+ QVBoxLayout *lay = new QVBoxLayout(this);
+- lay->setMargin(0);
++ lay->setContentsMargins(0, 0, 0, 0);
+ d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
+ lay->addWidget(d->mTextToSpeechWidget);
+ if (customEditor) {
Index: kruler/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kruler/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- kruler/Makefile 7 Nov 2019 10:11:59 -0000 1.1.1.1
+++ kruler/Makefile 25 Feb 2020 20:22:44 -0000
@@ -3,6 +3,7 @@
COMMENT = screen ruler for KDE
DISTNAME = kruler-${VERSION}
CATEGORIES = graphics
+REVISION = 0
HOMEPAGE = https://www.kde.org/applications/graphics/kruler/
Index: kruler/patches/patch-klineal_cpp
===================================================================
RCS file: kruler/patches/patch-klineal_cpp
diff -N kruler/patches/patch-klineal_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kruler/patches/patch-klineal_cpp 25 Feb 2020 20:22:44 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Index: klineal.cpp
+--- klineal.cpp.orig
++++ klineal.cpp
+@@ -268,12 +268,12 @@ void KLineal::drawBackground( QPainter& painter )
+ QColor a, b, bg = mColor;
+ QLinearGradient gradient;
+ if ( mHorizontal ) {
+- a = bg.light( 120 );
+- b = bg.dark( 130 );
++ a = bg.lighter( 120 );
++ b = bg.darker( 130 );
+ gradient = QLinearGradient( 1, 0, 1, height() );
+ } else {
+- a = bg.light( 120 );
+- b = bg.dark( 130 );
++ a = bg.lighter( 120 );
++ b = bg.darker( 130 );
+ gradient = QLinearGradient( 0, 1, width(), 1 );
+ }
+ a.setAlpha( mOpacity );
