From: Kacper Kowalik Date: Wed, 2 Jun 2010 18:00:43 +0000 (+0000) Subject: Enabling shared libs, fixing as-needed issues wrt bug 248549. Thanks Diego for the... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ccc81c6b57dccda4a0adecd9e76242b9f9c7b63b;p=gentoo.git Enabling shared libs, fixing as-needed issues wrt bug 248549. Thanks Diego for the report. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/x11-wm/blackbox/ChangeLog b/x11-wm/blackbox/ChangeLog index 303b4f738114..bd1dadf76702 100644 --- a/x11-wm/blackbox/ChangeLog +++ b/x11-wm/blackbox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/blackbox # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.65 2010/02/22 19:53:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.66 2010/06/02 18:00:42 xarthisius Exp $ + + 02 Jun 2010; Kacper Kowalik + blackbox-0.70.1.ebuild, +files/blackbox-0.70.1-asneeded.patch: + Enabling shared libs, fixing as-needed issues wrt bug 248549. Thanks Diego + for the report. 22 Feb 2010; Raúl Porcel blackbox-0.70.1.ebuild: arm stable diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest index 7a0593e5af56..d71cd7d53343 100644 --- a/x11-wm/blackbox/Manifest +++ b/x11-wm/blackbox/Manifest @@ -1,6 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX blackbox-0.70.1-asneeded.patch 1239 RMD160 f8b88de0a2d33f86ebb17d1a59d9cbe3ec6436d5 SHA1 64c8a6a581c51f80fa7a7a3e0b66b86020795534 SHA256 ad1860a953865b3fbbbfc4e93e47e177fa41953f9a1b0b1c07b377e1a2f384a0 AUX blackbox-0.70.1-gcc-4.3.patch 3274 RMD160 db1f6eca21e3ffcc0ff2662f6701bb05d636d532 SHA1 e8db616f0c134575eaf096ec0aa72f47e355b86f SHA256 4b4f13650bed35666dd27bcd4744e4f9d28f794e6f3e6c5ba5daedf780f16a78 AUX blackbox.desktop 143 RMD160 946479197e095569f74e0398ce5a511f7d8dcb5a SHA1 7df18e18bf5df68d920028a616eaeb36466e30f3 SHA256 ccf8efedd257b097f5f3c9b46354a4f2205fe655b5b66976fb11e47c040fe418 DIST blackbox-0.70.1.tar.bz2 492399 RMD160 daa414d3d9093614ad7caa18c0fe3863ef3db707 SHA1 66455b8400d6659b5681c290a5ced3697d199955 SHA256 92c2be347253f29b10063d579b4267a21516cb322a41b5e83d770fa6d44afd21 -EBUILD blackbox-0.70.1.ebuild 1320 RMD160 8a20ff9f1bb5671acb5eea2065e0df55a53862c6 SHA1 0001b8df06d3a2fa7d7ae048675b1969b54da8ff SHA256 b7398e76ae79e57679df137b186388eddfdf6296fcc11f0dbc1c5b07635afc89 -MISC ChangeLog 9024 RMD160 64b2259243fbd52edc5ef3de3ce4a620b4ca21c2 SHA1 67e8bbe352d03a566ec67ddcbae7c4644bc77b66 SHA256 6f2d6da256992b7fec46918fb1406c2a0a7157fbcc8b1d29cfadd0c101f602e0 +EBUILD blackbox-0.70.1.ebuild 1365 RMD160 10224a749efd00c7cbb715ec12fc9f12ebf678e3 SHA1 8397ea274cb743641d3e9f9a196259d26c157825 SHA256 3399de9a6a83e4ec11ce7985d5cfd5845c63cd3fec58fb1b4da7c7755010bd91 +MISC ChangeLog 9242 RMD160 3ecadf07871bf5afeb442e1ff7ba029bcaac72b2 SHA1 caf5d4f43b553cc04086879544af75bb39b3e8de SHA256 da97dea2a2f0a922340ecac4492d07a52be6d68252754188a298496bab49cf95 MISC metadata.xml 410 RMD160 b564864ea724eaf70a3bf22d5c1273c5dd9f23ad SHA1 9b9b85a6b9d4fe371a6aeb8d4298bf4a15e5c481 SHA256 38cb18239f8dc6257902ea486287d75e5b2db766f5b94722f12d75a710eb9c12 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iJwEAQECAAYFAkwGnFMACgkQIiMqcbOVdxSedAP9FRcqJOOwkRrctFjmGawBZARC +i9POrquFr8x5v8du3mV8W8hb5i7vJhu7QPaqp/bcHzLWMR+5WAnR3duHWQxXSd0Z +L5Sdokea3sIZX7Gb7MOOdve8GUrOju+FjEe2On0vo1mZfFldX/6WSjU8OfIviCGu +kBISYvkF5/n9FLzkcYQ= +=zAPV +-----END PGP SIGNATURE----- diff --git a/x11-wm/blackbox/blackbox-0.70.1.ebuild b/x11-wm/blackbox/blackbox-0.70.1.ebuild index 0627d1325d1d..0c57af6f393d 100644 --- a/x11-wm/blackbox/blackbox-0.70.1.ebuild +++ b/x11-wm/blackbox/blackbox-0.70.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.70.1.ebuild,v 1.11 2010/02/22 19:53:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.70.1.ebuild,v 1.12 2010/06/02 18:00:42 xarthisius Exp $ -inherit eutils +inherit autotools eutils DESCRIPTION="A small, fast, full-featured window manager for X" HOMEPAGE="http://blackboxwm.sourceforge.net/" @@ -28,7 +28,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-gcc-4.3.patch" + epatch "${FILESDIR}/${P}-gcc-4.3.patch" \ + "${FILESDIR}/${P}-asneeded.patch" + eautoreconf } src_compile() { @@ -36,8 +38,7 @@ src_compile() { --sysconfdir=/etc/X11/${PN} \ $(use_enable debug) \ $(use_enable nls) \ - $(use_enable truetype xft) \ - || die "econf failed" + $(use_enable truetype xft) emake || die "emake failed" } @@ -50,5 +51,5 @@ src_install() { doins "${FILESDIR}/${PN}.desktop" emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO + dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO || die } diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch b/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch new file mode 100644 index 000000000000..a6b1e22e62b5 --- /dev/null +++ b/x11-wm/blackbox/files/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) +