diff -Nru blackbox-0.70.1/debian/changelog blackbox-0.70.1/debian/changelog --- blackbox-0.70.1/debian/changelog 2020-03-22 15:34:54.000000000 +0000 +++ blackbox-0.70.1/debian/changelog 2020-03-28 03:04:44.000000000 +0000 @@ -1,8 +1,29 @@ -blackbox (0.70.1-37build1) focal; urgency=medium +blackbox (0.70.1-38) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * QA upload. + + [ Joao Eriberto Mota Filho ] + * debian/control: + - Added 'Rules-Requires-Root: no' to source stanza. + - Bumped Standards-Version to 4.5.0. + * debian/copyright: updated packaging copyright names and years. + * debian/libbt0.symbols: added 'Build-Depends-Package:' line. + * debian/lintian-overrides: created to override a false positive. + * debian/not-installed: created to list a .la file not installed. + * debian/patches/: + - Added serial numbers for all patches. + - Created 110_fix-spelling.patch to fix a spelling error in manpage. + - Using suffix 'patch' for all patches. + * debian/salsa-ci.yml: added to provide CI tests for Salsa. + * debian/tests/control: created to perform trivial CI tests. + * debian/watch: bumped version to 4. + + [ Debian Janitor ] + * Set upstream metadata fields: Archive, Bug-Database, Repository, + Repository-Browse. + * Use secure URI in debian/watch. - -- Matthias Klose Sun, 22 Mar 2020 16:34:54 +0100 + -- Joao Eriberto Mota Filho Sat, 28 Mar 2020 00:04:44 -0300 blackbox (0.70.1-37) unstable; urgency=medium @@ -348,7 +369,7 @@ * debian/rules: eliminate lintian warning. - debian-rules-missing-recommended-target build-arch - debian-rules-missing-recommended-target build-indep - * debian/rules: remove non-existant libbt1 from dh_shlibdeps. + * debian/rules: remove non-existent libbt1 from dh_shlibdeps. * debian/control: add libxext-dev to Build-Depends. * Bump standards version to 3.9.2 diff -Nru blackbox-0.70.1/debian/control blackbox-0.70.1/debian/control --- blackbox-0.70.1/debian/control 2019-07-17 18:30:01.000000000 +0000 +++ blackbox-0.70.1/debian/control 2020-03-28 03:04:44.000000000 +0000 @@ -5,8 +5,9 @@ Build-Depends: debhelper-compat (= 12), libxext-dev, libxft-dev, - libxt-dev, -Standards-Version: 4.4.0 + libxt-dev +Standards-Version: 4.5.0 +Rules-Requires-Root: no Homepage: https://sourceforge.net/projects/blackboxwm/ Vcs-Git: https://salsa.debian.org/debian/blackbox.git Vcs-Browser: https://salsa.debian.org/debian/blackbox diff -Nru blackbox-0.70.1/debian/copyright blackbox-0.70.1/debian/copyright --- blackbox-0.70.1/debian/copyright 2019-07-17 19:01:13.000000000 +0000 +++ blackbox-0.70.1/debian/copyright 2020-03-28 03:04:44.000000000 +0000 @@ -4,14 +4,14 @@ Files: * Copyright: - 1997-2000, 2002-2005 Bradley T Hughes + 1997-2005 Bradley T Hughes 2000 Ales Kosir - Bertrand Duret + 2000 Bertrand Duret 2000-2002 Timothy M. King - Wilbert Berendsen + 2000-2002 Wilbert Berendsen 2001-2005 Sean 'Shaleh' Perry 2002 R.B. "Brig" Young II - Satoh Satoru + 2002 Satoh Satoru License: Expat Files: debian/* @@ -19,17 +19,23 @@ 2000-2002 Sean 'Shaleh' Perry 2001 LaMont Jones 2003 David Pashley - Jesus Climent + 2003 Jesus Climent 2004-2007 Bruno Barrera C. 2006 Luk Claes 2008 Marc 'HE' Brockschmidt - Simon McVittie + 2008 Simon McVittie 2011 Jakub Wilk 2011-2014 HIGUCHI Daisuke (VDR dai) 2012 David Prevot - Matthias Klose + 2012 Matthias Klose 2014-2016 Herbert Parentes Fortes Neto - 2015 Joao Eriberto Mota Filho + 2015-2020 Joao Eriberto Mota Filho + 2015 James Cowgill + 2015 Sebastian Ramacher + 2015 Steve Langasek + 2017 Simon Quigley + 2018 Adrian Bunk + 2019 Boyuan Yang License: GPL-2+ License: Expat diff -Nru blackbox-0.70.1/debian/libbt0.symbols blackbox-0.70.1/debian/libbt0.symbols --- blackbox-0.70.1/debian/libbt0.symbols 2019-07-17 18:50:20.000000000 +0000 +++ blackbox-0.70.1/debian/libbt0.symbols 2020-03-28 03:04:44.000000000 +0000 @@ -1,4 +1,5 @@ libbt.so.0 libbt0 #MINVER# +* Build-Depends-Package: libbt-dev # Ignore std:: template instantiations (regex|optional)"^_ZN?K?S" 0.70.1 _ZN2bt10ColorCache4findEjiii@Base 0.70.1 diff -Nru blackbox-0.70.1/debian/lintian-overrides blackbox-0.70.1/debian/lintian-overrides --- blackbox-0.70.1/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/lintian-overrides 2020-03-28 03:04:44.000000000 +0000 @@ -0,0 +1,2 @@ +# Not a spelling error. It is a sequence of bytes in binary file. +blackbox: spelling-error-in-binary usr/bin/blackbox whitH with diff -Nru blackbox-0.70.1/debian/not-installed blackbox-0.70.1/debian/not-installed --- blackbox-0.70.1/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/not-installed 2020-03-28 03:04:44.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/x86_64-linux-gnu/libbt.la diff -Nru blackbox-0.70.1/debian/patches/0010-Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch blackbox-0.70.1/debian/patches/0010-Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch --- blackbox-0.70.1/debian/patches/0010-Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch 2019-07-17 18:37:49.000000000 +0000 +++ blackbox-0.70.1/debian/patches/0010-Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From: Peter Schlaile -Date: Fri, 22 Oct 2010 00:27:37 +0200 -Subject: Prevent crashes on apps disabled minimize or maximize - -blackbox crashes on applications that disable minimize/maximize wm functions -but leave minimize/maximize wm decorations enabled. (Shouldn't happen, but -also shouldn't crash the window manager.) - -Crash happens when clicking on the minimize or maximize button. - -Instead of using an assert, this patch ignores these button events. -Alternatively, the buttons could be decorated but crayed out. - -Bug-Debian: https://bugs.debian.org/600968 -Forwarded: no -Last-Update: 2019-07-17 - -Reviewed-by: Boyuan Yang ---- - src/Window.cc | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/Window.cc b/src/Window.cc -index b1361ae..9cc861a 100644 ---- a/src/Window.cc -+++ b/src/Window.cc -@@ -2319,7 +2319,9 @@ void BlackboxWindow::iconify(void) { - } - } - } else { -- assert(hasWindowFunction(WindowFunctionIconify)); -+ if (!hasWindowFunction(WindowFunctionIconify)) { -+ return; -+ } - } - - _screen->addIcon(this); -@@ -2338,7 +2340,9 @@ void BlackboxWindow::iconify(void) { - - - void BlackboxWindow::maximize(unsigned int button) { -- assert(hasWindowFunction(WindowFunctionMaximize)); -+ if (!hasWindowFunction(WindowFunctionMaximize)) { -+ return; -+ } - - // any maximize operation always unshades - client.ewmh.shaded = false; diff -Nru blackbox-0.70.1/debian/patches/010_pkgconfig-requires-private.patch blackbox-0.70.1/debian/patches/010_pkgconfig-requires-private.patch --- blackbox-0.70.1/debian/patches/010_pkgconfig-requires-private.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/010_pkgconfig-requires-private.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Move XFT libraries from Requires to Requires.private. +Author: David Schmitt +Bug-Debian: http://bugs.debian.org/342035 +Forwarded: no +Last-Update: 2011-03-13 + +--- a/lib/libbt.pc.in ++++ b/lib/libbt.pc.in +@@ -5,7 +5,7 @@ + + Name: Blackbox Toolbox + Description: Utility class library for writing small applications +-Requires: @XFT_PKGCONFIG@ + Version: @VERSION@ ++Requires.private: @XFT_PKGCONFIG@ + Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@ + Cflags: -I${includedir}/bt diff -Nru blackbox-0.70.1/debian/patches/020_fix-ftbfs-gcc-4.3.patch blackbox-0.70.1/debian/patches/020_fix-ftbfs-gcc-4.3.patch --- blackbox-0.70.1/debian/patches/020_fix-ftbfs-gcc-4.3.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/020_fix-ftbfs-gcc-4.3.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,100 @@ +Description: Add missing includes to fix FTBFS with GCC 4.3. +Author: Cyril Brulebois +Forwarded: no +Bug-Debian: http://bugs.debian.org/456047 +Last-Update: 2011-03-12 + +--- a/src/main.cc ++++ b/src/main.cc +@@ -36,6 +36,8 @@ + + #include + ++#include ++ + + static void showHelp(int exitval) { + // print version - this should not be localized! +--- a/src/BlackboxResource.cc ++++ b/src/BlackboxResource.cc +@@ -33,6 +33,8 @@ + #include + #include + ++#include ++ + + BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { + screen_resources = 0; +--- a/src/Screen.cc ++++ b/src/Screen.cc +@@ -48,6 +48,8 @@ + #include + #include + ++#include ++ + + static bool running = true; + static int anotherWMRunning(Display *, XErrorEvent *) { +--- a/src/ScreenResource.cc ++++ b/src/ScreenResource.cc +@@ -33,6 +33,8 @@ + + #include + ++#include ++ + + static const int iconify_width = 9; + static const int iconify_height = 9; +--- a/util/bsetroot.cc ++++ b/util/bsetroot.cc +@@ -27,11 +27,14 @@ + #include + #include + ++#include + #include + + #include + #include + ++#include ++ + + // ignore all X errors + static int x11_error(::Display *, XErrorEvent *) +--- a/lib/Resource.cc ++++ b/lib/Resource.cc +@@ -30,6 +30,8 @@ + + #include + ++#include ++ + + bt::Resource::Resource(void) + : db(NULL) +--- a/lib/XDG.cc ++++ b/lib/XDG.cc +@@ -26,7 +26,7 @@ + #include "XDG.hh" + + #include +- ++#include + + // make sure directory names end with a slash + static std::string terminateDir(const std::string &string) +--- a/lib/Image.cc ++++ b/lib/Image.cc +@@ -45,6 +45,8 @@ + #include + #include + ++#include ++ + // #define COLORTABLE_DEBUG + // #define MITSHM_DEBUG + diff -Nru blackbox-0.70.1/debian/patches/030_bsetbg-bash-shebang.patch blackbox-0.70.1/debian/patches/030_bsetbg-bash-shebang.patch --- blackbox-0.70.1/debian/patches/030_bsetbg-bash-shebang.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/030_bsetbg-bash-shebang.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Set bsetbg shebang to #!/bin/bash. +Author: Simon McVittie +Forwarded: no +Bug-Debian: http://bugs.debian.org/472893 +Last-Update: 2011-03-12 + +--- a/util/bsetbg ++++ b/util/bsetbg +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) + # diff -Nru blackbox-0.70.1/debian/patches/040_textpropertytostring-unconditional.patch blackbox-0.70.1/debian/patches/040_textpropertytostring-unconditional.patch --- blackbox-0.70.1/debian/patches/040_textpropertytostring-unconditional.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/040_textpropertytostring-unconditional.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk +Forwarded: no +Bug-Debian: http://bugs.debian.org/614468 +Last-Update: 2011-03-12 + +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include ++ + #include + #include + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt + diff -Nru blackbox-0.70.1/debian/patches/050_manpage-tidy-up.patch blackbox-0.70.1/debian/patches/050_manpage-tidy-up.patch --- blackbox-0.70.1/debian/patches/050_manpage-tidy-up.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/050_manpage-tidy-up.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,88 @@ +Description: Fix spelling and typographic errors in the manual pages. +Author: Jakub Wilk +Forwarded: no +Last-Update: 2011-03-13 + +--- a/doc/bsetbg.1 ++++ b/doc/bsetbg.1 +@@ -112,25 +112,25 @@ + The default is ~/.bsetbg_last_cmd . + + .TP +-As mentioned above, \fBbsetbg\fR will function perfectly for the majority of users without having a configuration file. Power users who want more control over \fBbsetbg\fR's behavior should run \fBbsetbg -g\fR and use the output to create a \fI~/.bsetbgrc\fR which may then be tweaked by hand. ++As mentioned above, \fBbsetbg\fR will function perfectly for the majority of users without having a configuration file. Power users who want more control over \fBbsetbg\fR's behavior should run \fBbsetbg \-g\fR and use the output to create a \fI~/.bsetbgrc\fR which may then be tweaked by hand. + + .SH EXAMPLES + In this example, bsetbg will set the image in centered mode: + +- bsetbg -center foo.png ++ bsetbg \-center foo.png + + An example of the \fB-exec\fR argument: + +- bsetbg -exec xv -root -quit -rmode 5 -rbg rgb:2/2/2 \\ +- -center foo.png ++ bsetbg \-exec xv \-root \-quit \-rmode 5 \-rbg rgb:2/2/2 \\ ++ \-center foo.png + + An example in which bsetbg creates a configuration file using xv and qiv: + +- bsetbg -g xv qiv > ~/.bsetbgrc ++ bsetbg \-g xv qiv > ~/.bsetbgrc + + An example of the use of the \fB-app\fR argument: + +- bsetbg -app qiv "-o rgb:d6/c5/a2 -x" -c foo.png ++ bsetbg \-app qiv "\-o rgb:d6/c5/a2 \-x" \-c foo.png + + .SH AUTHOR + The author of +--- a/doc/blackbox.1.in ++++ b/doc/blackbox.1.in +@@ -251,7 +251,7 @@ + mentioned in the Description. Dockapps + automatically run in the slit in most cases, but + may require a special command switch. +-Often, -w is used for "withdrawn" into the slit. ++Often, \-w is used for "withdrawn" into the slit. + + gkrellm is a very useful and modern dockapp that + gives the user near real time information on +@@ -280,8 +280,8 @@ + .EX 8 + .B i.e. + #!/bin/sh +-speyes -w & sleep 2 +-gkrellm -w & sleep 2 ++speyes \-w & sleep 2 ++gkrellm \-w & sleep 2 + .EE + .\" + .\" ***** THE TOOLBAR ***** +@@ -393,7 +393,7 @@ + workspaces. + .TP + .B Kill Client +-This kills the client program with -SIGKILL (-9) ++This kills the client program with \-SIGKILL (\-9) + Only use this as a last resort. + .TP + .B Close +@@ -704,7 +704,7 @@ + .B Here is a working example of a menu file: + .\" ----- menu example ----- + [begin] (MenuName) +- [exec] (xterm) {xterm -ls -bg black -fg green} ++ [exec] (xterm) {xterm \-ls \-bg black \-fg green} + [submenu] (X utilities) + [exec] (xcalc) {xcalc} + [end] +@@ -847,7 +847,7 @@ + .TP 3 + .BI "session.imageDither" " [True|False]" + This setting is only used when running in low +-color modes. Image Dithering helps to show an ++color modes. Image Dithering helps one to show an + image properly even if there are not enough + colors available in the system. + .EX diff -Nru blackbox-0.70.1/debian/patches/060_fix-spelling-errors.patch blackbox-0.70.1/debian/patches/060_fix-spelling-errors.patch --- blackbox-0.70.1/debian/patches/060_fix-spelling-errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/060_fix-spelling-errors.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Fix spelling errors in the source code. +Author: Jakub Wilk +Forwarded: no +Last-Update: 2011-03-13 + +--- a/nls/C/blackbox.m ++++ b/nls/C/blackbox.m +@@ -1,6 +1,6 @@ + $set 13 #blackbox + + $ #NoManagableScreens +-# Blackbox::Blackbox: no managable screens found, aborting\n ++# Blackbox::Blackbox: no manageable screens found, aborting\n + $ #MapRequest + # Blackbox::process_event: MapRequest for 0x%lx\n +--- a/nls/ko_KR/blackbox.m ++++ b/nls/ko_KR/blackbox.m +@@ -1,6 +1,6 @@ + $set 13 #blackbox + + $ #NoManagableScreens +-# Blackbox::Blackbox: no managable screens found, aborting\n ++# Blackbox::Blackbox: no maneagable screens found, aborting\n + $ #MapRequest + # Blackbox::process_event: MapRequest for 0x%lx\n +--- a/nls/zh_TW/blackbox.m ++++ b/nls/zh_TW/blackbox.m +@@ -1,6 +1,6 @@ + $set 13 #blackbox + + $ #NoManagableScreens +-# Blackbox::Blackbox: no managable screens found, aborting\n ++# Blackbox::Blackbox: no manageable screens found, aborting\n + $ #MapRequest + # Blackbox::process_event: MapRequest for 0x%lx\n +--- a/src/blackbox.cc ++++ b/src/blackbox.cc +@@ -420,7 +420,7 @@ + } + + if (managed == 0) { +- fprintf(stderr, "%s: no managable screens found, exiting...\n", ++ fprintf(stderr, "%s: no manageable screens found, exiting...\n", + applicationName().c_str()); + ::exit(3); + } diff -Nru blackbox-0.70.1/debian/patches/070_fix-ftbfs-x32.patch blackbox-0.70.1/debian/patches/070_fix-ftbfs-x32.patch --- blackbox-0.70.1/debian/patches/070_fix-ftbfs-x32.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/070_fix-ftbfs-x32.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,19 @@ +Description: fix FTBFS on x32 +Author: Adam Borowski +Bug-Debian: http://bugs.debian.org/736211 +Last-Update: 2014-01-21 + +diff -urd blackbox-0.70.1.0/src/Toolbar.cc blackbox-0.70.1/src/Toolbar.cc +--- blackbox-0.70.1.0/src/Toolbar.cc 2005-04-12 09:38:00.000000000 +0200 ++++ blackbox-0.70.1/src/Toolbar.cc 2014-01-20 17:12:33.059144580 +0100 +@@ -44,8 +44,8 @@ + { + timeval now; + gettimeofday(&now, 0); +- return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l)) +- - (now.tv_usec / 1000l)))); ++ return (std::max((time_t)1000, ((((resolution - (now.tv_sec % resolution)) * 1000)) ++ - (now.tv_usec / 1000)))); + } + + diff -Nru blackbox-0.70.1/debian/patches/080_configure.ac.patch blackbox-0.70.1/debian/patches/080_configure.ac.patch --- blackbox-0.70.1/debian/patches/080_configure.ac.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/080_configure.ac.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,24 @@ +Description: fix lintian e: pkg-config-bad-directive + The following files includes a wrong directive + libbt-dev 0.70.1-23 (binary) + usr/lib/x86_64-linux-gnu/pkgconfig/libbt.pc -L/usr/local/lib + usr/lib/i386-linux-gnu/pkgconfig/libbt.pc -L/usr/local/lib +Author: Herbert Parentes Fortes Neto +Last-Update: 2014-11-20 +--- a/configure.ac ++++ b/configure.ac +@@ -11,10 +11,10 @@ + dnl Look in the most logical places for external libraries + CPPFLAGS="$CPPFLAGS -I$prefix/include" + LDFLAGS="$LDFLAGS -L$prefix/lib" +-if test "x$prefix" != "x/usr/local"; then +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-fi ++#if test "x$prefix" != "x/usr/local"; then ++# CPPFLAGS="$CPPFLAGS -I/usr/local/include" ++# LDFLAGS="$LDFLAGS -L/usr/local/lib" ++#fi + + dnl Locate required external software + AC_PROG_CC diff -Nru blackbox-0.70.1/debian/patches/090_focus.patch blackbox-0.70.1/debian/patches/090_focus.patch --- blackbox-0.70.1/debian/patches/090_focus.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/090_focus.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fixes focus. Sometimes it is lost. + Bug 784955. +Author: Brian Bidulock +Last-Update: 2015-05-16 +Index: blackbox-0.70.1/src/blackbox.cc +=================================================================== +--- blackbox-0.70.1.orig/src/blackbox.cc ++++ blackbox-0.70.1/src/blackbox.cc +@@ -281,6 +281,7 @@ void Blackbox::process_event(XEvent *e) + bool lost_focus = true; // did the window really lose focus? + bool no_focus = true; // did another window get focus? + ++ XSync(XDisplay(), False); + XEvent event; + if (XCheckIfEvent(XDisplay(), &event, scanForFocusIn, NULL)) { + process_event(&event); diff -Nru blackbox-0.70.1/debian/patches/100_Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch blackbox-0.70.1/debian/patches/100_Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch --- blackbox-0.70.1/debian/patches/100_Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/100_Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,48 @@ +From: Peter Schlaile +Date: Fri, 22 Oct 2010 00:27:37 +0200 +Subject: Prevent crashes on apps disabled minimize or maximize + +blackbox crashes on applications that disable minimize/maximize wm functions +but leave minimize/maximize wm decorations enabled. (Shouldn't happen, but +also shouldn't crash the window manager.) + +Crash happens when clicking on the minimize or maximize button. + +Instead of using an assert, this patch ignores these button events. +Alternatively, the buttons could be decorated but crayed out. + +Bug-Debian: https://bugs.debian.org/600968 +Forwarded: no +Last-Update: 2019-07-17 + +Reviewed-by: Boyuan Yang +--- + src/Window.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/Window.cc b/src/Window.cc +index b1361ae..9cc861a 100644 +--- a/src/Window.cc ++++ b/src/Window.cc +@@ -2319,7 +2319,9 @@ void BlackboxWindow::iconify(void) { + } + } + } else { +- assert(hasWindowFunction(WindowFunctionIconify)); ++ if (!hasWindowFunction(WindowFunctionIconify)) { ++ return; ++ } + } + + _screen->addIcon(this); +@@ -2338,7 +2340,9 @@ void BlackboxWindow::iconify(void) { + + + void BlackboxWindow::maximize(unsigned int button) { +- assert(hasWindowFunction(WindowFunctionMaximize)); ++ if (!hasWindowFunction(WindowFunctionMaximize)) { ++ return; ++ } + + // any maximize operation always unshades + client.ewmh.shaded = false; diff -Nru blackbox-0.70.1/debian/patches/110_fix-spelling.patch blackbox-0.70.1/debian/patches/110_fix-spelling.patch --- blackbox-0.70.1/debian/patches/110_fix-spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/patches/110_fix-spelling.patch 2020-03-28 03:04:44.000000000 +0000 @@ -0,0 +1,16 @@ +Description: fix a spelling error in manpage +Author: Joao Eriberto Mota Filho +Last-Update: 2020-03-28 +Index: blackbox/doc/blackbox.1.in +=================================================================== +--- blackbox.orig/doc/blackbox.1.in ++++ blackbox/doc/blackbox.1.in +@@ -527,7 +527,7 @@ Previous versions of Blackbox put backgr + and styles in different directories. The + directories listed above are the only officially + supported directories. However you may put them +-whereever you like as long as you update your menu ++wherever you like as long as you update your menu + file so it knows where to find your styles. + .\" ----- tarball ----- + .TP diff -Nru blackbox-0.70.1/debian/patches/bsetbg-bash-shebang.diff blackbox-0.70.1/debian/patches/bsetbg-bash-shebang.diff --- blackbox-0.70.1/debian/patches/bsetbg-bash-shebang.diff 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/bsetbg-bash-shebang.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Set bsetbg shebang to #!/bin/bash. -Author: Simon McVittie -Forwarded: no -Bug-Debian: http://bugs.debian.org/472893 -Last-Update: 2011-03-12 - ---- a/util/bsetbg -+++ b/util/bsetbg -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) - # diff -Nru blackbox-0.70.1/debian/patches/configure.ac.patch blackbox-0.70.1/debian/patches/configure.ac.patch --- blackbox-0.70.1/debian/patches/configure.ac.patch 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/configure.ac.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: fix lintian e: pkg-config-bad-directive - The following files includes a wrong directive - libbt-dev 0.70.1-23 (binary) - usr/lib/x86_64-linux-gnu/pkgconfig/libbt.pc -L/usr/local/lib - usr/lib/i386-linux-gnu/pkgconfig/libbt.pc -L/usr/local/lib -Author: Herbert Parentes Fortes Neto -Last-Update: 2014-11-20 ---- a/configure.ac -+++ b/configure.ac -@@ -11,10 +11,10 @@ - dnl Look in the most logical places for external libraries - CPPFLAGS="$CPPFLAGS -I$prefix/include" - LDFLAGS="$LDFLAGS -L$prefix/lib" --if test "x$prefix" != "x/usr/local"; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi -+#if test "x$prefix" != "x/usr/local"; then -+# CPPFLAGS="$CPPFLAGS -I/usr/local/include" -+# LDFLAGS="$LDFLAGS -L/usr/local/lib" -+#fi - - dnl Locate required external software - AC_PROG_CC diff -Nru blackbox-0.70.1/debian/patches/fix-ftbfs-gcc-4.3.diff blackbox-0.70.1/debian/patches/fix-ftbfs-gcc-4.3.diff --- blackbox-0.70.1/debian/patches/fix-ftbfs-gcc-4.3.diff 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/fix-ftbfs-gcc-4.3.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -Description: Add missing includes to fix FTBFS with GCC 4.3. -Author: Cyril Brulebois -Forwarded: no -Bug-Debian: http://bugs.debian.org/456047 -Last-Update: 2011-03-12 - ---- a/src/main.cc -+++ b/src/main.cc -@@ -36,6 +36,8 @@ - - #include - -+#include -+ - - static void showHelp(int exitval) { - // print version - this should not be localized! ---- a/src/BlackboxResource.cc -+++ b/src/BlackboxResource.cc -@@ -33,6 +33,8 @@ - #include - #include - -+#include -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; ---- a/src/Screen.cc -+++ b/src/Screen.cc -@@ -48,6 +48,8 @@ - #include - #include - -+#include -+ - - static bool running = true; - static int anotherWMRunning(Display *, XErrorEvent *) { ---- a/src/ScreenResource.cc -+++ b/src/ScreenResource.cc -@@ -33,6 +33,8 @@ - - #include - -+#include -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; ---- a/util/bsetroot.cc -+++ b/util/bsetroot.cc -@@ -27,11 +27,14 @@ - #include - #include - -+#include - #include - - #include - #include - -+#include -+ - - // ignore all X errors - static int x11_error(::Display *, XErrorEvent *) ---- a/lib/Resource.cc -+++ b/lib/Resource.cc -@@ -30,6 +30,8 @@ - - #include - -+#include -+ - - bt::Resource::Resource(void) - : db(NULL) ---- a/lib/XDG.cc -+++ b/lib/XDG.cc -@@ -26,7 +26,7 @@ - #include "XDG.hh" - - #include -- -+#include - - // make sure directory names end with a slash - static std::string terminateDir(const std::string &string) ---- a/lib/Image.cc -+++ b/lib/Image.cc -@@ -45,6 +45,8 @@ - #include - #include - -+#include -+ - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG - diff -Nru blackbox-0.70.1/debian/patches/fix-ftbfs-x32.diff blackbox-0.70.1/debian/patches/fix-ftbfs-x32.diff --- blackbox-0.70.1/debian/patches/fix-ftbfs-x32.diff 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/fix-ftbfs-x32.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: fix FTBFS on x32 -Author: Adam Borowski -Bug-Debian: http://bugs.debian.org/736211 -Last-Update: 2014-01-21 - -diff -urd blackbox-0.70.1.0/src/Toolbar.cc blackbox-0.70.1/src/Toolbar.cc ---- blackbox-0.70.1.0/src/Toolbar.cc 2005-04-12 09:38:00.000000000 +0200 -+++ blackbox-0.70.1/src/Toolbar.cc 2014-01-20 17:12:33.059144580 +0100 -@@ -44,8 +44,8 @@ - { - timeval now; - gettimeofday(&now, 0); -- return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l)) -- - (now.tv_usec / 1000l)))); -+ return (std::max((time_t)1000, ((((resolution - (now.tv_sec % resolution)) * 1000)) -+ - (now.tv_usec / 1000)))); - } - - diff -Nru blackbox-0.70.1/debian/patches/fix-spelling-errors.diff blackbox-0.70.1/debian/patches/fix-spelling-errors.diff --- blackbox-0.70.1/debian/patches/fix-spelling-errors.diff 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/fix-spelling-errors.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Description: Fix spelling errors in the source code. -Author: Jakub Wilk -Forwarded: no -Last-Update: 2011-03-13 - ---- a/nls/C/blackbox.m -+++ b/nls/C/blackbox.m -@@ -1,6 +1,6 @@ - $set 13 #blackbox - - $ #NoManagableScreens --# Blackbox::Blackbox: no managable screens found, aborting\n -+# Blackbox::Blackbox: no manageable screens found, aborting\n - $ #MapRequest - # Blackbox::process_event: MapRequest for 0x%lx\n ---- a/nls/ko_KR/blackbox.m -+++ b/nls/ko_KR/blackbox.m -@@ -1,6 +1,6 @@ - $set 13 #blackbox - - $ #NoManagableScreens --# Blackbox::Blackbox: no managable screens found, aborting\n -+# Blackbox::Blackbox: no maneagable screens found, aborting\n - $ #MapRequest - # Blackbox::process_event: MapRequest for 0x%lx\n ---- a/nls/zh_TW/blackbox.m -+++ b/nls/zh_TW/blackbox.m -@@ -1,6 +1,6 @@ - $set 13 #blackbox - - $ #NoManagableScreens --# Blackbox::Blackbox: no managable screens found, aborting\n -+# Blackbox::Blackbox: no manageable screens found, aborting\n - $ #MapRequest - # Blackbox::process_event: MapRequest for 0x%lx\n ---- a/src/blackbox.cc -+++ b/src/blackbox.cc -@@ -420,7 +420,7 @@ - } - - if (managed == 0) { -- fprintf(stderr, "%s: no managable screens found, exiting...\n", -+ fprintf(stderr, "%s: no manageable screens found, exiting...\n", - applicationName().c_str()); - ::exit(3); - } diff -Nru blackbox-0.70.1/debian/patches/focus.patch blackbox-0.70.1/debian/patches/focus.patch --- blackbox-0.70.1/debian/patches/focus.patch 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/focus.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Fixes focus. Sometimes it is lost. - Bug 784955. -Author: Brian Bidulock -Last-Update: 2015-05-16 -Index: blackbox-0.70.1/src/blackbox.cc -=================================================================== ---- blackbox-0.70.1.orig/src/blackbox.cc -+++ blackbox-0.70.1/src/blackbox.cc -@@ -281,6 +281,7 @@ void Blackbox::process_event(XEvent *e) - bool lost_focus = true; // did the window really lose focus? - bool no_focus = true; // did another window get focus? - -+ XSync(XDisplay(), False); - XEvent event; - if (XCheckIfEvent(XDisplay(), &event, scanForFocusIn, NULL)) { - process_event(&event); diff -Nru blackbox-0.70.1/debian/patches/manpage-tidy-up.diff blackbox-0.70.1/debian/patches/manpage-tidy-up.diff --- blackbox-0.70.1/debian/patches/manpage-tidy-up.diff 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/manpage-tidy-up.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -Description: Fix spelling and typographic errors in the manual pages. -Author: Jakub Wilk -Forwarded: no -Last-Update: 2011-03-13 - ---- a/doc/bsetbg.1 -+++ b/doc/bsetbg.1 -@@ -112,25 +112,25 @@ - The default is ~/.bsetbg_last_cmd . - - .TP --As mentioned above, \fBbsetbg\fR will function perfectly for the majority of users without having a configuration file. Power users who want more control over \fBbsetbg\fR's behavior should run \fBbsetbg -g\fR and use the output to create a \fI~/.bsetbgrc\fR which may then be tweaked by hand. -+As mentioned above, \fBbsetbg\fR will function perfectly for the majority of users without having a configuration file. Power users who want more control over \fBbsetbg\fR's behavior should run \fBbsetbg \-g\fR and use the output to create a \fI~/.bsetbgrc\fR which may then be tweaked by hand. - - .SH EXAMPLES - In this example, bsetbg will set the image in centered mode: - -- bsetbg -center foo.png -+ bsetbg \-center foo.png - - An example of the \fB-exec\fR argument: - -- bsetbg -exec xv -root -quit -rmode 5 -rbg rgb:2/2/2 \\ -- -center foo.png -+ bsetbg \-exec xv \-root \-quit \-rmode 5 \-rbg rgb:2/2/2 \\ -+ \-center foo.png - - An example in which bsetbg creates a configuration file using xv and qiv: - -- bsetbg -g xv qiv > ~/.bsetbgrc -+ bsetbg \-g xv qiv > ~/.bsetbgrc - - An example of the use of the \fB-app\fR argument: - -- bsetbg -app qiv "-o rgb:d6/c5/a2 -x" -c foo.png -+ bsetbg \-app qiv "\-o rgb:d6/c5/a2 \-x" \-c foo.png - - .SH AUTHOR - The author of ---- a/doc/blackbox.1.in -+++ b/doc/blackbox.1.in -@@ -251,7 +251,7 @@ - mentioned in the Description. Dockapps - automatically run in the slit in most cases, but - may require a special command switch. --Often, -w is used for "withdrawn" into the slit. -+Often, \-w is used for "withdrawn" into the slit. - - gkrellm is a very useful and modern dockapp that - gives the user near real time information on -@@ -280,8 +280,8 @@ - .EX 8 - .B i.e. - #!/bin/sh --speyes -w & sleep 2 --gkrellm -w & sleep 2 -+speyes \-w & sleep 2 -+gkrellm \-w & sleep 2 - .EE - .\" - .\" ***** THE TOOLBAR ***** -@@ -393,7 +393,7 @@ - workspaces. - .TP - .B Kill Client --This kills the client program with -SIGKILL (-9) -+This kills the client program with \-SIGKILL (\-9) - Only use this as a last resort. - .TP - .B Close -@@ -704,7 +704,7 @@ - .B Here is a working example of a menu file: - .\" ----- menu example ----- - [begin] (MenuName) -- [exec] (xterm) {xterm -ls -bg black -fg green} -+ [exec] (xterm) {xterm \-ls \-bg black \-fg green} - [submenu] (X utilities) - [exec] (xcalc) {xcalc} - [end] -@@ -847,7 +847,7 @@ - .TP 3 - .BI "session.imageDither" " [True|False]" - This setting is only used when running in low --color modes. Image Dithering helps to show an -+color modes. Image Dithering helps one to show an - image properly even if there are not enough - colors available in the system. - .EX diff -Nru blackbox-0.70.1/debian/patches/pkgconfig-requires-private.diff blackbox-0.70.1/debian/patches/pkgconfig-requires-private.diff --- blackbox-0.70.1/debian/patches/pkgconfig-requires-private.diff 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/pkgconfig-requires-private.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Move XFT libraries from Requires to Requires.private. -Author: David Schmitt -Bug-Debian: http://bugs.debian.org/342035 -Forwarded: no -Last-Update: 2011-03-13 - ---- a/lib/libbt.pc.in -+++ b/lib/libbt.pc.in -@@ -5,7 +5,7 @@ - - Name: Blackbox Toolbox - Description: Utility class library for writing small applications --Requires: @XFT_PKGCONFIG@ - Version: @VERSION@ -+Requires.private: @XFT_PKGCONFIG@ - Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@ - Cflags: -I${includedir}/bt diff -Nru blackbox-0.70.1/debian/patches/series blackbox-0.70.1/debian/patches/series --- blackbox-0.70.1/debian/patches/series 2019-07-17 18:37:49.000000000 +0000 +++ blackbox-0.70.1/debian/patches/series 2020-03-28 03:04:44.000000000 +0000 @@ -1,10 +1,11 @@ -pkgconfig-requires-private.diff -fix-ftbfs-gcc-4.3.diff -bsetbg-bash-shebang.diff -textpropertytostring-unconditional.diff -manpage-tidy-up.diff -fix-spelling-errors.diff -fix-ftbfs-x32.diff -configure.ac.patch -focus.patch -0010-Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch +010_pkgconfig-requires-private.patch +020_fix-ftbfs-gcc-4.3.patch +030_bsetbg-bash-shebang.patch +040_textpropertytostring-unconditional.patch +050_manpage-tidy-up.patch +060_fix-spelling-errors.patch +070_fix-ftbfs-x32.patch +080_configure.ac.patch +090_focus.patch +100_Prevent-crashes-on-apps-disabled-minimize-or-maximiz.patch +110_fix-spelling.patch diff -Nru blackbox-0.70.1/debian/patches/textpropertytostring-unconditional.diff blackbox-0.70.1/debian/patches/textpropertytostring-unconditional.diff --- blackbox-0.70.1/debian/patches/textpropertytostring-unconditional.diff 2019-07-17 18:39:18.000000000 +0000 +++ blackbox-0.70.1/debian/patches/textpropertytostring-unconditional.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Description: Declare bt::textPropertyToString unconditionally. -Author: Jakub Wilk -Forwarded: no -Bug-Debian: http://bugs.debian.org/614468 -Last-Update: 2011-03-12 - ---- a/lib/Util.hh -+++ b/lib/Util.hh -@@ -25,6 +25,8 @@ - #ifndef __Util_hh - #define __Util_hh - -+#include -+ - #include - #include - -@@ -94,10 +96,8 @@ - - std::string tolower(const std::string &string); - --#ifdef _XUTIL_H_ - std::string textPropertyToString(::Display *display, - ::XTextProperty& text_prop); --#endif - - } // namespace bt - diff -Nru blackbox-0.70.1/debian/salsa-ci.yml blackbox-0.70.1/debian/salsa-ci.yml --- blackbox-0.70.1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/salsa-ci.yml 2020-03-28 03:04:44.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru blackbox-0.70.1/debian/tests/control blackbox-0.70.1/debian/tests/control --- blackbox-0.70.1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/tests/control 2020-03-28 03:04:44.000000000 +0000 @@ -0,0 +1,6 @@ +Test-Command: blackbox -help + +Test-Command: blackbox -version + +Test-Command: xvfb-run -a startx & +Depends: @, xauth, xvfb, xorg diff -Nru blackbox-0.70.1/debian/upstream/metadata blackbox-0.70.1/debian/upstream/metadata --- blackbox-0.70.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ blackbox-0.70.1/debian/upstream/metadata 2020-03-28 03:03:43.000000000 +0000 @@ -0,0 +1,4 @@ +Archive: SourceForge +Bug-Database: https://github.com/bbidulock/blackboxwm/issues +Repository: https://github.com/bbidulock/blackboxwm.git +Repository-Browse: https://github.com/bbidulock/blackboxwm diff -Nru blackbox-0.70.1/debian/watch blackbox-0.70.1/debian/watch --- blackbox-0.70.1/debian/watch 2019-07-17 18:22:33.000000000 +0000 +++ blackbox-0.70.1/debian/watch 2020-03-28 03:04:44.000000000 +0000 @@ -1,3 +1,2 @@ -version=3 - -http://sf.net/blackboxwm/blackbox-(\d+\.\S+)\.tar\.(?:gz|bz2|xz) +version=4 +https://sf.net/blackboxwm/blackbox-(\d+\.\S+)\.tar\.(?:gz|bz2|xz)