[arch-commits] Commit in blackbox/repos (14 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sun Dec 6 22:57:53 UTC 2015


    Date: Sunday, December 6, 2015 @ 23:57:52
  Author: bpiotrowski
Revision: 149325

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  blackbox/repos/community-staging-i686/
  blackbox/repos/community-staging-i686/PKGBUILD
    (from rev 149324, blackbox/trunk/PKGBUILD)
  blackbox/repos/community-staging-i686/bbdock.patch
    (from rev 149324, blackbox/trunk/bbdock.patch)
  blackbox/repos/community-staging-i686/blackbox-0.70.1-asneeded.patch
    (from rev 149324, blackbox/trunk/blackbox-0.70.1-asneeded.patch)
  blackbox/repos/community-staging-i686/bsetbg-feh.patch
    (from rev 149324, blackbox/trunk/bsetbg-feh.patch)
  blackbox/repos/community-staging-i686/gcc4.3.patch
    (from rev 149324, blackbox/trunk/gcc4.3.patch)
  blackbox/repos/community-staging-i686/textpropertytostring-unconditional.patch
    (from rev 149324, blackbox/trunk/textpropertytostring-unconditional.patch)
  blackbox/repos/community-staging-x86_64/
  blackbox/repos/community-staging-x86_64/PKGBUILD
    (from rev 149324, blackbox/trunk/PKGBUILD)
  blackbox/repos/community-staging-x86_64/bbdock.patch
    (from rev 149324, blackbox/trunk/bbdock.patch)
  blackbox/repos/community-staging-x86_64/blackbox-0.70.1-asneeded.patch
    (from rev 149324, blackbox/trunk/blackbox-0.70.1-asneeded.patch)
  blackbox/repos/community-staging-x86_64/bsetbg-feh.patch
    (from rev 149324, blackbox/trunk/bsetbg-feh.patch)
  blackbox/repos/community-staging-x86_64/gcc4.3.patch
    (from rev 149324, blackbox/trunk/gcc4.3.patch)
  blackbox/repos/community-staging-x86_64/textpropertytostring-unconditional.patch
    (from rev 149324, blackbox/trunk/textpropertytostring-unconditional.patch)

-------------------------------------------------------------------+
 community-staging-i686/PKGBUILD                                   |   49 ++++
 community-staging-i686/bbdock.patch                               |   16 +
 community-staging-i686/blackbox-0.70.1-asneeded.patch             |   49 ++++
 community-staging-i686/bsetbg-feh.patch                           |   23 ++
 community-staging-i686/gcc4.3.patch                               |  111 ++++++++++
 community-staging-i686/textpropertytostring-unconditional.patch   |   28 ++
 community-staging-x86_64/PKGBUILD                                 |   49 ++++
 community-staging-x86_64/bbdock.patch                             |   16 +
 community-staging-x86_64/blackbox-0.70.1-asneeded.patch           |   49 ++++
 community-staging-x86_64/bsetbg-feh.patch                         |   23 ++
 community-staging-x86_64/gcc4.3.patch                             |  111 ++++++++++
 community-staging-x86_64/textpropertytostring-unconditional.patch |   28 ++
 12 files changed, 552 insertions(+)

Copied: blackbox/repos/community-staging-i686/PKGBUILD (from rev 149324, blackbox/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-12-06 22:57:52 UTC (rev 149325)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: durbatuluk <dvdscripter at gmail.org>
+# Contributor: Steve Ponsford <sp4d at lavabit.com>
+
+pkgname=blackbox
+pkgver=0.70.1
+pkgrel=13
+pkgdesc="A window manager for X11"
+url="http://blackboxwm.sourceforge.net/"
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
+license=('MIT')
+source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz
+	gcc4.3.patch
+	bbdock.patch
+	bsetbg-feh.patch
+	textpropertytostring-unconditional.patch
+        blackbox-0.70.1-asneeded.patch)
+md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
+         'bc7a1335d77cdeb6f85cba4d01e68e63'
+         '69c5a5e981b087b2d8267cab996b48dd'
+         'e7fb0d5bfd95820c0194ec73df66dadc'
+         '3b92ad246f07126dd55ae9634d6e875e'
+         '55d2437d58aeb76392fe66caab13840c')
+
+prepare() {
+  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
+  patch -Np0 -i ../blackbox-0.70.1-asneeded.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./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
+}

Copied: blackbox/repos/community-staging-i686/bbdock.patch (from rev 149324, blackbox/trunk/bbdock.patch)
===================================================================
--- community-staging-i686/bbdock.patch	                        (rev 0)
+++ community-staging-i686/bbdock.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -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);
+ 

