diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-12-19 15:56:24 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-12-19 15:56:24 +0000 |
commit | 1afa5c8a429183ce5c3fcae03f5a404798ebda86 (patch) | |
tree | c49f526ed0177f76ace45c2c6ec3fd112bf423e7 /devel/kf5-kservice/Makefile | |
parent | 6339586dd75a6b76d6d39f078b3004ca17e07304 (diff) | |
download | ports-1afa5c8a429183ce5c3fcae03f5a404798ebda86.tar.gz ports-1afa5c8a429183ce5c3fcae03f5a404798ebda86.zip |
Update KDE Frameworks to 5.29.0
Release notes: https://www.kde.org/announcements/kde-frameworks-5.29.0.php
New ports:
* textproc/kf5-syntax-highlighting (new in 5.28.0)
* graphics/kf5-prison (new in 5.29.0)
Fixes:
* kf5-kservice: Move applications.menu to kf5-applications.menu to stop conflicting with kdelibs4.
* Define conflicts in the kde4-l10n ports (debian does the same).
* kf5-kapidox: Fix with python3
Thanks to Matthew Rezny <matthew@reztek.cz> for looking at the conflicts in 214528,
and Dima Panov (fluffy@) for the python3 fix.
PR: 214528
Reviewed by: rakuco, mat
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D8776
Notes
Notes:
svn path=/head/; revision=428946
Diffstat (limited to 'devel/kf5-kservice/Makefile')
-rw-r--r-- | devel/kf5-kservice/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/devel/kf5-kservice/Makefile b/devel/kf5-kservice/Makefile index b70b1705a75e..c80369484ae4 100644 --- a/devel/kf5-kservice/Makefile +++ b/devel/kf5-kservice/Makefile @@ -13,6 +13,9 @@ USE_KDE= archive config coreaddons crash dbusaddons \ doctools ecm i18n USE_QT5= buildtools_build core dbus gui qmake_build xml +# Make the applications.menu file not conflict with KDE4. +CMAKE_ARGS= -DAPPLICATIONS_MENU_NAME:STRING="kf5-applications.menu" + .include <bsd.port.pre.mk> # Flex on FreeBSD 9 and older 10 is too old .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 |