[113826] trunk/dports/comms/telepathy-qt

[nicos at macports.org]

Revision: 113826
          https://trac.macports.org/changeset/113826
Author:   nicos at macports.org
Date:     2013-11-24 07:23:11 -0800 (Sun, 24 Nov 2013)
Log Message:
-----------
telepathy-qt: fix build with higher versions of cmake

Modified Paths:
--------------
    trunk/dports/comms/telepathy-qt/Portfile

Added Paths:
-----------
    trunk/dports/comms/telepathy-qt/files/
    trunk/dports/comms/telepathy-qt/files/patch-FindQt.diff

Modified: trunk/dports/comms/telepathy-qt/Portfile
===================================================================
--- trunk/dports/comms/telepathy-qt/Portfile	2013-11-24 15:13:06 UTC (rev 113825)
+++ trunk/dports/comms/telepathy-qt/Portfile	2013-11-24 15:23:11 UTC (rev 113826)
@@ -25,6 +25,9 @@
 depends_lib-append  port:qt4-mac \
                     port:libtelepathy
 
+#Patch for newer versions of cmake
+patchfiles          patch-FindQt.diff
+
 variant python25 conflicts python26 python27 description {Build using Python 2.5} {
         depends_build-append port:python25
         configure.python ${prefix}/bin/python2.5

Added: trunk/dports/comms/telepathy-qt/files/patch-FindQt.diff
===================================================================
--- trunk/dports/comms/telepathy-qt/files/patch-FindQt.diff	                        (rev 0)
+++ trunk/dports/comms/telepathy-qt/files/patch-FindQt.diff	2013-11-24 15:23:11 UTC (rev 113826)
@@ -0,0 +1,29 @@
+--- cmake/modules/FindQt.cmake.orig	2013-11-25 00:05:55.000000000 +0900
++++ cmake/modules/FindQt.cmake	2013-11-25 00:07:00.000000000 +0900
+@@ -72,12 +72,22 @@
+   ENDIF(QT_VERSION_MAJOR MATCHES 4)
+ ENDMACRO(QT_GET_MOC_FLAGS)
+ 
++
++
+ MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
+   IF(QT_VERSION_MAJOR MATCHES 4)
+-    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+-  ELSE(QT_VERSION_MAJOR MATCHES 4)
+-    IF(QT_VERSION_MAJOR MATCHES 5)
+-      QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++   ELSE(QT_VERSION_MAJOR MATCHES 4)
++     IF(QT_VERSION_MAJOR MATCHES 5)
++      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+     ENDIF(QT_VERSION_MAJOR MATCHES 5)
+   ENDIF(QT_VERSION_MAJOR MATCHES 4)
+ ENDMACRO(QT_CREATE_MOC_COMMAND)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131124/a4e0d9b1/attachment.html>