Accepting request 564256 from KDE:Applications

KDE Applications 17.12.1

OBS-URL: https://build.opensuse.org/request/show/564256
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=83

fix-build-with-older-kio.patch

@@ -0,0 +1,42 @@
+From 1f36ad0aad6bce75318268acf36374d13d479a66 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Tue, 9 Jan 2018 10:54:06 +0100
+Subject: [PATCH] Fix build with KIO < 5.33
+
+KUrlRequester::setAcceptMode() got introduced in KIO 5.33.0, but k3b
+specifies 5.21.0 as minimum version.
+Modify the KUrlRequester's fileDialog() directly when using an older
+version to fix the compilation.
+
+Differential Revision: https://phabricator.kde.org/D9718
+---
+ src/k3btempdirselectionwidget.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp
+index 3ff3a87b4..395328eb0 100644
+--- a/src/k3btempdirselectionwidget.cpp
++++ b/src/k3btempdirselectionwidget.cpp
+@@ -26,6 +26,7 @@
+ #include <KIOCore/KDiskFreeSpaceInfo>
+ #include <KIOCore/KIO/Global>
+ #include <KIOWidgets/KUrlRequester>
++#include <kio_version.h>
+ 
+ #include <QtCore/QFileInfo>
+ #include <QtCore/QTimer>
+@@ -68,7 +69,11 @@ K3b::TempDirSelectionWidget::TempDirSelectionWidget( QWidget *parent )
+     // choose a default
+     setSelectionMode( DIR );
+ 
++#if KIO_VERSION >= QT_VERSION_CHECK(5, 33, 0)
+     m_editDirectory->setAcceptMode(QFileDialog::AcceptSave);
++#else
++    m_editDirectory->fileDialog()->setAcceptMode(QFileDialog::AcceptSave);
++#endif
+     m_editDirectory->setUrl( QUrl::fromLocalFile( k3bcore->globalSettings()->defaultTempPath() ) );
+     slotUpdateFreeTempSpace();
+ 
+-- 
+2.13.6
+

k3b-17.12.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c20595c3be16dcc3fa0f2cccb86d3fce8e6239480b21768e16fdc17c494c2e6
-size 10574540

k3b-17.12.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfbf7d1212bdf2f519aa9dc99ecf528342c31324cb860d746ea6a73c94745a86
+size 10575632

k3b.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jan 11 23:40:57 CET 2018 - lbeltrame@kde.org
+
+- Update to 17.12.1
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-17.12.1.php
+- Changes since 17.12.0:
+  * Revert "Fix Settings dialog resizes itself issue"
+
+-------------------------------------------------------------------
+Tue Jan  9 09:58:08 UTC 2018 - wbauer@tmo.at
+
+- Add fix-build-with-older-kio.patch to make it build again on
+  standard Leap 42.x.
+
 -------------------------------------------------------------------
 Sat Dec 09 14:59:02 CET 2017 - lbeltrame@kde.org
 

k3b.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package k3b
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %bcond_without    mad
 
 Name:           k3b
-Version:        17.12.0
+Version:        17.12.1
 Release:        0
 Summary:        CD/DVD/Blu-ray Burning Application for KDE
 License:        GPL-2.0+
@@ -32,6 +32,8 @@ Url:            http://www.kde.org
 Source:         %{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE
 Patch1:         Don-t-suggest-to-install-libburn.patch
+# PATCH-FIX-UPSTREAM
+Patch2:         fix-build-with-older-kio.patch
 
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -121,6 +123,7 @@ This package contain files needed for development with k3b.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 CXXFLAGS="%{optflags} -fno-strict-aliasing"