summaryrefslogtreecommitdiff
path: root/x11-wm/blackbox/files/patch-util_bsetroot.cc
diff options
context:
space:
mode:
authorKubilay Kocak <koobs@FreeBSD.org>2018-08-09 06:42:47 +0000
committerKubilay Kocak <koobs@FreeBSD.org>2018-08-09 06:42:47 +0000
commitd105717fd776352f833b81cacbb311fb41495b24 (patch)
treea86f0304bc164e35d8796bc6ee7ac358db86dbec /x11-wm/blackbox/files/patch-util_bsetroot.cc
parentUpdate devel/elixir-libring to version 1.3.2. (diff)
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<long>(x), static_cast<long>(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: <Trond Endrestol ximalas info> (Clang 6 fix) Approved by: Andrew J. Caines <A J Caines halplant com> (technically) Approved by: portmgr (implicit, build fixes, framework compliance) Reported by: Erich Dollansky <freebsd ed lists sumeritec com> [2] MFH: 2018Q3
Notes
Notes: svn path=/head/; revision=476722
Diffstat (limited to 'x11-wm/blackbox/files/patch-util_bsetroot.cc')
-rw-r--r--x11-wm/blackbox/files/patch-util_bsetroot.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/x11-wm/blackbox/files/patch-util_bsetroot.cc b/x11-wm/blackbox/files/patch-util_bsetroot.cc
index fc10d491203c..7efa9ec9c933 100644
--- a/x11-wm/blackbox/files/patch-util_bsetroot.cc
+++ b/x11-wm/blackbox/files/patch-util_bsetroot.cc
@@ -1,5 +1,5 @@
---- util/bsetroot.cc.orig 2013-08-31 16:18:50.697762748 +0200
-+++ util/bsetroot.cc 2013-08-31 16:19:53.695753444 +0200
+--- util/bsetroot.cc.orig 2005-03-15 07:01:37 UTC
++++ util/bsetroot.cc
@@ -28,6 +28,7 @@
#include <Texture.hh>
@@ -8,7 +8,7 @@
#include <X11/Xatom.h>
#include <stdio.h>
-@@ -68,11 +69,11 @@
+@@ -68,11 +69,11 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_na
} else if (! strcmp("-mod", argv[i])) {
if ((++i) >= argc) usage();
@@ -22,7 +22,7 @@
if (mod_x < 1) mod_x = 1;
if (mod_y < 1) mod_y = 1;
-@@ -336,7 +337,7 @@
+@@ -336,7 +337,7 @@ void bsetroot::usage(int exit_code) {
" -to <color> gradient end color\n\n"
" -solid <color> solid color\n\n"
" -help print this help text and exit\n");
@@ -31,7 +31,7 @@
}
int main(int argc, char **argv) {
-@@ -350,7 +351,7 @@
+@@ -350,7 +351,7 @@ int main(int argc, char **argv) {
if ((++i) >= argc) {
fprintf(stderr, "error: '-display' requires an argument\n");