From owner-svn-ports-all@freebsd.org Sun Jan 29 12:19:48 2017 Return-Path: Delivered-To: svn-ports-all@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 099E0CC4799; Sun, 29 Jan 2017 12:19:48 +0000 (UTC) (envelope-from danilo@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 D166C1E8; Sun, 29 Jan 2017 12:19:47 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0TCJkhQ056168; Sun, 29 Jan 2017 12:19:46 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0TCJk3d056163; Sun, 29 Jan 2017 12:19:46 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201701291219.v0TCJk3d056163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 29 Jan 2017 12:19:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432725 - in head/deskutils/charmtimetracker: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2017 12:19:48 -0000 Author: danilo Date: Sun Jan 29 12:19:46 2017 New Revision: 432725 URL: https://svnweb.freebsd.org/changeset/ports/432725 Log: - Update to 1.11.4 while here - Use CHARM_FORCE_QT4 option to avoid using QT5 if it's installed PR: 216427 Submitted by: avg Modified: head/deskutils/charmtimetracker/Makefile head/deskutils/charmtimetracker/distinfo head/deskutils/charmtimetracker/files/patch-CMakeLists.txt head/deskutils/charmtimetracker/pkg-plist Modified: head/deskutils/charmtimetracker/Makefile ============================================================================== --- head/deskutils/charmtimetracker/Makefile Sun Jan 29 12:03:15 2017 (r432724) +++ head/deskutils/charmtimetracker/Makefile Sun Jan 29 12:19:46 2017 (r432725) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= charmtimetracker -PORTVERSION= 1.6.0 -PORTREVISION= 2 +PORTVERSION= 1.11.4 CATEGORIES= deskutils MAINTAINER= avg@icyb.net.ua @@ -16,9 +15,9 @@ GH_ACCOUNT= KDAB GH_PROJECT= Charm USES= cmake -CMAKE_ARGS+= -DCharm_VERSION:STRING=${PORTVERSION} -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network \ - qtestlib sql sql-sqlite3 xml +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 Modified: head/deskutils/charmtimetracker/distinfo ============================================================================== --- head/deskutils/charmtimetracker/distinfo Sun Jan 29 12:03:15 2017 (r432724) +++ head/deskutils/charmtimetracker/distinfo Sun Jan 29 12:19:46 2017 (r432725) @@ -1,2 +1,3 @@ -SHA256 (KDAB-Charm-1.6.0_GH0.tar.gz) = 39027c827e7b62024f08f5cd64f0c8764571899c5931017d97894820b7bb200e -SIZE (KDAB-Charm-1.6.0_GH0.tar.gz) = 730617 +TIMESTAMP = 1481195995 +SHA256 (KDAB-Charm-1.11.4_GH0.tar.gz) = 24f31c76e30a56e87647a8aafa87e448e86e23e9e796c225b0e824a40dfb663b +SIZE (KDAB-Charm-1.11.4_GH0.tar.gz) = 809067 Modified: head/deskutils/charmtimetracker/files/patch-CMakeLists.txt ============================================================================== --- head/deskutils/charmtimetracker/files/patch-CMakeLists.txt Sun Jan 29 12:03:15 2017 (r432724) +++ head/deskutils/charmtimetracker/files/patch-CMakeLists.txt Sun Jan 29 12:19:46 2017 (r432725) @@ -1,11 +1,11 @@ --- CMakeLists.txt.orig 2012-04-19 18:05:29.938959913 +0300 +++ CMakeLists.txt 2012-04-19 18:05:39.398959691 +0300 -@@ -47,7 +47,7 @@ IF( APPLE AND "${QT_VERSION_MAJOR}.${QT_ +@@ -191,7 +191,7 @@ ENDIF() IF( CMAKE_BUILD_TYPE MATCHES "^[Rr]elease$" ) - ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT ) + ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT -DNDEBUG ) - ELSE() - MESSAGE( WARNING - "Only run Charm in Debug mode if you are doing development!\n" + ENDIF() + + # Always include the source and build directories in the include path Modified: head/deskutils/charmtimetracker/pkg-plist ============================================================================== --- head/deskutils/charmtimetracker/pkg-plist Sun Jan 29 12:03:15 2017 (r432724) +++ head/deskutils/charmtimetracker/pkg-plist Sun Jan 29 12:19:46 2017 (r432725) @@ -1,17 +1,3 @@ bin/charmtimetracker share/applications/charmtimetracker.desktop share/icons/hicolor/128x128/apps/Charm-128x128.png -share/icons/hicolor/16x16/apps/charmtray16.png -share/icons/hicolor/24x24/apps/01.png -share/icons/hicolor/24x24/apps/02.png -share/icons/hicolor/24x24/apps/03.png -share/icons/hicolor/24x24/apps/04.png -share/icons/hicolor/24x24/apps/05.png -share/icons/hicolor/24x24/apps/06.png -share/icons/hicolor/24x24/apps/07.png -share/icons/hicolor/24x24/apps/08.png -share/icons/hicolor/24x24/apps/09.png -share/icons/hicolor/24x24/apps/10.png -share/icons/hicolor/24x24/apps/11.png -share/icons/hicolor/24x24/apps/12.png -share/icons/hicolor/24x24/apps/charmtray24.png