From d105717fd776352f833b81cacbb311fb41495b24 Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Thu, 9 Aug 2018 06:42:47 +0000 Subject: x11-wm/blackbox: Fix build with Clang 6, Fix TOOLS_ONLY option Clang 6 (on 12-CURRENT) reports the following error during build: EWMH.cc:250:7: error: non-constant-expression cannot be narrowed from type 'long' to 'unsigned long' in initializer list [-Wc++11-narrowing] { static_cast(x), static_cast(y) }; ^~~~~~~~~~~~~~~~~~~~ There was also a bug introduced 4 years ago which removed the MAN1 variable a later INSTALL_MAN macro relied on [1]. This caused a build/install failure when the TOOLS_ONLY option was enabled. This change fixes those two issues. While I'm here level up port compliance: - Add LICENSE_FILE - Convert to OPTIONS helpers - Regenerate patches [1] http://svnweb.freebsd.org/changeset/ports/346174 [2] https://lists.freebsd.org/pipermail/freebsd-ports/2018-August/114039.html PR: 226708 Submitted by: (Clang 6 fix) Approved by: Andrew J. Caines (technically) Approved by: portmgr (implicit, build fixes, framework compliance) Reported by: Erich Dollansky [2] MFH: 2018Q3 --- x11-wm/blackbox/files/patch-lib_EWMH.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 x11-wm/blackbox/files/patch-lib_EWMH.cc (limited to 'x11-wm/blackbox/files/patch-lib_EWMH.cc') diff --git a/x11-wm/blackbox/files/patch-lib_EWMH.cc b/x11-wm/blackbox/files/patch-lib_EWMH.cc new file mode 100644 index 000000000000..78d2e557bf03 --- /dev/null +++ b/x11-wm/blackbox/files/patch-lib_EWMH.cc @@ -0,0 +1,15 @@ +# Fix error: non-constant-expression cannot be narrowed from type 'long' to +# 'unsigned long' in initializer list [-Wc++11-narrowing] +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226708 + +--- lib/EWMH.cc.orig 2018-08-09 04:45:57 UTC ++++ lib/EWMH.cc +@@ -247,7 +247,7 @@ bool bt::EWMH::readDesktopGeometry(Window target, + + void bt::EWMH::setDesktopViewport(Window target, int x, int y) const { + const unsigned long viewport[] = +- { static_cast(x), static_cast(y) }; ++ { static_cast(x), static_cast(y) }; + setProperty(target, XA_CARDINAL, net_desktop_viewport, + reinterpret_cast(viewport), 2); + } -- cgit v1.2.3