pool/k3b
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 516268 from home:wolfi323:branches:KDE:Applications

Browse Source 
- Add Fix-creating-DVD-video-image.patch to fix creating Video DVDs (boo#1051338, kde#383011)

OBS-URL: https://build.opensuse.org/request/show/516268
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=40
This commit is contained in:
Christophe Giboudeaux 2017-08-12 11:31:11 +00:00 committed by Git OBS Bridge
parent 0ce0852bfc
commit fb6cb1f345
3 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Fix-creating-DVD-video-image.patch Normal file
View File

@ -0,0 +1,77 @@
From d2679715487c2254ed5a55b20aa21ea0b36421f0 Mon Sep 17 00:00:00 2001
From: Leslie Zhai <lesliezhai@llvm.org.cn>
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(-)
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
@@ -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 <filename>%1</filename>.",
+ 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 <filename>%1</filename>.",
+ 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 <filename>%1</filename>.",
+ 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 <filename>%1</filename>.",
+ d->tempDir->path()), MessageError);
return -1;
}
}
--
cgit v0.11.2

6
k3b.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Aug 12 08:00:25 UTC 2017 - wbauer@tmo.at
- Add Fix-creating-DVD-video-image.patch to fix creating Video DVDs
(boo#1051338, kde#383011)
-------------------------------------------------------------------
Fri Aug 11 22:45:00 UTC 2017 - christophe@krop.fr

3
k3b.spec
View File

@ -36,6 +36,8 @@ Patch1: Don-t-suggest-to-install-libburn.patch
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,6 +129,7 @@ This package contain files needed for development with k3b.
%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
CXXFLAGS="%{optflags} -fno-strict-aliasing"