OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=34

Re-enable-transcode-support.patch

@@ -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
-

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

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