summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-11 22:24:10 (GMT)
committerRichard Purdie <richard@openedhand.com>2007-11-11 22:24:10 (GMT)
commit1accf43d3a40d4ad843eacd9fa79c04ea09eae6e (patch)
tree403d35e1fa6ec3a9f2266ced7b8d428e95b14555 /meta
parent71969e2e7662ec11147a8ebb1d3a7d55f39a16ea (diff)
downloadpoky-1accf43d3a40d4ad843eacd9fa79c04ea09eae6e.tar.gz
libmatchbox: Add missing patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3113 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libmatchbox/files/configure_fixes.patch79
1 files changed, 79 insertions, 0 deletions
diff --git a/meta/packages/libmatchbox/files/configure_fixes.patch b/meta/packages/libmatchbox/files/configure_fixes.patch
new file mode 100644
index 0000000..083d32a
--- /dev/null
+++ b/meta/packages/libmatchbox/files/configure_fixes.patch
@@ -0,0 +1,79 @@
1---
2 configure.ac | 15 +++++++--------
3 libmb.pc.in | 2 +-
4 2 files changed, 8 insertions(+), 9 deletions(-)
5
6Index: libmatchbox-1.9/configure.ac
7===================================================================
8--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000
9+++ libmatchbox-1.9/configure.ac 2007-11-11 22:52:09.000000000 +0000
10@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then
11 xft_pkg=xft
12 SUPPORTS_XFT=1
13 AC_DEFINE(USE_XFT, [1], [Use Xft])
14+ XFT_REQUIRED="xft"
15 fi
16 # XXX : xau is missing from x11.pc - workaround is too add here
17 PKG_CHECK_MODULES(XLIBS, x11 xext $xft_pkg)
18@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then
19 AC_DEFINE(USE_XFT, [1], [Use Xft])
20 SUPPORTS_XFT=1
21 AC_MSG_RESULT(yes)
22+ XFT_REQUIRED="xft"
23 else
24
25 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
26@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then
27 AC_DEFINE(USE_XFT, [1], [Use Xft])
28 SUPPORTS_XFT=1
29 AC_MSG_RESULT(yes)
30+ MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS"
31+ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS"
32 fi
33 fi
34 fi
35
36 XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
37-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
38-
39-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
40+XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext"
41
42 fi
43
44-# do this here for freetype include
45-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
46-
47-
48 dnl ------ Check for Pango ---------------------------------------------------
49
50 if test x$enable_pango != xno; then
51@@ -172,7 +170,7 @@ if test x$enable_png != xno; then
52 AC_DEFINE(USE_PNG, [1], [Use Png])
53 SUPPORTS_PNG=1
54 PNG_LIBS="-lpng -lz"
55- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
56+ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
57 else
58 AC_MSG_WARN([*** Cannot find PNG, disabling support])
59 enable_png=no
60@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS)
61 AC_SUBST(XLIBS_REQUIRED)
62 AC_SUBST(PANGO_REQUIRED)
63 AC_SUBST(PNG_REQUIRED)
64+AC_SUBST(XFT_REQUIRED)
65
66 dnl ------ Below used for mbconfig.h ----------------------------------------
67
68Index: libmatchbox-1.9/libmb.pc.in
69===================================================================
70--- libmatchbox-1.9.orig/libmb.pc.in 2007-11-11 22:30:47.000000000 +0000
71+++ libmatchbox-1.9/libmb.pc.in 2007-11-11 22:31:01.000000000 +0000
72@@ -7,6 +7,6 @@ Name: libmb
73 Description: Utility Library used by Matchbox utilities.
74 Version: @VERSION@
75
76-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
77+Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
78 Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
79 Cflags: -I${includedir} @MB_EXTRA_CFLAGS@