From f8a043598a7fee3537327201143dbac5300d20bb9427754a9a77d4cba9ad2d86 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Nov 2015 14:32:21 +0000 Subject: [PATCH] Accepting request 341825 from KDE:Extra 1 OBS-URL: https://build.opensuse.org/request/show/341825 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=61 --- fix-dvd-transcoding.patch | 30 ++++++++++++++++++++++++++++++ k3b.changes | 6 ++++++ k3b.spec | 3 +++ 3 files changed, 39 insertions(+) create mode 100644 fix-dvd-transcoding.patch diff --git a/fix-dvd-transcoding.patch b/fix-dvd-transcoding.patch new file mode 100644 index 0000000..8c0f078 --- /dev/null +++ b/fix-dvd-transcoding.patch @@ -0,0 +1,30 @@ +From: Martin Koller +Date: Mon, 26 Oct 2015 21:12:35 +0000 +Subject: revert "fix" which adds literal quote chars to the filename +X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=9f109bbc7fe718135da402535f6ca7ca5c105d4d +--- +revert "fix" which adds literal quote chars to the filename + +commit 2786d19f added explicit quote characters around the filename, +which is wrong since the filename is passed into a QStringList, +which passes all its separate arguments to the started process. +Adding quote chars would lead to the filename having the +quote chars as part of the filename. + +BUG: 350403 +REVIEW: 125804 +--- + + +--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp ++++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +@@ -303,7 +303,7 @@ + } + + // the output filename +- *d->process << "-o" << QString("\"%1\"").arg(m_filename); ++ *d->process << "-o" << m_filename; + } + else { + // gather information about the video stream, ignore audio + diff --git a/k3b.changes b/k3b.changes index 3ab20ef..f60b060 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 30 11:49:20 UTC 2015 - wbauer@tmo.at + +- Add fix-dvd-transcoding.patch: Fix transcoding of DVD titles + (kde#350403) + ------------------------------------------------------------------- Sun Oct 11 13:11:55 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/k3b.spec b/k3b.spec index 29963ca..cc3d991 100644 --- a/k3b.spec +++ b/k3b.spec @@ -33,6 +33,8 @@ Source: http://download.kde.org/stable/%{name}/%{name}-%{version}a.tar.x Patch0: initial-preference.diff # PATCH-FIX-OPENSUSE building-docs-once-is-enough.patch -- Fix build when CMP002 policy is set to NEW Patch1: building-docs-once-is-enough.patch +# PATCH-FIX-UPSTREAM fix-dvd-transcoding.patch kde#350403 -- Fix transcoding of DVD titles +Patch2: fix-dvd-transcoding.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,6 +103,7 @@ This package contain files needed for development with k3b. %setup -q -n %{name}-%{version} %patch0 %patch1 -p1 +%patch2 -p1 # patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" pushd src/icons/actions