From b8b1546b31d46091f8a208c0686fed2851ccfef999b4f3831357d6da4551dbd3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:23:07 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=32 --- k3b-17.04.3.tar.xz | 3 --- k3b-17.07.90.tar.xz | 3 +++ k3b.changes | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 k3b-17.04.3.tar.xz create mode 100644 k3b-17.07.90.tar.xz diff --git a/k3b-17.04.3.tar.xz b/k3b-17.04.3.tar.xz deleted file mode 100644 index 9adb5c7..0000000 --- a/k3b-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3d5ef74df0f6a15e4d0238d502d49af09909f4392fe80f35e5cc7a223983028 -size 10568048 diff --git a/k3b-17.07.90.tar.xz b/k3b-17.07.90.tar.xz new file mode 100644 index 0000000..aed35db --- /dev/null +++ b/k3b-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92ba8e554990d741725077f95be84ba3491a6e87c6931b178d3bd067ba28c274 +size 10559728 diff --git a/k3b.changes b/k3b.changes index fc21b9a..bf0176d 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 5 18:16:53 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + ------------------------------------------------------------------- Wed Aug 2 07:13:07 UTC 2017 - wbauer@tmo.at From d4830d05e8174b3e05c5a9d832a5ecc9a564edd9fb09649ee5815bf0fc3ae4fc Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:49:10 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=33 --- k3b.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k3b.spec b/k3b.spec index f6e3556..f61f644 100644 --- a/k3b.spec +++ b/k3b.spec @@ -23,7 +23,7 @@ %bcond_with mad Name: k3b -Version: 17.04.3 +Version: 17.07.90 Release: 0 Summary: CD/DVD/Blu-ray Burning Application for KDE License: GPL-2.0+ From 169b07400a768a86bf95a4e93f6ddb9e8810b0ea6fa0dcfcdbd1b1627255d5f7 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 6 Aug 2017 06:35:15 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=34 --- Re-enable-transcode-support.patch | 41 ------------------------------- k3b.changes | 2 +- k3b.spec | 3 --- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Re-enable-transcode-support.patch diff --git a/Re-enable-transcode-support.patch b/Re-enable-transcode-support.patch deleted file mode 100644 index 7eaa1de..0000000 --- a/Re-enable-transcode-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 78fac1e46a2dd1b2a97f614b8c641a845c7c0c47 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Mon, 12 Jun 2017 15:28:11 +0200 -Subject: [PATCH] Re-enable transcode support - -Transcode support has been disabled upstream because of bug reports -(kde#360170) and the fact that transcode is basically unmaintained. - -So it's currently not possible to rip DVDs at all, and even worse, k3b -shows an error dialog that you should install transcode even if it is -installed. - -Ripping DVDs with Packman's transcode seems to work fine though, so -let's re-enable it. ---- - libk3b/core/k3bdefaultexternalprograms.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp -index a8f4c06da..a5c82ae48 100644 ---- a/libk3b/core/k3bdefaultexternalprograms.cpp -+++ b/libk3b/core/k3bdefaultexternalprograms.cpp -@@ -45,7 +45,6 @@ void K3b::addDefaultPrograms( K3b::ExternalBinManager* m ) - void K3b::addTranscodePrograms( K3b::ExternalBinManager* m ) - { - Q_UNUSED(m); -- /* Deprecated transcode - static const char* const transcodeTools[] = { "transcode", - 0, // K3b 1.0 only uses the transcode binary - "tcprobe", -@@ -57,7 +56,6 @@ void K3b::addTranscodePrograms( K3b::ExternalBinManager* m ) - - for( int i = 0; transcodeTools[i]; ++i ) - m->addProgram( new K3b::TranscodeProgram( transcodeTools[i] ) ); -- */ - } - - --- -2.12.3 - diff --git a/k3b.changes b/k3b.changes index bf0176d..760d40b 100644 --- a/k3b.changes +++ b/k3b.changes @@ -4,7 +4,7 @@ Sat Aug 5 18:16:53 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 * https://www.kde.org/announcements/announce-applications-17.07.90.php - +- Drop Re-enable-transcode-support.patch (merged upstream) ------------------------------------------------------------------- Wed Aug 2 07:13:07 UTC 2017 - wbauer@tmo.at diff --git a/k3b.spec b/k3b.spec index f61f644..fffec90 100644 --- a/k3b.spec +++ b/k3b.spec @@ -30,8 +30,6 @@ License: GPL-2.0+ Group: Productivity/Multimedia/CD/Record Url: http://www.kde.org Source: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch: Re-enable-transcode-support.patch # PATCH-FIX-OPENSUSE Patch1: Don-t-suggest-to-install-libburn.patch # PATCH-FIX-UPSTREAM @@ -126,7 +124,6 @@ This package contain files needed for development with k3b. %prep %setup -q -%patch -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 From b86035033099455af60771681684bbc354a84a03b7762ea5ad4d0de58fca2ae8 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 6 Aug 2017 07:52:51 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=35 --- Add-readCheckSystemConfig.patch | 7 ++--- Fix-do-not-show-again.patch | 53 --------------------------------- k3b.changes | 1 + k3b.spec | 3 -- 4 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 Fix-do-not-show-again.patch diff --git a/Add-readCheckSystemConfig.patch b/Add-readCheckSystemConfig.patch index 0805e81..bbd9969 100644 --- a/Add-readCheckSystemConfig.patch +++ b/Add-readCheckSystemConfig.patch @@ -12,7 +12,7 @@ BUG: 381368 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp -index d04a0bd..0d0f363 100644 +index 9897903..bbe40bd 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -175,6 +175,9 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l @@ -25,7 +25,7 @@ index d04a0bd..0d0f363 100644 if( k3bcore->deviceManager()->allDevices().isEmpty() ) { problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL, i18n("No optical drive found."), -@@ -711,13 +714,13 @@ QList K3b::SystemProblemDialog::checkForAutomounting() +@@ -705,13 +708,13 @@ QList K3b::SystemProblemDialog::checkForAutomounting() bool K3b::SystemProblemDialog::readCheckSystemConfig() { @@ -44,6 +44,3 @@ index d04a0bd..0d0f363 100644 } --- -cgit v0.11.2 - diff --git a/Fix-do-not-show-again.patch b/Fix-do-not-show-again.patch deleted file mode 100644 index 03faee2..0000000 --- a/Fix-do-not-show-again.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c1fae2adc90fac9a2af11ec9ef95ecc12033fa41 Mon Sep 17 00:00:00 2001 -From: Leslie Zhai -Date: Mon, 19 Jun 2017 16:42:41 +0800 -Subject: Fix "do not show again" from system configuration problems dialog is - not remembered - -BUG: 381368 -REVIEW: 130162 ---- - src/k3bsystemproblemdialog.cpp | 11 +++++------ - src/k3bsystemproblemdialog.h | 2 +- - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp -index 9dfc50c..126ad31 100644 ---- a/src/k3bsystemproblemdialog.cpp -+++ b/src/k3bsystemproblemdialog.cpp -@@ -159,14 +159,13 @@ K3b::SystemProblemDialog::SystemProblemDialog( const QList& - } - - --void K3b::SystemProblemDialog::closeEvent( QCloseEvent* e ) -+void K3b::SystemProblemDialog::done(int r) - { -- if( m_checkDontShowAgain->isChecked() ) { -- KConfigGroup grp( KSharedConfig::openConfig(), "General Options" ); -- grp.writeEntry( "check system config", false ); -+ if (m_checkDontShowAgain->isChecked()) { -+ KConfigGroup grp(KSharedConfig::openConfig(), "General Options"); -+ grp.writeEntry("check system config", false); - } -- -- e->accept(); -+ QDialog::done(r); - } - - -diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h -index b45f2f8..b406b25 100644 ---- a/src/k3bsystemproblemdialog.h -+++ b/src/k3bsystemproblemdialog.h -@@ -81,7 +81,7 @@ namespace K3b { - static void checkSystem( QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors ); - - protected: -- void closeEvent( QCloseEvent* ); -+ void done(int) Q_DECL_OVERRIDE; - - private Q_SLOTS: - void slotShowDeviceSettings(); --- -cgit v0.11.2 - diff --git a/k3b.changes b/k3b.changes index 760d40b..f1734cc 100644 --- a/k3b.changes +++ b/k3b.changes @@ -5,6 +5,7 @@ Sat Aug 5 18:16:53 UTC 2017 - christophe@krop.fr * KDE Applications 17.07.90 * https://www.kde.org/announcements/announce-applications-17.07.90.php - Drop Re-enable-transcode-support.patch (merged upstream) +- Drop Fix-do-not-show-again.patch (merged upstream) ------------------------------------------------------------------- Wed Aug 2 07:13:07 UTC 2017 - wbauer@tmo.at diff --git a/k3b.spec b/k3b.spec index fffec90..9976a02 100644 --- a/k3b.spec +++ b/k3b.spec @@ -33,8 +33,6 @@ Source: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch1: Don-t-suggest-to-install-libburn.patch # PATCH-FIX-UPSTREAM -Patch2: Fix-do-not-show-again.patch -# PATCH-FIX-UPSTREAM Patch3: Add-readCheckSystemConfig.patch # PATCH-FIX-UPSTREAM Patch4: Add-forceCheck-for-ManualCheckSystem.patch @@ -125,7 +123,6 @@ This package contain files needed for development with k3b. %prep %setup -q %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 From 7bd150343996a20e1c666b21cbd5bfa9bce7f951e035180933e5621cf9969941 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 22:53:29 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=37 --- k3b.changes | 9 ++++++++ k3b.spec | 61 +++++++++++++++++++++-------------------------------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/k3b.changes b/k3b.changes index f1734cc..3d0a168 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 11 22:45:00 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : +- Too many changes to list here + ------------------------------------------------------------------- Sat Aug 5 18:16:53 UTC 2017 - christophe@krop.fr diff --git a/k3b.spec b/k3b.spec index 9976a02..2220230 100644 --- a/k3b.spec +++ b/k3b.spec @@ -97,7 +97,9 @@ Recommends: vcdimager Provides: kde4-k3b = 4.2.2.svn951754 Obsoletes: k3b-codecs Obsoletes: kde4-k3b < 4.2.2.svn951754 +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,22 +137,7 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 %kf5_find_htmldocs - %else - # %%kf5_find_htmldocs is only defined since Leap 42.3 - CURDIR=`pwd` - pushd %{buildroot}%{_kf5_htmldir} - for i in *; do - if ! [ -d "/usr/share/locale/${i}" ]; then - echo "Removing unsupported translation %{_kf5_htmldir}/${i}" - rm -rf "$i" - elif [ "$i" != "en" ]; then - echo "%doc %lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang - fi - done - popd - %endif %endif %suse_update_desktop_file -r org.kde.k3b Qt KDE AudioVideo DiscBurning @@ -170,42 +157,42 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %files %defattr(-,root,root,-) %doc COPYING* ChangeLog FAQ.txt PERMISSIONS.txt README.txt -%{_kf5_bindir}/k3b %config %{_kf5_configdir}/k3btheme.knsrc +%dir %{_kf5_servicesdir}/ServiceMenus +%dir %{_kf5_sharedir}/konqsidebartng +%dir %{_kf5_sharedir}/konqsidebartng/virtual_folders +%dir %{_kf5_sharedir}/konqsidebartng/virtual_folders/services +%dir %{_kf5_sharedir}/solid +%dir %{_kf5_sharedir}/solid/actions +%doc %lang(en) %{_kf5_htmldir}/en/k3b/ +%{_kf5_applicationsdir}/org.kde.k3b.desktop +%{_kf5_appstreamdir}/org.kde.k3b.appdata.xml +%{_kf5_bindir}/k3b +%{_kf5_iconsdir}/hicolor/*/apps/k3b.* +%{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-k3b.* +%{_kf5_kxmlguidir}/k3b +%{_kf5_libdir}/libk3bdevice.so.* +%{_kf5_libdir}/libk3blib.so.* +%{_kf5_notifydir}/k3b.notifyrc %{_kf5_plugindir}/k3b*.so %{_kf5_plugindir}/kcm_k3b*.so %{_kf5_plugindir}/kio_videodvd.so -%{_kf5_libdir}/libk3bdevice.so.* -%{_kf5_libdir}/libk3blib.so.* -%{_kf5_applicationsdir}/org.kde.k3b.desktop -%{_kf5_appstreamdir}/org.kde.k3b.appdata.xml -%doc %{_kf5_htmldir}/en/k3b/ -%{_kf5_iconsdir}/hicolor/*/apps/k3b.* -%{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-k3b.* -%dir %{_datadir}/konqsidebartng -%dir %{_datadir}/konqsidebartng/virtual_folders -%dir %{_datadir}/konqsidebartng/virtual_folders/services -%{_datadir}/konqsidebartng/virtual_folders/services/videodvd.desktop -%dir %{_datadir}/solid -%dir %{_datadir}/solid/actions -%{_datadir}/solid/actions/k3b_*.desktop -%{_datadir}/k3b -%dir %{_kf5_servicesdir}/ServiceMenus %{_kf5_servicesdir}/ServiceMenus/k3b_*.desktop %{_kf5_servicesdir}/k3b*.desktop %{_kf5_servicesdir}/kcm_k3b*.desktop %{_kf5_servicesdir}/videodvd.protocol %{_kf5_servicetypesdir}/k3bplugin.desktop -%{_kf5_notifydir}/k3b.notifyrc -%{_kf5_kxmlguidir}/k3b -%{_datadir}/mime/packages/x-k3b.xml +%{_kf5_sharedir}/k3b +%{_kf5_sharedir}/konqsidebartng/virtual_folders/services/videodvd.desktop +%{_kf5_sharedir}/mime/packages/x-k3b.xml +%{_kf5_sharedir}/solid/actions/k3b_*.desktop %files devel %defattr(-,root,root,-) %doc COPYING* %{_includedir}/k3b*.h -%{_libdir}/libk3bdevice.so -%{_libdir}/libk3blib.so +%{_kf5_libdir}/libk3bdevice.so +%{_kf5_libdir}/libk3blib.so %if %{with lang} %files lang -f %{name}.lang From 699584c193e0c669e56e6d3b0bf5c75d149b3ce0a4ca54bbac59acd98cadd3bd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:08:48 +0000 Subject: [PATCH 6/8] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=38 --- k3b-17.07.90.tar.xz | 3 --- k3b-17.08.0.tar.xz | 3 +++ k3b.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 k3b-17.07.90.tar.xz create mode 100644 k3b-17.08.0.tar.xz diff --git a/k3b-17.07.90.tar.xz b/k3b-17.07.90.tar.xz deleted file mode 100644 index aed35db..0000000 --- a/k3b-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92ba8e554990d741725077f95be84ba3491a6e87c6931b178d3bd067ba28c274 -size 10559728 diff --git a/k3b-17.08.0.tar.xz b/k3b-17.08.0.tar.xz new file mode 100644 index 0000000..c37ce1f --- /dev/null +++ b/k3b-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adcdbc6297d1e01c0dd60cbe120d8cc3317866144a0629e975b59240dade12d8 +size 10560968 diff --git a/k3b.spec b/k3b.spec index 2220230..6895abf 100644 --- a/k3b.spec +++ b/k3b.spec @@ -23,7 +23,7 @@ %bcond_with mad Name: k3b -Version: 17.07.90 +Version: 17.08.0 Release: 0 Summary: CD/DVD/Blu-ray Burning Application for KDE License: GPL-2.0+ From 0ce0852bfcc6b0144747c7d31085bed0b50c16e45ad4d18279cfd70f25e20271 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 12 Aug 2017 08:11:09 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=39 --- k3b.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/k3b.spec b/k3b.spec index 6895abf..d067234 100644 --- a/k3b.spec +++ b/k3b.spec @@ -137,7 +137,22 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name + %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 %kf5_find_htmldocs + %else + # %%kf5_find_htmldocs is only defined since Leap 42.3 + CURDIR=`pwd` + pushd %{buildroot}%{_kf5_htmldir} + for i in *; do + if ! [ -d "/usr/share/locale/${i}" ]; then + echo "Removing unsupported translation %{_kf5_htmldir}/${i}" + rm -rf "$i" + elif [ "$i" != "en" ]; then + echo "%doc %lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang + fi + done + popd + %endif %endif %suse_update_desktop_file -r org.kde.k3b Qt KDE AudioVideo DiscBurning From fb6cb1f345a56f9cdc4e9d448064421dad23849ada50e6b996881f77100e8581 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 12 Aug 2017 11:31:11 +0000 Subject: [PATCH 8/8] Accepting request 516268 from home:wolfi323:branches:KDE:Applications - 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 --- Fix-creating-DVD-video-image.patch | 77 ++++++++++++++++++++++++++++++ k3b.changes | 6 +++ k3b.spec | 3 ++ 3 files changed, 86 insertions(+) create mode 100644 Fix-creating-DVD-video-image.patch diff --git a/Fix-creating-DVD-video-image.patch b/Fix-creating-DVD-video-image.patch new file mode 100644 index 0000000..d148c11 --- /dev/null +++ b/Fix-creating-DVD-video-image.patch @@ -0,0 +1,77 @@ +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(-) + +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 %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; + } + } +-- +cgit v0.11.2 + diff --git a/k3b.changes b/k3b.changes index 3d0a168..7a61e73 100644 --- a/k3b.changes +++ b/k3b.changes @@ -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 diff --git a/k3b.spec b/k3b.spec index d067234..79a1385 100644 --- a/k3b.spec +++ b/k3b.spec @@ -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"