Date: Sat, 19 Mar 2016 14:38:35 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411407 - head/net-im/telepathy-qt4/files Message-ID: <201603191438.u2JEcZUp007265@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Mar 19 14:38:35 2016 New Revision: 411407 URL: https://svnweb.freebsd.org/changeset/ports/411407 Log: Add some upstream patches that properly declare all build dependencies. The upcoming CMake 3.5.0 generates Makefiles that break parallel builds more often when the dependencies between each targets are not declared correctly. PR: 208033 Added: head/net-im/telepathy-qt4/files/patch-git_1e1f53e9 (contents, props changed) head/net-im/telepathy-qt4/files/patch-git_7389dc9 (contents, props changed) Added: head/net-im/telepathy-qt4/files/patch-git_1e1f53e9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telepathy-qt4/files/patch-git_1e1f53e9 Sat Mar 19 14:38:35 2016 (r411407) @@ -0,0 +1,21 @@ +This commit is required to avoid occasional build failures in parallel builds +especially after CMake 3.5.0. + +commit 1e1f53e9d91684918c34ec50392f86287e001a1e +Author: Alexandr Akulich <akulichalexander@gmail.com> +Date: Fri Jan 15 18:52:59 2016 +0500 + + BaseChannel: Reduced includes (doesn't depend on client stuff anymore). + +--- TelepathyQt/base-channel.cpp ++++ TelepathyQt/base-channel.cpp +@@ -26,7 +26,8 @@ + + #include "TelepathyQt/_gen/base-channel.moc.hpp" + #include "TelepathyQt/_gen/base-channel-internal.moc.hpp" +-#include "TelepathyQt/future-internal.h" ++#include "TelepathyQt/_gen/future-constants.h" ++#include "TelepathyQt/_gen/future-types.h" + + #include "TelepathyQt/debug-internal.h" + Added: head/net-im/telepathy-qt4/files/patch-git_7389dc9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telepathy-qt4/files/patch-git_7389dc9 Sat Mar 19 14:38:35 2016 (r411407) @@ -0,0 +1,20 @@ +This commit is required to avoid occasional build failures in parallel builds. + +commit 7389dc990c67d4269f3a79c924c054e87f2e4ac5 +Author: Alexandr Akulich <akulichalexander@gmail.com> +Date: Fri, 15 Jan 2016 18:54:09 +0500 + + CMakeLists: Added missing service dependence. + + telepathy-qt-service depends on generated stable and future types and consts. + +--- TelepathyQt/CMakeLists.txt ++++ TelepathyQt/CMakeLists.txt +@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT) + #endif (ENABLE_COMPILER_COVERAGE) + # lets build a static only library until we have a stable API/ABI + add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS}) ++ add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen) + + # generate service moc files + foreach(moc_src ${telepathy_qt_service_MOC_SRCS})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603191438.u2JEcZUp007265>