cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak build after recent Qt 5.15 update.

Browse Source
This commit is contained in:
rsadowski 2021-01-19 06:33:36 +00:00
parent 64aae06f72
commit 11039fe91c
18 changed files with 357 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/kde-applications/calendarsupport/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2020/11/08 20:12:50 rsadowski Exp $
# $OpenBSD: Makefile,v 1.8 2021/01/19 06:33:36 rsadowski Exp $
COMMENT = PIM calendar support library
DISTNAME = calendarsupport-${VERSION}
CATEGORIES = devel
REVISION = 0
SHARED_LIBS += KF5CalendarSupport 1.0 # 5.13.2

54
x11/kde-applications/calendarsupport/patches/patch-src_printing_calprintdefaultplugins_cpp Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-src_printing_calprintdefaultplugins_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/calprintdefaultplugins.cpp
--- src/printing/calprintdefaultplugins.cpp.orig
+++ src/printing/calprintdefaultplugins.cpp
@@ -821,7 +821,7 @@ void CalPrintDay::print(QPainter &p, int width, int he
QString line1 = local.toString(mFromDate, QLocale::ShortFormat);
QString line2 = local.toString(mToDate, QLocale::ShortFormat);
QString title;
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from-to", "%1 - %2", line1, line2);
} else {
title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
@@ -1066,14 +1066,14 @@ void CalPrintWeek::saveConfig()
}
}
-QPrinter::Orientation CalPrintWeek::defaultOrientation() const
+QPageLayout::Orientation CalPrintWeek::defaultOrientation() const
{
if (mWeekPrintType == Filofax) {
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
} else if (mWeekPrintType == SplitWeek) {
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
} else {
- return QPrinter::Landscape;
+ return QPageLayout::Landscape;
}
}
@@ -1115,7 +1115,7 @@ void CalPrintWeek::print(QPainter &p, int width, int h
do {
line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
line2 = local.toString(curWeek, QLocale::ShortFormat);
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from-to", "%1 - %2", line1, line2);
} else {
title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
@@ -1142,7 +1142,7 @@ void CalPrintWeek::print(QPainter &p, int width, int h
do {
line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
line2 = local.toString(curWeek, QLocale::ShortFormat);
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)",
line1, line2, curWeek.weekNumber());
} else {

41
x11/kde-applications/calendarsupport/patches/patch-src_printing_calprintdefaultplugins_h Normal file
View File

@ -0,0 +1,41 @@
$OpenBSD: patch-src_printing_calprintdefaultplugins_h,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/calprintdefaultplugins.h
--- src/printing/calprintdefaultplugins.h.orig
+++ src/printing/calprintdefaultplugins.h
@@ -69,9 +69,9 @@ class CALENDARSUPPORT_EXPORT CalPrintIncidence : publi
}
QWidget *createConfigWidget(QWidget *) override;
- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override
+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override
{
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
}
public:
@@ -182,7 +182,7 @@ class CalPrintWeek : public CalPrintPluginBase (public
/**
Returns the default orientation for the eWeekPrintType.
*/
- QPrinter::Orientation defaultOrientation() const override;
+ QPageLayout::Orientation defaultOrientation() const override;
public:
void print(QPainter &p, int width, int height) override;
@@ -238,9 +238,9 @@ class CalPrintMonth : public CalPrintPluginBase (publi
}
QWidget *createConfigWidget(QWidget *) override;
- QPrinter::Orientation defaultOrientation() const override
+ QPageLayout::Orientation defaultOrientation() const override
{
- return QPrinter::Landscape;
+ return QPageLayout::Landscape;
}
public:

25
x11/kde-applications/calendarsupport/patches/patch-src_printing_calprinter_cpp Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_printing_calprinter_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/calprinter.cpp
--- src/printing/calprinter.cpp.orig
+++ src/printing/calprinter.cpp
@@ -142,13 +142,13 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, C
QPrinter printer;
switch (dlgorientation) {
case eOrientPlugin:
- printer.setOrientation(selectedStyle->defaultOrientation());
+ printer.setPageOrientation(selectedStyle->defaultOrientation());
break;
case eOrientPortrait:
- printer.setOrientation(QPrinter::Portrait);
+ printer.setPageOrientation(QPageLayout::Portrait);
break;
case eOrientLandscape:
- printer.setOrientation(QPrinter::Landscape);
+ printer.setPageOrientation(QPageLayout::Landscape);
break;
case eOrientPrinter:
break;

38
x11/kde-applications/calendarsupport/patches/patch-src_printing_calprintpluginbase_cpp Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-src_printing_calprintpluginbase_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/calprintpluginbase.cpp
--- src/printing/calprintpluginbase.cpp.orig
+++ src/printing/calprintpluginbase.cpp
@@ -249,9 +249,9 @@ void CalPrintPluginBase::setPrintFooter(bool printFoot
mPrintFooter = printFooter;
}
-QPrinter::Orientation CalPrintPluginBase::orientation() const
+QPageLayout::Orientation CalPrintPluginBase::orientation() const
{
- return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
+ return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait;
}
QColor CalPrintPluginBase::getTextColor(const QColor &c) const
@@ -343,7 +343,7 @@ int CalPrintPluginBase::headerHeight() const
{
if (mHeaderHeight >= 0) {
return mHeaderHeight;
- } else if (orientation() == QPrinter::Portrait) {
+ } else if (orientation() == QPageLayout::Portrait) {
return PORTRAIT_HEADER_HEIGHT;
} else {
return LANDSCAPE_HEADER_HEIGHT;
@@ -373,7 +373,7 @@ int CalPrintPluginBase::footerHeight() const
if (mFooterHeight >= 0) {
return mFooterHeight;
- } else if (orientation() == QPrinter::Portrait) {
+ } else if (orientation() == QPageLayout::Portrait) {
return PORTRAIT_FOOTER_HEIGHT;
} else {
return LANDSCAPE_FOOTER_HEIGHT;

17
x11/kde-applications/calendarsupport/patches/patch-src_printing_calprintpluginbase_h Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_printing_calprintpluginbase_h,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/calprintpluginbase.h
--- src/printing/calprintpluginbase.h.orig
+++ src/printing/calprintpluginbase.h
@@ -123,7 +123,7 @@ class CalPrintPluginBase : public PrintPlugin (public)
*/
static int weekdayColumn(int weekday);
- QPrinter::Orientation orientation() const;
+ QPageLayout::Orientation orientation() const;
/** Returns the height of the page header. If the height was explicitly
set using setHeaderHeight, that value is returned, otherwise a

20
x11/kde-applications/calendarsupport/patches/patch-src_printing_printplugin_h Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_printing_printplugin_h,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/printplugin.h
--- src/printing/printplugin.h.orig
+++ src/printing/printplugin.h
@@ -153,9 +153,9 @@ class PrintPlugin : public Plugin (public)
config settings), implement this function in your subclass and
return the desired orientation.
*/
- virtual QPrinter::Orientation defaultOrientation() const
+ virtual QPageLayout::Orientation defaultOrientation() const
{
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
}
/**

29
x11/kde-applications/calendarsupport/patches/patch-src_printing_yearprint_cpp Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_printing_yearprint_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/yearprint.cpp
--- src/printing/yearprint.cpp.orig
+++ src/printing/yearprint.cpp
@@ -98,9 +98,9 @@ void CalPrintYear::saveConfig()
}
}
-QPrinter::Orientation CalPrintYear::defaultOrientation() const
+QPageLayout::Orientation CalPrintYear::defaultOrientation() const
{
- return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait;
+ return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait;
}
void CalPrintYear::setDateRange(const QDate &from, const QDate &to)
@@ -147,7 +147,7 @@ void CalPrintYear::print(QPainter &p, int width, int h
QString stdate = locale.toString(start, QLocale::ShortFormat);
QString endate = locale.toString(end, QLocale::ShortFormat);
QString title;
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from - to", "%1 - %2", stdate, endate);
} else {
title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate);

17
x11/kde-applications/calendarsupport/patches/patch-src_printing_yearprint_h Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_printing_yearprint_h,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt5.15 build
https://github.com/KDE/calendarsupport/commit/b4193facb223bd5b73a65318dec8ced51b66adf7
Index: src/printing/yearprint.h
--- src/printing/yearprint.h.orig
+++ src/printing/yearprint.h
@@ -64,7 +64,7 @@ class CalPrintYear : public CalPrintPluginBase (public
}
QWidget *createConfigWidget(QWidget *) override;
- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override;
+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override;
public:
void print(QPainter &p, int width, int height) override;

3
x11/kde-applications/kaddressbook/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2020/11/03 16:12:32 rsadowski Exp $
# $OpenBSD: Makefile,v 1.6 2021/01/19 06:33:36 rsadowski Exp $
COMMENT = addressbook viewer/frontend for KDE
DISTNAME = kaddressbook-${VERSION}
CATEGORIES = devel
REVISION = 1
SHARED_LIBS += kaddressbookprivate 1.0 # 5.13.2

17
x11/kde-applications/kaddressbook/patches/patch-src_printing_compact_compactstyle_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_printing_compact_compactstyle_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt 5.15 build
https://github.com/KDE/kaddressbook/commit/8aee8d40ae2a1c920d3520163d550d3b49720226
Index: src/printing/compact/compactstyle.cpp
--- src/printing/compact/compactstyle.cpp.orig
+++ src/printing/compact/compactstyle.cpp
@@ -184,7 +184,7 @@ void CompactStyle::print(const KContacts::Addressee::L
// print
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));

17
x11/kde-applications/kaddressbook/patches/patch-src_printing_grantlee_grantleeprintstyle_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_printing_grantlee_grantleeprintstyle_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt 5.15 build
https://github.com/KDE/kaddressbook/commit/8aee8d40ae2a1c920d3520163d550d3b49720226
Index: src/printing/grantlee/grantleeprintstyle.cpp
--- src/printing/grantlee/grantleeprintstyle.cpp.orig
+++ src/printing/grantlee/grantleeprintstyle.cpp
@@ -52,7 +52,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
{
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));

17
x11/kde-applications/kaddressbook/patches/patch-src_printing_mike_mikesstyle_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_printing_mike_mikesstyle_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt 5.15 build
https://github.com/KDE/kaddressbook/commit/8aee8d40ae2a1c920d3520163d550d3b49720226
Index: src/printing/mike/mikesstyle.cpp
--- src/printing/mike/mikesstyle.cpp.orig
+++ src/printing/mike/mikesstyle.cpp
@@ -123,7 +123,7 @@ MikesStyle::~MikesStyle()
void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
{
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));

17
x11/kde-applications/kaddressbook/patches/patch-src_printing_ringbinder_ringbinderstyle_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_printing_ringbinder_ringbinderstyle_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak Qt 5.15 build
https://github.com/KDE/kaddressbook/commit/8aee8d40ae2a1c920d3520163d550d3b49720226
Index: src/printing/ringbinder/ringbinderstyle.cpp
--- src/printing/ringbinder/ringbinderstyle.cpp.orig
+++ src/printing/ringbinder/ringbinderstyle.cpp
@@ -175,7 +175,7 @@ void RingBinderPrintStyle::print(const KContacts::Addr
config.sync();
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));

3
x11/kde-applications/kompare/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2020/11/03 16:12:38 rsadowski Exp $
# $OpenBSD: Makefile,v 1.10 2021/01/19 06:33:36 rsadowski Exp $
COMMENT = file compare utility for KDE
DISTNAME = kompare-${VERSION}
CATEGORIES = textproc devel
REVISION = 1
SHARED_LIBS += komparedialogpages 2.0 # 0.0
SHARED_LIBS += kompareinterface 2.0 # 0.0

25
x11/kde-applications/kompare/patches/patch-komparepart_kompare_part_cpp Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-komparepart_kompare_part_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak build with Qt 5.15
Index: komparepart/kompare_part.cpp
--- komparepart/kompare_part.cpp.orig
+++ komparepart/kompare_part.cpp
@@ -610,7 +610,7 @@ void KomparePart::saveDiff()
void KomparePart::slotFilePrint()
{
QPrinter printer;
- printer.setOrientation(QPrinter::Landscape);
+ printer.setPageOrientation(QPageLayout::Landscape);
QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
if (dlg->exec() == QDialog::Accepted)
@@ -625,7 +625,7 @@ void KomparePart::slotFilePrint()
void KomparePart::slotFilePrintPreview()
{
QPrinter printer;
- printer.setOrientation(QPrinter::Landscape);
+ printer.setPageOrientation(QPageLayout::Landscape);
QPrintPreviewDialog dlg(&printer);
connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested);

4
x11/kde-applications/spectacle/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2020/11/03 16:12:42 rsadowski Exp $
# $OpenBSD: Makefile,v 1.13 2021/01/19 06:33:36 rsadowski Exp $
COMMENT = KDE screen capture and screenshot program
VERSION = 19.04.3
DISTNAME = spectacle-${VERSION}
CATEGORIES = x11
REVISION = 1
REVISION = 2
HOMEPAGE = https://www.kde.org/applications/graphics/spectacle/

15
x11/kde-applications/spectacle/patches/patch-src_QuickEditor_QuickEditor_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_QuickEditor_QuickEditor_cpp,v 1.1 2021/01/19 06:33:36 rsadowski Exp $
Unbreak build wild Qt 5.15.2
Index: src/QuickEditor/QuickEditor.cpp
--- src/QuickEditor/QuickEditor.cpp.orig
+++ src/QuickEditor/QuickEditor.cpp
@@ -18,6 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
+#include <QPainterPath>
#include <KLocalizedString>
#include "QuickEditor.h"