[141442] trunk/dports/office/charm

[mk at macports.org]

Revision: 141442
          https://trac.macports.org/changeset/141442
Author:   mk at macports.org
Date:     2015-10-18 13:49:13 -0700 (Sun, 18 Oct 2015)
Log Message:
-----------
charm(-qt5): update to version 1.10.0 (patches in adapt-to-osx-macports.patch still have to be adapted)

Modified Paths:
--------------
    trunk/dports/office/charm/Portfile
    trunk/dports/office/charm/files/patch-CMakeFiles.patch

Modified: trunk/dports/office/charm/Portfile
===================================================================
--- trunk/dports/office/charm/Portfile	2015-10-18 20:25:32 UTC (rev 141441)
+++ trunk/dports/office/charm/Portfile	2015-10-18 20:49:13 UTC (rev 141442)
@@ -5,9 +5,11 @@
 PortGroup           github 1.0
 PortGroup           cmake 1.0
 
-github.setup        KDAB Charm 1.9.0rc1
-
 name                charm
+version             1.10.0
+
+github.setup        KDAB Charm ${version}
+
 maintainers         gmail.com:rjvbertin mk openmaintainer
 categories          office
 license             GPL-2+ LGPL-2.1+
@@ -21,33 +23,27 @@
     conflicts       ${name}
     depends_lib-append      port:qt5-mac-sqlite3-plugin
     configure.args-append   -DWITH_QT4:BOOL=OFF
-
-    checksums       rmd160  1ef90f8273eab79f1b0ee067021f1548bf945971 \
-                    sha256  32da61e2d13f0b2ce1b46f2ee7bbdff94a4d78cb4fe0b43fee16e857fb810ac1
 }
 
 if {${subport} ne "${name}-qt5"} {
     PortGroup       qt4 1.0
 
-    version         1.8.0
-    revision        20150312
+    revision        20151018
 
     conflicts       ${name}-qt5
     depends_build-append    port:automoc
     depends_lib-append      port:qt4-mac-sqlite3-plugin
     configure.args-append   -DWITH_QT4:BOOL=ON
-
-    # faaf49e9
-    checksums       rmd160  50e87a81e853c81ea0d538f7a165570d0e9f2ac0 \
-                    sha256  f49b485e0bd072f3564420859d0114538a3d321cd2f9c1a124d488aefbea8424
 }
 
-#configure.args-append   -DCharm_VERSION="${version}-${github.version}" -DBIN_INSTALL_DIR:PATH=${qt_apps_dir}
-configure.args-append   -DCharm_VERSION="${version}" -DBIN_INSTALL_DIR:PATH=${qt_apps_dir}
+checksums           rmd160  40184c4f0de2b7f9fe328b7fd2f0d47922be6e1c \
+                    sha256  5c7ea12da4ad1324a9aaf1f5d29612fc1d789a70bbcbfa2f57766b96f04275e1
 
-patchfiles          patch-CMakeFiles.patch \
-                    adapt-to-osx-macports.patch
+configure.args-append   -DCharm_VERSION="${version}"
 
+# These patches have still do be adapted to the current version:
+#patchfiles          adapt-to-osx-macports.patch
+
 post-extract                {file mkdir ${workpath}/build}
 # standard post-arg, where to find the primary CMakeLists.txt file.
 default configure.post_args {../${worksrcdir}}
@@ -56,8 +52,8 @@
 
 use_parallel_build  yes
 
-post-destroot {
-    xinstall -m 0755 -d ${destroot}${qt_apps_dir}
-    ln -s ${qt_apps_dir}/Charm.app/Contents/MacOS/Charm ${destroot}${prefix}/bin/charmtimetracker
+destroot {
+    xinstall -m 0755 -d ${destroot}${applications_dir}
+    file copy ${workpath}/build/Charm/Charm.app ${destroot}${applications_dir}
 }
 

Modified: trunk/dports/office/charm/files/patch-CMakeFiles.patch
===================================================================
--- trunk/dports/office/charm/files/patch-CMakeFiles.patch	2015-10-18 20:25:32 UTC (rev 141441)
+++ trunk/dports/office/charm/files/patch-CMakeFiles.patch	2015-10-18 20:49:13 UTC (rev 141442)
@@ -2,19 +2,6 @@
 index 4e735a1..55f78bc 100644
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -38,8 +38,10 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 )
- SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake" )
- SET( CMAKE_AUTOMOC ON )
- 
--# try Qt5 first, and prefer that if found
--find_package(Qt5Core QUIET)
-+if(NOT WITH_QT4)
-+    # try Qt5 first, and prefer that if found
-+    find_package(Qt5Core QUIET)
-+endif()
- IF (Qt5Core_FOUND)
-     find_package(Qt5Widgets REQUIRED)
-     find_package(Qt5Xml REQUIRED)
 @@ -61,11 +63,11 @@ IF (Qt5Core_FOUND)
          SET(QT_PLATFORM_SPECIFIC_LIBRARIES)
      ENDIF()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/83d6b6f0/attachment.html>