Applications 17.08.2 checkin

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=48
This commit is contained in:
Luca Beltrame 2017-10-17 05:05:00 +00:00 committed by Git OBS Bridge
parent ad52a5ae96
commit cdaeaf504a
8 changed files with 42 additions and 41 deletions

View File

@ -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

View File

@ -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::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting()
@@ -705,13 +708,13 @@ QList<K3b::Device::Device*> K3b::SystemP
bool K3b::SystemProblemDialog::readCheckSystemConfig()
{

View File

@ -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

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41ba0753b295e22bffade095e9fe665a2018d295fffa763cbbee644cd57568df
size 10565672

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9db7522562322babe264c12b8421277d550a26aa4010b57b5f85490d3fe1eed8
size 10565520

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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

View File

@ -29,7 +29,7 @@
%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+