Date: Sat, 17 Sep 2016 09:20:17 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422302 - in head/devel/automoc4: . files Message-ID: <201609170920.u8H9KHNr086861@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Sep 17 09:20:17 2016 New Revision: 422302 URL: https://svnweb.freebsd.org/changeset/ports/422302 Log: devel/automoc4: Add upstream patches to silence warnings when using automoc4 PR: 212565 Submitted by: Adriaan de Groot <groot@kde.org> Approved by: rakuco (mentor) Obtained from: area51 Modified: head/devel/automoc4/Makefile head/devel/automoc4/files/patch-Automoc4Config.cmake head/devel/automoc4/files/patch-CMakeLists.txt Modified: head/devel/automoc4/Makefile ============================================================================== --- head/devel/automoc4/Makefile Sat Sep 17 09:01:37 2016 (r422301) +++ head/devel/automoc4/Makefile Sat Sep 17 09:20:17 2016 (r422302) @@ -3,7 +3,7 @@ PORTNAME= automoc4 PORTVERSION= 0.9.88 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE Modified: head/devel/automoc4/files/patch-Automoc4Config.cmake ============================================================================== --- head/devel/automoc4/files/patch-Automoc4Config.cmake Sat Sep 17 09:01:37 2016 (r422301) +++ head/devel/automoc4/files/patch-Automoc4Config.cmake Sat Sep 17 09:20:17 2016 (r422302) @@ -1,12 +1,49 @@ ---- ./Automoc4Config.cmake.orig 2012-05-28 10:08:18.449122610 +0200 -+++ ./Automoc4Config.cmake 2012-05-28 10:09:14.719218317 +0200 +This patch is contains the following upstream commits to silence some warnings: + * 48f6e64d98e4aaa47f2a49faa5f3e821bc21fd6e + Don't attempt to add dependencies which do not exist. + * b0184fe96b1a07b57cb489eb87710dc33f070dc1 + Don't attempt to read the DEFINITIONS property. + +As well as the FreeBSD specific fix from + * r297583 + Fix automoc4 detection when its .cmake file is referenced through + a symlink. + + +--- Automoc4Config.cmake.orig 2009-01-22 18:50:09 UTC ++++ Automoc4Config.cmake @@ -49,7 +49,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - + + -get_filename_component(_AUTOMOC4_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_AUTOMOC4_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" REALPATH) +get_filename_component(_AUTOMOC4_CURRENT_DIR "${_AUTOMOC4_CURRENT_DIR}" PATH) - + # set the automoc version number include(${_AUTOMOC4_CURRENT_DIR}/Automoc4Version.cmake) +@@ -114,7 +115,6 @@ macro(AUTOMOC4 _target_NAME _SRCS) + if(_moc_files) + set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_automoc.cpp") + get_directory_property(_moc_incs INCLUDE_DIRECTORIES) +- get_directory_property(_moc_defs DEFINITIONS) + get_directory_property(_moc_cdefs COMPILE_DEFINITIONS) + + # configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs +@@ -176,7 +176,6 @@ macro(_ADD_AUTOMOC4_TARGET _target_NAME + set(_automoc_source "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp") + set(_automoc_dotFiles "${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.cpp.files") + get_directory_property(_moc_incs INCLUDE_DIRECTORIES) +- get_directory_property(_moc_defs DEFINITIONS) + get_directory_property(_moc_cdefs COMPILE_DEFINITIONS) + + # configure_file replaces _moc_files, _moc_incs, _moc_cdefs and _moc_defs +@@ -245,5 +244,7 @@ endmacro(_AUTOMOC4_KDE4_PRE_TARGET_HANDL + + + macro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING _target) +- add_dependencies(${_target} "${_target}_automoc") ++ if (TARGET "${_target}_automoc") ++ add_dependencies(${_target} "${_target}_automoc") ++ endif() + endmacro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING) Modified: head/devel/automoc4/files/patch-CMakeLists.txt ============================================================================== --- head/devel/automoc4/files/patch-CMakeLists.txt Sat Sep 17 09:01:37 2016 (r422301) +++ head/devel/automoc4/files/patch-CMakeLists.txt Sat Sep 17 09:20:17 2016 (r422302) @@ -1,13 +1,31 @@ ---- CMakeLists.txt.orig Sun Dec 25 15:35:23 2011 -+++ CMakeLists.txt Sun Dec 25 15:35:40 2011 -@@ -21,7 +21,9 @@ +This patch is contains the following upstream commits: + * b094e11e24e5fb7672d73613cceb4af4cd8158bc + set cmake_min_req to enable newer policies + +As well as the FreeBSD specific fix from + * r288120 + Work around the "automoc hangs forever while building kde" problem. + + +--- CMakeLists.txt.orig 2009-01-22 18:50:09 UTC ++++ CMakeLists.txt +@@ -1,7 +1,6 @@ ++cmake_minimum_required(VERSION 2.8.9) + project(Automoc4) + +-cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR) +- + find_package(Qt4 REQUIRED) + + if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") +@@ -21,7 +20,9 @@ add_executable(automoc4 kde4automoc.cpp) set_target_properties(automoc4 PROPERTIES SKIP_BUILD_RPATH FALSE INSTALL_RPATH_USE_LINK_PATH TRUE ) - + -target_link_libraries(automoc4 ${QT_QTCORE_LIBRARY}) +find_package(Threads) +target_link_libraries(automoc4 ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) + - + install(TARGETS automoc4 DESTINATION bin) install(FILES Automoc4Config.cmake Automoc4Version.cmake automoc4.files.in DESTINATION lib${LIB_SUFFIX}/automoc4)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609170920.u8H9KHNr086861>