From owner-svn-ports-head@freebsd.org Wed Sep 27 15:46:40 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81EE8E079B3; Wed, 27 Sep 2017 15:46:40 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5AF297C541; Wed, 27 Sep 2017 15:46:40 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8RFkdo3019486; Wed, 27 Sep 2017 15:46:39 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8RFkdGF019482; Wed, 27 Sep 2017 15:46:39 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201709271546.v8RFkdGF019482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Wed, 27 Sep 2017 15:46:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450759 - in head/deskutils/charmtimetracker: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/deskutils/charmtimetracker: . files X-SVN-Commit-Revision: 450759 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Sep 2017 15:46:40 -0000 Author: adridg Date: Wed Sep 27 15:46:39 2017 New Revision: 450759 URL: https://svnweb.freebsd.org/changeset/ports/450759 Log: Switch Charm Time Tracker to Qt5 and take maintainership. Approved by: tcberner (mentor) Approved by: avg (maintainer) Differential Revision: https://reviews.freebsd.org/D12489 Modified: head/deskutils/charmtimetracker/Makefile head/deskutils/charmtimetracker/files/patch-CMakeLists.txt head/deskutils/charmtimetracker/pkg-plist Modified: head/deskutils/charmtimetracker/Makefile ============================================================================== --- head/deskutils/charmtimetracker/Makefile Wed Sep 27 15:38:47 2017 (r450758) +++ head/deskutils/charmtimetracker/Makefile Wed Sep 27 15:46:39 2017 (r450759) @@ -2,32 +2,32 @@ # $FreeBSD$ PORTNAME= charmtimetracker -PORTVERSION= 1.11.4 +DISTVERSION= 1.11.4 +PORTREVISION= 1 CATEGORIES= deskutils -MAINTAINER= avg@icyb.net.ua +MAINTAINER= adridg@FreeBSD.org COMMENT= Time tracker +# The top-level license file is GPLv2, but all the sources say +# (at your option) GPLv2+ . LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= fails to compile: cc1plus: unrecognized command line option "-std=c++0x" +USES= cmake:outsource compiler:c++11-lib +# Use bundled keychain; the keychain is only used for KDAB-internal +# features not available or configurable in the port. +CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION} \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Keychain=TRUE USE_GITHUB= yes GH_ACCOUNT= KDAB GH_PROJECT= Charm -USES= cmake -CMAKE_ARGS+= -DCharm_VERSION:STRING=${PORTVERSION} -DCHARM_FORCE_QT4=true -USE_QT4= qmake_build moc_build rcc_build uic_build corelib dbus gui \ - network qtestlib script sql sql-sqlite3 xml -USE_XORG= ice x11 xext xscrnsaver -INSTALLS_ICONS= yes - -PORTDOCS= ReadMe.txt - -OPTIONS_DEFINE= DOCS - -post-install: - ${RM} ${STAGEDIR}${DOCSDIR}/License.txt +USE_QT5= core dbus gui \ + network printsupport script sql sql-sqlite3 \ + testlib widgets xml \ + buildtools_build qmake_build +USE_XORG= ice x11 xcb xext xscrnsaver .include Modified: head/deskutils/charmtimetracker/files/patch-CMakeLists.txt ============================================================================== --- head/deskutils/charmtimetracker/files/patch-CMakeLists.txt Wed Sep 27 15:38:47 2017 (r450758) +++ head/deskutils/charmtimetracker/files/patch-CMakeLists.txt Wed Sep 27 15:46:39 2017 (r450759) @@ -1,7 +1,34 @@ ---- CMakeLists.txt.orig 2012-04-19 18:05:29.938959913 +0300 -+++ CMakeLists.txt 2012-04-19 18:05:39.398959691 +0300 -@@ -191,7 +191,7 @@ + - Shuffle a little to enforce C++11 in a normal way + - Drop non-standard flags (unbreak PPC64) + - Don't install license, since the ports LICENSE_FILE already does that + +--- CMakeLists.txt.orig 2016-11-02 11:10:18 UTC ++++ CMakeLists.txt +@@ -1,4 +1,8 @@ +-PROJECT( Charm ) ++CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 ) ++PROJECT( Charm CXX ) ++SET( CMAKE_CXX_STANDARD 11 ) ++SET( CMAKE_CXX_STANDARD_REQUIRED ON ) ++ + IF( NOT Charm_VERSION ) + FIND_PACKAGE( Git QUIET ) + IF( EXISTS ${GIT_EXECUTABLE} ) +@@ -34,12 +38,8 @@ ENDIF() + + MESSAGE( STATUS "Building Charm ${Charm_VERSION} in ${CMAKE_BUILD_TYPE} mode" ) + +-CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 ) + SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake" ) + +-IF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") +- SET(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") +-ENDIF() + IF(MSVC) + SET(CMAKE_CXX_FLAGS "-D_USING_V110_SDK71_=1 ${CMAKE_CXX_FLAGS}") ENDIF() +@@ -191,7 +185,7 @@ IF( APPLE AND "${QT_VERSION_MAJOR}.${QT_ + ENDIF() IF( CMAKE_BUILD_TYPE MATCHES "^[Rr]elease$" ) - ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT ) @@ -9,3 +36,12 @@ ENDIF() # Always include the source and build directories in the include path +@@ -264,7 +258,7 @@ CONFIGURE_FILE( CharmCMake.h.cmake ${CMA + SET( LICENSE_FILE "License.txt" ) + SET( README_FILE "ReadMe.txt" ) + IF( NOT APPLE ) +- INSTALL( FILES "${LICENSE_FILE}" "${README_FILE}" DESTINATION ${DOC_INSTALL_DIR} ) ++ INSTALL( FILES "${README_FILE}" DESTINATION ${DOC_INSTALL_DIR} ) + ENDIF() + + # Only support CPack packaging on newer versions of CMake. Modified: head/deskutils/charmtimetracker/pkg-plist ============================================================================== --- head/deskutils/charmtimetracker/pkg-plist Wed Sep 27 15:38:47 2017 (r450758) +++ head/deskutils/charmtimetracker/pkg-plist Wed Sep 27 15:46:39 2017 (r450759) @@ -1,3 +1,4 @@ bin/charmtimetracker share/applications/charmtimetracker.desktop +%%DOCSDIR%%/ReadMe.txt share/icons/hicolor/128x128/apps/Charm-128x128.png