diff --git a/fix-build-with-older-kio.patch b/fix-build-with-older-kio.patch deleted file mode 100644 index 95f11ad..0000000 --- a/fix-build-with-older-kio.patch +++ /dev/null @@ -1,42 +0,0 @@ -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-18.04.0.tar.xz b/k3b-18.04.0.tar.xz deleted file mode 100644 index 3ede1e1..0000000 --- a/k3b-18.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74e813fa0f4bbef56f8ae9ec09551f41477d4aa870ff9e5701f813d95915fd98 -size 10588096 diff --git a/k3b-18.04.1.tar.xz b/k3b-18.04.1.tar.xz new file mode 100644 index 0000000..1a0b806 --- /dev/null +++ b/k3b-18.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87dadfb54b33a772efc93b4757e44cbbbb16f97fe064702f8215903c0c26c85f +size 10596384 diff --git a/k3b.changes b/k3b.changes index 6f46883..b146361 100644 --- a/k3b.changes +++ b/k3b.changes @@ -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 diff --git a/k3b.spec b/k3b.spec index 6f3edac..6dc2ed0 100644 --- a/k3b.spec +++ b/k3b.spec @@ -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"