wok annotate blackbox/stuff/blackbox-0.70.1-asneeded.patch @ rev 22178
corrected font-manager again
| author | Hans-G?nter Theisgen |
|---|---|
| date | Sat Nov 09 11:39:06 2019 +0100 (2019-11-09) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@11217 | 1 Fixing build with as-needed. Enabling shared libs. |
| pascal@11217 | 2 |
| pascal@11217 | 3 http://bugs.gentoo.org/show_bug.cgi?id=248549 |
| pascal@11217 | 4 |
| pascal@11217 | 5 --- src/Makefile.am |
| pascal@11217 | 6 +++ src/Makefile.am |
| pascal@11217 | 7 @@ -22,7 +22,7 @@ |
| pascal@11217 | 8 |
| pascal@11217 | 9 DEFAULT_MENU = $(pkgdatadir)/menu |
| pascal@11217 | 10 DEFAULT_STYLE = $(pkgdatadir)/styles/Gray |
| pascal@11217 | 11 -CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ |
| pascal@11217 | 12 +AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ |
| pascal@11217 | 13 -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ |
| pascal@11217 | 14 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ |
| pascal@11217 | 15 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ |
| pascal@11217 | 16 --- lib/Makefile.am |
| pascal@11217 | 17 +++ lib/Makefile.am |
| pascal@11217 | 18 @@ -62,7 +62,8 @@ |
| pascal@11217 | 19 Util.hh \ |
| pascal@11217 | 20 XDG.hh |
| pascal@11217 | 21 |
| pascal@11217 | 22 -libbt_la_LIBADD = @ICONV@ @LOCALE@ |
| pascal@11217 | 23 +libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ |
| pascal@11217 | 24 +libbt_la_CFLAGS = @xft_CFLAGS@ |
| pascal@11217 | 25 |
| pascal@11217 | 26 pkgconfigdir = $(libdir)/pkgconfig |
| pascal@11217 | 27 nodist_pkgconfig_DATA = libbt.pc |
| pascal@11217 | 28 --- util/Makefile.am |
| pascal@11217 | 29 +++ util/Makefile.am |
| pascal@11217 | 30 @@ -21,7 +21,7 @@ |
| pascal@11217 | 31 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| pascal@11217 | 32 # DEALINGS IN THE SOFTWARE. |
| pascal@11217 | 33 |
| pascal@11217 | 34 -CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ |
| pascal@11217 | 35 +AM_CPPFLAGS = @DEBUG@ @NLS@ \ |
| pascal@11217 | 36 -I$(top_srcdir)/lib |
| pascal@11217 | 37 |
| pascal@11217 | 38 bin_SCRIPTS = bsetbg |
| pascal@11217 | 39 --- configure.ac |
| pascal@11217 | 40 +++ configure.ac |
| pascal@11217 | 41 @@ -29,7 +29,7 @@ |
| pascal@11217 | 42 AC_PROG_INSTALL |
| pascal@11217 | 43 |
| pascal@11217 | 44 dnl libbt shouldn't be shared by default (yet) |
| pascal@11217 | 45 -AC_DISABLE_SHARED |
| pascal@11217 | 46 +dnl AC_DISABLE_SHARED |
| pascal@11217 | 47 AC_PROG_LIBTOOL |
| pascal@11217 | 48 AC_SUBST(LIBTOOL_DEPS) |
| pascal@11217 | 49 |