Changeset 135456 for trunk/dports/kde


Ignore:
Timestamp:
Apr 23, 2015, 9:48:44 PM (4 years ago)
Author:
mk@…
Message:

kmymoney4-devel: reintroduce patches against meinproc4 crash (see issue #47496)

Location:
trunk/dports/kde/kmymoney4-devel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/kde/kmymoney4-devel/Portfile

    r133106 r135456  
    4444patchfiles        patch-mainRaster.diff
    4545
     46if {![variant_isset docs]} {
     47    patchfiles-append   patch_remove_manpage.diff patch-CMakeLists_remove_APIDOC.txt.diff
     48}
     49
    4650configure.args-append   -DENABLE_KBANKING=ON \
    4751                        -DKDE4_BUILD_TESTS=OFF
  • trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff

    r90405 r135456  
    1 diff --git a/CMakeLists.txt b/CMakeLists.txt
    2 index 6e20c3f..b7f2c4f 100644
    3 --- a/CMakeLists.txt
    4 +++ b/CMakeLists.txt
    5 @@ -97,7 +97,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
     1--- kmymoney/CMakeLists.txt     2015-04-23 23:31:22.000000000 +0200
     2+++ kmymoney/CMakeLists.txt.new 2015-04-23 23:40:20.000000000 +0200
     3@@ -91,18 +91,6 @@
    64 
    7  # check for Doxygen
    8  FIND_PACKAGE(Doxygen)
    9 -IF(DOXYGEN_FOUND)
    10 +IF( FALSE )
    11    SET(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
     5 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
    126 
    13    MAKE_DIRECTORY(${APIDOC_DIR})
    14 @@ -105,7 +105,7 @@ IF(DOXYGEN_FOUND)
    15    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen IMMEDIATE)
    16  
    17    ADD_CUSTOM_TARGET(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
    18 -ENDIF(DOXYGEN_FOUND)
    19 +ENDIF( FALSE )
    20  
    21  FIND_PACKAGE(GMP REQUIRED)
    22  SET(LIBALKIMIA_MIN_VERSION 4.3.2)
     7-# check for Doxygen
     8-find_package(Doxygen)
     9-if(DOXYGEN_FOUND)
     10-  set(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
     11-
     12-  make_directory(${APIDOC_DIR})
     13-
     14-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen IMMEDIATE)
     15-
     16-  add_custom_target(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
     17-endif(DOXYGEN_FOUND)
     18-
     19 find_package(LibAlkimia 4.3.2 REQUIRED)
     20 #TODO: remove when LibAlkimia minimum version will be raised
     21 if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY)
     22@@ -295,7 +283,7 @@
     23 add_subdirectory( libkdchart )
     24 add_subdirectory( tools )
     25 add_subdirectory( kmymoney )
     26-add_subdirectory( doc )
     27+#add_subdirectory( doc )
     28 if (USE_DEVELOPER_DOC)
     29   add_subdirectory( developer-doc )
     30 endif (USE_DEVELOPER_DOC)
  • trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff

    r103781 r135456  
    33***************
    44*** 1,2 ****
    5 ! KDE4_CREATE_HANDBOOK(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
    6 ! KDE4_CREATE_MANPAGE(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
     5! kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
     6! kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
    77--- 1,2 ----
    8 ! #KDE4_CREATE_HANDBOOK(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
    9 ! #KDE4_CREATE_MANPAGE(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
     8! #kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
     9! #kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
Note: See TracChangeset for help on using the changeset viewer.