Hello community, here is the log from the commit of package kaddressbook for openSUSE:Factory checked in at 2020-11-25 19:29:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kaddressbook (Old) and /work/SRC/openSUSE:Factory/.kaddressbook.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kaddressbook" Wed Nov 25 19:29:27 2020 rev:53 rq:850396 version:20.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kaddressbook/kaddressbook.changes 2020-11-10 13:35:36.296932302 +0100 +++ /work/SRC/openSUSE:Factory/.kaddressbook.new.5913/kaddressbook.changes 2020-11-25 19:30:18.730554037 +0100 @@ -1,0 +2,6 @@ +Tue Nov 24 09:29:00 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add patch to fix build with Qt 5.15.2: + * 0001-Compile-with-recent-Qt-5.15.patch + +------------------------------------------------------------------- New: ---- 0001-Compile-with-recent-Qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaddressbook.spec ++++++ --- /var/tmp/diff_new_pack.Kon3Ef/_old 2020-11-25 19:30:19.394554691 +0100 +++ /var/tmp/diff_new_pack.Kon3Ef/_new 2020-11-25 19:30:19.398554694 +0100 @@ -28,6 +28,8 @@ Group: Productivity/Networking/Email/Utilities URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Compile-with-recent-Qt-5.15.patch BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: pkgconfig @@ -77,7 +79,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build ++++++ 0001-Compile-with-recent-Qt-5.15.patch ++++++ From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001 From: Volker Krause <[email protected]> Date: Sun, 25 Oct 2020 18:22:58 +0100 Subject: [PATCH] Compile with recent Qt 5.15 More QPrinter methods got deprecated there. DevicePixel no longer exists as a unit, visually Point looks pretty much the same though. --- src/printing/compact/compactstyle.cpp | 2 +- src/printing/grantlee/grantleeprintstyle.cpp | 2 +- src/printing/mike/mikesstyle.cpp | 2 +- src/printing/ringbinder/ringbinderstyle.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp index d950a963..71e74c0f 100644 --- a/src/printing/compact/compactstyle.cpp +++ b/src/printing/compact/compactstyle.cpp @@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre // 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")); diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp index d7afe8ef..49b5e494 100644 --- a/src/printing/grantlee/grantleeprintstyle.cpp +++ b/src/printing/grantlee/grantleeprintstyle.cpp @@ -38,7 +38,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")); diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp index 9f698c53..81a4bd6f 100644 --- a/src/printing/mike/mikesstyle.cpp +++ b/src/printing/mike/mikesstyle.cpp @@ -107,7 +107,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")); diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp index 60a39c86..5f600d6a 100644 --- a/src/printing/ringbinder/ringbinderstyle.cpp +++ b/src/printing/ringbinder/ringbinderstyle.cpp @@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri 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")); -- 2.29.2 _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
