pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm Make wm/blackbox the latest version, remove weird v...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fe6c74fcf991
branches: trunk
changeset: 454392:fe6c74fcf991
user: nia <nia%pkgsrc.org@localhost>
date: Thu Jun 10 12:48:49 2021 +0000
description:
Make wm/blackbox the latest version, remove weird versioned packages
concept ok'd by gutteridge
diffstat:
wm/Makefile | 5 +-
wm/bbkeys/MESSAGE | 7 -
wm/bbkeys/Makefile | 13 ++-
wm/bbkeys/PLIST | 20 ++--
wm/bbkeys/distinfo | 16 ++-
wm/bbkeys/patches/patch-Makefile.in | 15 +++
wm/bbkeys/patches/patch-aa | 13 --
wm/bbkeys/patches/patch-src_Config.cpp | 14 +++
wm/bbkeys/patches/patch-src_KeyClient.cpp | 26 +++++
wm/bbkeys/patches/patch-src_Netclient.cpp | 49 ++++++++++
wm/bbkeys/patches/patch-src_ScreenHandler.cpp | 61 +++++++++++++
wm/bbkeys09/DESCR | 5 -
wm/bbkeys09/Makefile | 29 ------
wm/bbkeys09/PLIST | 13 --
wm/bbkeys09/distinfo | 11 --
wm/bbkeys09/patches/patch-Makefile.in | 15 ---
wm/bbkeys09/patches/patch-src_Config.cpp | 14 ---
wm/bbkeys09/patches/patch-src_KeyClient.cpp | 26 -----
wm/bbkeys09/patches/patch-src_Netclient.cpp | 49 ----------
wm/bbkeys09/patches/patch-src_ScreenHandler.cpp | 61 -------------
wm/bbpager/Makefile | 20 ++-
wm/bbpager/PLIST | 5 +-
wm/bbpager/distinfo | 14 +-
wm/bbpager/patches/patch-aa | 2 +-
wm/bbpager/patches/patch-ab | 2 +-
wm/bbpager/patches/patch-resource.cc | 20 ----
wm/bbpager/patches/patch-src_Baseresource.cxx | 12 ++
wm/bbpager/patches/patch-src_main.cxx | 12 ++
wm/bbpager/patches/patch-src_resource.cxx | 13 ++
wm/bbpager04/DESCR | 1 -
wm/bbpager04/Makefile | 30 ------
wm/bbpager04/PLIST | 6 -
wm/bbpager04/distinfo | 11 --
wm/bbpager04/patches/patch-aa | 89 -------------------
wm/bbpager04/patches/patch-ab | 56 ------------
wm/bbpager04/patches/patch-src_Baseresource.cxx | 12 --
wm/bbpager04/patches/patch-src_main.cxx | 12 --
wm/bbpager04/patches/patch-src_resource.cxx | 13 --
wm/blackbox/Makefile | 30 ++++--
wm/blackbox/PLIST | 99 ++++++++++++++-------
wm/blackbox/distinfo | 29 +++--
wm/blackbox/patches/patch-aa | 13 --
wm/blackbox/patches/patch-ab | 13 --
wm/blackbox/patches/patch-ac | 14 ---
wm/blackbox/patches/patch-ad | 13 --
wm/blackbox/patches/patch-ae | 16 ---
wm/blackbox/patches/patch-doc_fr__FR_Makefile.in | 15 +++
wm/blackbox/patches/patch-doc_ja__JP_Makefile.in | 15 +++
wm/blackbox/patches/patch-doc_nl__NL_Makefile.in | 15 +++
wm/blackbox/patches/patch-doc_sl__SI_Makefile.in | 15 +++
wm/blackbox/patches/patch-lib_Image.cc | 49 ++++++++++
wm/blackbox/patches/patch-lib_Menu.cc | 87 +++++++++++++++++++
wm/blackbox/patches/patch-lib_Unicode.cc | 45 ++++++++++
wm/blackbox/patches/patch-src_GCCache.cc | 12 --
wm/blackbox/patches/patch-src_Image.cc | 12 --
wm/blackbox/patches/patch-src_ImageControl.cc | 12 --
wm/blackbox/patches/patch-src_Screen.cc | 17 +++
wm/blackbox/patches/patch-src_Toolbar.cc | 18 ++++
wm/blackbox/patches/patch-src_main.cc | 15 +++
wm/blackbox/patches/patch-util_bsetbg | 10 ++
wm/blackbox70/DESCR | 4 -
wm/blackbox70/Makefile | 34 -------
wm/blackbox70/PLIST | 81 ------------------
wm/blackbox70/buildlink3.mk | 21 ----
wm/blackbox70/distinfo | 17 ---
wm/blackbox70/options.mk | 27 ------
wm/blackbox70/patches/patch-doc_fr__FR_Makefile.in | 15 ---
wm/blackbox70/patches/patch-doc_ja__JP_Makefile.in | 15 ---
wm/blackbox70/patches/patch-doc_nl__NL_Makefile.in | 15 ---
wm/blackbox70/patches/patch-doc_sl__SI_Makefile.in | 15 ---
wm/blackbox70/patches/patch-lib_Image.cc | 49 ----------
wm/blackbox70/patches/patch-lib_Menu.cc | 87 -------------------
wm/blackbox70/patches/patch-lib_Unicode.cc | 45 ----------
wm/blackbox70/patches/patch-src_Screen.cc | 17 ---
wm/blackbox70/patches/patch-src_Toolbar.cc | 18 ----
wm/blackbox70/patches/patch-src_main.cc | 15 ---
wm/blackbox70/patches/patch-util_bsetbg | 10 --
77 files changed, 656 insertions(+), 1185 deletions(-)
diffs (truncated from 2254 to 300 lines):
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/Makefile
--- a/wm/Makefile Thu Jun 10 12:26:26 2021 +0000
+++ b/wm/Makefile Thu Jun 10 12:48:49 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2021/04/25 04:43:30 wiz Exp $
+# $NetBSD: Makefile,v 1.163 2021/06/10 12:48:49 nia Exp $
#
COMMENT= X11 window managers, configuration tools, and themes
@@ -11,13 +11,10 @@
SUBDIR+= amiwm
SUBDIR+= awesome
SUBDIR+= bbkeys
-SUBDIR+= bbkeys09
SUBDIR+= bbpager
-SUBDIR+= bbpager04
SUBDIR+= bbrun
SUBDIR+= berry
SUBDIR+= blackbox
-SUBDIR+= blackbox70
SUBDIR+= bmpanel2
SUBDIR+= bsetroot
SUBDIR+= bspwm
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/MESSAGE
--- a/wm/bbkeys/MESSAGE Thu Jun 10 12:26:26 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/07/14 03:48:02 dholland Exp $
-
-This version of bbkeys does not work with semi-recent X servers (since
-Xorg) unless the compositing extension ("Composite") is disabled in
-the server configuration.
-===========================================================================
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/Makefile
--- a/wm/bbkeys/Makefile Thu Jun 10 12:26:26 2021 +0000
+++ b/wm/bbkeys/Makefile Thu Jun 10 12:48:49 2021 +0000
@@ -1,24 +1,29 @@
-# $NetBSD: Makefile,v 1.36 2021/05/24 19:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2021/06/10 12:48:49 nia Exp $
#
-DISTNAME= bbkeys-0.8.6
-PKGREVISION= 10
+DISTNAME= bbkeys-0.9.1
CATEGORIES= x11 wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbkeys/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://bbkeys.sourceforge.net/
COMMENT= General X Window keygrabber
+LICENSE= mit
CONFLICTS+= bbkeys09-[0-9]*
+SUPERSEDES+= bbkeys09-[0-9]*
+PREV_PKGPATH= wm/bbkeys09
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pkg-config
BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../wm/blackbox/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/PLIST
--- a/wm/bbkeys/PLIST Thu Jun 10 12:26:26 2021 +0000
+++ b/wm/bbkeys/PLIST Thu Jun 10 12:48:49 2021 +0000
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:40:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/06/10 12:48:49 nia Exp $
bin/bbkeys
-bin/bbkeysconf.pl
man/man1/bbkeys.1
-man/man5/bbkeys.bb.5
man/man5/bbkeysrc.5
-share/bbtools/bbkeys.bb
-share/bbtools/bbkeys.nobb
-share/doc/bbkeys/AUTHORS
-share/doc/bbkeys/BUGS
-share/doc/bbkeys/ChangeLog
-share/doc/bbkeys/NEWS
-share/doc/bbkeys/README
+share/bbkeys/bbkeysrc
+share/bbkeys/defaultStyle
+share/share/doc/bbkeys/AUTHORS
+share/share/doc/bbkeys/BUGS
+share/share/doc/bbkeys/ChangeLog
+share/share/doc/bbkeys/LICENSE
+share/share/doc/bbkeys/NEWS
+share/share/doc/bbkeys/README
+share/share/doc/bbkeys/TODO
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/distinfo
--- a/wm/bbkeys/distinfo Thu Jun 10 12:26:26 2021 +0000
+++ b/wm/bbkeys/distinfo Thu Jun 10 12:48:49 2021 +0000
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.7 2015/11/02 23:42:50 agc Exp $
+$NetBSD: distinfo,v 1.8 2021/06/10 12:48:49 nia Exp $
-SHA1 (bbkeys-0.8.6.tar.gz) = b1638ec44903fffbe8ca822b6ee854c8d48d91eb
-RMD160 (bbkeys-0.8.6.tar.gz) = c78e1386e18131105a9be7eacf249026d315c516
-SHA512 (bbkeys-0.8.6.tar.gz) = 41d498c75d947ea8f9c1c621e92adb8fcada3e388fdf9da60cd8ab0194f215993f9868b80cc5f0ac1aae2dcd03f03dabfc0de0a59a166d87339143919fd13248
-Size (bbkeys-0.8.6.tar.gz) = 185230 bytes
-SHA1 (patch-aa) = 303186f314c9d0f18415cef97630e874de14048d
+SHA1 (bbkeys-0.9.1.tar.gz) = 93708f6b082e1b6e61173b49e2198f24411f3470
+RMD160 (bbkeys-0.9.1.tar.gz) = b498845ea6cd11dd638f203b75e9ec14ca0e62ce
+SHA512 (bbkeys-0.9.1.tar.gz) = c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
+Size (bbkeys-0.9.1.tar.gz) = 226941 bytes
+SHA1 (patch-Makefile.in) = 3e61b500d79de5cafa5d746b546196c9a9a3a652
+SHA1 (patch-src_Config.cpp) = 8624e2bc6a08c6d6de0b0e488617ce84c1fe1d15
+SHA1 (patch-src_KeyClient.cpp) = e6c9479b1847f0872d729cc5a112b9293d6158ee
+SHA1 (patch-src_Netclient.cpp) = 6d91c21a6eb33dd860c39e207d8c3fa3b1842b9b
+SHA1 (patch-src_ScreenHandler.cpp) = 8c883c9c9db39bca86f8579dc8ba1cc35b619d7c
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/bbkeys/patches/patch-Makefile.in Thu Jun 10 12:48:49 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Place documents elsewhere.
+
+--- Makefile.in.orig 2008-12-22 03:08:52.000000000 +0000
++++ Makefile.in
+@@ -152,7 +152,7 @@ build_alias = @build_alias@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/bbkeys
++docdir = $(datadir)/share/doc/bbkeys
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/patches/patch-aa
--- a/wm/bbkeys/patches/patch-aa Thu Jun 10 12:26:26 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/09/24 14:21:53 jschauma Exp $
-
---- Makefile.in.orig Tue Sep 24 10:06:49 2002
-+++ Makefile.in Tue Sep 24 10:07:14 2002
-@@ -80,7 +80,7 @@
-
- SUBDIRS = src data doc redhat
-
--docdir = $(prefix)/doc/bbkeys
-+docdir = $(prefix)/share/doc/bbkeys
- doc_DATA = README AUTHORS BUGS ChangeLog NEWS
- EXTRA_DIST = $(doc_DATA) debian
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/patches/patch-src_Config.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/bbkeys/patches/patch-src_Config.cpp Thu Jun 10 12:48:49 2021 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Config.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Include strings.h too.
+
+--- src/Config.cpp.orig 2011-11-25 16:58:41.000000000 +0000
++++ src/Config.cpp
+@@ -25,6 +25,7 @@
+
+ #include "Config.h"
+ #include <string>
++#include <strings.h>
+
+ #include <iostream>
+ using std::cout;
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/patches/patch-src_KeyClient.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/bbkeys/patches/patch-src_KeyClient.cpp Thu Jun 10 12:48:49 2021 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_KeyClient.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Include strings.h too.
+Initialize all pointers.
+
+--- src/KeyClient.cpp.orig 2008-12-22 01:52:35.000000000 +0000
++++ src/KeyClient.cpp
+@@ -46,6 +46,7 @@ extern "C" {
+
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <strings.h>
+
+ }
+
+@@ -104,6 +105,10 @@ KeyClient::KeyClient (int argc, char **a
+ _netclient = new Netclient(this->display());
+ _active = _clients.end();
+
++ // Initialize uninitialized pointers to NULL
++ _keybindings = NULL;
++ config_check_timer = NULL;
++
+ initialize();
+ }
+
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/patches/patch-src_Netclient.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/bbkeys/patches/patch-src_Netclient.cpp Thu Jun 10 12:48:49 2021 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_Netclient.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Fix LP64 problem with the X11 protocol handling, from FreeBSD.
+
+--- src/Netclient.cpp.orig 2008-12-22 01:10:19.000000000 +0000
++++ src/Netclient.cpp
+@@ -141,6 +141,7 @@ bool Netclient::getValue(Window win, Ato
+ int result;
+ unsigned long maxread = nelements;
+ bool ret = False;
++ int bsize;
+
+ // try get the first element
+ result = XGetWindowProperty(_display.XDisplay(), win, atom, 0l, 1l, False,
+@@ -149,18 +150,19 @@ bool Netclient::getValue(Window win, Ato
+ ret = (result == Success && ret_type == type && ret_size == size &&
+ nelements > 0);
+ if (ret) {
++ bsize = (size == 32) ? sizeof(long) : size/8;
+ if (ret_bytes == 0 || maxread <= nelements) {
+ // we got the whole property's value
+- *value = new unsigned char[nelements * size/8 + 1];
+- memcpy(*value, c_val, nelements * size/8 + 1);
++ *value = new unsigned char[nelements * bsize + 1];
++ memcpy(*value, c_val, nelements * bsize + 1);
+ } else {
+ // get the entire property since it is larger than one long
+ XFree(c_val);
+ // the number of longs that need to be retreived to get the property's
+ // entire value. The last + 1 is the first long that we retrieved above.
+ int remain = (ret_bytes - 1)/sizeof(long) + 1 + 1;
+- if (remain > size/8 * (signed)maxread) // dont get more than the max
+- remain = size/8 * (signed)maxread;
++ if (remain > bsize * (signed)maxread) // dont get more than the max
++ remain = bsize * (signed)maxread;
+ result = XGetWindowProperty(_display.XDisplay(), win, atom, 0l, remain, False, type,
+ &ret_type, &ret_size, &nelements, &ret_bytes,
+ &c_val);
+@@ -174,8 +176,8 @@ bool Netclient::getValue(Window win, Ato
+ if (! ret)
+ return getValue(win, atom, type, maxread, value, size);
+
+- *value = new unsigned char[nelements * size/8 + 1];
+- memcpy(*value, c_val, nelements * size/8 + 1);
++ *value = new unsigned char[nelements * bsize + 1];
++ memcpy(*value, c_val, nelements * bsize + 1);
+ }
+ }
+ if (c_val) XFree(c_val);
diff -r 0b29c3079d91 -r fe6c74fcf991 wm/bbkeys/patches/patch-src_ScreenHandler.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/bbkeys/patches/patch-src_ScreenHandler.cpp Thu Jun 10 12:48:49 2021 +0000
@@ -0,0 +1,61 @@
+$NetBSD: patch-src_ScreenHandler.cpp,v 1.1 2021/06/10 12:48:49 nia Exp $
+
+Debug output for missing active window.
+Used while debugging what turned out to be an LP64 problem,
+but may be useful later, so left here.
+
+--- src/ScreenHandler.cpp.orig 2008-12-22 02:48:59.000000000 +0000
++++ src/ScreenHandler.cpp
+@@ -467,6 +467,9 @@ void ScreenHandler::keyPressEvent (const
+ assert(false); // unhandled action type!
+ break;
+ }
++ } else {
++ if ( _debug )
++ cout <<BBTOOL << ": " << "No active window" <<endl;
+ }
+ }
+
+@@ -564,18 +567,26 @@ void ScreenHandler::updateActiveWindow()
+ {
+ assert(_managed);
+
++ if ( _debug )
++ cout <<BBTOOL << ": " << "checking active window" <<endl;
++
+ Window a = None;
+ _netclient->getValue(_root, _netclient->activeWindow(), XA_WINDOW, a);
+
+ if ( None == a ) {
++ if ( _debug )
++ cout <<BBTOOL << ": " << "no active window found" << endl;
+ return;
+ }
+
+ WindowList::iterator it, end = _clients.end();
+ for (it = _clients.begin(); it != end; ++it) {
+ if ( (*it)->window() == a) {
+- if ( (*it)->getScreenNumber() != _screenNumber )
++ if ( (*it)->getScreenNumber() != _screenNumber ) {
++ if ( _debug )
Home |
Main Index |
Thread Index |
Old Index