diff options
| author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-09 17:06:15 +0800 |
|---|---|---|
| committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-09 17:06:15 +0800 |
| commit | 00eedbb363c956199ae09a8857dbf13e81246324 (patch) | |
| tree | d4d1dad5c3cf17b8b71d8a7542bb4d44a85606ba | |
| parent | a2816215c1f1408a516151a60c03b1ad8ba5a330 (diff) | |
| download | marcuscom-ports-00eedbb363c956199ae09a8857dbf13e81246324.tar marcuscom-ports-00eedbb363c956199ae09a8857dbf13e81246324.tar.gz marcuscom-ports-00eedbb363c956199ae09a8857dbf13e81246324.tar.bz2 marcuscom-ports-00eedbb363c956199ae09a8857dbf13e81246324.tar.lz marcuscom-ports-00eedbb363c956199ae09a8857dbf13e81246324.tar.xz marcuscom-ports-00eedbb363c956199ae09a8857dbf13e81246324.tar.zst marcuscom-ports-00eedbb363c956199ae09a8857dbf13e81246324.zip | |
Fix build against recent cmake. Import upstream commit 05fe3f4980bbc6b016e25dcf07e44afe29e377c0.
Reported by: poudriere
Obtained from: telepathy-qt4 git repo
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18872 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | net-im/telepathy-qt4/Makefile | 2 | ||||
| -rw-r--r-- | net-im/telepathy-qt4/files/patch-cmake_modules_FindQt.cmake | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile index 114cbb397..0421fa840 100644 --- a/net-im/telepathy-qt4/Makefile +++ b/net-im/telepathy-qt4/Makefile @@ -13,8 +13,10 @@ COMMENT= High-level Qt binding for Telepathy LICENSE= LGPL21 +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus LIB_DEPENDS= libtelepathy-farstream.so:${PORTSDIR}/net-im/telepathy-farstream \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus USE_GNOME= libxslt:build USE_GSTREAMER= yes diff --git a/net-im/telepathy-qt4/files/patch-cmake_modules_FindQt.cmake b/net-im/telepathy-qt4/files/patch-cmake_modules_FindQt.cmake new file mode 100644 index 000000000..f1ff0dedb --- /dev/null +++ b/net-im/telepathy-qt4/files/patch-cmake_modules_FindQt.cmake @@ -0,0 +1,15 @@ +--- cmake/modules/FindQt.cmake.orig 2013-11-09 10:25:04.481793123 +0000 ++++ cmake/modules/FindQt.cmake 2013-11-09 10:25:11.662793204 +0000 +@@ -74,7 +74,11 @@ + + 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}") ++ 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) + QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") |