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_Display.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'x11-wm/blackbox/files/patch-lib_Display.cc') diff --git a/x11-wm/blackbox/files/patch-lib_Display.cc b/x11-wm/blackbox/files/patch-lib_Display.cc index 1fc8032f1aa4..a33e7ebbe961 100644 --- a/x11-wm/blackbox/files/patch-lib_Display.cc +++ b/x11-wm/blackbox/files/patch-lib_Display.cc @@ -1,5 +1,5 @@ ---- lib/Display.cc.orig 2005-01-03 10:42:38.000000000 +0100 -+++ lib/Display.cc 2013-08-31 15:42:48.395906537 +0200 +--- lib/Display.cc.orig 2005-01-03 09:42:38 UTC ++++ lib/Display.cc @@ -25,6 +25,7 @@ #include "Display.hh" @@ -16,7 +16,7 @@ namespace bt { void createBitmapLoader(const Display &display); -@@ -68,7 +68,7 @@ +@@ -68,7 +68,7 @@ bt::Display::Display(const char *dpy_name, bool multi_ if (!(xdisplay = XOpenDisplay(dpy_name))) { fprintf(stderr, "bt::Display: failed to open display '%s'\n", dpy_name ? dpy_name : ""); @@ -25,7 +25,7 @@ } #ifdef DEBUG -@@ -77,7 +77,7 @@ +@@ -77,7 +77,7 @@ bt::Display::Display(const char *dpy_name, bool multi_ if (fcntl(XConnectionNumber(xdisplay), F_SETFD, 1) == -1) { fprintf(stderr, "bt::Display: failed to mark connection close-on-exec\n"); -- cgit v1.2.3