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

Accepting request 516522 from KDE:Applications

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/516522
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2017-08-24 15:51:10 +00:00 committed by Git OBS Bridge
commit e9936b8086
8 changed files with 134 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Add-readCheckSystemConfig.patch
View File

@ -12,7 +12,7 @@ BUG: 381368
1 file changed, 8 insertions(+), 5 deletions(-) 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index d04a0bd..0d0f363 100644 index 9897903..bbe40bd 100644
--- a/src/k3bsystemproblemdialog.cpp --- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp
@@ -175,6 +175,9 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l @@ -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() ) { if( k3bcore->deviceManager()->allDevices().isEmpty() ) {
problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL, problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL,
i18n("No optical drive found."), 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() bool K3b::SystemProblemDialog::readCheckSystemConfig()
{ {
@ -44,6 +44,3 @@ index d04a0bd..0d0f363 100644
} }
--
cgit v0.11.2

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

53
Fix-do-not-show-again.patch
View File

@ -1,53 +0,0 @@
From c1fae2adc90fac9a2af11ec9ef95ecc12033fa41 Mon Sep 17 00:00:00 2001
From: Leslie Zhai <lesliezhai@llvm.org.cn>
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<K3b::SystemProblem>&
}
-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

41
Re-enable-transcode-support.patch
View File

@ -1,41 +0,0 @@
From 78fac1e46a2dd1b2a97f614b8c641a845c7c0c47 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
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

3
k3b-17.04.3.tar.xz
View File

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

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

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

24
k3b.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
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
- 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
- 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)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 2 07:13:07 UTC 2017 - wbauer@tmo.at Wed Aug 2 07:13:07 UTC 2017 - wbauer@tmo.at

57
k3b.spec
View File

@ -23,23 +23,21 @@
%bcond_with mad %bcond_with mad
Name: k3b Name: k3b
Version: 17.04.3 Version: 17.08.0
Release: 0 Release: 0
Summary: CD/DVD/Blu-ray Burning Application for KDE Summary: CD/DVD/Blu-ray Burning Application for KDE
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Multimedia/CD/Record Group: Productivity/Multimedia/CD/Record
Url: http://www.kde.org Url: http://www.kde.org
Source: %{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch: Re-enable-transcode-support.patch
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch1: Don-t-suggest-to-install-libburn.patch Patch1: Don-t-suggest-to-install-libburn.patch
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch2: Fix-do-not-show-again.patch
# PATCH-FIX-UPSTREAM
Patch3: Add-readCheckSystemConfig.patch Patch3: Add-readCheckSystemConfig.patch
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch4: Add-forceCheck-for-ManualCheckSystem.patch Patch4: Add-forceCheck-for-ManualCheckSystem.patch
# PATCH-FIX-UPSTREAM
Patch5: Fix-creating-DVD-video-image.patch
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: fdupes BuildRequires: fdupes
@ -101,7 +99,9 @@ Recommends: vcdimager
Provides: kde4-k3b = 4.2.2.svn951754 Provides: kde4-k3b = 4.2.2.svn951754
Obsoletes: k3b-codecs Obsoletes: k3b-codecs
Obsoletes: kde4-k3b < 4.2.2.svn951754 Obsoletes: kde4-k3b < 4.2.2.svn951754
%if %{with lang}
Recommends: %{name}-lang Recommends: %{name}-lang
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -126,11 +126,10 @@ This package contain files needed for development with k3b.
%prep %prep
%setup -q %setup -q
%patch -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
CXXFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
@ -176,42 +175,42 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing"
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING* ChangeLog FAQ.txt PERMISSIONS.txt README.txt %doc COPYING* ChangeLog FAQ.txt PERMISSIONS.txt README.txt
%{_kf5_bindir}/k3b
%config %{_kf5_configdir}/k3btheme.knsrc %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}/k3b*.so
%{_kf5_plugindir}/kcm_k3b*.so %{_kf5_plugindir}/kcm_k3b*.so
%{_kf5_plugindir}/kio_videodvd.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}/ServiceMenus/k3b_*.desktop
%{_kf5_servicesdir}/k3b*.desktop %{_kf5_servicesdir}/k3b*.desktop
%{_kf5_servicesdir}/kcm_k3b*.desktop %{_kf5_servicesdir}/kcm_k3b*.desktop
%{_kf5_servicesdir}/videodvd.protocol %{_kf5_servicesdir}/videodvd.protocol
%{_kf5_servicetypesdir}/k3bplugin.desktop %{_kf5_servicetypesdir}/k3bplugin.desktop
%{_kf5_notifydir}/k3b.notifyrc %{_kf5_sharedir}/k3b
%{_kf5_kxmlguidir}/k3b %{_kf5_sharedir}/konqsidebartng/virtual_folders/services/videodvd.desktop
%{_datadir}/mime/packages/x-k3b.xml %{_kf5_sharedir}/mime/packages/x-k3b.xml
%{_kf5_sharedir}/solid/actions/k3b_*.desktop
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING* %doc COPYING*
%{_includedir}/k3b*.h %{_includedir}/k3b*.h
%{_libdir}/libk3bdevice.so %{_kf5_libdir}/libk3bdevice.so
%{_libdir}/libk3blib.so %{_kf5_libdir}/libk3blib.so
%if %{with lang} %if %{with lang}
%files lang -f %{name}.lang %files lang -f %{name}.lang