Wolfgang Bauer 2018-05-11 13:15:49 +00:00 committed by Git OBS Bridge
parent af81a8dfdc
commit 63e29721b9
5 changed files with 17 additions and 50 deletions

View File

@ -1,42 +0,0 @@
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

View File

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

3
k3b-18.04.1.tar.xz Normal file
View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 11 05:17:44 UTC 2018 - lbeltrame@kde.org
- Update to 18.04.1
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-18.04.1.php
- Changes since 18.04.0:
* Fix build with KIO < 5.33
* Fix pixmap scaling on HiDPI screens (kde#390081)
- Dropped patches, now upstream:
* fix-build-with-older-kio.patch
-------------------------------------------------------------------
Wed Apr 18 07:48:42 CEST 2018 - lbeltrame@kde.org

View File

@ -23,7 +23,7 @@
%bcond_without mad
Name: k3b
Version: 18.04.0
Version: 18.04.1
Release: 0
Summary: CD/DVD/Blu-ray Burning Application for KDE
License: GPL-2.0-or-later
@ -32,9 +32,6 @@ 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
BuildRequires: flac-devel
@ -123,7 +120,6 @@ This package contain files needed for development with k3b.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
CXXFLAGS="%{optflags} -fno-strict-aliasing"