CVS commit: pkgsrc/wm/blackbox

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Sep  4 19:16:13 UTC 2022

Modified Files:
        pkgsrc/wm/blackbox: Makefile distinfo
        pkgsrc/wm/blackbox/patches: patch-src_Toolbar.cc

Log Message:
blackbox: fix builds in some contexts (missing time.h)


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/wm/blackbox/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/wm/blackbox/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/blackbox/Makefile
diff -u pkgsrc/wm/blackbox/Makefile:1.40 pkgsrc/wm/blackbox/Makefile:1.41
--- pkgsrc/wm/blackbox/Makefile:1.40    Sun Oct  3 12:49:58 2021
+++ pkgsrc/wm/blackbox/Makefile Sun Sep  4 19:16:13 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2021/10/03 12:49:58 gutteridge Exp $
+# $NetBSD: Makefile,v 1.41 2022/09/04 19:16:13 gutteridge Exp $
 
 DISTNAME=      blackbox-0.77
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bbidulock/}
 GITHUB_PROJECT=        blackboxwm

Index: pkgsrc/wm/blackbox/distinfo
diff -u pkgsrc/wm/blackbox/distinfo:1.18 pkgsrc/wm/blackbox/distinfo:1.19
--- pkgsrc/wm/blackbox/distinfo:1.18    Tue Oct 26 11:25:10 2021
+++ pkgsrc/wm/blackbox/distinfo Sun Sep  4 19:16:13 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:25:10 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/09/04 19:16:13 gutteridge Exp $
 
 BLAKE2s (blackbox-0.77.tar.lz) = aa11578da7eeb667b33f11f71b833e9a7fd44d9c827c035bf96c758c0e38c150
 SHA512 (blackbox-0.77.tar.lz) = d33c611ae019ab37b936566470f318b7a9de601da6586f2b7485882e2da2c9a22cfaa6dd4850b9a749791f33a9dbb8bcb84c88cb10a890080eb437131f19c593
@@ -11,5 +11,5 @@ SHA1 (patch-lib_Image.cc) = ab49da02853b
 SHA1 (patch-lib_Menu.cc) = b16a7439fa5db1d287e5353ec5986a9c3ffd6cfb
 SHA1 (patch-lib_Unicode.cc) = 7a13e7822a9af71c97b24e167394d87a65e8be73
 SHA1 (patch-src_Screen.cc) = 7a75160a66eb6317930af063514688c6e5028569
-SHA1 (patch-src_Toolbar.cc) = 2fdcea33eff7b6a99f22ce7a77c9b713b4f005b5
+SHA1 (patch-src_Toolbar.cc) = 29a15bfacb9d28ddb6590f58f3ad035aa5127256
 SHA1 (patch-src_main.cc) = 24f43276e20f8fb89c6cb478e5e1bf52ea3eb659

Index: pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc
diff -u pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc:1.1 pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc:1.2
--- pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc:1.1 Thu Jun 10 12:48:50 2021
+++ pkgsrc/wm/blackbox/patches/patch-src_Toolbar.cc     Sun Sep  4 19:16:13 2022
@@ -1,10 +1,18 @@
-$NetBSD: patch-src_Toolbar.cc,v 1.1 2021/06/10 12:48:50 nia Exp $
+$NetBSD: patch-src_Toolbar.cc,v 1.2 2022/09/04 19:16:13 gutteridge Exp $
 
-Fix build failure when time_t is 64 bits on a 32-bit machine.
+* Fix build failure when time_t is 64 bits on a 32-bit machine.
+* Fix build with GCC 12 (missing <time.h> include)
+https://github.com/bbidulock/blackboxwm/commit/adb18c673fae698bfdcf979349aaf665ef224035
 
---- src/Toolbar.cc.orig        2016-07-10 16:31:38.000000000 +0000
+--- src/Toolbar.cc.orig        2013-09-24 17:20:15.000000000 +0000
 +++ src/Toolbar.cc
-@@ -43,8 +43,10 @@
+@@ -38,13 +38,16 @@
+ #include <X11/Xutil.h>
+ #include <sys/time.h>
+ #include <assert.h>
++#include <time.h>
+ 
+ 
  long nextTimeout(int resolution)
  {
    timeval now;