Copied: blackbox/repos/community-staging-i686/blackbox-0.70.1-asneeded.patch (from rev 149324, blackbox/trunk/blackbox-0.70.1-asneeded.patch)
===================================================================
--- community-staging-i686/blackbox-0.70.1-asneeded.patch	                        (rev 0)
+++ community-staging-i686/blackbox-0.70.1-asneeded.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -0,0 +1,49 @@
+Fixing build with as-needed. Enabling shared libs.
+
+http://bugs.gentoo.org/show_bug.cgi?id=248549
+ 
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -22,7 +22,7 @@
+ 
+ DEFAULT_MENU		= $(pkgdatadir)/menu
+ DEFAULT_STYLE		= $(pkgdatadir)/styles/Gray
+-CPPFLAGS		= @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
++AM_CPPFLAGS		= @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
+ 			  -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
+ 			  -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
+ 			  -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
+--- lib/Makefile.am
++++ lib/Makefile.am
+@@ -62,7 +62,8 @@
+ 			Util.hh						\
+ 			XDG.hh
+ 
+-libbt_la_LIBADD =	@ICONV@ @LOCALE@
++libbt_la_LIBADD =	@ICONV@ @LOCALE@ @xft_LIBS@
++libbt_la_CFLAGS = 	@xft_CFLAGS@
+ 
+ pkgconfigdir = 		$(libdir)/pkgconfig
+ nodist_pkgconfig_DATA =	libbt.pc
+--- util/Makefile.am
++++ util/Makefile.am
+@@ -21,7 +21,7 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ # DEALINGS IN THE SOFTWARE.
+ 
+-CPPFLAGS		= @CPPFLAGS@ @DEBUG@ @NLS@ \
++AM_CPPFLAGS		= @DEBUG@ @NLS@ \
+ 			  -I$(top_srcdir)/lib
+ 
+ bin_SCRIPTS		= bsetbg
+--- configure.ac
++++ configure.ac
+@@ -29,7 +29,7 @@
+ AC_PROG_INSTALL
+ 
+ dnl libbt shouldn't be shared by default (yet)
+-AC_DISABLE_SHARED
++dnl AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 

Copied: blackbox/repos/community-staging-i686/bsetbg-feh.patch (from rev 149324, blackbox/trunk/bsetbg-feh.patch)
===================================================================
--- community-staging-i686/bsetbg-feh.patch	                        (rev 0)
+++ community-staging-i686/bsetbg-feh.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -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`

Copied: blackbox/repos/community-staging-i686/gcc4.3.patch (from rev 149324, blackbox/trunk/gcc4.3.patch)
===================================================================
--- community-staging-i686/gcc4.3.patch	                        (rev 0)
+++ community-staging-i686/gcc4.3.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -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 <stdio.h>
+ #include <stdlib.h>
+ 
++#include <cstring>
++
+ // #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 <stdio.h>
+ 
++#include <cstring>
++
+ 
+ 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 <stdlib.h>
+-
++#include <algorithm>
+ 
+ // 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 <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
++#include <cstring>
++
+ 
+ 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 <ctype.h>
+ #include <dirent.h>
+ 
++#include <cstring>
++
+ 
+ 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 <assert.h>
+ 
++#include <cstring>
++
+ 
+ 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 <stdio.h>
+ 
++#include <cstring>
++
+ 
+ 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 at 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 <Pen.hh>
+ #include <Texture.hh>
+ 
++#include <cstdlib>
+ #include <cctype>
+ 
+ #include <X11/Xatom.h>
+ #include <stdio.h>
+ 
++#include <cstring>
++
+ 
+ // ignore all X errors
+ static int x11_error(::Display *, XErrorEvent *)

Copied: blackbox/repos/community-staging-i686/textpropertytostring-unconditional.patch (from rev 149324, blackbox/trunk/textpropertytostring-unconditional.patch)
===================================================================
--- community-staging-i686/textpropertytostring-unconditional.patch	                        (rev 0)
+++ community-staging-i686/textpropertytostring-unconditional.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -0,0 +1,28 @@
+Description: Declare bt::textPropertyToString unconditionally.
+Author: Jakub Wilk <jwilk at debian.org>
+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 <X11/Xutil.h>
++
+ #include <limits.h>
+ #include <string>
+ 
+@@ -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
+ 

Copied: blackbox/repos/community-staging-x86_64/PKGBUILD (from rev 149324, blackbox/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-12-06 22:57:52 UTC (rev 149325)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: durbatuluk <dvdscripter at gmail.org>
+# Contributor: Steve Ponsford <sp4d at lavabit.com>
+
+pkgname=blackbox
+pkgver=0.70.1
+pkgrel=13
+pkgdesc="A window manager for X11"
+url="http://blackboxwm.sourceforge.net/"
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
+license=('MIT')
+source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz
+	gcc4.3.patch
+	bbdock.patch
+	bsetbg-feh.patch
+	textpropertytostring-unconditional.patch
+        blackbox-0.70.1-asneeded.patch)
+md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
+         'bc7a1335d77cdeb6f85cba4d01e68e63'
+         '69c5a5e981b087b2d8267cab996b48dd'
+         'e7fb0d5bfd95820c0194ec73df66dadc'
+         '3b92ad246f07126dd55ae9634d6e875e'
+         '55d2437d58aeb76392fe66caab13840c')
+
+prepare() {
+  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
+  patch -Np0 -i ../blackbox-0.70.1-asneeded.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./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
+}

Copied: blackbox/repos/community-staging-x86_64/bbdock.patch (from rev 149324, blackbox/trunk/bbdock.patch)
===================================================================
--- community-staging-x86_64/bbdock.patch	                        (rev 0)
+++ community-staging-x86_64/bbdock.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -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);
+ 

Copied: blackbox/repos/community-staging-x86_64/blackbox-0.70.1-asneeded.patch (from rev 149324, blackbox/trunk/blackbox-0.70.1-asneeded.patch)
===================================================================
--- community-staging-x86_64/blackbox-0.70.1-asneeded.patch	                        (rev 0)
+++ community-staging-x86_64/blackbox-0.70.1-asneeded.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -0,0 +1,49 @@
+Fixing build with as-needed. Enabling shared libs.
+
+http://bugs.gentoo.org/show_bug.cgi?id=248549
+ 
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -22,7 +22,7 @@
+ 
+ DEFAULT_MENU		= $(pkgdatadir)/menu
+ DEFAULT_STYLE		= $(pkgdatadir)/styles/Gray
+-CPPFLAGS		= @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
++AM_CPPFLAGS		= @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
+ 			  -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
+ 			  -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
+ 			  -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
+--- lib/Makefile.am
++++ lib/Makefile.am
+@@ -62,7 +62,8 @@
+ 			Util.hh						\
+ 			XDG.hh
+ 
+-libbt_la_LIBADD =	@ICONV@ @LOCALE@
++libbt_la_LIBADD =	@ICONV@ @LOCALE@ @xft_LIBS@
++libbt_la_CFLAGS = 	@xft_CFLAGS@
+ 
+ pkgconfigdir = 		$(libdir)/pkgconfig
+ nodist_pkgconfig_DATA =	libbt.pc
+--- util/Makefile.am
++++ util/Makefile.am
+@@ -21,7 +21,7 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ # DEALINGS IN THE SOFTWARE.
+ 
+-CPPFLAGS		= @CPPFLAGS@ @DEBUG@ @NLS@ \
++AM_CPPFLAGS		= @DEBUG@ @NLS@ \
+ 			  -I$(top_srcdir)/lib
+ 
+ bin_SCRIPTS		= bsetbg
+--- configure.ac
++++ configure.ac
+@@ -29,7 +29,7 @@
+ AC_PROG_INSTALL
+ 
+ dnl libbt shouldn't be shared by default (yet)
+-AC_DISABLE_SHARED
++dnl AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 

Copied: blackbox/repos/community-staging-x86_64/bsetbg-feh.patch (from rev 149324, blackbox/trunk/bsetbg-feh.patch)
===================================================================
--- community-staging-x86_64/bsetbg-feh.patch	                        (rev 0)
+++ community-staging-x86_64/bsetbg-feh.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -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`

