Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at 2018-01-16 09:34:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k3b (Old) and /work/SRC/openSUSE:Factory/.k3b.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k3b" Tue Jan 16 09:34:02 2018 rev:83 rq:564256 version:17.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/k3b/k3b.changes 2017-12-18 08:46:46.151696056 +0100 +++ /work/SRC/openSUSE:Factory/.k3b.new/k3b.changes 2018-01-16 09:34:04.684975533 +0100 @@ -1,0 +2,16 @@ +Thu Jan 11 23:40:57 CET 2018 - [email protected] + +- 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 - [email protected] + +- Add fix-build-with-older-kio.patch to make it build again on + standard Leap 42.x. + +------------------------------------------------------------------- Old: ---- k3b-17.12.0.tar.xz New: ---- fix-build-with-older-kio.patch k3b-17.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.xUpIjZ/_old 2018-01-16 09:34:05.596932865 +0100 +++ /var/tmp/diff_new_pack.xUpIjZ/_new 2018-01-16 09:34:05.596932865 +0100 @@ -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 @@ 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 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build CXXFLAGS="%{optflags} -fno-strict-aliasing" ++++++ fix-build-with-older-kio.patch ++++++ >From 1f36ad0aad6bce75318268acf36374d13d479a66 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> 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 -> k3b-17.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/k3b/k3b-17.12.0.tar.xz /work/SRC/openSUSE:Factory/.k3b.new/k3b-17.12.1.tar.xz differ: char 26, line 1
