[arch-commits] Commit in k3b/trunk (PKGBUILD k3b-gcc6.patch)

[Antonio Rojas]

    Date: Friday, November 11, 2016 @ 13:37:45
  Author: arojas
Revision: 280532

kdemultimedia libs rename

Added:
  k3b/trunk/k3b-gcc6.patch
Modified:
  k3b/trunk/PKGBUILD

----------------+
 PKGBUILD       |   11 +++++---
 k3b-gcc6.patch |   73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-11 10:48:52 UTC (rev 280531)
+++ PKGBUILD	2016-11-11 13:37:45 UTC (rev 280532)
@@ -3,13 +3,13 @@
 
 pkgname=k3b
 pkgver=2.0.3a
-pkgrel=6
+pkgrel=7
 epoch=1
 pkgdesc="Feature-rich and easy to handle CD burning application"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/k3b/"
 license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'libsamplerate' 'libmad'
+depends=('kdebase-runtime' 'libkcddb4' 'libsamplerate' 'libmad'
          'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft')
 makedepends=('cmake' 'automoc4' 'docbook-xml')
 optdepends=('dvd+rw-tools: for dvd burning support'
@@ -18,9 +18,10 @@
             'emovix: for bootable multimedia cd/dvd support'
             'cdrdao: for disk-at-once (DAO) mode support'
             'cdparanoia: for cd ripping support')
-source=(http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.xz k3b-ffmpeg3.patch)
+source=(http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.xz k3b-ffmpeg3.patch k3b-gcc6.patch)
 sha1sums=('f1001db3b5b32ef6bdb827742f1ca357c82b216f'
-          '8ee47b04e92499d484c49e33dd33dabdf53025c9')
+          '8ee47b04e92499d484c49e33dd33dabdf53025c9'
+          '83693cc2a3ef7b67e4254c151dfb4bef421b8761')
 
 prepare() {
   cd $pkgname-2.0.3
@@ -28,6 +29,8 @@
   sed -e "s|^cmake_minimum_required|#cmake_minimum_required|" -i CMakeLists.txt
 # Fix build with ffmpeg 3.0 (Gentoo)
   patch -p1 -i ../k3b-ffmpeg3.patch
+# Fix build with GCC6 (rpmfusion)
+  patch -p1 -i ../k3b-gcc6.patch
 }
 
 build() {

Added: k3b-gcc6.patch
===================================================================
--- k3b-gcc6.patch	                        (rev 0)
+++ k3b-gcc6.patch	2016-11-11 13:37:45 UTC (rev 280532)
@@ -0,0 +1,73 @@
+--- k3b-2.0.3/libk3b/tools/k3bwavefilewriter.cpp.old	2016-05-14 12:33:15.000000000 -0400
++++ k3b-2.0.3/libk3b/tools/k3bwavefilewriter.cpp	2016-05-14 12:34:35.218389226 -0400
+@@ -111,17 +111,17 @@
+ {
+     static const char riffHeader[] =
+         {
+-            0x52, 0x49, 0x46, 0x46, // 0  "RIFF"
+-            0x00, 0x00, 0x00, 0x00, // 4  wavSize
+-            0x57, 0x41, 0x56, 0x45, // 8  "WAVE"
+-            0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
+-            0x10, 0x00, 0x00, 0x00, // 16
+-            0x01, 0x00, 0x02, 0x00, // 20
+-            0x44, 0xac, 0x00, 0x00, // 24
+-            0x10, 0xb1, 0x02, 0x00, // 28
+-            0x04, 0x00, 0x10, 0x00, // 32
+-            0x64, 0x61, 0x74, 0x61, // 36 "data"
+-            0x00, 0x00, 0x00, 0x00  // 40 byteCount
++            (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0  "RIFF"
++            (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4  wavSize
++            (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8  "WAVE"
++            (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
++            (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
++            (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
++            (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
++            (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
++            (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
++            (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
++            (char)0x00, (char)0x00, (char)0x00, (char)0x00  // 40 byteCount
+         };
+ 
+     m_outputStream.writeRawData( riffHeader, 44 );
+--- k3b-2.0.3/libk3b/projects/k3bcdrdaowriter.cpp.old	2014-11-04 13:37:31.000000000 -0500
++++ k3b-2.0.3/libk3b/projects/k3bcdrdaowriter.cpp	2016-05-14 12:41:13.769135417 -0400
+@@ -908,7 +908,7 @@
+ 
+ void K3b::CdrdaoWriter::parseCdrdaoMessage()
+ {
+-    static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 };
++    static const char msgSync[] = { (char)0xff, (char)0x00, (char)0xff, (char)0x00 };
+     unsigned int avail = m_comSock->bytesAvailable();
+     unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize );
+     unsigned int count = 0;
+--- k3b-2.0.3/plugins/encoder/external/k3bexternalencoder.cpp.old	2014-11-04 13:37:31.000000000 -0500
++++ k3b-2.0.3/plugins/encoder/external/k3bexternalencoder.cpp	2016-05-14 12:45:57.967902413 -0400
+@@ -39,17 +39,17 @@
+ 
+ static const char s_riffHeader[] =
+ {
+-    0x52, 0x49, 0x46, 0x46, // 0  "RIFF"
+-    0x00, 0x00, 0x00, 0x00, // 4  wavSize
+-    0x57, 0x41, 0x56, 0x45, // 8  "WAVE"
+-    0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
+-    0x10, 0x00, 0x00, 0x00, // 16
+-    0x01, 0x00, 0x02, 0x00, // 20
+-    0x44, 0xac, 0x00, 0x00, // 24
+-    0x10, 0xb1, 0x02, 0x00, // 28
+-    0x04, 0x00, 0x10, 0x00, // 32
+-    0x64, 0x61, 0x74, 0x61, // 36 "data"
+-    0x00, 0x00, 0x00, 0x00  // 40 byteCount
++    (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0  "RIFF"
++    (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4  wavSize
++    (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8  "WAVE"
++    (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
++    (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
++    (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
++    (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
++    (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
++    (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
++    (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
++    (char)0x00, (char)0x00, (char)0x00, (char)0x00  // 40 byteCount
+ };
+ 
+