diff --git a/Add-forceCheck-for-ManualCheckSystem.patch b/Add-forceCheck-for-ManualCheckSystem.patch deleted file mode 100644 index e9d928b..0000000 --- a/Add-forceCheck-for-ManualCheckSystem.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 762fc98addfc5a83e80aa1c7d83384a512c48f33 Mon Sep 17 00:00:00 2001 -From: Leslie Zhai -Date: Wed, 2 Aug 2017 14:44:29 +0800 -Subject: Add forceCheck for ManualCheckSystem. - -CCBUG: 381368 ---- - src/k3b.cpp | 2 +- - src/k3bsystemproblemdialog.cpp | 4 ++-- - src/k3bsystemproblemdialog.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -Index: k3b-17.08.2/src/k3b.cpp -=================================================================== ---- k3b-17.08.2.orig/src/k3b.cpp -+++ k3b-17.08.2/src/k3b.cpp -@@ -1422,7 +1422,7 @@ void K3b::MainWindow::slotCheckSystem() - - void K3b::MainWindow::slotManualCheckSystem() - { -- K3b::SystemProblemDialog::checkSystem( this, K3b::SystemProblemDialog::AlwaysNotify ); -+ K3b::SystemProblemDialog::checkSystem(this, K3b::SystemProblemDialog::AlwaysNotify, true/* forceCheck */); - } - - -Index: k3b-17.08.2/src/k3bsystemproblemdialog.cpp -=================================================================== ---- k3b-17.08.2.orig/src/k3bsystemproblemdialog.cpp -+++ k3b-17.08.2/src/k3bsystemproblemdialog.cpp -@@ -169,13 +169,13 @@ void K3b::SystemProblemDialog::done(int - } - - --void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel level ) -+void K3b::SystemProblemDialog::checkSystem(QWidget* parent, NotificationLevel level, bool forceCheck) - { - QList problems; - bool showDeviceSettingsButton = false; - bool showBinSettingsButton = false; - -- if (!readCheckSystemConfig()) -+ if (!forceCheck && !readCheckSystemConfig()) - return; - - if( k3bcore->deviceManager()->allDevices().isEmpty() ) { -Index: k3b-17.08.2/src/k3bsystemproblemdialog.h -=================================================================== ---- k3b-17.08.2.orig/src/k3bsystemproblemdialog.h -+++ k3b-17.08.2/src/k3bsystemproblemdialog.h -@@ -78,7 +78,7 @@ namespace K3b { - * or K3b is started for the first time. - */ - static bool readCheckSystemConfig(); -- static void checkSystem( QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors ); -+ static void checkSystem(QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors, bool forceCheck = false); - - protected: - void done(int) Q_DECL_OVERRIDE; diff --git a/Add-readCheckSystemConfig.patch b/Add-readCheckSystemConfig.patch deleted file mode 100644 index f215f6d..0000000 --- a/Add-readCheckSystemConfig.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9408b834d4eb20264a526beb3bbbb1c5882db564 Mon Sep 17 00:00:00 2001 -From: Leslie Zhai -Date: Tue, 1 Aug 2017 14:24:42 +0800 -Subject: Add readCheckSystemConfig before checkSystem to fix "do not show - again" from system configuration problems dialog is not remembered issue. - -A great patch by Wolfgang Bauer! - -BUG: 381368 ---- - src/k3bsystemproblemdialog.cpp | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -Index: k3b-17.08.2/src/k3bsystemproblemdialog.cpp -=================================================================== ---- k3b-17.08.2.orig/src/k3bsystemproblemdialog.cpp -+++ k3b-17.08.2/src/k3bsystemproblemdialog.cpp -@@ -175,6 +175,9 @@ void K3b::SystemProblemDialog::checkSyst - bool showDeviceSettingsButton = false; - bool showBinSettingsButton = false; - -+ if (!readCheckSystemConfig()) -+ return; -+ - if( k3bcore->deviceManager()->allDevices().isEmpty() ) { - problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL, - i18n("No optical drive found."), -@@ -705,13 +708,13 @@ QList K3b::SystemP - - bool K3b::SystemProblemDialog::readCheckSystemConfig() - { -- KConfigGroup cfgGrp( KSharedConfig::openConfig(), "General Options" ); -+ KConfigGroup cfgGrp(KSharedConfig::openConfig(), "General Options"); - -- K3b::Version configVersion( cfgGrp.readEntry( "Last system check version", "0.1" ) ); -- if( configVersion < k3bcore->version() ) -- cfgGrp.writeEntry( "check system config", true ); -+ K3b::Version configVersion(cfgGrp.readEntry( "Last system check version", "0.1" )); -+ if (configVersion < k3bcore->version()) -+ cfgGrp.writeEntry("check system config", true); - -- return cfgGrp.readEntry( "check system config", true ); -+ return cfgGrp.readEntry("check system config", false); - } - - diff --git a/Don-t-suggest-to-install-libburn.patch b/Don-t-suggest-to-install-libburn.patch index 0770343..8cd320c 100644 --- a/Don-t-suggest-to-install-libburn.patch +++ b/Don-t-suggest-to-install-libburn.patch @@ -13,19 +13,20 @@ People who want to use cdrskin instead can still install it. src/k3bsystemproblemdialog.cpp | 6 ------ 1 file changed, 6 deletions(-) -Index: k3b-17.08.2/src/k3bsystemproblemdialog.cpp +Index: k3b-17.11.80/src/k3bsystemproblemdialog.cpp =================================================================== ---- k3b-17.08.2.orig/src/k3bsystemproblemdialog.cpp -+++ k3b-17.08.2/src/k3bsystemproblemdialog.cpp -@@ -288,12 +288,6 @@ void K3b::SystemProblemDialog::checkSyst +--- k3b-17.11.80.orig/src/k3bsystemproblemdialog.cpp ++++ k3b-17.11.80/src/k3bsystemproblemdialog.cpp +@@ -293,13 +293,6 @@ void K3b::SystemProblemDialog::checkSyst #endif } - if (!k3bcore->externalBinManager()->foundBin("cdrskin")) { -- problems.append(K3b::SystemProblem(K3b::SystemProblem::CRITICAL, +- problems.append(K3b::SystemProblem(K3b::SystemProblem::NON_CRITICAL, - i18n("Unable to find %1 executable", QString("cdrskin")), -- i18n("K3b uses cdrskin in place of cdrecord."), -- i18n("Install the libburn package which contains cdrskin"))); +- i18n("Cdrskin can substitute for cdrecord with data and audio" +- " CD, and for growisofs with DVD and BD."), +- i18n("Consider to install the libburn and cdrskin packages."))); - } } diff --git a/Fix-creating-DVD-video-image.patch b/Fix-creating-DVD-video-image.patch deleted file mode 100644 index 558dfd6..0000000 --- a/Fix-creating-DVD-video-image.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d2679715487c2254ed5a55b20aa21ea0b36421f0 Mon Sep 17 00:00:00 2001 -From: Leslie Zhai -Date: Fri, 11 Aug 2017 09:17:15 +0800 -Subject: Fix cannot create DVD video image issue. - -BUG: 383011 - -Reviewers: aacid, anthonyfieroni, sitter - -Reviewed By: sitter - -Subscribers: KDE Applications - -Differential Revision: https://phabricator.kde.org/D7063 ---- - libk3b/projects/videodvd/k3bvideodvdimager.cpp | 35 +++++++++++++++----------- - 1 file changed, 21 insertions(+), 14 deletions(-) - -Index: k3b-17.08.2/libk3b/projects/videodvd/k3bvideodvdimager.cpp -=================================================================== ---- k3b-17.08.2.orig/libk3b/projects/videodvd/k3bvideodvdimager.cpp -+++ k3b-17.08.2/libk3b/projects/videodvd/k3bvideodvdimager.cpp -@@ -101,30 +101,37 @@ int K3b::VideoDvdImager::writePathSpec() - // - // We do this here since K3b::IsoImager::start calls cleanup which deletes the temp files - // -- d->tempDir.reset( new QTemporaryDir( "k3bVideoDvdXXXXXX" ) ); -- QDir dir( d->tempDir->path() ); -- qDebug() << "(K3b::VideoDvdImager) creating temp dir: " << dir.path(); -- if( !dir.mkdir( dir.path() ) ) { -- emit infoMessage( i18n("Unable to create temporary folder '%1'.",dir.path()), MessageError ); -+ d->tempDir.reset(new QTemporaryDir(QDir::tempPath() + "/k3bVideoDvdXXXXXX")); -+ if (!d->tempDir->isValid()) { -+ emit infoMessage(xi18n("Unable to create Invalid temporary folder %1.", -+ d->tempDir->path()), MessageError); - return -1; - } - -- dir.cd( dir.path() ); -- if( !dir.mkdir( "VIDEO_TS" ) ) { -- emit infoMessage( i18n("Unable to create temporary folder '%1'.",dir.path() + "/VIDEO_TS"), MessageError ); -+ const auto videoDir = -+#if QT_VERSION < 0x050900 -+ d->tempDir->path() + "/VIDEO_TS"; -+#else -+ d->tempDir->filePath("VIDEO_TS"); -+#endif -+ if (!QDir().mkpath(videoDir)) { -+ emit infoMessage(xi18n("Unable to create temporary folder %1.", -+ videoDir), MessageError); - return -1; - } - -- Q_FOREACH( K3b::DataItem* item, d->doc->videoTsDir()->children() ) { -- if( item->isDir() ) { -- emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).",item->k3bName()), MessageError ); -+ Q_FOREACH(const K3b::DataItem* item, d->doc->videoTsDir()->children()) { -+ if (item->isDir()) { -+ emit infoMessage(xi18n("Found invalid entry in the VIDEO_TS folder %1.", -+ item->k3bName()), MessageError); - return -1; - } - - // convert to upper case names -- if( ::symlink( QFile::encodeName( item->localPath() ), -- QFile::encodeName( dir.path() + "/VIDEO_TS/" + item->k3bName().toUpper() ) ) == -1 ) { -- emit infoMessage( i18n("Unable to link temporary file in folder %1.", dir.path() ), MessageError ); -+ if (::symlink(QFile::encodeName(item->localPath()), -+ QFile::encodeName(videoDir + "/" + item->k3bName().toUpper())) == -1) { -+ emit infoMessage(xi18n("Unable to link temporary file in folder %1.", -+ d->tempDir->path()), MessageError); - return -1; - } - } diff --git a/k3b-17.08.3.tar.xz b/k3b-17.08.3.tar.xz deleted file mode 100644 index 5f96a6d..0000000 --- a/k3b-17.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3edc5a79991ebdefdbbf0f0ee756e43499ebd73a00215e7b569c946e458504f -size 10565760 diff --git a/k3b-17.12.0.tar.xz b/k3b-17.12.0.tar.xz new file mode 100644 index 0000000..ab5b2a0 --- /dev/null +++ b/k3b-17.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c20595c3be16dcc3fa0f2cccb86d3fce8e6239480b21768e16fdc17c494c2e6 +size 10574540 diff --git a/k3b.changes b/k3b.changes index fa68a21..1786b14 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Sat Dec 09 14:59:02 CET 2017 - lbeltrame@kde.org + +- Update to 17.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.0.php +- Changes since 17.11.90: + * None + +------------------------------------------------------------------- +Sat Dec 02 10:12:35 CET 2017 - lbeltrame@kde.org + +- Update to 17.11.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-rc.php +- Changes since 17.11.80: + * None + +------------------------------------------------------------------- +Mon Nov 20 06:58:55 CET 2017 - lbeltrame@kde.org + +- Update to 17.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-beta.php +- Changes since 17.08.3: + * Too many changes to list here +- Dropped patches, now upstream: + * Add-forceCheck-for-ManualCheckSystem.patch + * Fix-creating-DVD-video-image.patch + * Add-readCheckSystemConfig.patch + ------------------------------------------------------------------- Thu Nov 09 23:10:53 CET 2017 - lbeltrame@kde.org diff --git a/k3b.spec b/k3b.spec index 3db798a..291b07e 100644 --- a/k3b.spec +++ b/k3b.spec @@ -23,7 +23,7 @@ %bcond_without mad Name: k3b -Version: 17.08.3 +Version: 17.12.0 Release: 0 Summary: CD/DVD/Blu-ray Burning Application for KDE License: GPL-2.0+ @@ -32,12 +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 -Patch3: Add-readCheckSystemConfig.patch -# PATCH-FIX-UPSTREAM -Patch4: Add-forceCheck-for-ManualCheckSystem.patch -# PATCH-FIX-UPSTREAM -Patch5: Fix-creating-DVD-video-image.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -127,9 +121,6 @@ This package contain files needed for development with k3b. %prep %setup -q %patch1 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build CXXFLAGS="%{optflags} -fno-strict-aliasing"