aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/brlcad/files/patch-cmake_2.8.1281
-rw-r--r--cad/brlcad/files/patch-src__other__CMakeLists.txt16
-rw-r--r--devel/cmake-gui/Makefile8
-rw-r--r--devel/cmake-gui/pkg-plist1
-rw-r--r--devel/cmake-modules/Makefile2
-rw-r--r--devel/cmake-modules/pkg-plist7
-rw-r--r--devel/cmake/Makefile2
-rw-r--r--devel/cmake/distinfo4
-rw-r--r--devel/cmake/files/patch-CMakeLists.txt12
-rw-r--r--devel/cmake/files/patch-Modules_FindGTK2.cmake25
-rw-r--r--devel/cmake/files/patch-Modules_FindwxWidgets.cmake8
-rw-r--r--devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx41
-rw-r--r--graphics/tulip/files/patch-UseTulip.cmake49
-rw-r--r--net-im/libjreen/files/patch-cmake__jreenMacros.cmake43
-rw-r--r--net-im/telepathy-qt4/files/patch-cmake__modules__FindQt.cmake37
-rw-r--r--polish/kadu/files/patch-plugins-jabber_protocol-3rdparty-CMakeLists.txt16
16 files changed, 308 insertions, 44 deletions
diff --git a/cad/brlcad/files/patch-cmake_2.8.12 b/cad/brlcad/files/patch-cmake_2.8.12
new file mode 100644
index 000000000000..80dc224952ad
--- /dev/null
+++ b/cad/brlcad/files/patch-cmake_2.8.12
@@ -0,0 +1,81 @@
+------------------------------------------------------------------------
+r57006 | starseeker | 2013-08-21 04:30:27 +0300 (Wed, 21 Aug 2013) | 1 line
+
+Latest CMake spotted a syntax error.
+
+------------------------------------------------------------------------
+r57007 | starseeker | 2013-08-21 04:40:51 +0300 (Wed, 21 Aug 2013) | 1 line
+
+More string formatting gotchas caught by 2.8.12rc1 CMake
+
+------------------------------------------------------------------------
+Index: src/other/tk/CMake/tcl.cmake
+===================================================================
+--- src/other/tk/CMake/tcl.cmake (revision 57006)
++++ src/other/tk/CMake/tcl.cmake (revision 57007)
+@@ -959,8 +959,8 @@
+ ENDMACRO(CHECK_FD_SET_IN_TYPES_D)
+
+ MACRO(CHECK_COMPILER_SUPPORTS_HIDDEN_D)
+- SET(TEST_SRC"
+- #define MODULE_SCOPE extern __attribute__((__visibility__("hidden")))
++ SET(TEST_SRC "
++ #define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))
+ main(){};
+ ")
+ CHECK_C_SOURCE_COMPILES("${TEST_SRC}" COMPILER_SUPPORTS_HIDDEN)
+Index: src/other/tcl/CMake/tcl.cmake
+===================================================================
+--- src/other/tcl/CMake/tcl.cmake (revision 57006)
++++ src/other/tcl/CMake/tcl.cmake (revision 57007)
+@@ -959,8 +959,8 @@
+ ENDMACRO(CHECK_FD_SET_IN_TYPES_D)
+
+ MACRO(CHECK_COMPILER_SUPPORTS_HIDDEN_D)
+- SET(TEST_SRC"
+- #define MODULE_SCOPE extern __attribute__((__visibility__("hidden")))
++ SET(TEST_SRC "
++ #define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))
+ main(){};
+ ")
+ CHECK_C_SOURCE_COMPILES("${TEST_SRC}" COMPILER_SUPPORTS_HIDDEN)
+Index: misc/CMake/FindTCL.cmake
+===================================================================
+--- misc/CMake/FindTCL.cmake (revision 57006)
++++ misc/CMake/FindTCL.cmake (revision 57007)
+@@ -307,7 +307,7 @@
+
+
+ # Set up the logic for determining if a particular Tcl is compiled threaded.
+-set(tclthreaded_script"
++set(tclthreaded_script "
+ set filename \"${CMAKE_BINARY_DIR}/CMakeTmp/TCL_THREADED\"
+ set fileId [open $filename \"w\"]
+ if {[info exists tcl_platform(threaded)]} {puts $fileId 1}
+Index: INSTALL
+===================================================================
+--- INSTALL (revision 57005)
++++ INSTALL (revision 57006)
+@@ -374,7 +374,7 @@
+ Disabling the run-time debugging facilities can provide a significant
+ (10%-30%) performance boost at the expense of extensive error
+ checking (that in turn help prevent corruption of your data).
+-Default is ;ON;, and should only be disabled for read-only render
++Default is "ON", and should only be disabled for read-only render
+ work where performance is critical.
+
+ Aliases: ENABLE_RUNTIME_DEBUG, ENABLE_RUN_TIME_DEBUG, ENABLE_RUNTIME_DEBUGGING
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt (revision 57005)
++++ CMakeLists.txt (revision 57006)
+@@ -1121,7 +1121,7 @@
+ Disabling the run-time debugging facilities can provide a significant
+ (10%-30%) performance boost at the expense of extensive error
+ checking (that in turn help prevent corruption of your data).
+-Default is "ON", and should only be disabled for read-only render
++Default is \"ON\", and should only be disabled for read-only render
+ work where performance is critical.
+ ")
+ BRLCAD_OPTION(ON BRLCAD_ENABLE_RUNTIME_DEBUG BRLCAD_ENABLE_RUNTIME_DEBUG_ALIASES BRLCAD_ENABLE_RUNTIME_DEBUG_DESCRIPTION)
+
diff --git a/cad/brlcad/files/patch-src__other__CMakeLists.txt b/cad/brlcad/files/patch-src__other__CMakeLists.txt
new file mode 100644
index 000000000000..1cf975504184
--- /dev/null
+++ b/cad/brlcad/files/patch-src__other__CMakeLists.txt
@@ -0,0 +1,16 @@
+Fixes a build failure with CMake 2.8.12.
+
+Discussed in http://article.gmane.org/gmane.comp.cad.brlcad.devel/3782
+
+Index: src/other/CMakeLists.txt
+===================================================================
+--- src/other/CMakeLists.txt (revision 58323)
++++ src/other/CMakeLists.txt (working copy)
+@@ -390,6 +390,7 @@
+ # PNG_INCLUDE_DIR, so a generic macro won't pick up the setting -
+ # handle it here.
+
++ set(PNG_LIBRARY "${PNG_LIBRARY}" CACHE STRING "PNG library" FORCE)
+ set(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} CACHE STRING "PNG include directory" FORCE)
+ endif(BRLCAD_PNG_BUILD)
+ DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/libpng/CTestTestfile.cmake)
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 190e051fa577..09300ccb0ed0 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cmake
-PORTVERSION= 2.8.11.2
+PORTVERSION= 2.8.12
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v2.8/
PKGNAMESUFFIX= -gui
@@ -14,14 +14,12 @@ USES= cmake:run
CMAKE_ARGS= -DBUILD_QtDialog:bool=on \
-DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}"
-MAN1= cmake-gui.1
BUILD_WRKSRC= ${WRKSRC}/Source/QtDialog
INSTALL_WRKSRC= ${BUILD_WRKSRC}
DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo
-NO_STAGE= yes
post-patch:
@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
@@ -33,7 +31,7 @@ pre-install:
${WRKSRC}/bin/cmake-gui --help-man > ${WRKSRC}/cmake-gui.1
post-install:
- ${MKDIR} ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/cmake-gui.1 ${MANPREFIX}/man/man1
+ ${MKDIR} ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/cmake-gui.1 ${STAGEDIR}${MANPREFIX}/man/man1
.include <bsd.port.mk>
diff --git a/devel/cmake-gui/pkg-plist b/devel/cmake-gui/pkg-plist
index dbb454893692..1eacbaeac5b0 100644
--- a/devel/cmake-gui/pkg-plist
+++ b/devel/cmake-gui/pkg-plist
@@ -1,4 +1,5 @@
bin/cmake-gui
+man/man1/cmake-gui.1.gz
share/applications/CMake.desktop
share/mime/packages/cmakecache.xml
share/pixmaps/CMakeSetup32.png
diff --git a/devel/cmake-modules/Makefile b/devel/cmake-modules/Makefile
index d8483a64e742..45f8e120f2c5 100644
--- a/devel/cmake-modules/Makefile
+++ b/devel/cmake-modules/Makefile
@@ -1,7 +1,7 @@
# Created by: gahr
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -modules
COMMENT= Modules and Templates for CMake
diff --git a/devel/cmake-modules/pkg-plist b/devel/cmake-modules/pkg-plist
index 1977a9e0343f..930f3c02a9d4 100644
--- a/devel/cmake-modules/pkg-plist
+++ b/devel/cmake-modules/pkg-plist
@@ -62,6 +62,7 @@
%%DATADIR%%/Modules/CMakeFortranCompilerId.F.in
%%DATADIR%%/Modules/CMakeFortranInformation.cmake
%%DATADIR%%/Modules/CMakeGenericSystem.cmake
+%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
%%DATADIR%%/Modules/CMakeJOMFindMake.cmake
%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
@@ -74,6 +75,7 @@
%%DATADIR%%/Modules/CMakeParseArguments.cmake
%%DATADIR%%/Modules/CMakeParseImplicitLinkInfo.cmake
%%DATADIR%%/Modules/CMakePlatformId.h.in
+%%DATADIR%%/Modules/CMakePrintHelpers.cmake
%%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
%%DATADIR%%/Modules/CMakePushCheckState.cmake
%%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
@@ -178,6 +180,10 @@
%%DATADIR%%/Modules/Compiler/HP-C.cmake
%%DATADIR%%/Modules/Compiler/HP-CXX.cmake
%%DATADIR%%/Modules/Compiler/HP-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/IAR-ASM.cmake
+%%DATADIR%%/Modules/Compiler/IAR-C.cmake
+%%DATADIR%%/Modules/Compiler/IAR-CXX.cmake
+%%DATADIR%%/Modules/Compiler/IAR.cmake
%%DATADIR%%/Modules/Compiler/Intel-ASM.cmake
%%DATADIR%%/Modules/Compiler/Intel-C.cmake
%%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
@@ -453,6 +459,7 @@
%%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake
%%DATADIR%%/Modules/Platform/Darwin-GNU.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Intel-Fortran.cmake
%%DATADIR%%/Modules/Platform/Darwin-NAG-Fortran.cmake
%%DATADIR%%/Modules/Platform/Darwin-VisualAge-C.cmake
%%DATADIR%%/Modules/Platform/Darwin-VisualAge-CXX.cmake
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 98d0361904d1..b53834909a83 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cmake
-PORTVERSION= 2.8.11.2
+PORTVERSION= 2.8.12
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v2.8/
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 6c43aae6c347..bea130ee4db6 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-2.8.11.2.tar.gz) = b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562
-SIZE (cmake-2.8.11.2.tar.gz) = 5887016
+SHA256 (cmake-2.8.12.tar.gz) = d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287
+SIZE (cmake-2.8.12.tar.gz) = 6064138
diff --git a/devel/cmake/files/patch-CMakeLists.txt b/devel/cmake/files/patch-CMakeLists.txt
index d5b7f23dc8e1..1672fce09de4 100644
--- a/devel/cmake/files/patch-CMakeLists.txt
+++ b/devel/cmake/files/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
---- CMakeLists.txt.orig 2012-11-27 22:20:59.000000000 +0200
-+++ CMakeLists.txt 2012-11-27 22:23:04.000000000 +0200
-@@ -605,17 +605,17 @@
- install(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST})
+--- CMakeLists.txt.orig 2013-10-14 16:29:44.055730052 +0300
++++ CMakeLists.txt 2013-10-14 16:30:05.395729128 +0300
+@@ -629,17 +629,17 @@
+ install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR})
# Install script directories.
-install(
- DIRECTORY Modules Templates
-- DESTINATION "${CMake_DATA_DEST}"
+- DESTINATION ${CMAKE_DATA_DIR}
- FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
- DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
- GROUP_READ GROUP_EXECUTE
@@ -17,7 +17,7 @@
- )
+# install(
+# DIRECTORY Modules Templates
-+# DESTINATION "${CMake_DATA_DEST}"
++# DESTINATION ${CMAKE_DATA_DIR}
+# FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+# DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+# GROUP_READ GROUP_EXECUTE
diff --git a/devel/cmake/files/patch-Modules_FindGTK2.cmake b/devel/cmake/files/patch-Modules_FindGTK2.cmake
deleted file mode 100644
index ce343d6d0e57..000000000000
--- a/devel/cmake/files/patch-Modules_FindGTK2.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
-Author: Daniele E. Domenichelli <ddomenichelli@kde.org>
-Date: Mon Jun 17 17:31:10 2013 +0200
-
- FindGTK2: Detect gthread library
-
-commit 76c72b9f14258933e4cf810da275bd2b931c5ac9
-Author: Daniele E. Domenichelli <daniele.domenichelli@iit.it>
-Date: Wed Jul 31 17:39:38 2013 +0200
-
- FindGTK2: gthread-2.0 folder does not exist
-
- Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
-
---- Modules/FindGTK2.cmake.orig 2013-09-29 17:29:09.000000000 +0300
-+++ Modules/FindGTK2.cmake 2013-09-29 17:29:42.000000000 +0300
-@@ -463,6 +463,8 @@
- _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
- _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
-
-+ _GTK2_FIND_LIBRARY (GTK2_GTHREAD_LIBRARY gthread false true)
-+
- _GTK2_FIND_LIBRARY (GTK2_GIO_LIBRARY gio false true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h)
diff --git a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
index 47ee294e1590..01c7b5f07c17 100644
--- a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
+++ b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
@@ -1,11 +1,11 @@
---- ./Modules/FindwxWidgets.cmake.orig 2010-06-28 19:15:57.000000000 +0400
-+++ ./Modules/FindwxWidgets.cmake 2010-07-06 02:06:02.277945209 +0400
-@@ -689,7 +689,7 @@
+--- Modules/FindwxWidgets.cmake.orig 2013-10-14 16:39:11.995705456 +0300
++++ Modules/FindwxWidgets.cmake 2013-10-14 16:39:31.315704621 +0300
+@@ -702,7 +702,7 @@
# UNIX: Start actual work.
#-----------------------------------------------------------------
# Support cross-compiling, only search in the target platform.
- find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
+ find_program(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
+ DOC "Location of wxWidgets library configuration provider binary (wx-config)."
ONLY_CMAKE_FIND_ROOT_PATH
)
-
diff --git a/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx b/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx
new file mode 100644
index 000000000000..8cb8ecb9a9cd
--- /dev/null
+++ b/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx
@@ -0,0 +1,41 @@
+From e0b5a0523e6ba75efc97d5fc0bc5299b5f3d3bca Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Mon, 14 Oct 2013 23:35:05 +0300
+Subject: [PATCH] KWSys: Include backtrace-related headers on FreeBSD.
+
+This was probably broken for a long while, but the problem was not apparent
+because the check for execinfo.h would fail by default because
+-I/usr/local/include was not being passed to the compiler when making the
+checks for the header's existence.
+
+Now that very recent FreeBSD versions (ie. 10-CURRENT) have NetBSD's
+libexecinfo in base (and it is thus installed into /usr), the
+backtrace-related checks would pass, but the required headers were not being
+included in SystemInformation.cxx.
+---
+ Source/kwsys/SystemInformation.cxx | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
+index 7c31f3a..2672730 100644
+--- Source/kwsys/SystemInformation.cxx
++++ Source/kwsys/SystemInformation.cxx
+@@ -88,6 +88,15 @@ typedef int siginfo_t;
+ # include <ifaddrs.h>
+ # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
+ # endif
++# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
++# include <execinfo.h>
++# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
++# include <cxxabi.h>
++# endif
++# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
++# include <dlfcn.h>
++# endif
++# endif
+ #endif
+
+ #if defined(__OpenBSD__) || defined(__NetBSD__)
+--
+1.8.4
+
diff --git a/graphics/tulip/files/patch-UseTulip.cmake b/graphics/tulip/files/patch-UseTulip.cmake
new file mode 100644
index 000000000000..902d0759a462
--- /dev/null
+++ b/graphics/tulip/files/patch-UseTulip.cmake
@@ -0,0 +1,49 @@
+CMake 2.8.12 fix.
+
+http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce60ff509c4ff27fe861fc5b2080f50897a68c4
+changed the arguments of the internal macros QT4_EXTRACT_OPTIONS and
+QT4_CREATE_MOC_COMMAND which the port uses directly, so we have to adapt.
+
+Tulip 4.x should not have this problem, as it removed its QT4_* macro wrappers.
+--- UseTulip.cmake.orig 2012-06-11 10:46:14.000000000 +0300
++++ UseTulip.cmake 2013-11-03 19:16:59.000000000 +0200
+@@ -1,5 +1,5 @@
+ MACRO (TULIP_QT4_WRAP_UI outfiles )
+- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
++ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
+ FOREACH (it ${ui_files})
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+@@ -13,7 +13,7 @@
+ ENDMACRO (TULIP_QT4_WRAP_UI)
+
+ MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE outfiles )
+- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
++ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
+ FOREACH (it ${ui_files})
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+@@ -27,7 +27,7 @@
+ ENDMACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE)
+
+ MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE_TULIP outfiles )
+- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
++ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
+ FOREACH (it ${ui_files})
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+@@ -42,12 +42,12 @@
+
+ MACRO (TULIP_QT4_WRAP_CPP outfiles )
+ QT4_GET_MOC_FLAGS(moc_flags)
+- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
++ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
+ FOREACH (it ${moc_files})
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cpp)
+- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
++ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
+ SET(${outfiles} ${${outfiles}} ${outfile})
+ ENDFOREACH(it)
+ ENDMACRO (TULIP_QT4_WRAP_CPP)
diff --git a/net-im/libjreen/files/patch-cmake__jreenMacros.cmake b/net-im/libjreen/files/patch-cmake__jreenMacros.cmake
new file mode 100644
index 000000000000..473fe3f80bde
--- /dev/null
+++ b/net-im/libjreen/files/patch-cmake__jreenMacros.cmake
@@ -0,0 +1,43 @@
+CMake 2.8.12 fix.
+
+http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce60ff509c4ff27fe861fc5b2080f50897a68c4
+changed the arguments of the internal macros QT4_EXTRACT_OPTIONS and
+QT4_CREATE_MOC_COMMAND which the port uses directly, so we have to adapt.
+--- cmake/jreenMacros.cmake.orig 2013-01-06 17:49:31.000000000 +0200
++++ cmake/jreenMacros.cmake 2013-11-03 19:42:41.000000000 +0200
+@@ -19,7 +19,7 @@
+ MACRO (JREEN_WRAP_CPP outfiles )
+ # get include dirs
+ QT4_GET_MOC_FLAGS(moc_flags)
+- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
++ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
+
+ FOREACH (it ${moc_files})
+ GET_FILENAME_COMPONENT(_abs_FILE ${it} ABSOLUTE)
+@@ -39,7 +39,7 @@
+ FOREACH (_current_MOC_INC ${_match})
+ STRING(REGEX MATCH "moc_[^ <\"]+\\.cpp" _current_MOC "${_current_MOC_INC}")
+ SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+- QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "")
++ QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "" "${moc_target}")
+ MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+ ENDFOREACH (_current_MOC_INC)
+ ENDIF()
+@@ -47,7 +47,7 @@
+ FOREACH (_current_MOC_INC ${_match2})
+ STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+ SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+- QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
++ QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "" "${moc_target}")
+ MACRO_ADD_FILE_DEPENDENCIES(${_header} ${_moc})
+ ENDFOREACH (_current_MOC_INC)
+ ENDIF()
+@@ -57,7 +57,7 @@
+ STRING(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}")
+ IF(_match2)
+ QT4_MAKE_OUTPUT_FILE(${_abs_FILE} moc_ cpp outfile)
+- QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}")
++ QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
+ SET(${outfiles} ${${outfiles}} ${outfile})
+ ENDIF()
+ ENDIF()
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 000000000000..e1972521a53b
--- /dev/null
+++ b/net-im/telepathy-qt4/files/patch-cmake__modules__FindQt.cmake
@@ -0,0 +1,37 @@
+From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sun, 29 Sep 2013 22:19:27 +0000
+Subject: Fix compilation on new versions of cmake
+
+Recent cmake has changed the argument count to
+qt4_create_moc_command, we need to adjust accordingly
+
+Reviewed-by: Dario Freddi <dario.freddi@ispirata.com>
+---
+diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
+index c2eac76..b3131f0 100644
+--- cmake/modules/FindQt.cmake
++++ cmake/modules/FindQt.cmake
+@@ -74,10 +74,18 @@ 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}")
++ 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}")
++ 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)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/polish/kadu/files/patch-plugins-jabber_protocol-3rdparty-CMakeLists.txt b/polish/kadu/files/patch-plugins-jabber_protocol-3rdparty-CMakeLists.txt
new file mode 100644
index 000000000000..6f1d6216ab0a
--- /dev/null
+++ b/polish/kadu/files/patch-plugins-jabber_protocol-3rdparty-CMakeLists.txt
@@ -0,0 +1,16 @@
+CMake 2.8.12 fix.
+
+http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce60ff509c4ff27fe861fc5b2080f50897a68c4
+changed the arguments of the internal macro QT4_CREATE_MOC_COMMAND which the
+port uses directly, so we have to adapt.
+--- plugins/jabber_protocol/3rdparty/CMakeLists.txt.orig 2013-11-03 19:28:58.000000000 +0200
++++ plugins/jabber_protocol/3rdparty/CMakeLists.txt 2013-11-03 19:29:04.000000000 +0200
+@@ -26,7 +26,7 @@
+ get_filename_component (_basename ${_current_MOC} NAME_WE)
+ set (_header ${_abs_FILE})
+ set (_moc ${_abs_PATH}/${_current_MOC})
+- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
++ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
+ MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
+ endforeach (_current_MOC_INC)
+ endif (_match)
generated by cgit (git 2.34.1) at 2024-11-29 16:14:29 +0800