Accepting request 512731 from KDE:Applications
1 OBS-URL: https://build.opensuse.org/request/show/512731 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=74
This commit is contained in:
commit
910503af22
35
Don-t-suggest-to-install-libburn.patch
Normal file
35
Don-t-suggest-to-install-libburn.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 8cf4e9d0da6fd3ad794928faad8619aa66c3ddd3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
Date: Wed, 26 Jul 2017 17:34:21 +0200
|
||||||
|
Subject: [PATCH] Don't suggest to install libburn
|
||||||
|
|
||||||
|
The message is actually misleading because k3b uses cdrskin which is
|
||||||
|
packaged separately to libburn in openSUSE.
|
||||||
|
|
||||||
|
Let's stick to prefer cdrecord for now.
|
||||||
|
People who want to use cdrskin instead can still install it.
|
||||||
|
(boo#1050715)
|
||||||
|
---
|
||||||
|
src/k3bsystemproblemdialog.cpp | 6 ------
|
||||||
|
1 file changed, 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
|
||||||
|
index 126ad3120..9897903e0 100644
|
||||||
|
--- a/src/k3bsystemproblemdialog.cpp
|
||||||
|
+++ b/src/k3bsystemproblemdialog.cpp
|
||||||
|
@@ -288,12 +288,6 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (!k3bcore->externalBinManager()->foundBin("cdrskin")) {
|
||||||
|
- problems.append(K3b::SystemProblem(K3b::SystemProblem::CRITICAL,
|
||||||
|
- i18n("Unable to find %1 executable", QString("cdrskin")),
|
||||||
|
- i18n("K3b uses cdrskin in place of cdrecord."),
|
||||||
|
- i18n("Install the libburn package which contains cdrskin")));
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
2.13.1
|
||||||
|
|
10
k3b.changes
10
k3b.changes
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 26 15:41:52 UTC 2017 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Add Don-t-suggest-to-install-libburn.patch to not suggest to the
|
||||||
|
user to install libburn on startup. The message is actually
|
||||||
|
misleading as k3b would actually use cdrskin which is packaged
|
||||||
|
separately in openSUSE. But let's stick to prefer the proven
|
||||||
|
cdrecord for now, people can still install cdrskin if they'd
|
||||||
|
prefer to use it. (boo#1050715)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Jul 15 22:59:06 CEST 2017 - lbeltrame@kde.org
|
Sat Jul 15 22:59:06 CEST 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
3
k3b.spec
3
k3b.spec
@ -32,6 +32,8 @@ Url: http://www.kde.org
|
|||||||
Source: %{name}-%{version}.tar.xz
|
Source: %{name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-OPENSUSE
|
# PATCH-FIX-OPENSUSE
|
||||||
Patch: Re-enable-transcode-support.patch
|
Patch: Re-enable-transcode-support.patch
|
||||||
|
# PATCH-FIX-OPENSUSE
|
||||||
|
Patch1: Don-t-suggest-to-install-libburn.patch
|
||||||
|
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -119,6 +121,7 @@ This package contain files needed for development with k3b.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -p1
|
%patch -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user