wok-undigest rev 294
Add as-needed patch to blackbox (took from gentoo)
author | Alexander Medvedev <devl547@gmail.com> |
---|---|
date | Tue Jun 07 16:15:24 2011 +0000 (2011-06-07) |
parents | 6c388d9de551 |
children | 7892b349ecf8 |
files | blackbox/receipt blackbox/stuff/blackbox-0.70.1-asneeded.patch |
line diff
1.1 --- a/blackbox/receipt Fri Jun 03 17:08:28 2011 +0000 1.2 +++ b/blackbox/receipt Tue Jun 07 16:15:24 2011 +0000 1.3 @@ -8,7 +8,6 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.5 WEB_SITE="http://blackboxwm.sourceforge.net/" 1.6 WGET_URL="$SF_MIRROR/blackboxwm/$TARBALL" 1.7 -BUILD_DEPENDS="xorg-libXt-dev xorg-libXft-dev" 1.8 DEPENDS="xorg-libXt xorg-libXft sed xorg-xextproto" 1.9 1.10 # TODO: modify tazx for blackbox so it will creat a correct ~/.xinitrc 1.11 @@ -22,6 +21,7 @@ 1.12 --libexecdir=/usr/bin --mandir=/usr/share/man \ 1.13 $CONFIGURE_ARGS && 1.14 patch -p1 < $stuff/blackbox-0.70.1-gcc-4.3.patch 1.15 + patch -p1 < $stuff/blackbox-0.70.1-asneeded.patch 1.16 make && 1.17 make DESTDIR=$DESTDIR install 1.18 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/blackbox/stuff/blackbox-0.70.1-asneeded.patch Tue Jun 07 16:15:24 2011 +0000 2.3 @@ -0,0 +1,49 @@ 2.4 +Fixing build with as-needed. Enabling shared libs. 2.5 + 2.6 +http://bugs.gentoo.org/show_bug.cgi?id=248549 2.7 + 2.8 +--- src/Makefile.am 2.9 ++++ src/Makefile.am 2.10 +@@ -22,7 +22,7 @@ 2.11 + 2.12 + DEFAULT_MENU = $(pkgdatadir)/menu 2.13 + DEFAULT_STYLE = $(pkgdatadir)/styles/Gray 2.14 +-CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ 2.15 ++AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ 2.16 + -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ 2.17 + -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ 2.18 + -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ 2.19 +--- lib/Makefile.am 2.20 ++++ lib/Makefile.am 2.21 +@@ -62,7 +62,8 @@ 2.22 + Util.hh \ 2.23 + XDG.hh 2.24 + 2.25 +-libbt_la_LIBADD = @ICONV@ @LOCALE@ 2.26 ++libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ 2.27 ++libbt_la_CFLAGS = @xft_CFLAGS@ 2.28 + 2.29 + pkgconfigdir = $(libdir)/pkgconfig 2.30 + nodist_pkgconfig_DATA = libbt.pc 2.31 +--- util/Makefile.am 2.32 ++++ util/Makefile.am 2.33 +@@ -21,7 +21,7 @@ 2.34 + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 2.35 + # DEALINGS IN THE SOFTWARE. 2.36 + 2.37 +-CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ 2.38 ++AM_CPPFLAGS = @DEBUG@ @NLS@ \ 2.39 + -I$(top_srcdir)/lib 2.40 + 2.41 + bin_SCRIPTS = bsetbg 2.42 +--- configure.ac 2.43 ++++ configure.ac 2.44 +@@ -29,7 +29,7 @@ 2.45 + AC_PROG_INSTALL 2.46 + 2.47 + dnl libbt shouldn't be shared by default (yet) 2.48 +-AC_DISABLE_SHARED 2.49 ++dnl AC_DISABLE_SHARED 2.50 + AC_PROG_LIBTOOL 2.51 + AC_SUBST(LIBTOOL_DEPS) 2.52 +