pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/wm/blackbox70
Module Name: pkgsrc
Committed By: he
Date: Fri Oct 12 18:00:55 UTC 2018
Modified Files:
pkgsrc/wm/blackbox70: Makefile PLIST distinfo
Added Files:
pkgsrc/wm/blackbox70/patches: patch-autogen.sh
patch-doc_fr__FR_Makefile.am patch-doc_ja__JP_Makefile.am
patch-doc_nl__NL_Makefile.am patch-doc_sl__SI_Makefile.am
patch-lib_Image.cc patch-lib_Menu.cc patch-lib_Unicode.cc
patch-src_Screen.cc patch-src_Toolbar.cc patch-util_bsetbg
Removed Files:
pkgsrc/wm/blackbox70/patches: patch-aa patch-ab patch-ac
patch-lib-Resource.cc patch-lib-Util.hh patch-lib-XDG.cc
patch-lib_Display.cc patch-lib_Pen.cc patch-lib_Texture.cc
patch-src-BlackboxResource.cc patch-src-ScreenResource.cc
patch-src-main.cc patch-src_Window.cc patch-src_blackbox.cc
patch-util-bsetroot.cc
Log Message:
Switch upstream for blackbox70, and upgrade to version 0.72.
The old upstream last had a release in November 2005, and the new
upstream in May this year. In recent rebuilds, the old version
has developed "focus issues" when run with "sloppy focus", as is
my preference. The new upstream is a fork of blackbox but where
this among other issues have been fixed.
The patches have also been re-done and partly renamed, and some of
the old patches to build with SunPro have not been carried forward,
as I don't have a suitable system to verify that these are still
required.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/wm/blackbox70/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/blackbox70/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/blackbox70/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/wm/blackbox70/patches/patch-aa \
pkgsrc/wm/blackbox70/patches/patch-ab \
pkgsrc/wm/blackbox70/patches/patch-ac \
pkgsrc/wm/blackbox70/patches/patch-src-main.cc
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/blackbox70/patches/patch-autogen.sh \
pkgsrc/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am \
pkgsrc/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am \
pkgsrc/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am \
pkgsrc/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am \
pkgsrc/wm/blackbox70/patches/patch-lib_Image.cc \
pkgsrc/wm/blackbox70/patches/patch-lib_Menu.cc \
pkgsrc/wm/blackbox70/patches/patch-lib_Unicode.cc \
pkgsrc/wm/blackbox70/patches/patch-src_Screen.cc \
pkgsrc/wm/blackbox70/patches/patch-src_Toolbar.cc \
pkgsrc/wm/blackbox70/patches/patch-util_bsetbg
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/blackbox70/patches/patch-lib-Resource.cc \
pkgsrc/wm/blackbox70/patches/patch-lib-Util.hh \
pkgsrc/wm/blackbox70/patches/patch-lib-XDG.cc \
pkgsrc/wm/blackbox70/patches/patch-lib_Display.cc \
pkgsrc/wm/blackbox70/patches/patch-lib_Pen.cc \
pkgsrc/wm/blackbox70/patches/patch-lib_Texture.cc \
pkgsrc/wm/blackbox70/patches/patch-src-BlackboxResource.cc \
pkgsrc/wm/blackbox70/patches/patch-src-ScreenResource.cc \
pkgsrc/wm/blackbox70/patches/patch-src_Window.cc \
pkgsrc/wm/blackbox70/patches/patch-src_blackbox.cc \
pkgsrc/wm/blackbox70/patches/patch-util-bsetroot.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/blackbox70/Makefile
diff -u pkgsrc/wm/blackbox70/Makefile:1.12 pkgsrc/wm/blackbox70/Makefile:1.13
--- pkgsrc/wm/blackbox70/Makefile:1.12 Wed Jul 18 00:06:24 2018
+++ pkgsrc/wm/blackbox70/Makefile Fri Oct 12 18:00:55 2018
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.12 2018/07/18 00:06:24 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2018/10/12 18:00:55 he Exp $
-DISTNAME= blackbox-0.70.1
-PKGNAME= blackbox70-0.70.1
-PKGREVISION= 1
+VERSION= 0.72
+DISTNAME= blackbox-${VERSION}
+PKGNAME= blackbox70-${VERSION}
CATEGORIES= wm x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=bbidulock/}
+GITHUB_PROJECT= blackboxwm
+GITHUB_TAG= ${VERSION}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/bradleythughes/blackbox
-COMMENT= Small and fast X11R6 window manager
+HOMEPAGE= https://github.com/bbidulock/blackboxwm
+COMMENT= Small and fast X11 window manager
CONFLICTS= bsetroot-[0-9]*
CONFLICTS+= blackbox-[0-9]*
@@ -17,11 +19,15 @@ USE_LANGUAGES= c c++03
GNU_CONFIGURE= YES
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
+USE_TOOLS+= automake autoconf
LIBS+= ${BUILDLINK_LDADD.iconv}
BUILDLINK_DEPMETHOD.libXt?= build
+pre-configure:
+ cd ${WRKSRC}; ./autogen.sh
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
Index: pkgsrc/wm/blackbox70/PLIST
diff -u pkgsrc/wm/blackbox70/PLIST:1.2 pkgsrc/wm/blackbox70/PLIST:1.3
--- pkgsrc/wm/blackbox70/PLIST:1.2 Sun Jun 14 18:18:57 2009
+++ pkgsrc/wm/blackbox70/PLIST Fri Oct 12 18:00:55 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:18:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/10/12 18:00:55 he Exp $
bin/blackbox
bin/bsetbg
bin/bsetroot
@@ -23,12 +23,33 @@ include/bt/Util.hh
include/bt/XDG.hh
lib/libbt.la
lib/pkgconfig/libbt.pc
+man/fr/man1/blackbox.1
+man/fr/man1/bsetroot.1
+man/ja/man1/blackbox.1
+man/ja/man1/bsetroot.1
man/man1/blackbox.1
man/man1/bsetbg.1
man/man1/bsetroot.1
+man/nl/man1/blackbox.1
+man/nl/man1/bsetroot.1
+man/sl/man1/blackbox.1
share/blackbox/menu
+share/blackbox/styles/Artwiz
share/blackbox/styles/Blue
+share/blackbox/styles/Cthulhain
+share/blackbox/styles/Flux
share/blackbox/styles/Gray
share/blackbox/styles/Green
+share/blackbox/styles/Minimal
+share/blackbox/styles/Nyz
+share/blackbox/styles/Operation
+share/blackbox/styles/Outcomes
share/blackbox/styles/Purple
+share/blackbox/styles/Rampage
+share/blackbox/styles/Rancor
share/blackbox/styles/Red
+share/blackbox/styles/Results
+share/blackbox/styles/Shade
+share/blackbox/styles/Spiff
+share/blackbox/styles/TDF
+share/blackbox/styles/Twice
Index: pkgsrc/wm/blackbox70/distinfo
diff -u pkgsrc/wm/blackbox70/distinfo:1.7 pkgsrc/wm/blackbox70/distinfo:1.8
--- pkgsrc/wm/blackbox70/distinfo:1.7 Mon Nov 2 23:42:51 2015
+++ pkgsrc/wm/blackbox70/distinfo Fri Oct 12 18:00:55 2018
@@ -1,22 +1,17 @@
-$NetBSD: distinfo,v 1.7 2015/11/02 23:42:51 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/10/12 18:00:55 he Exp $
-SHA1 (blackbox-0.70.1.tar.gz) = f0ab7e4b44ae6ee4c2a2136651afc567c47fe2cd
-RMD160 (blackbox-0.70.1.tar.gz) = ab80c43d42dbfac23c9f981885f25a42c66f51a6
-SHA512 (blackbox-0.70.1.tar.gz) = 99d1cd344b37c012828d2892bb6dfab2385aba6f1e3d981f7d976affe553856acadd6e17809fc01d5f6e7c1b8a423acab05c3c44405a716d3141e87a71e38798
-Size (blackbox-0.70.1.tar.gz) = 650400 bytes
-SHA1 (patch-aa) = 36e90d9a54329009c1d1fd9788ebe349858578b3
-SHA1 (patch-ab) = 1e568872f238e05be11d2a4f25cc38c9fa461b71
-SHA1 (patch-ac) = 5f7132230ab4c53bf5042a274592bae45c6a15ed
-SHA1 (patch-lib-Resource.cc) = 8ac7fee379aa940f85c7800572be5ee3bb4202c5
-SHA1 (patch-lib-Util.hh) = b0bbf923ee06d200666ce96b6bf5ad648b361fd8
-SHA1 (patch-lib-XDG.cc) = 55422803fd20b8f100816a204de7af22f00ba51c
-SHA1 (patch-lib_Display.cc) = 3b9c3dd6f9a309d4dc77409f3523608214e52926
-SHA1 (patch-lib_Pen.cc) = 41da4c0b2aad21d875be6521257e791926b31143
-SHA1 (patch-lib_Texture.cc) = 9c076e2f47d7ca99f422098323f19b60bbf389b4
-SHA1 (patch-src-BlackboxResource.cc) = 66d022f7a91f2054c45c3f38a0fe98da4ddce3de
-SHA1 (patch-src-ScreenResource.cc) = ec09befadf9e92bd9e9543f7e9b472639bf6e8d5
-SHA1 (patch-src-Toolbar.cc) = 6f301302c3370b67feb22dc066ed4aac0624d23d
-SHA1 (patch-src-main.cc) = c5469f129f13b77c403ae54beba134ab26631652
-SHA1 (patch-src_Window.cc) = fbf093e74c4d1779e65830ad6c32c0733bfc5ee3
-SHA1 (patch-src_blackbox.cc) = a17c3eec5f6375feb8e68c4d53811bae5ab94d5b
-SHA1 (patch-util-bsetroot.cc) = 87b3e5aab03facfce88286f25df14580c39582c6
+SHA1 (blackbox-0.72.tar.gz) = 87e90c7d6da9f94a79100433490b33de4189f194
+RMD160 (blackbox-0.72.tar.gz) = 3991d8512703cceafcd93185978684441d06d7d7
+SHA512 (blackbox-0.72.tar.gz) = 8fffb8857240cfa11876c29dbb61dff3381b8e5b6f1937e14c81202d30b0cbc23135e42c6d8829c6e7ab7cdc821a1a62fee34db59da9b846634175442c5d7c1e
+Size (blackbox-0.72.tar.gz) = 360673 bytes
+SHA1 (patch-autogen.sh) = 28074bddfdfb4df2d78122f6bb8089522028ef23
+SHA1 (patch-doc_fr__FR_Makefile.am) = 77fdac4d552af2ef0e8d43c5f6f8aeb0f8e20862
+SHA1 (patch-doc_ja__JP_Makefile.am) = e5dcdf4da59f805547cbf0cc9eb5d28468685e2b
+SHA1 (patch-doc_nl__NL_Makefile.am) = 951a4babc59a7a237cf662c7c3a2d2b865d9495b
+SHA1 (patch-doc_sl__SI_Makefile.am) = b348b43e5c8064cd4b46212d3bd609a2f41c7f02
+SHA1 (patch-lib_Image.cc) = ab49da02853b670843f4884517f0727d4569d50a
+SHA1 (patch-lib_Menu.cc) = b16a7439fa5db1d287e5353ec5986a9c3ffd6cfb
+SHA1 (patch-lib_Unicode.cc) = b2936e86dab0e4d0104312b5a387081a3fa02134
+SHA1 (patch-src_Screen.cc) = 7a75160a66eb6317930af063514688c6e5028569
+SHA1 (patch-src_Toolbar.cc) = 2fdcea33eff7b6a99f22ce7a77c9b713b4f005b5
+SHA1 (patch-util_bsetbg) = 2e5ea600ef842ff677591220398fb7300d210397
Added files:
Index: pkgsrc/wm/blackbox70/patches/patch-autogen.sh
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-autogen.sh:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-autogen.sh Fri Oct 12 18:00:55 2018
@@ -0,0 +1,10 @@
+$NetBSD: patch-autogen.sh,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- autogen.sh.orig 2016-07-10 16:31:38.000000000 +0000
++++ autogen.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ cd "$(dirname "$0")"
+
Index: pkgsrc/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am Fri Oct 12 18:00:55 2018
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_fr__FR_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/fr_FR/Makefile.am.orig 2018-10-10 08:41:59.978660422 +0000
++++ doc/fr_FR/Makefile.am
+@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
Index: pkgsrc/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am Fri Oct 12 18:00:55 2018
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_ja__JP_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/ja_JP/Makefile.am.orig 2018-10-10 08:42:03.331555177 +0000
++++ doc/ja_JP/Makefile.am
+@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
Index: pkgsrc/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am Fri Oct 12 18:00:55 2018
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_nl__NL_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/nl_NL/Makefile.am.orig 2018-10-10 08:42:06.624393977 +0000
++++ doc/nl_NL/Makefile.am
+@@ -21,5 +21,5 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
Index: pkgsrc/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am Fri Oct 12 18:00:55 2018
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_sl__SI_Makefile.am,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- doc/sl_SI/Makefile.am.orig 2018-10-10 08:42:10.007327109 +0000
++++ doc/sl_SI/Makefile.am
+@@ -20,5 +20,5 @@ blackbox.1: blackbox.1.in
+ $(SED) -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+ -e "s,@pkgdatadir@,$(pkgdatadir)," \
+ -e "s,@version@,$(VERSION)," \
+- $< > $@
++ blackbox.1.in > $@
+
Index: pkgsrc/wm/blackbox70/patches/patch-lib_Image.cc
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-lib_Image.cc:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-lib_Image.cc Fri Oct 12 18:00:55 2018
@@ -0,0 +1,49 @@
+$NetBSD: patch-lib_Image.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+
+Sunpro cannot resolve sqrt(int) to either sqrt(double) or
+sqrt(long double).
+
+--- lib/Image.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ lib/Image.cc
+@@ -1704,14 +1704,14 @@ void bt::Image::egradient(const Color &f
+ for (y = 0; y < height; ++y) {
+ for (x = 0; x < width; ++x, ++p) {
+ p->red = static_cast<unsigned char>
+- (tr - (rsign * static_cast<int>(sqrt(xt[0][x] +
+- yt[0][y]))));
++ (tr - (rsign * static_cast<int>(sqrt(double(xt[0][x] +
++ yt[0][y])))));
+ p->green = static_cast<unsigned char>
+- (tg - (gsign * static_cast<int>(sqrt(xt[1][x] +
+- yt[1][y]))));
++ (tg - (gsign * static_cast<int>(sqrt(double(xt[1][x] +
++ yt[1][y])))));
+ p->blue = static_cast<unsigned char>
+- (tb - (bsign * static_cast<int>(sqrt(xt[2][x] +
+- yt[2][y]))));
++ (tb - (bsign * static_cast<int>(sqrt(double(xt[2][x] +
++ yt[2][y])))));
+ }
+ }
+ } else {
+@@ -1719,14 +1719,14 @@ void bt::Image::egradient(const Color &f
+ for (y = 0; y < height; ++y) {
+ for (x = 0; x < width; ++x, ++p) {
+ p->red = static_cast<unsigned char>
+- (tr - (rsign * static_cast<int>(sqrt(xt[0][x]
+- + yt[0][y]))));
++ (tr - (rsign * static_cast<int>(sqrt(double(xt[0][x]
++ + yt[0][y])))));
+ p->green = static_cast<unsigned char>
+- (tg - (gsign * static_cast<int>(sqrt(xt[1][x]
+- + yt[1][y]))));
++ (tg - (gsign * static_cast<int>(sqrt(double(xt[1][x]
++ + yt[1][y])))));
+ p->blue = static_cast<unsigned char>
+- (tb - (bsign * static_cast<int>(sqrt(xt[2][x]
+- + yt[2][y]))));
++ (tb - (bsign * static_cast<int>(sqrt(double(xt[2][x]
++ + yt[2][y])))));
+
+ if (y & 1) {
+ p->red = (p->red >> 1) + (p->red >> 2);
Index: pkgsrc/wm/blackbox70/patches/patch-lib_Menu.cc
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-lib_Menu.cc:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-lib_Menu.cc Fri Oct 12 18:00:55 2018
@@ -0,0 +1,87 @@
+$NetBSD: patch-lib_Menu.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+
+Sunpro has problems with a non-const const_reverse_iterator.
+
+--- lib/Menu.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ lib/Menu.cc
+@@ -37,6 +37,7 @@
+
+ #include <cstdio>
+ #include <assert.h>
++#include <cstdlib>
+
+
+ bt::MenuStyle **bt::MenuStyle::styles = 0;
+@@ -365,7 +366,7 @@ unsigned int bt::Menu::insertItem(const
+ } else {
+ index = std::min(static_cast<size_t>(index), _items.size());
+ it = _items.begin();
+- std::advance<ItemList::iterator, signed>(it, index);
++ std::advance(it, index);
+ }
+
+ it = _items.insert(it, item);
+@@ -516,7 +517,7 @@ void bt::Menu::removeItem(unsigned int i
+
+ void bt::Menu::removeIndex(unsigned int index) {
+ ItemList::iterator it = _items.begin();
+- std::advance<ItemList::iterator, signed>(it, index);
++ std::advance(it, index);
+ if (it == _items.end())
+ return; // item not found
+ removeItemByIterator(it);
+@@ -1037,7 +1038,7 @@ void bt::Menu::keyPressEvent(const XKeyE
+ const ItemList::const_iterator &end = _items.end();
+ ItemList::const_iterator anchor = _items.begin();
+ if (_active_index != ~0u) {
+- std::advance<ItemList::const_iterator, signed>(anchor, _active_index);
++ std::advance(anchor, _active_index);
+
+ // go one paste the current active index
+ if (anchor != end && !anchor->separator)
+@@ -1054,11 +1055,10 @@ void bt::Menu::keyPressEvent(const XKeyE
+ }
+
+ case XK_Up: {
+- ItemList::const_reverse_iterator anchor = _items.rbegin();
+- const ItemList::const_reverse_iterator &end = _items.rend();
++ ItemList::reverse_iterator anchor = _items.rbegin();
++ const ItemList::reverse_iterator &end = _items.rend();
+ if (_active_index != ~0u) {
+- std::advance<ItemList::const_reverse_iterator, signed>
+- (anchor, _items.size() - _active_index - 1);
++ std::advance(anchor, _items.size() - _active_index - 1);
+
+ // go one item past the current active index
+ if (anchor != end && !anchor->separator)
+@@ -1067,7 +1067,7 @@ void bt::Menu::keyPressEvent(const XKeyE
+
+ if (anchor == end) anchor = _items.rbegin();
+
+- ItemList::const_reverse_iterator it =
++ ItemList::reverse_iterator it =
+ std::find_if(anchor, end, InteractMatch());
+ if (it != end)
+ activateIndex(it->indx);
+@@ -1075,8 +1075,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+ }
+
+ case XK_Home: {
+- const ItemList::const_iterator &end = _items.end();
+- ItemList::const_iterator it = _items.begin();
++ const ItemList::iterator &end = _items.end();
++ ItemList::iterator it = _items.begin();
+ it = std::find_if(it, end, InteractMatch());
+ if (it != end)
+ activateIndex(it->indx);
+@@ -1084,8 +1084,8 @@ void bt::Menu::keyPressEvent(const XKeyE
+ }
+
+ case XK_End: {
+- const ItemList::const_reverse_iterator &end = _items.rend();
+- ItemList::const_reverse_iterator it = _items.rbegin();
++ const ItemList::reverse_iterator &end = _items.rend();
++ ItemList::reverse_iterator it = _items.rbegin();
+ it = std::find_if(it, end, InteractMatch());
+ if (it != end)
+ activateIndex(it->indx);
Index: pkgsrc/wm/blackbox70/patches/patch-lib_Unicode.cc
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-lib_Unicode.cc:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-lib_Unicode.cc Fri Oct 12 18:00:55 2018
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_Unicode.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- lib/Unicode.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ lib/Unicode.cc
+@@ -83,8 +83,8 @@ namespace bt {
+ if (cd == invalid)
+ return;
+
+- char *inp =
+- reinterpret_cast<char *>
++ const char *inp =
++ reinterpret_cast<const char *>
+ (const_cast<typename _Source::value_type *>(in.data()));
+ const typename _Source::size_type in_size =
+ in.size() * sizeof(typename _Source::value_type);
+@@ -109,7 +109,7 @@ namespace bt {
+ {
+ const typename _Source::size_type off = in_size - in_bytes + 1;
+ inp =
+- reinterpret_cast<char *>
++ reinterpret_cast<const char *>
+ (const_cast<typename _Source::value_type *>(in.data()));
+ in_bytes = in_size - off;
+ break;
Index: pkgsrc/wm/blackbox70/patches/patch-src_Screen.cc
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-src_Screen.cc:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-src_Screen.cc Fri Oct 12 18:00:55 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_Screen.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+
+Sunpro has problems with a non-const const_reverse_iterator.
+
+--- src/Screen.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ src/Screen.cc
+@@ -616,8 +616,8 @@ void BScreen::setCurrentWorkspace(unsign
+
+ // withdraw windows in reverse order to minimize the number of
+ // Expose events
+- StackingList::const_reverse_iterator it = _stackingList.rbegin();
+- const StackingList::const_reverse_iterator end = _stackingList.rend();
++ StackingList::reverse_iterator it = _stackingList.rbegin();
++ const StackingList::reverse_iterator end = _stackingList.rend();
+ for (; it != end; ++it) {
+ BlackboxWindow *win = dynamic_cast<BlackboxWindow *>(*it);
+ if (win && win->workspace() == current_workspace)
Index: pkgsrc/wm/blackbox70/patches/patch-src_Toolbar.cc
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-src_Toolbar.cc:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-src_Toolbar.cc Fri Oct 12 18:00:55 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_Toolbar.cc,v 1.1 2018/10/12 18:00:55 he Exp $
+
+Fix build failure when time_t is 64 bits on a 32-bit machine.
+
+--- src/Toolbar.cc.orig 2016-07-10 16:31:38.000000000 +0000
++++ src/Toolbar.cc
+@@ -43,8 +43,10 @@
+ long nextTimeout(int resolution)
+ {
+ timeval now;
++ int secs;
+ gettimeofday(&now, 0);
+- return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l))
++ secs = now.tv_sec % resolution;
++ return (std::max(1000l, ((((resolution - secs) * 1000l))
+ - (now.tv_usec / 1000l))));
+ }
+
Index: pkgsrc/wm/blackbox70/patches/patch-util_bsetbg
diff -u /dev/null pkgsrc/wm/blackbox70/patches/patch-util_bsetbg:1.1
--- /dev/null Fri Oct 12 18:00:55 2018
+++ pkgsrc/wm/blackbox70/patches/patch-util_bsetbg Fri Oct 12 18:00:55 2018
@@ -0,0 +1,10 @@
+$NetBSD: patch-util_bsetbg,v 1.1 2018/10/12 18:00:55 he Exp $
+
+--- util/bsetbg.orig 2016-07-10 16:31:38.000000000 +0000
++++ util/bsetbg
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # Copyright (c) 2000-2002 Timothy M. King (tmk%lordzork.com@localhost)
+ #
Home |
Main Index |
Thread Index |
Old Index