diff options
Diffstat (limited to 'x11-wm/plasma5-kwin')
| -rw-r--r-- | x11-wm/plasma5-kwin/Makefile | 8 | ||||
| -rw-r--r-- | x11-wm/plasma5-kwin/files/extra-patch-fbsd10 | 16 |
2 files changed, 1 insertions, 23 deletions
diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 59843fca4d55..20e39ed40133 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -43,14 +43,8 @@ USE_QT= concurrent core dbus gui multimedia network qml quick script \ quickcontrols2_run virtualkeyboard_run USE_XORG= ice sm x11 xcb xext xi -.include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -# Base compiler clang 3.5 does not understand -Winconsistent-missing-override -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd10 -.endif - post-patch: ${REINPLACE_CMD} '/sysmacros.h/d' \ ${PATCH_WRKSRC}/logind.cpp -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/plasma5-kwin/files/extra-patch-fbsd10 b/x11-wm/plasma5-kwin/files/extra-patch-fbsd10 deleted file mode 100644 index a5b793dfb540..000000000000 --- a/x11-wm/plasma5-kwin/files/extra-patch-fbsd10 +++ /dev/null @@ -1,16 +0,0 @@ -Clang 3.4 (base compiler in 10-STABLE) does not know --Winconsistent-missing-override, and having that flag -in the CXX flags messes up visibility detection. So -don't warn about unknown warnings. - ---- CMakeLists.txt.orig 2017-09-21 18:34:57.176858000 +0200 -+++ CMakeLists.txt 2017-09-21 18:35:15.580988000 +0200 -@@ -53,7 +53,7 @@ - set(CMAKE_CXX_STANDARD_REQUIRED ON) - - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override") - endif() - - find_package(Qt5Multimedia QUIET) |