pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm/blackbox70 Switch upstream for blackbox70, and upgr...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fd19af73a968
branches: trunk
changeset: 386242:fd19af73a968
user: he <he%pkgsrc.org@localhost>
date: Fri Oct 12 18:00:55 2018 +0000
description:
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.
diffstat:
wm/blackbox70/Makefile | 20 +++-
wm/blackbox70/PLIST | 23 +++++-
wm/blackbox70/distinfo | 37 +++----
wm/blackbox70/patches/patch-aa | 57 -------------
wm/blackbox70/patches/patch-ab | 91 ---------------------
wm/blackbox70/patches/patch-ac | 26 ------
wm/blackbox70/patches/patch-autogen.sh | 10 ++
wm/blackbox70/patches/patch-doc_fr__FR_Makefile.am | 11 ++
wm/blackbox70/patches/patch-doc_ja__JP_Makefile.am | 11 ++
wm/blackbox70/patches/patch-doc_nl__NL_Makefile.am | 11 ++
wm/blackbox70/patches/patch-doc_sl__SI_Makefile.am | 11 ++
wm/blackbox70/patches/patch-lib-Resource.cc | 12 --
wm/blackbox70/patches/patch-lib-Util.hh | 13 ---
wm/blackbox70/patches/patch-lib-XDG.cc | 13 ---
wm/blackbox70/patches/patch-lib_Display.cc | 13 ---
wm/blackbox70/patches/patch-lib_Image.cc | 49 +++++++++++
wm/blackbox70/patches/patch-lib_Menu.cc | 87 ++++++++++++++++++++
wm/blackbox70/patches/patch-lib_Pen.cc | 12 --
wm/blackbox70/patches/patch-lib_Texture.cc | 13 ---
wm/blackbox70/patches/patch-lib_Unicode.cc | 24 +++++
wm/blackbox70/patches/patch-src-BlackboxResource.cc | 12 --
wm/blackbox70/patches/patch-src-ScreenResource.cc | 13 ---
wm/blackbox70/patches/patch-src-main.cc | 14 ---
wm/blackbox70/patches/patch-src_Screen.cc | 17 +++
wm/blackbox70/patches/patch-src_Toolbar.cc | 18 ++++
wm/blackbox70/patches/patch-src_Window.cc | 12 --
wm/blackbox70/patches/patch-src_blackbox.cc | 12 --
wm/blackbox70/patches/patch-util-bsetroot.cc | 14 ---
wm/blackbox70/patches/patch-util_bsetbg | 10 ++
29 files changed, 310 insertions(+), 356 deletions(-)
diffs (truncated from 818 to 300 lines):
diff -r 8b79ef65821e -r fd19af73a968 wm/blackbox70/Makefile
--- a/wm/blackbox70/Makefile Fri Oct 12 15:46:50 2018 +0000
+++ b/wm/blackbox70/Makefile Fri Oct 12 18:00:55 2018 +0000
@@ -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 @@
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"
diff -r 8b79ef65821e -r fd19af73a968 wm/blackbox70/PLIST
--- a/wm/blackbox70/PLIST Fri Oct 12 15:46:50 2018 +0000
+++ b/wm/blackbox70/PLIST Fri Oct 12 18:00:55 2018 +0000
@@ -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/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
diff -r 8b79ef65821e -r fd19af73a968 wm/blackbox70/distinfo
--- a/wm/blackbox70/distinfo Fri Oct 12 15:46:50 2018 +0000
+++ b/wm/blackbox70/distinfo Fri Oct 12 18:00:55 2018 +0000
@@ -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
diff -r 8b79ef65821e -r fd19af73a968 wm/blackbox70/patches/patch-aa
--- a/wm/blackbox70/patches/patch-aa Fri Oct 12 15:46:50 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/11/22 20:02:48 joerg Exp $
-
-Sunpro cannot resolve sqrt(int) to either sqrt(double) or
-sqrt(long double).
-
---- lib/Image.cc.orig 2005-04-08 15:41:09.000000000 +0000
-+++ lib/Image.cc
-@@ -44,6 +44,7 @@
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-
- // #define COLORTABLE_DEBUG
- // #define MITSHM_DEBUG
-@@ -1694,14 +1695,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 {
-@@ -1709,14 +1710,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);
diff -r 8b79ef65821e -r fd19af73a968 wm/blackbox70/patches/patch-ab
--- a/wm/blackbox70/patches/patch-ab Fri Oct 12 15:46:50 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2013/04/29 21:27:15 joerg Exp $
-
-Sunpro has problems with a non-const const_reverse_iterator.
-
---- lib/Menu.cc.orig 2005-01-27 17:08:22.000000000 +0000
-+++ lib/Menu.cc
-@@ -33,9 +33,9 @@
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
-
--#include <stdio.h>
- #include <assert.h>
--
-+#include <stdio.h>
-+#include <stdlib.h>
-
- bt::MenuStyle **bt::MenuStyle::styles = 0;
-
-@@ -363,7 +363,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);
-@@ -514,7 +514,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);
-@@ -1035,7 +1035,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)
-@@ -1052,11 +1052,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)
-@@ -1065,7 +1064,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);
-@@ -1073,8 +1072,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);
-@@ -1082,8 +1081,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);
diff -r 8b79ef65821e -r fd19af73a968 wm/blackbox70/patches/patch-ac
--- a/wm/blackbox70/patches/patch-ac Fri Oct 12 15:46:50 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/11/22 20:02:48 joerg Exp $
-
-Sunpro has problems with a non-const const_reverse_iterator.
-
---- src/Screen.cc.orig 2005-10-18 08:07:22.000000000 +0000
-+++ src/Screen.cc
-@@ -47,7 +47,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <dirent.h>
--
-+#include <string.h>
Home |
Main Index |
Thread Index |
Old Index