Attachment 174627 Details for Bug 212565 – Patch devel/automoc4

[patch] Patch devel/automoc4

automoc.patch (text/plain), 3.15 KB, created by groot on 2016-09-10 19:24:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2016-09-10 19:24:59 UTC

Size: 3.15 KB

patch

obsolete

>Index: devel/automoc4/Makefile
>===================================================================
>--- devel/automoc4/Makefile	(revision 421729)
>+++ devel/automoc4/Makefile	(working copy)
>@@ -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
>Index: devel/automoc4/files/patch-Automoc4Config.cmake
>===================================================================
>--- devel/automoc4/files/patch-Automoc4Config.cmake	(revision 421729)
>+++ devel/automoc4/files/patch-Automoc4Config.cmake	(working copy)
>@@ -1,5 +1,5 @@
>---- ./Automoc4Config.cmake.orig	2012-05-28 10:08:18.449122610 +0200
>-+++ ./Automoc4Config.cmake	2012-05-28 10:09:14.719218317 +0200
>+--- 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.
>  
>@@ -10,3 +10,28 @@
>  
>  # 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)
>Index: devel/automoc4/files/patch-CMakeLists.txt
>===================================================================
>--- devel/automoc4/files/patch-CMakeLists.txt	(revision 421729)
>+++ devel/automoc4/files/patch-CMakeLists.txt	(working copy)
>@@ -1,6 +1,15 @@
>---- CMakeLists.txt.orig	Sun Dec 25 15:35:23 2011
>-+++ CMakeLists.txt	Sun Dec 25 15:35:40 2011
>-@@ -21,7 +21,9 @@
>+--- 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 )
>

Actions: View | Diff

Attachments on bug 212565: 174627