Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at 2017-08-24 17:51:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k3b (Old) and /work/SRC/openSUSE:Factory/.k3b.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k3b" Thu Aug 24 17:51:10 2017 rev:76 rq:516522 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/k3b/k3b.changes 2017-08-06 11:24:39.973080138 +0200 +++ /work/SRC/openSUSE:Factory/.k3b.new/k3b.changes 2017-08-24 17:51:11.650606248 +0200 @@ -1,0 +2,24 @@ +Sat Aug 12 08:00:25 UTC 2017 - [email protected] + +- Add Fix-creating-DVD-video-image.patch to fix creating Video DVDs + (boo#1051338, kde#383011) + +------------------------------------------------------------------- +Fri Aug 11 22:45:00 UTC 2017 - [email protected] + +- 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 - [email protected] + +- 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) +- Drop Fix-do-not-show-again.patch (merged upstream) + +------------------------------------------------------------------- Old: ---- Fix-do-not-show-again.patch Re-enable-transcode-support.patch k3b-17.04.3.tar.xz New: ---- Fix-creating-DVD-video-image.patch k3b-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.bVMVhd/_old 2017-08-24 17:51:13.070406269 +0200 +++ /var/tmp/diff_new_pack.bVMVhd/_new 2017-08-24 17:51:13.078405142 +0200 @@ -23,23 +23,21 @@ %bcond_with mad Name: k3b -Version: 17.04.3 +Version: 17.08.0 Release: 0 Summary: CD/DVD/Blu-ray Burning Application for KDE 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 -Patch2: Fix-do-not-show-again.patch -# PATCH-FIX-UPSTREAM 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 @@ -101,7 +99,9 @@ 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 @@ -126,11 +126,10 @@ %prep %setup -q -%patch -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build CXXFLAGS="%{optflags} -fno-strict-aliasing" @@ -176,42 +175,42 @@ %files %defattr(-,root,root,-) %doc COPYING* ChangeLog FAQ.txt PERMISSIONS.txt README.txt -%{_kf5_bindir}/k3b %config %{_kf5_configdir}/k3btheme.knsrc -%{_kf5_plugindir}/k3b*.so -%{_kf5_plugindir}/kcm_k3b*.so -%{_kf5_plugindir}/kio_videodvd.so -%{_kf5_libdir}/libk3bdevice.so.* -%{_kf5_libdir}/libk3blib.so.* +%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 -%doc %{_kf5_htmldir}/en/k3b/ +%{_kf5_bindir}/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_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_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 ++++++ Add-readCheckSystemConfig.patch ++++++ --- /var/tmp/diff_new_pack.bVMVhd/_old 2017-08-24 17:51:13.150395002 +0200 +++ /var/tmp/diff_new_pack.bVMVhd/_new 2017-08-24 17:51:13.154394439 +0200 @@ -12,7 +12,7 @@ 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 @@ if( k3bcore->deviceManager()->allDevices().isEmpty() ) { problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL, i18n("No optical drive found."), -@@ -711,13 +714,13 @@ QList<K3b::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting() +@@ -705,13 +708,13 @@ QList<K3b::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting() bool K3b::SystemProblemDialog::readCheckSystemConfig() { @@ -44,6 +44,3 @@ } --- -cgit v0.11.2 - ++++++ Fix-creating-DVD-video-image.patch ++++++ >From d2679715487c2254ed5a55b20aa21ea0b36421f0 Mon Sep 17 00:00:00 2001 From: Leslie Zhai <[email protected]> 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 ++++++ k3b-17.04.3.tar.xz -> k3b-17.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/k3b/k3b-17.04.3.tar.xz /work/SRC/openSUSE:Factory/.k3b.new/k3b-17.08.0.tar.xz differ: char 26, line 1
