From 07625166ab46f6fe5dc88d27ec77987fdd7be9dc Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 19:14:22 -0300 Subject: rename to blackbox --- libre/blackbox-libre/PKGBUILD | 49 --------- libre/blackbox-libre/bbdock.patch | 16 --- libre/blackbox-libre/bsetbg-feh.patch | 23 ----- libre/blackbox-libre/gcc4.3.patch | 111 -------------------- libre/blackbox-libre/menu | 112 --------------------- .../textpropertytostring-unconditional.patch | 28 ------ libre/blackbox/PKGBUILD | 47 +++++++++ libre/blackbox/bbdock.patch | 16 +++ libre/blackbox/bsetbg-feh.patch | 23 +++++ libre/blackbox/gcc4.3.patch | 111 ++++++++++++++++++++ libre/blackbox/menu | 112 +++++++++++++++++++++ .../textpropertytostring-unconditional.patch | 28 ++++++ 12 files changed, 337 insertions(+), 339 deletions(-) delete mode 100644 libre/blackbox-libre/PKGBUILD delete mode 100644 libre/blackbox-libre/bbdock.patch delete mode 100644 libre/blackbox-libre/bsetbg-feh.patch delete mode 100644 libre/blackbox-libre/gcc4.3.patch delete mode 100644 libre/blackbox-libre/menu delete mode 100644 libre/blackbox-libre/textpropertytostring-unconditional.patch create mode 100644 libre/blackbox/PKGBUILD create mode 100644 libre/blackbox/bbdock.patch create mode 100644 libre/blackbox/bsetbg-feh.patch create mode 100644 libre/blackbox/gcc4.3.patch create mode 100644 libre/blackbox/menu create mode 100644 libre/blackbox/textpropertytostring-unconditional.patch (limited to 'libre') diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD deleted file mode 100644 index 94f07ee2e..000000000 --- a/libre/blackbox-libre/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $ -# Maintainer (Arch): Sergej Pupykin -# Contributor (Arch): durbatuluk -# Contributor (Arch): Steve Ponsford -# Maintainer: Márcio Silva - -_pkgname=blackbox -pkgname=${_pkgname}-libre -pkgver=0.70.1 -pkgrel=11 -pkgdesc="A window manager for X11, without nonfree programs on the menu" -url="http://blackboxwm.sourceforge.net/" -arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -license=('MIT') -source=(http://downloads.sourceforge.net/blackboxwm/$_pkgname-$pkgver.tar.gz - gcc4.3.patch - bbdock.patch - bsetbg-feh.patch - textpropertytostring-unconditional.patch - menu) -md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' - 'bc7a1335d77cdeb6f85cba4d01e68e63' - '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc' - '3b92ad246f07126dd55ae9634d6e875e' - 'f4fefa5f25c65c5d9a601e9c14646757') - -build() { - cd $srcdir/$_pkgname-$pkgver - - patch -Np1 -i ../gcc4.3.patch - patch -Np0 -i ../bbdock.patch - patch -Np0 -i ../bsetbg-feh.patch - patch -Np1 -i ../textpropertytostring-unconditional.patch - - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd $srcdir/$_pkgname-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE - install -D -m644 $srcdir/menu $pkgdir/usr/share/$_pkgname/menu -} diff --git a/libre/blackbox-libre/bbdock.patch b/libre/blackbox-libre/bbdock.patch deleted file mode 100644 index 709b6cfe1..000000000 --- a/libre/blackbox-libre/bbdock.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 -+++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 -@@ -248,6 +248,13 @@ - bt::PixmapCache::find(screen->screenNumber(), texture, - frame.rect.width(), frame.rect.height(), - frame.pixmap); -+/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ -+ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) -+ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); -+ else if ((texture.texture() & bt::Texture::Solid)) -+ XSetWindowBackground(display, frame.window, -+ texture.color1().pixel(screen->screenNumber())); -+/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ - XClearArea(display, frame.window, 0, 0, - frame.rect.width(), frame.rect.height(), True); - diff --git a/libre/blackbox-libre/bsetbg-feh.patch b/libre/blackbox-libre/bsetbg-feh.patch deleted file mode 100644 index 17a612ff0..000000000 --- a/libre/blackbox-libre/bsetbg-feh.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 -+++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 -@@ -22,7 +22,7 @@ - - PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin - --img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" -+img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" - - display_full_cmd="display -geometry 800x600 -window root" - display_tile_cmd="display -window root" -@@ -59,6 +59,11 @@ - xsetbg_center_cmd="xsetbg -center" - xsetbg_default_cmd="$xsetbg_center_cmd" - -+feh_full_cmd="feh --bg-scale" -+feh_tile_cmd="feh --bg-tile" -+feh_center_cmd="feh --bg-center" -+feh_default_cmd="$feh_center_cmd" -+ - ################################## - - me=`basename $0` diff --git a/libre/blackbox-libre/gcc4.3.patch b/libre/blackbox-libre/gcc4.3.patch deleted file mode 100644 index 40a9dcdef..000000000 --- a/libre/blackbox-libre/gcc4.3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc ---- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -45,6 +45,8 @@ - #include - #include - -+#include -+ - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG - -diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc ---- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -30,6 +30,8 @@ - - #include - -+#include -+ - - bt::Resource::Resource(void) - : db(NULL) -diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc ---- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 -+++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -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) -diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc ---- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 -+++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - #include - #include - -+#include -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc ---- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 -+++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -48,6 +48,8 @@ - #include - #include - -+#include -+ - - static bool running = true; - static int anotherWMRunning(Display *, XErrorEvent *) { -diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc ---- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 -+++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - - #include - -+#include -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc ---- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 -+++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -36,6 +36,8 @@ - - #include - -+#include -+ - - static void showHelp(int exitval) { - // print version - this should not be localized! -diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg ---- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) - # -diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc ---- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -27,11 +27,14 @@ - #include - #include - -+#include - #include - - #include - #include - -+#include -+ - - // ignore all X errors - static int x11_error(::Display *, XErrorEvent *) diff --git a/libre/blackbox-libre/menu b/libre/blackbox-libre/menu deleted file mode 100644 index 9cba27d16..000000000 --- a/libre/blackbox-libre/menu +++ /dev/null @@ -1,112 +0,0 @@ -# This is the default menu file for Blackbox 0.33.0 and up -# -# Lines beginning with the '#' character are ignored. -# -# The new syntax is simpler than the old X resource format... -# Each menu item consists of 2 or 3 fields: -# -# [command] (label) {data} -# -# where [command] is one of: -# -# [begin] [end] [exec] [exit] [reconfig] [restart] [submenu] -# [style] [stylesdir] [include] [workspaces] [config] -# -# [begin] is used for the top level menu -# [submenu] is used for submenus -# [end] must be used with BOTH [begin] and [submenu] to tell the parser to stop -# reading from the file. -# -# [exec] (label) {string} -# This will insert an item that runs a program. -# -# [exit] (label) -# This will insert an item that exits the window manager. -# -# [reconfig] (label) {string} -# This will insert an item that tells blackbox to re-read it's configuration -# files. {string} is optional, and if supplied, will execute the string with -# /bin/sh -c before the reconfiguration is performed. (this is helpful for -# writing multiple config files and switching between them) -# -# [restart] (label) {string} -# This will insert an item to restart the window manager. {string} is -# optional, and if omitted, blackbox will restart itself. If {string} is -# specified, then a different window manager will be started. -# -# [style] (filename) -# This will insert an item to reconfigure blackbox with the new style. This -# change is saved when blackbox exits or restarts. -# -# [include] (filename) -# This will read more menu items from the file "filename". The file cannot -# contain a [begin] or [end], except for the [end] needed for submenus. -# -# [workspaces] (label) -# This tells Blackbox to insert a "link" to the workspaces menu directly -# into your menu. -# -# [config] (label) -# This tells Blackbox to insert the ConfigMenu into your menu. The ConfigMenu -# allows you to change several options found in your ~/.blackboxrc file on the -# fly. -# -# example: - -[begin] (Blackbox) - [exec] (xterm) {xterm -ls} - [exec] (rxvt) {rxvt} - - [exec] (LibreOffice) {soffice} - [exec] (XEmacs) {xemacs} - [exec] (XPDF) {xpdf} - - [submenu] (Graphics) - [exec] (The GIMP) {gimp} - [exec] (Image Magick) {display} - [end] - - [submenu] (Internet) - [exec] (Icecat) {icecat} - [exec] (Iceweasel libre) {iceweasel} - [submenu] (Icedove libre) - [exec] (Icedove libre Mail) {icedove -mail} - [exec] (Icedove libre News) {icedove -news} - [end] - [submenu] (Iceape libre) - [exec] (Iceape libre Mail) {icedove -mail} - [exec] (Iceape libre News) {icedove -news} - [exec] (Iceape libre Composer) {icedove -edit} - [end] - [end] - - [submenu] (X Utilities) - [exec] (Xfontsel) {xfontsel} - [exec] (Xman) {xman} - [exec] (Xcalc) {xcalc} - [exec] (Xload) {xload} - [end] - - [submenu] (Styles) {Choose a style...} - [stylesdir] (/usr/share/blackbox/styles) - [end] - - [workspaces] (Workspace List) - [config] (Configuration) - - [reconfig] (Reconfigure) - [restart] (Restart) - [submenu] (Others) {Other Window Managers} - [restart] (Start FVWM) {fvwm} - [restart] (Start WindowMaker) {wmaker} - [restart] (Start Afterstep) {afterstep} - [restart] (Start Enlightenment) {enlightenment} - [restart] (Start TWM) {twm} - [restart] (Start KWIM) {kwim} - [end] - - [exit] (Exit) -[end] - -# End of example menu. - diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox-libre/textpropertytostring-unconditional.patch deleted file mode 100644 index ed320388a..000000000 --- a/libre/blackbox-libre/textpropertytostring-unconditional.patch +++ /dev/null @@ -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 --git a/libre/blackbox/PKGBUILD b/libre/blackbox/PKGBUILD new file mode 100644 index 000000000..cca418a9f --- /dev/null +++ b/libre/blackbox/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $ +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): durbatuluk +# Contributor (Arch): Steve Ponsford +# Maintainer: Márcio Silva + +pkgname=blackbox +pkgver=0.70.1 +pkgrel=11.parabola1 +pkgdesc="A window manager for X11, without nonfree programs on the menu" +url="http://${pkgname}wm.sourceforge.net/" +arch=('i686' 'x86_64' 'mips64el') +depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') +replaces=($pkgname-libre) +conflicts=($pkgname-libre) +license=('MIT') +source=(http://downloads.sourceforge.net/${pkgname}wm/$pkgname-$pkgver.tar.gz + gcc4.3.patch + bbdock.patch + bsetbg-feh.patch + textpropertytostring-unconditional.patch + menu) +md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' + 'bc7a1335d77cdeb6f85cba4d01e68e63' + '69c5a5e981b087b2d8267cab996b48dd' + 'e7fb0d5bfd95820c0194ec73df66dadc' + '3b92ad246f07126dd55ae9634d6e875e' + 'f4fefa5f25c65c5d9a601e9c14646757') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i ../gcc4.3.patch + patch -Np0 -i ../bbdock.patch + patch -Np0 -i ../bsetbg-feh.patch + patch -Np1 -i ../textpropertytostring-unconditional.patch + + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m644 $srcdir/menu $pkgdir/usr/share/$pkgname/menu +} diff --git a/libre/blackbox/bbdock.patch b/libre/blackbox/bbdock.patch new file mode 100644 index 000000000..709b6cfe1 --- /dev/null +++ b/libre/blackbox/bbdock.patch @@ -0,0 +1,16 @@ +--- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 ++++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 +@@ -248,6 +248,13 @@ + bt::PixmapCache::find(screen->screenNumber(), texture, + frame.rect.width(), frame.rect.height(), + frame.pixmap); ++/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ ++ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) ++ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); ++ else if ((texture.texture() & bt::Texture::Solid)) ++ XSetWindowBackground(display, frame.window, ++ texture.color1().pixel(screen->screenNumber())); ++/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ + XClearArea(display, frame.window, 0, 0, + frame.rect.width(), frame.rect.height(), True); + diff --git a/libre/blackbox/bsetbg-feh.patch b/libre/blackbox/bsetbg-feh.patch new file mode 100644 index 000000000..17a612ff0 --- /dev/null +++ b/libre/blackbox/bsetbg-feh.patch @@ -0,0 +1,23 @@ +--- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 ++++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 +@@ -22,7 +22,7 @@ + + PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin + +-img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" ++img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" + + display_full_cmd="display -geometry 800x600 -window root" + display_tile_cmd="display -window root" +@@ -59,6 +59,11 @@ + xsetbg_center_cmd="xsetbg -center" + xsetbg_default_cmd="$xsetbg_center_cmd" + ++feh_full_cmd="feh --bg-scale" ++feh_tile_cmd="feh --bg-tile" ++feh_center_cmd="feh --bg-center" ++feh_default_cmd="$feh_center_cmd" ++ + ################################## + + me=`basename $0` diff --git a/libre/blackbox/gcc4.3.patch b/libre/blackbox/gcc4.3.patch new file mode 100644 index 000000000..40a9dcdef --- /dev/null +++ b/libre/blackbox/gcc4.3.patch @@ -0,0 +1,111 @@ +diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc +--- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 ++++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -45,6 +45,8 @@ + #include + #include + ++#include ++ + // #define COLORTABLE_DEBUG + // #define MITSHM_DEBUG + +diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc +--- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 ++++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -30,6 +30,8 @@ + + #include + ++#include ++ + + bt::Resource::Resource(void) + : db(NULL) +diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc +--- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 ++++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -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) +diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc +--- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 ++++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -33,6 +33,8 @@ + #include + #include + ++#include ++ + + BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { + screen_resources = 0; +diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc +--- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 ++++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -48,6 +48,8 @@ + #include + #include + ++#include ++ + + static bool running = true; + static int anotherWMRunning(Display *, XErrorEvent *) { +diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc +--- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 ++++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -33,6 +33,8 @@ + + #include + ++#include ++ + + static const int iconify_width = 9; + static const int iconify_height = 9; +diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc +--- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 ++++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -36,6 +36,8 @@ + + #include + ++#include ++ + + static void showHelp(int exitval) { + // print version - this should not be localized! +diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg +--- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 ++++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) + # +diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc +--- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 ++++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 +@@ -27,11 +27,14 @@ + #include + #include + ++#include + #include + + #include + #include + ++#include ++ + + // ignore all X errors + static int x11_error(::Display *, XErrorEvent *) diff --git a/libre/blackbox/menu b/libre/blackbox/menu new file mode 100644 index 000000000..9cba27d16 --- /dev/null +++ b/libre/blackbox/menu @@ -0,0 +1,112 @@ +# This is the default menu file for Blackbox 0.33.0 and up +# +# Lines beginning with the '#' character are ignored. +# +# The new syntax is simpler than the old X resource format... +# Each menu item consists of 2 or 3 fields: +# +# [command] (label) {data} +# +# where [command] is one of: +# +# [begin] [end] [exec] [exit] [reconfig] [restart] [submenu] +# [style] [stylesdir] [include] [workspaces] [config] +# +# [begin] is used for the top level menu +# [submenu] is used for submenus +# [end] must be used with BOTH [begin] and [submenu] to tell the parser to stop +# reading from the file. +# +# [exec] (label) {string} +# This will insert an item that runs a program. +# +# [exit] (label) +# This will insert an item that exits the window manager. +# +# [reconfig] (label) {string} +# This will insert an item that tells blackbox to re-read it's configuration +# files. {string} is optional, and if supplied, will execute the string with +# /bin/sh -c before the reconfiguration is performed. (this is helpful for +# writing multiple config files and switching between them) +# +# [restart] (label) {string} +# This will insert an item to restart the window manager. {string} is +# optional, and if omitted, blackbox will restart itself. If {string} is +# specified, then a different window manager will be started. +# +# [style] (filename) +# This will insert an item to reconfigure blackbox with the new style. This +# change is saved when blackbox exits or restarts. +# +# [include] (filename) +# This will read more menu items from the file "filename". The file cannot +# contain a [begin] or [end], except for the [end] needed for submenus. +# +# [workspaces] (label) +# This tells Blackbox to insert a "link" to the workspaces menu directly +# into your menu. +# +# [config] (label) +# This tells Blackbox to insert the ConfigMenu into your menu. The ConfigMenu +# allows you to change several options found in your ~/.blackboxrc file on the +# fly. +# +# example: + +[begin] (Blackbox) + [exec] (xterm) {xterm -ls} + [exec] (rxvt) {rxvt} + + [exec] (LibreOffice) {soffice} + [exec] (XEmacs) {xemacs} + [exec] (XPDF) {xpdf} + + [submenu] (Graphics) + [exec] (The GIMP) {gimp} + [exec] (Image Magick) {display} + [end] + + [submenu] (Internet) + [exec] (Icecat) {icecat} + [exec] (Iceweasel libre) {iceweasel} + [submenu] (Icedove libre) + [exec] (Icedove libre Mail) {icedove -mail} + [exec] (Icedove libre News) {icedove -news} + [end] + [submenu] (Iceape libre) + [exec] (Iceape libre Mail) {icedove -mail} + [exec] (Iceape libre News) {icedove -news} + [exec] (Iceape libre Composer) {icedove -edit} + [end] + [end] + + [submenu] (X Utilities) + [exec] (Xfontsel) {xfontsel} + [exec] (Xman) {xman} + [exec] (Xcalc) {xcalc} + [exec] (Xload) {xload} + [end] + + [submenu] (Styles) {Choose a style...} + [stylesdir] (/usr/share/blackbox/styles) + [end] + + [workspaces] (Workspace List) + [config] (Configuration) + + [reconfig] (Reconfigure) + [restart] (Restart) + [submenu] (Others) {Other Window Managers} + [restart] (Start FVWM) {fvwm} + [restart] (Start WindowMaker) {wmaker} + [restart] (Start Afterstep) {afterstep} + [restart] (Start Enlightenment) {enlightenment} + [restart] (Start TWM) {twm} + [restart] (Start KWIM) {kwim} + [end] + + [exit] (Exit) +[end] + +# End of example menu. + diff --git a/libre/blackbox/textpropertytostring-unconditional.patch b/libre/blackbox/textpropertytostring-unconditional.patch new file mode 100644 index 000000000..ed320388a --- /dev/null +++ b/libre/blackbox/textpropertytostring-unconditional.patch @@ -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 + -- cgit v1.2.3-54-g00ecf