1 |
xarthisius 10/06/02 18:00:44 |
2 |
|
3 |
Added: blackbox-0.70.1-asneeded.patch |
4 |
Log: |
5 |
Enabling shared libs, fixing as-needed issues wrt bug 248549. Thanks Diego for the report. |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: blackbox-0.70.1-asneeded.patch |
15 |
=================================================================== |
16 |
Fixing build with as-needed. Enabling shared libs. |
17 |
|
18 |
http://bugs.gentoo.org/show_bug.cgi?id=248549 |
19 |
|
20 |
--- src/Makefile.am |
21 |
+++ src/Makefile.am |
22 |
@@ -22,7 +22,7 @@ |
23 |
|
24 |
DEFAULT_MENU = $(pkgdatadir)/menu |
25 |
DEFAULT_STYLE = $(pkgdatadir)/styles/Gray |
26 |
-CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ |
27 |
+AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ |
28 |
-DLOCALEPATH=\"$(pkgdatadir)/nls\" \ |
29 |
-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ |
30 |
-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ |
31 |
--- lib/Makefile.am |
32 |
+++ lib/Makefile.am |
33 |
@@ -62,7 +62,8 @@ |
34 |
Util.hh \ |
35 |
XDG.hh |
36 |
|
37 |
-libbt_la_LIBADD = @ICONV@ @LOCALE@ |
38 |
+libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ |
39 |
+libbt_la_CFLAGS = @xft_CFLAGS@ |
40 |
|
41 |
pkgconfigdir = $(libdir)/pkgconfig |
42 |
nodist_pkgconfig_DATA = libbt.pc |
43 |
--- util/Makefile.am |
44 |
+++ util/Makefile.am |
45 |
@@ -21,7 +21,7 @@ |
46 |
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
47 |
# DEALINGS IN THE SOFTWARE. |
48 |
|
49 |
-CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ |
50 |
+AM_CPPFLAGS = @DEBUG@ @NLS@ \ |
51 |
-I$(top_srcdir)/lib |
52 |
|
53 |
bin_SCRIPTS = bsetbg |
54 |
--- configure.ac |
55 |
+++ configure.ac |
56 |
@@ -29,7 +29,7 @@ |
57 |
AC_PROG_INSTALL |
58 |
|
59 |
dnl libbt shouldn't be shared by default (yet) |
60 |
-AC_DISABLE_SHARED |
61 |
+dnl AC_DISABLE_SHARED |
62 |
AC_PROG_LIBTOOL |
63 |
AC_SUBST(LIBTOOL_DEPS) |