aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authordanilo <danilo@FreeBSD.org>2017-01-29 20:19:46 +0800
committerdanilo <danilo@FreeBSD.org>2017-01-29 20:19:46 +0800
commit01948a8cbc4c3f995285db24952b928277ce1f21 (patch)
tree47b803ca3b763f5e19144dbccbf4b8fd1f50130a /deskutils
parent1ea6d2042c2d1bf010209a2455ef2716238e34a4 (diff)
downloadfreebsd-ports-gnome-01948a8cbc4c3f995285db24952b928277ce1f21.tar.gz
freebsd-ports-gnome-01948a8cbc4c3f995285db24952b928277ce1f21.tar.zst
freebsd-ports-gnome-01948a8cbc4c3f995285db24952b928277ce1f21.zip
- 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
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/charmtimetracker/Makefile9
-rw-r--r--deskutils/charmtimetracker/distinfo5
-rw-r--r--deskutils/charmtimetracker/files/patch-CMakeLists.txt8
-rw-r--r--deskutils/charmtimetracker/pkg-plist14
4 files changed, 11 insertions, 25 deletions
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index ca0ebbb36fcc..0439c9ad0a4c 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -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
diff --git a/deskutils/charmtimetracker/distinfo b/deskutils/charmtimetracker/distinfo
index c7d153ca24d1..6b70abd4f73f 100644
--- a/deskutils/charmtimetracker/distinfo
+++ b/deskutils/charmtimetracker/distinfo
@@ -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
diff --git a/deskutils/charmtimetracker/files/patch-CMakeLists.txt b/deskutils/charmtimetracker/files/patch-CMakeLists.txt
index 95ecdac1fe82..a096085b9e2c 100644
--- a/deskutils/charmtimetracker/files/patch-CMakeLists.txt
+++ b/deskutils/charmtimetracker/files/patch-CMakeLists.txt
@@ -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
diff --git a/deskutils/charmtimetracker/pkg-plist b/deskutils/charmtimetracker/pkg-plist
index b048d1634079..7ef0220b0d53 100644
--- a/deskutils/charmtimetracker/pkg-plist
+++ b/deskutils/charmtimetracker/pkg-plist
@@ -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