Copied: blackbox/repos/community-staging-x86_64/gcc4.3.patch (from rev 149324, blackbox/trunk/gcc4.3.patch)
===================================================================
--- community-staging-x86_64/gcc4.3.patch	                        (rev 0)
+++ community-staging-x86_64/gcc4.3.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -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 <stdio.h>
+ #include <stdlib.h>
+ 
++#include <cstring>
++
+ // #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 <stdio.h>
+ 
++#include <cstring>
++
+ 
+ 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 <stdlib.h>
+-
++#include <algorithm>
+ 
+ // 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 <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
++#include <cstring>
++
+ 
+ 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 <ctype.h>
+ #include <dirent.h>
+ 
++#include <cstring>
++
+ 
+ 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 <assert.h>
+ 
++#include <cstring>
++
+ 
+ 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 <stdio.h>
+ 
++#include <cstring>
++
+ 
+ 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 at 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 <Pen.hh>
+ #include <Texture.hh>
+ 
++#include <cstdlib>
+ #include <cctype>
+ 
+ #include <X11/Xatom.h>
+ #include <stdio.h>
+ 
++#include <cstring>
++
+ 
+ // ignore all X errors
+ static int x11_error(::Display *, XErrorEvent *)

Copied: blackbox/repos/community-staging-x86_64/textpropertytostring-unconditional.patch (from rev 149324, blackbox/trunk/textpropertytostring-unconditional.patch)
===================================================================
--- community-staging-x86_64/textpropertytostring-unconditional.patch	                        (rev 0)
+++ community-staging-x86_64/textpropertytostring-unconditional.patch	2015-12-06 22:57:52 UTC (rev 149325)
@@ -0,0 +1,28 @@
+Description: Declare bt::textPropertyToString unconditionally.
+Author: Jakub Wilk <jwilk at debian.org>
+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 <X11/Xutil.h>
++
+ #include <limits.h>
+ #include <string>
+ 
+@@ -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
+ 



More information about the arch-commits mailing list