[packages/k3b] - rel 6; fix build

[arekm]

commit d6b36624faadc18b38353ad89619de17217f3c78
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Apr 30 20:03:56 2018 +0200

    - rel 6; fix build

 k3b-build.patch | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 k3b.spec        |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)
---
diff --git a/k3b.spec b/k3b.spec
index 9ad022a..2c3e05d 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -16,7 +16,7 @@ Summary(hu.UTF-8):	CD Kreator
 Summary(pl.UTF-8):	Kreator CD
 Name:		k3b
 Version:	2.0.3
-Release:	5
+Release:	6
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Libraries
diff --git a/k3b-build.patch b/k3b-build.patch
index 38f23f6..97dd9bf 100644
--- a/k3b-build.patch
+++ b/k3b-build.patch
@@ -95,3 +95,65 @@ index 388d181..d365905 100644
 -- 
 cgit v0.11.2
 
+From 88b3596675e06c04573b4c0a296d4eabcc94680f Mon Sep 17 00:00:00 2001
+From: Leslie Zhai <xiangzhai83 at gmail.com>
+Date: Mon, 28 Nov 2016 12:28:15 +0800
+Subject: Export K3b::BootItem compiled for clang++
+
+---
+ CMakeLists.txt                              | 1 +
+ INSTALL.txt                                 | 2 ++
+ libk3b/projects/datacd/k3bbootitem.h        | 3 ++-
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 6 +++---
+ 4 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/libk3b/projects/datacd/k3bbootitem.h b/libk3b/projects/datacd/k3bbootitem.h
+index 305c8dd..7b9a7ed 100644
+--- a/libk3b/projects/datacd/k3bbootitem.h
++++ b/libk3b/projects/datacd/k3bbootitem.h
+@@ -16,9 +16,10 @@
+ #define _K3B_BOOT_ITEM_H_
+ 
+ #include "k3bfileitem.h"
++#include "k3b_export.h"
+ 
+ namespace K3b {
+-    class BootItem : public FileItem
++    class LIBK3B_EXPORT BootItem : public FileItem
+     {
+     public:
+         BootItem( const QString& fileName, DataDoc& doc, const QString& k3bName = 0 );
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index 25b2208..f1dfbf7 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -260,7 +260,7 @@ QString K3bFFMpegFile::title() const
+     AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
+     if( ade == NULL )
+         return QString();
+-    if( ade->value != '\0' )
++    if (strlen(ade->value))
+         return QString::fromLocal8Bit( ade->value );
+     else
+         return QString();
+@@ -273,7 +273,7 @@ QString K3bFFMpegFile::author() const
+     AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
+     if( ade == NULL )
+         return QString();
+-    if( ade->value != '\0' )
++    if (strlen(ade->value))
+         return QString::fromLocal8Bit( ade->value );
+     else
+         return QString();
+@@ -286,7 +286,7 @@ QString K3bFFMpegFile::comment() const
+     AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
+     if( ade == NULL )
+         return QString();
+-    if( ade->value != '\0' )
++    if (strlen(ade->value))
+         return QString::fromLocal8Bit( ade->value );
+     else
+         return QString();
+-- 
+cgit v0.11.2
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/k3b.git/commitdiff/d6b36624faadc18b38353ad89619de17217f3c78