wok diff blackbox/stuff/blackbox-0.70.1-asneeded.patch @ rev 16881

at-spi2: fix wget url.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jul 13 20:41:10 2014 +0300 (2014-07-13)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/blackbox/stuff/blackbox-0.70.1-asneeded.patch	Sun Jul 13 20:41:10 2014 +0300
     1.3 @@ -0,0 +1,49 @@
     1.4 +Fixing build with as-needed. Enabling shared libs.
     1.5 +
     1.6 +http://bugs.gentoo.org/show_bug.cgi?id=248549
     1.7 + 
     1.8 +--- src/Makefile.am
     1.9 ++++ src/Makefile.am
    1.10 +@@ -22,7 +22,7 @@
    1.11 + 
    1.12 + DEFAULT_MENU		= $(pkgdatadir)/menu
    1.13 + DEFAULT_STYLE		= $(pkgdatadir)/styles/Gray
    1.14 +-CPPFLAGS		= @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
    1.15 ++AM_CPPFLAGS		= @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
    1.16 + 			  -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
    1.17 + 			  -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
    1.18 + 			  -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
    1.19 +--- lib/Makefile.am
    1.20 ++++ lib/Makefile.am
    1.21 +@@ -62,7 +62,8 @@
    1.22 + 			Util.hh						\
    1.23 + 			XDG.hh
    1.24 + 
    1.25 +-libbt_la_LIBADD =	@ICONV@ @LOCALE@
    1.26 ++libbt_la_LIBADD =	@ICONV@ @LOCALE@ @xft_LIBS@
    1.27 ++libbt_la_CFLAGS = 	@xft_CFLAGS@
    1.28 + 
    1.29 + pkgconfigdir = 		$(libdir)/pkgconfig
    1.30 + nodist_pkgconfig_DATA =	libbt.pc
    1.31 +--- util/Makefile.am
    1.32 ++++ util/Makefile.am
    1.33 +@@ -21,7 +21,7 @@
    1.34 + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
    1.35 + # DEALINGS IN THE SOFTWARE.
    1.36 + 
    1.37 +-CPPFLAGS		= @CPPFLAGS@ @DEBUG@ @NLS@ \
    1.38 ++AM_CPPFLAGS		= @DEBUG@ @NLS@ \
    1.39 + 			  -I$(top_srcdir)/lib
    1.40 + 
    1.41 + bin_SCRIPTS		= bsetbg
    1.42 +--- configure.ac
    1.43 ++++ configure.ac
    1.44 +@@ -29,7 +29,7 @@
    1.45 + AC_PROG_INSTALL
    1.46 + 
    1.47 + dnl libbt shouldn't be shared by default (yet)
    1.48 +-AC_DISABLE_SHARED
    1.49 ++dnl AC_DISABLE_SHARED
    1.50 + AC_PROG_LIBTOOL
    1.51 + AC_SUBST(LIBTOOL_DEPS)
    1.52 +