Ticket #42707: patch-mythtv-core.25_2014Mar03_01.diff

File patch-mythtv-core.25_2014Mar03_01.diff, 3.6 KB (added by ctreleaven (Craig Treleaven), 10 years ago)

Fixes build on Mavericks/XCode 5

  • Portfile

    diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/mythtv-core.25/Portfile ./Portfile
    old new  
    1313github.setup        MythTV mythtv ${shorthash}
    1414name                mythtv-core${majorversion}
    1515version             0${majorversion}${minorversion}-Fixes-20130811
    16 revision            2
     16revision            3
    1717categories          multimedia
    1818platforms           darwin
    1919license             GPL-2
     
    8686                    patch-protect-metadata-loads-from-multiple-threads.diff \
    8787                    patch-restore-fe-netcontrol-play-resume-functionality.diff
    8888
     89#    http://code.mythtv.org/trac/ticket/12020
     90patchfiles-append   patch-clang_compat.diff \
     91
    8992post-extract {
    9093    file mkdir ${worksrcpath}/macports
    9194    foreach {applescript} ${applescripts} {
     
    376379#
    377380############################################################################"
    378381
    379 livecheck.version       ${version}
    380 livecheck.regex         "tarball/v(0.25\[^\"\]+)"
     382livecheck.version       ${majorversion}${minorversion}
     383livecheck.regex         "archive/v(0.27\[\\.\\d\]?)${extract.suffix}"
  • files/patch-clang_compat.diff

    diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/mythtv-core.25/files/patch-clang_compat.diff ./files/patch-clang_compat.diff
    old new  
     1From bcd7344c533bd0b4cf0b2ecaf82b570202bebccc Mon Sep 17 00:00:00 2001
     2From: Amar Takhar <verm@darkbeer.org>
     3Date: Wed, 15 Jan 2014 21:44:48 +0000
     4Subject: [PATCH] Fixes for FreeBSD 10.0 + clang.
     5
     6---
     7 mythtv/libs/libmyth/remoteutil.h                 | 2 ++
     8 mythtv/libs/libmythbase/mythmiscutil.h           | 1 +
     9 mythtv/libs/libmythbase/mythsystemlegacy.h       | 1 +
     10 mythtv/libs/libmythbase/mythtimer.cpp            | 2 ++
     11 mythtv/libs/libmythbase/mythtimezone.cpp         | 1 +
     12 mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 +++++-
     13 mythtv/libs/libmythui/mythgesture.cpp            | 1 +
     14 mythtv/libs/libmythui/mythpainter.cpp            | 1 +
     15 mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 ++++
     16 9 files changed, 18 insertions(+), 1 deletion(-)
     17
     18see https://code.mythtv.org/trac/ticket/12020
     19
     20diff --git mythtv/libs/libmyth/remoteutil.h mythtv/libs/libmyth/remoteutil.h
     21index 7acff6a..4dc6a54 100644
     22--- mythtv/libs/libmyth/remoteutil.h
     23+++ mythtv/libs/libmyth/remoteutil.h
     24@@ -1,6 +1,8 @@
     25 #ifndef REMOTEUTIL_H_
     26 #define REMOTEUTIL_H_
     27 
     28+#include <time.h>
     29+
     30 #include <QStringList>
     31 #include <QDateTime>
     32 
     33diff --git mythtv/libs/libmythui/mythgesture.cpp mythtv/libs/libmythui/mythgesture.cpp
     34index 37846e4..f020f1a 100644
     35--- mythtv/libs/libmythui/mythgesture.cpp
     36+++ mythtv/libs/libmythui/mythgesture.cpp
     37@@ -30,6 +30,7 @@
     38 
     39 #include <cmath>
     40 #include <algorithm>
     41+#include <complex>
     42 
     43 #include <QMutex>
     44 #include <QMap>
     45 diff -u mythtv/libs/libmythui/mythpainter.cpp.orig mythtv/libs/libmythui/mythpainter.cpp
     46--- mythtv/libs/libmythui/mythpainter.cpp.orig  2013-08-11 19:30:33.000000000 -0400
     47+++ mythtv/libs/libmythui/mythpainter.cpp       2014-03-03 14:32:55.000000000 -0500
     48@@ -1,4 +1,5 @@
     49 #include <stdint.h>
     50+#include <complex>
     51 
     52 // QT headers
     53 #include <QRect>
     54 --
     551.8.5.2
     56