diff --git a/Add-forceCheck-for-ManualCheckSystem.patch b/Add-forceCheck-for-ManualCheckSystem.patch index 771da3d..e9d928b 100644 --- a/Add-forceCheck-for-ManualCheckSystem.patch +++ b/Add-forceCheck-for-ManualCheckSystem.patch @@ -10,10 +10,10 @@ CCBUG: 381368 src/k3bsystemproblemdialog.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/src/k3b.cpp b/src/k3b.cpp -index c3c21d4..96d3501 100644 ---- a/src/k3b.cpp -+++ b/src/k3b.cpp +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() @@ -23,11 +23,11 @@ index c3c21d4..96d3501 100644 } -diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp -index 0d0f363..34cf710 100644 ---- a/src/k3bsystemproblemdialog.cpp -+++ b/src/k3bsystemproblemdialog.cpp -@@ -169,13 +169,13 @@ void K3b::SystemProblemDialog::done(int r) +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 } @@ -43,10 +43,10 @@ index 0d0f363..34cf710 100644 return; if( k3bcore->deviceManager()->allDevices().isEmpty() ) { -diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h -index b406b25..573b557 100644 ---- a/src/k3bsystemproblemdialog.h -+++ b/src/k3bsystemproblemdialog.h +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. */ @@ -56,6 +56,3 @@ index b406b25..573b557 100644 protected: void done(int) Q_DECL_OVERRIDE; --- -cgit v0.11.2 - diff --git a/Add-readCheckSystemConfig.patch b/Add-readCheckSystemConfig.patch index bbd9969..f215f6d 100644 --- a/Add-readCheckSystemConfig.patch +++ b/Add-readCheckSystemConfig.patch @@ -11,11 +11,11 @@ BUG: 381368 src/k3bsystemproblemdialog.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp -index 9897903..bbe40bd 100644 ---- a/src/k3bsystemproblemdialog.cpp -+++ b/src/k3bsystemproblemdialog.cpp -@@ -175,6 +175,9 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l +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; @@ -25,7 +25,7 @@ index 9897903..bbe40bd 100644 if( k3bcore->deviceManager()->allDevices().isEmpty() ) { problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL, i18n("No optical drive found."), -@@ -705,13 +708,13 @@ QList K3b::SystemProblemDialog::checkForAutomounting() +@@ -705,13 +708,13 @@ QList K3b::SystemP bool K3b::SystemProblemDialog::readCheckSystemConfig() { diff --git a/Don-t-suggest-to-install-libburn.patch b/Don-t-suggest-to-install-libburn.patch index 423b9a0..0770343 100644 --- a/Don-t-suggest-to-install-libburn.patch +++ b/Don-t-suggest-to-install-libburn.patch @@ -13,11 +13,11 @@ People who want to use cdrskin instead can still install it. src/k3bsystemproblemdialog.cpp | 6 ------ 1 file changed, 6 deletions(-) -diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp -index 126ad3120..9897903e0 100644 ---- a/src/k3bsystemproblemdialog.cpp -+++ b/src/k3bsystemproblemdialog.cpp -@@ -288,12 +288,6 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l +Index: k3b-17.08.2/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 #endif } @@ -30,6 +30,3 @@ index 126ad3120..9897903e0 100644 } --- -2.13.1 - diff --git a/Fix-creating-DVD-video-image.patch b/Fix-creating-DVD-video-image.patch index d148c11..558dfd6 100644 --- a/Fix-creating-DVD-video-image.patch +++ b/Fix-creating-DVD-video-image.patch @@ -16,10 +16,10 @@ Differential Revision: https://phabricator.kde.org/D7063 libk3b/projects/videodvd/k3bvideodvdimager.cpp | 35 +++++++++++++++----------- 1 file changed, 21 insertions(+), 14 deletions(-) -diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp -index a8ae69a..1863e8b 100644 ---- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp -+++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp +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 @@ -72,6 +72,3 @@ index a8ae69a..1863e8b 100644 return -1; } } --- -cgit v0.11.2 - diff --git a/k3b-17.08.1.tar.xz b/k3b-17.08.1.tar.xz deleted file mode 100644 index ca25206..0000000 --- a/k3b-17.08.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41ba0753b295e22bffade095e9fe665a2018d295fffa763cbbee644cd57568df -size 10565672 diff --git a/k3b-17.08.2.tar.xz b/k3b-17.08.2.tar.xz new file mode 100644 index 0000000..558fbbb --- /dev/null +++ b/k3b-17.08.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9db7522562322babe264c12b8421277d550a26aa4010b57b5f85490d3fe1eed8 +size 10565520 diff --git a/k3b.changes b/k3b.changes index 4cbba55..01b7dd6 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Oct 17 08:40:07 UTC 2017 - wbauer@tmo.at + +- Enable MP3 support in general by default, libmad and lame + have been released as update for Leap 42.2 and 42.3 too + +------------------------------------------------------------------- +Tue Oct 17 00:31:20 CEST 2017 - lbeltrame@kde.org + +- Update to 17.08.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.08.2.php +- Changes since 17.08.1: + * None + ------------------------------------------------------------------- Mon Sep 11 17:45:43 UTC 2017 - jengelh@inai.de diff --git a/k3b.spec b/k3b.spec index 399eb0c..b70b999 100644 --- a/k3b.spec +++ b/k3b.spec @@ -19,17 +19,11 @@ %bcond_without lang %bcond_without ffmpeg -%if 0%{?suse_version} >= 1330 -# libmad and lame are in Factory now so use them %bcond_without lame %bcond_without mad -%else -%bcond_with lame -%bcond_with mad -%endif Name: k3b -Version: 17.08.1 +Version: 17.08.2 Release: 0 Summary: CD/DVD/Blu-ray Burning Application for KDE License: GPL-2.0+