Changeset 141442


Ignore:
Timestamp:
Oct 18, 2015, 8:49:13 PM (4 years ago)
Author:
mk@…
Message:

charm(-qt5): update to version 1.10.0 (patches in adapt-to-osx-macports.patch still have to be adapted)

Location:
trunk/dports/office/charm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/office/charm/Portfile

    r135574 r141442  
    66PortGroup           cmake 1.0
    77
    8 github.setup        KDAB Charm 1.9.0rc1
     8name                charm
     9version             1.10.0
    910
    10 name                charm
     11github.setup        KDAB Charm ${version}
     12
    1113maintainers         gmail.com:rjvbertin mk openmaintainer
    1214categories          office
     
    2224    depends_lib-append      port:qt5-mac-sqlite3-plugin
    2325    configure.args-append   -DWITH_QT4:BOOL=OFF
    24 
    25     checksums       rmd160  1ef90f8273eab79f1b0ee067021f1548bf945971 \
    26                     sha256  32da61e2d13f0b2ce1b46f2ee7bbdff94a4d78cb4fe0b43fee16e857fb810ac1
    2726}
    2827
     
    3029    PortGroup       qt4 1.0
    3130
    32     version         1.8.0
    33     revision        20150312
     31    revision        20151018
    3432
    3533    conflicts       ${name}-qt5
     
    3735    depends_lib-append      port:qt4-mac-sqlite3-plugin
    3836    configure.args-append   -DWITH_QT4:BOOL=ON
    39 
    40     # faaf49e9
    41     checksums       rmd160  50e87a81e853c81ea0d538f7a165570d0e9f2ac0 \
    42                     sha256  f49b485e0bd072f3564420859d0114538a3d321cd2f9c1a124d488aefbea8424
    4337}
    4438
    45 #configure.args-append   -DCharm_VERSION="${version}-${github.version}" -DBIN_INSTALL_DIR:PATH=${qt_apps_dir}
    46 configure.args-append   -DCharm_VERSION="${version}" -DBIN_INSTALL_DIR:PATH=${qt_apps_dir}
     39checksums           rmd160  40184c4f0de2b7f9fe328b7fd2f0d47922be6e1c \
     40                    sha256  5c7ea12da4ad1324a9aaf1f5d29612fc1d789a70bbcbfa2f57766b96f04275e1
    4741
    48 patchfiles          patch-CMakeFiles.patch \
    49                     adapt-to-osx-macports.patch
     42configure.args-append   -DCharm_VERSION="${version}"
     43
     44# These patches have still do be adapted to the current version:
     45#patchfiles          adapt-to-osx-macports.patch
    5046
    5147post-extract                {file mkdir ${workpath}/build}
     
    5753use_parallel_build  yes
    5854
    59 post-destroot {
    60     xinstall -m 0755 -d ${destroot}${qt_apps_dir}
    61     ln -s ${qt_apps_dir}/Charm.app/Contents/MacOS/Charm ${destroot}${prefix}/bin/charmtimetracker
     55destroot {
     56    xinstall -m 0755 -d ${destroot}${applications_dir}
     57    file copy ${workpath}/build/Charm/Charm.app ${destroot}${applications_dir}
    6258}
    6359
  • trunk/dports/office/charm/files/patch-CMakeFiles.patch

    r131841 r141442  
    33--- CMakeLists.txt
    44+++ CMakeLists.txt
    5 @@ -38,8 +38,10 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 )
    6  SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake" )
    7  SET( CMAKE_AUTOMOC ON )
    8  
    9 -# try Qt5 first, and prefer that if found
    10 -find_package(Qt5Core QUIET)
    11 +if(NOT WITH_QT4)
    12 +    # try Qt5 first, and prefer that if found
    13 +    find_package(Qt5Core QUIET)
    14 +endif()
    15  IF (Qt5Core_FOUND)
    16      find_package(Qt5Widgets REQUIRED)
    17      find_package(Qt5Xml REQUIRED)
    185@@ -61,11 +63,11 @@ IF (Qt5Core_FOUND)
    196         SET(QT_PLATFORM_SPECIFIC_LIBRARIES)
Note: See TracChangeset for help on using the changeset viewer.