Date: Thursday, September 11, 2014 @ 07:19:42 Author: bpiotrowski Revision: 118798
upgpkg: blackbox 0.70.1-12 provide shared libbt library Added: blackbox/trunk/blackbox-0.70.1-asneeded.patch Modified: blackbox/trunk/PKGBUILD --------------------------------+ PKGBUILD | 16 +++++++++--- blackbox-0.70.1-asneeded.patch | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-11 05:05:22 UTC (rev 118797) +++ PKGBUILD 2014-09-11 05:19:42 UTC (rev 118798) @@ -5,7 +5,7 @@ pkgname=blackbox pkgver=0.70.1 -pkgrel=11 +pkgrel=12 pkgdesc="A window manager for X11" url="http://blackboxwm.sourceforge.net/"; arch=('i686' 'x86_64') @@ -15,14 +15,16 @@ gcc4.3.patch bbdock.patch bsetbg-feh.patch - textpropertytostring-unconditional.patch) + textpropertytostring-unconditional.patch + blackbox-0.70.1-asneeded.patch) md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' 'bc7a1335d77cdeb6f85cba4d01e68e63' '69c5a5e981b087b2d8267cab996b48dd' 'e7fb0d5bfd95820c0194ec73df66dadc' - '3b92ad246f07126dd55ae9634d6e875e') + '3b92ad246f07126dd55ae9634d6e875e' + '55d2437d58aeb76392fe66caab13840c') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver patch -Np1 -i ../gcc4.3.patch @@ -29,7 +31,13 @@ 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 } Added: blackbox-0.70.1-asneeded.patch =================================================================== --- blackbox-0.70.1-asneeded.patch (rev 0) +++ blackbox-0.70.1-asneeded.patch 2014-09-11 05:19:42 UTC (rev 118798) @@ -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) +
