diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-12 10:43:02 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-12 10:43:02 -0300 |
| commit | 28a045401120eec8626db63c7089c0f4a130c9cb (patch) | |
| tree | 4f818cbdd73a6f43781a8edbfc10b17690001a7c | |
| parent | bc8118fb63d62b64bd76e6402f7d35b8d6a3cc7e (diff) | |
| parent | 281c9aef2e2f6cde3c8ce5a4b065d9b12fbe99be (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
| -rw-r--r-- | libre/blackbox/PKGBUILD | 14 | ||||
| -rw-r--r-- | libre/blackbox/blackbox-0.70.1-asneeded.patch | 49 |
2 files changed, 60 insertions, 3 deletions
diff --git a/libre/blackbox/PKGBUILD b/libre/blackbox/PKGBUILD index cca418a9f..abfbd7640 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,22 +19,30 @@ 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' '69c5a5e981b087b2d8267cab996b48dd' 'e7fb0d5bfd95820c0194ec73df66dadc' '3b92ad246f07126dd55ae9634d6e875e' + '55d2437d58aeb76392fe66caab13840c' '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) + |