Hello community, here is the log from the commit of package keepassxc for openSUSE:Factory checked in at 2017-06-21 13:58:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keepassxc (Old) and /work/SRC/openSUSE:Factory/.keepassxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keepassxc" Wed Jun 21 13:58:16 2017 rev:3 rq:505231 version:2.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/keepassxc/keepassxc.changes 2017-04-20 20:57:18.869964394 +0200 +++ /work/SRC/openSUSE:Factory/.keepassxc.new/keepassxc.changes 2017-06-21 13:58:18.541913147 +0200 @@ -1,0 +2,6 @@ +Wed Jun 21 07:52:11 UTC 2017 - [email protected] + +- Fix building with Qt 5.9 - gh#keepassxreboot/keepassxc#528 + * keepassxc-qt5.9.patch + +------------------------------------------------------------------- New: ---- keepassxc-qt5.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keepassxc.spec ++++++ --- /var/tmp/diff_new_pack.fUifkZ/_old 2017-06-21 13:58:19.369796368 +0200 +++ /var/tmp/diff_new_pack.fUifkZ/_new 2017-06-21 13:58:19.373795804 +0200 @@ -26,6 +26,8 @@ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/keepassxc-%{version}-src.tar.xz Source1: https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/keepassxc-%{version}-src.tar.xz.sig Source2: https://keepassxc.org/keepassxc_master_signing_key.asc#/%{name}.keyring +# PATCH-FIX-UPSTREAM keepassxc-qt5.9.patch gh#keepassxreboot/keepassxc#528 +Patch0: keepassxc-qt5.9.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -62,6 +64,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake \ ++++++ keepassxc-qt5.9.patch ++++++ >From 2b6059dee3a95591d787e8b8c931cd68c059d43f Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan <[email protected]> Date: Fri, 2 Jun 2017 01:28:39 +0800 Subject: [PATCH] :bug: Fix building with Qt 5.9 (closes #528) --- tests/modeltest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/modeltest.cpp b/tests/modeltest.cpp index 360a7bef..6bf8124c 100644 --- a/tests/modeltest.cpp +++ b/tests/modeltest.cpp @@ -448,7 +448,8 @@ void ModelTest::data() QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); if ( textAlignmentVariant.isValid() ) { int alignment = textAlignmentVariant.toInt(); - QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); + QCOMPARE( alignment, static_cast<int>( alignment & ( Qt::AlignHorizontal_Mask + | Qt::AlignVertical_Mask ) ) ); } // General Purpose roles that should return a QColor
