From 6f6813e53173be2914d2e1e853031bff987f3a3712d171c6419169889f2a1b2d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 9 Jan 2018 11:42:56 +0000 Subject: [PATCH 1/2] Accepting request 562852 from home:wolfi323:branches:KDE:Applications - Add fix-build-with-older-kio.patch to make it build again on standard Leap 42.x. (mainly for Packman) OBS-URL: https://build.opensuse.org/request/show/562852 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=57 --- fix-build-with-older-kio.patch | 42 ++++++++++++++++++++++++++++++++++ k3b.changes | 6 +++++ k3b.spec | 3 +++ 3 files changed, 51 insertions(+) create mode 100644 fix-build-with-older-kio.patch diff --git a/fix-build-with-older-kio.patch b/fix-build-with-older-kio.patch new file mode 100644 index 0000000..95f11ad --- /dev/null +++ b/fix-build-with-older-kio.patch @@ -0,0 +1,42 @@ +From 1f36ad0aad6bce75318268acf36374d13d479a66 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +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 + #include + #include ++#include + + #include + #include +@@ -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 + diff --git a/k3b.changes b/k3b.changes index 1786b14..d215ff3 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/k3b.spec b/k3b.spec index 291b07e..40f6c10 100644 --- a/k3b.spec +++ b/k3b.spec @@ -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" From 1ba4c2e77262b46ecc6b8ff7eb5dc983e5e8902d182ecf82f4cd772574ee1447 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 12 Jan 2018 11:20:48 +0000 Subject: [PATCH 2/2] KDE Applications 17.12.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=58 --- k3b-17.12.0.tar.xz | 3 --- k3b-17.12.1.tar.xz | 3 +++ k3b.changes | 10 ++++++++++ k3b.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 k3b-17.12.0.tar.xz create mode 100644 k3b-17.12.1.tar.xz diff --git a/k3b-17.12.0.tar.xz b/k3b-17.12.0.tar.xz deleted file mode 100644 index ab5b2a0..0000000 --- a/k3b-17.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c20595c3be16dcc3fa0f2cccb86d3fce8e6239480b21768e16fdc17c494c2e6 -size 10574540 diff --git a/k3b-17.12.1.tar.xz b/k3b-17.12.1.tar.xz new file mode 100644 index 0000000..6ceea05 --- /dev/null +++ b/k3b-17.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfbf7d1212bdf2f519aa9dc99ecf528342c31324cb860d746ea6a73c94745a86 +size 10575632 diff --git a/k3b.changes b/k3b.changes index d215ff3..712a017 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/k3b.spec b/k3b.spec index 40f6c10..7cb1c79 100644 --- a/k3b.spec +++ b/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+