Ticket #48024: kdevelop_V13482.patch

File kdevelop_V13482.patch, 2.7 KB (added by RJVB (René Bertin), 7 years ago)

upgrade to 1.11.0, fix of the Qt4 build and cleanup

  • office/charm/Portfile 

    diff --git a/office/charm/Portfile b/office/charm/Portfile
index a2ba6c202cb2e1d60fcdece8a0a8e472bca76d0f..aa56f9ae696c87244d69fb3a6f3e8be25001980e 100644
    a b  
    22
    33PortSystem          1.0
    44PortGroup           github 1.0
    5 PortGroup           cmake 1.0
     5PortGroup           cmake 1.1
    66
    77name                charm
    8 version             1.10.0
     8version             1.11.0
    99
    1010github.setup        KDAB Charm ${version}
    1111
    12 maintainers         gmail.com:rjvbertin mk openmaintainer
     12maintainers         gmail.com:rjvbertin openmaintainer
    1313categories          office
    1414license             GPL-2+ LGPL-2.1+
    1515description         Charm - the Cross-Platform Time Tracker
    … … subport ${name}-qt5 { 
    2020    PortGroup       qt5 1.0
    2121
    2222    conflicts       ${name}
    23     depends_lib-append      port:qt5-sqlite-plugin
    24     configure.args-append   -DWITH_QT4:BOOL=OFF
     23    qt5.depends_component \
     24                    sqlite-plugin
     25    configure.args-append \
     26                    -DCHARM_FORCE_QT4:BOOL=OFF
    2527}
    2628
    2729if {${subport} ne "${name}-qt5"} {
    … … if {${subport} ne "${name}-qt5"} { 
    3032    revision        20151018
    3133
    3234    conflicts       ${name}-qt5
    33     depends_build-append    port:automoc
    34     depends_lib-append      port:qt4-mac-sqlite3-plugin
    35     configure.args-append   -DWITH_QT4:BOOL=ON
     35    depends_build-append \
     36                    port:automoc
     37    depends_lib-append \
     38                    port:qt4-mac-sqlite3-plugin
     39    configure.args-append \
     40                    -DCHARM_FORCE_QT4:BOOL=ON
    3641}
    3742
    38 checksums           rmd160  40184c4f0de2b7f9fe328b7fd2f0d47922be6e1c \
    39                     sha256  5c7ea12da4ad1324a9aaf1f5d29612fc1d789a70bbcbfa2f57766b96f04275e1
     43checksums           rmd160  da690a57d743e8c79e2d60d8bb2f29a276b69055 \
     44                    sha256  8729bc0936a481a113b8a56a747455ec488bf565182ca29d8bb583c74b194267
    4045
    41 configure.args-append   -DCharm_VERSION="${version}"
     46configure.args-append \
     47                    -DCharm_VERSION="${version}"
    4248
    4349# These patches have still do be adapted to the current version:
    4450#patchfiles          adapt-to-osx-macports.patch
    4551
    46 post-extract                {file mkdir ${workpath}/build}
    47 # standard post-arg, where to find the primary CMakeLists.txt file.
    48 default configure.post_args {../${worksrcdir}}
    49 default configure.dir       {${workpath}/build}
    50 default build.dir           {${workpath}/build}
    51 
    5252use_parallel_build  yes
    5353
    5454destroot {
    55     xinstall -m 0755 -d ${destroot}${applications_dir}
    56     file copy ${workpath}/build/Charm/Charm.app ${destroot}${applications_dir}
     55    xinstall -m 0755 -d ${destroot}${qt_apps_dir}
     56    file copy ${workpath}/build/Charm/Charm.app ${destroot}${qt_apps_dir}
    5757}
    5858