From 4856a32c8fd6d6f689492605f9e6253132d40642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 11 Sep 2014 13:41:45 -0300
Subject: blackbox-0.70.1-12.parabola1: provide shared libbt library

---
 libre/blackbox/PKGBUILD                       | 13 +++++--
 libre/blackbox/blackbox-0.70.1-asneeded.patch | 49 +++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 libre/blackbox/blackbox-0.70.1-asneeded.patch

(limited to 'libre/blackbox')

diff --git a/libre/blackbox/PKGBUILD b/libre/blackbox/PKGBUILD
index cca418a9f..8b0d173ab 100644
--- a/libre/blackbox/PKGBUILD
+++ b/libre/blackbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $
+# $Id: PKGBUILD 118798 2014-09-11 05:19:42Z bpiotrowski $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor (Arch): durbatuluk <dvdscripter@gmail.org>
 # Contributor (Arch): Steve Ponsford <sp4d@lavabit.com>
@@ -6,7 +6,7 @@
 
 pkgname=blackbox
 pkgver=0.70.1
-pkgrel=11.parabola1
+pkgrel=12.parabola1
 pkgdesc="A window manager for X11, without nonfree programs on the menu"
 url="http://${pkgname}wm.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,6 +19,7 @@ source=(http://downloads.sourceforge.net/${pkgname}wm/$pkgname-$pkgver.tar.gz
 	bbdock.patch
 	bsetbg-feh.patch
 	textpropertytostring-unconditional.patch
+        blackbox-0.70.1-asneeded.patch
         menu)
 md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
          'bc7a1335d77cdeb6f85cba4d01e68e63'
@@ -27,14 +28,20 @@ md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
          '3b92ad246f07126dd55ae9634d6e875e'
          'f4fefa5f25c65c5d9a601e9c14646757')
 
-build() {
+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
 }
diff --git a/libre/blackbox/blackbox-0.70.1-asneeded.patch b/libre/blackbox/blackbox-0.70.1-asneeded.patch
new file mode 100644
index 000000000..a6b1e22e6
--- /dev/null
+++ b/libre/blackbox/blackbox-0.70.1-asneeded.patch
@@ -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)
+ 
-- 
cgit v1.2.3