[arch-commits] Commit in mythtv/trunk (PKGBUILD loggingserver.patch)

Ike Devolder idevolder at archlinux.org
Tue Feb 28 19:40:54 UTC 2017


    Date: Tuesday, February 28, 2017 @ 19:40:53
  Author: idevolder
Revision: 214252

upgpkg: mythtv 1:0.28.1-2

Added:
  mythtv/trunk/loggingserver.patch
Modified:
  mythtv/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   28 +++++++++-------------------
 loggingserver.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-28 19:21:27 UTC (rev 214251)
+++ PKGBUILD	2017-02-28 19:40:53 UTC (rev 214252)
@@ -6,8 +6,8 @@
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=mythtv
-pkgver=0.28
-pkgrel=9
+pkgver=0.28.1
+pkgrel=2
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@@ -27,29 +27,19 @@
 replaces=('myththemes' 'mythplugins-mythvideo')
 install='mythtv.install'
 source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz"
-        mythtv-fix-segfault.patch::"https://github.com/MythTV/mythtv/commit/c3a79298.patch"
-        mythtv-gcc6.patch::"https://github.com/MythTV/mythtv/commit/e4f6e011.patch"
-        'libcec4.patch'
-        'mythbackend.service' '99-mythbackend.rules')
-sha256sums=('7b3476c0ec0fc17d6b734f0440383815e81850a70b78c12ee40d61a408eba340'
-            '60696991fcaa24fb61392401bd27cfa35a15b54f4bcc01aee54dc84440c6df99'
-            'd35c4738f331ffff7d26d4cb98965689bdc72bd5b9776c1b31e5d97d06be724e'
-            'd54b455e3216f9975a648eb0692b4020a87e46441e9e0af6a082b5de93ec3cc1'
+        'mythbackend.service' '99-mythbackend.rules'
+        'loggingserver.patch')
+sha256sums=('598270a1cc89abd72ef4a86c1aa8cd6644ec189c87b7df0547a835f9d0020cac'
             'ed5ca54de26b7cd8a64e09626eed6e09f35d677daf88c530bb24cc4252bcce6d'
-            'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333')
+            'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333'
+            '3798c5d00c9dae19fa46b4d69f395df6461018c801dadf9b86f336b8c5ff39ec')
 
 prepare() {
   cd $pkgname-$pkgver/$pkgname
 
+  patch -p2 -i "$srcdir/loggingserver.patch"
+
   find 'bindings/python' 'contrib' 'programs/scripts' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-# Fix segfault with GCC 6 https://github.com/MythTV/mythtv/pull/122
-  cd ..
-  patch -p1 -i "$srcdir"/mythtv-fix-segfault.patch
-# Fix build with GCC 6
-  patch -p1 -i "$srcdir"/mythtv-gcc6.patch
-# fix to compile with libcec4
-  patch -p1 -i "$srcdir/libcec4.patch"
 }
 
 build() {

Added: loggingserver.patch
===================================================================
--- loggingserver.patch	                        (rev 0)
+++ loggingserver.patch	2017-02-28 19:40:53 UTC (rev 214252)
@@ -0,0 +1,11 @@
+--- a/mythtv/libs/libmythbase/loggingserver.cpp	2017-02-13 21:15:14.150339977 +0100
++++ b/mythtv/libs/libmythbase/loggingserver.cpp	2017-02-13 21:15:08.738490693 +0100
+@@ -722,7 +722,7 @@
+             if (!item)
+                 continue;
+ 
+-            if (item->message()[0] != '\0')
++            if (item->message()[0] != QChar('\0'))
+             {
+                 qLock.unlock();
+                 bool logged = m_logger->logqmsg(*query, item);



More information about the arch-commits mailing list