From 7872999288ee678cc176aeebf7f505428b508096 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 17 Dec 2018 13:56:50 -0500 Subject: blackbox-0.74-1.par1: updating version --- libre/blackbox/PKGBUILD | 55 ++++------ libre/blackbox/bbdock.patch | 16 --- libre/blackbox/blackbox-0.70.1-asneeded.patch | 49 --------- libre/blackbox/bsetbg-feh.patch | 23 ----- libre/blackbox/gcc4.3.patch | 111 --------------------- .../textpropertytostring-unconditional.patch | 28 ------ 6 files changed, 21 insertions(+), 261 deletions(-) delete mode 100644 libre/blackbox/bbdock.patch delete mode 100644 libre/blackbox/blackbox-0.70.1-asneeded.patch delete mode 100644 libre/blackbox/bsetbg-feh.patch delete mode 100644 libre/blackbox/gcc4.3.patch delete mode 100644 libre/blackbox/textpropertytostring-unconditional.patch (limited to 'libre/blackbox') diff --git a/libre/blackbox/PKGBUILD b/libre/blackbox/PKGBUILD index 8edfb2333..24a8c0cf4 100644 --- a/libre/blackbox/PKGBUILD +++ b/libre/blackbox/PKGBUILD @@ -1,55 +1,42 @@ -# $Id: PKGBUILD 149324 2015-12-06 22:57:37Z bpiotrowski $ # Maintainer (Arch): Sergej Pupykin # Contributor (Arch): durbatuluk # Contributor (Arch): Steve Ponsford -# Maintainer: Márcio Silva +# Maintainer (Hyperbola): Márcio Silva +# Maintainer: Omar Vega Ramos pkgname=blackbox -pkgver=0.70.1 -pkgrel=13.parabola2 -pkgdesc="A window manager for X11, without nonfree programs on the menu" -url="http://${pkgname}wm.sourceforge.net/" -arch=('i686' 'x86_64' 'armv7h') +pkgver=0.74 +pkgrel=1 +pkgrel+=.par1 +pkgdesc="A window manager for X11" +pkgdesc+=", without nonfree programs on the menu" +url="https://github.com/bbidulock/blackboxwm" +arch=('x86_64') +arch+=('i686' 'armv7h') 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 - blackbox-0.70.1-asneeded.patch +source=($pkgname-$pkgver.tar.gz::"https://github.com/bbidulock/blackboxwm/archive/$pkgver.tar.gz" menu) -md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' - 'bc7a1335d77cdeb6f85cba4d01e68e63' - '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc' - '3b92ad246f07126dd55ae9634d6e875e' - '55d2437d58aeb76392fe66caab13840c' - 'f4fefa5f25c65c5d9a601e9c14646757') +sha256sums=('b7abd3def4d499180bfde85c38d723f2e6930d0956d7d7c81280f0f16cff557d' + 'f7daa30ed0360ece14d14ddece602e1161b5dfc84098411531e4e02fa20ddc71') 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 + cd blackboxwm-$pkgver + sed -e '/AC_DISABLE_SHARED/d' -i configure.ac # Build shared library + ./autogen.sh } build() { - cd $srcdir/$pkgname-$pkgver + cd blackboxwm-$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 - install -D -m644 $srcdir/menu $pkgdir/usr/share/$pkgname/menu + cd blackboxwm-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 COPYING "$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 deleted file mode 100644 index 709b6cfe1..000000000 --- a/libre/blackbox/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/blackbox-0.70.1-asneeded.patch b/libre/blackbox/blackbox-0.70.1-asneeded.patch deleted file mode 100644 index a6b1e22e6..000000000 --- a/libre/blackbox/blackbox-0.70.1-asneeded.patch +++ /dev/null @@ -1,49 +0,0 @@ -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) - diff --git a/libre/blackbox/bsetbg-feh.patch b/libre/blackbox/bsetbg-feh.patch deleted file mode 100644 index 17a612ff0..000000000 --- a/libre/blackbox/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/gcc4.3.patch b/libre/blackbox/gcc4.3.patch deleted file mode 100644 index 40a9dcdef..000000000 --- a/libre/blackbox/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/textpropertytostring-unconditional.patch b/libre/blackbox/textpropertytostring-unconditional.patch deleted file mode 100644 index ed320388a..000000000 --- a/libre/blackbox/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 - -- cgit v1.2.3