[135456] trunk/dports/kde/kmymoney4-devel

[mk at macports.org]

Revision: 135456
          https://trac.macports.org/changeset/135456
Author:   mk at macports.org
Date:     2015-04-23 14:48:44 -0700 (Thu, 23 Apr 2015)
Log Message:
-----------
kmymoney4-devel: reintroduce patches against meinproc4 crash (see issue #47496)

Modified Paths:
--------------
    trunk/dports/kde/kmymoney4-devel/Portfile
    trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff
    trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff

Modified: trunk/dports/kde/kmymoney4-devel/Portfile
===================================================================
--- trunk/dports/kde/kmymoney4-devel/Portfile	2015-04-23 21:47:35 UTC (rev 135455)
+++ trunk/dports/kde/kmymoney4-devel/Portfile	2015-04-23 21:48:44 UTC (rev 135456)
@@ -43,6 +43,10 @@
 patch.pre_args    -p1
 patchfiles        patch-mainRaster.diff
 
+if {![variant_isset docs]} {
+    patchfiles-append   patch_remove_manpage.diff patch-CMakeLists_remove_APIDOC.txt.diff
+}
+
 configure.args-append   -DENABLE_KBANKING=ON \
                         -DKDE4_BUILD_TESTS=OFF
 

Modified: trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff
===================================================================
--- trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff	2015-04-23 21:47:35 UTC (rev 135455)
+++ trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff	2015-04-23 21:48:44 UTC (rev 135456)
@@ -1,22 +1,30 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e20c3f..b7f2c4f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+--- kmymoney/CMakeLists.txt	2015-04-23 23:31:22.000000000 +0200
++++ kmymoney/CMakeLists.txt.new	2015-04-23 23:40:20.000000000 +0200
+@@ -91,18 +91,6 @@
  
- # check for Doxygen
- FIND_PACKAGE(Doxygen)
--IF(DOXYGEN_FOUND)
-+IF( FALSE )
-   SET(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
  
-   MAKE_DIRECTORY(${APIDOC_DIR})
-@@ -105,7 +105,7 @@ IF(DOXYGEN_FOUND)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen IMMEDIATE)
- 
-   ADD_CUSTOM_TARGET(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
--ENDIF(DOXYGEN_FOUND)
-+ENDIF( FALSE )
- 
- FIND_PACKAGE(GMP REQUIRED)
- SET(LIBALKIMIA_MIN_VERSION 4.3.2)
+-# check for Doxygen
+-find_package(Doxygen)
+-if(DOXYGEN_FOUND)
+-  set(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
+-
+-  make_directory(${APIDOC_DIR})
+-
+-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen IMMEDIATE)
+-
+-  add_custom_target(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
+-endif(DOXYGEN_FOUND)
+-
+ find_package(LibAlkimia 4.3.2 REQUIRED)
+ #TODO: remove when LibAlkimia minimum version will be raised
+ if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY)
+@@ -295,7 +283,7 @@
+ add_subdirectory( libkdchart )
+ add_subdirectory( tools )
+ add_subdirectory( kmymoney )
+-add_subdirectory( doc )
++#add_subdirectory( doc )
+ if (USE_DEVELOPER_DOC)
+   add_subdirectory( developer-doc )
+ endif (USE_DEVELOPER_DOC)

Modified: trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff
===================================================================
--- trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff	2015-04-23 21:47:35 UTC (rev 135455)
+++ trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff	2015-04-23 21:48:44 UTC (rev 135456)
@@ -2,8 +2,8 @@
 --- kmymoney/doc/CMakeLists.txt.new	Thu Jan 19 23:05:05 2012
 ***************
 *** 1,2 ****
-! KDE4_CREATE_HANDBOOK(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
-! KDE4_CREATE_MANPAGE(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+! kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
+! kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
 --- 1,2 ----
-! #KDE4_CREATE_HANDBOOK(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
-! #KDE4_CREATE_MANPAGE(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+! #kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
+! #kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150423/b6fcf0ee/attachment.html>