mirror of
https://git.yoctoproject.org/poky
synced 2026-05-14 02:27:55 +02:00
79031b082b
gtk+: Add Upstream-Status ed: Add Upstream-Status gnome-common: Add Upstream-Status libmatchbox: Add Upstream-Status matchbox-wm: Add Upstream-Status x11vnc: Add Upstream-Status xtscal: Add Upstream-Status eds-dbus: Add Upstream-Status matchbox-desktop: Add Upstream-Status matchbox-keyboard: Add Upstream-Status matchbox-stroke: Add Upstream-Status matchbox-theme-sato: Add Upstream-Status owl-video-widget: Add Upstream-Status beecrypt: Add Upstream-Status gnome-icon-theme: Add Upstream-Status tslib: Add Upstream-Status libowl-av: Add Upstream-Status sato-icon-theme: Add Upstream-Status web-webkit: Add Upstream-Status metacity: Add Upstream-Status apr: Add Upstream-Status gdk-pixbuf: Add Upstream-Status pcmanfm: Add Upstream-Status gpgme: Add Upstream-Status eee-acpi-scripts: Add Upstream-Status libgalago: Add Upstream-Status python-pygtk: Add Upstream-Status gnome-mime-data: Add Upstream-Status clutter: Add Upstream-Status clutter-gtk: Add Upstream-Status tidy: Add Upstream-Status mutter: Add Upstream-Status xcursor-transparent-theme: Add Upstream-Status leafpad: Add Upstream-Status matchbox-config-gtk: Add Upstream-Status contacts: Add Upstream-Status dates: Add Upstream-Status web: Add Upstream-Status webkit: Add Upstream-Status - Also removed empty fix_im.patch apr-util: Add Upstream-Status libcroco: Add Upstream-Status liboil: Add Upstream-Status libxslt: Add Upstream-Status libglade: Add Upstream-Status gnome-terminal: Add Upstream-Status xev: Add Upstream-Status claws-mail: Add Upstream-Status clipboard-manager: Add Upstream-Status epdfview: Add Upstream-Status kf: Add Upstream-Status qemu: Add Upstream-Status clutter-gst: Add Upstream-Status table: Add Upstream-Status matchbox-panel-2: Add Upstream-Status (From OE-Core rev: 10bdb737c2c4c6996fd035849109a1e07580a6b9) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
---
|
|
configure.ac | 15 +++++++--------
|
|
libmb.pc.in | 2 +-
|
|
2 files changed, 8 insertions(+), 9 deletions(-)
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
|
|
Index: libmatchbox-1.9/configure.ac
|
|
===================================================================
|
|
--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000
|
|
+++ libmatchbox-1.9/configure.ac 2007-11-11 22:52:09.000000000 +0000
|
|
@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then
|
|
xft_pkg=xft
|
|
SUPPORTS_XFT=1
|
|
AC_DEFINE(USE_XFT, [1], [Use Xft])
|
|
+ XFT_REQUIRED="xft"
|
|
fi
|
|
# XXX : xau is missing from x11.pc - workaround is too add here
|
|
PKG_CHECK_MODULES(XLIBS, x11 xext $xft_pkg)
|
|
@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then
|
|
AC_DEFINE(USE_XFT, [1], [Use Xft])
|
|
SUPPORTS_XFT=1
|
|
AC_MSG_RESULT(yes)
|
|
+ XFT_REQUIRED="xft"
|
|
else
|
|
|
|
AC_PATH_PROG(XFT_CONFIG, xft-config, no)
|
|
@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then
|
|
AC_DEFINE(USE_XFT, [1], [Use Xft])
|
|
SUPPORTS_XFT=1
|
|
AC_MSG_RESULT(yes)
|
|
+ MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS"
|
|
+ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS"
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
|
|
-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
|
|
-
|
|
-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
|
|
+XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext"
|
|
|
|
fi
|
|
|
|
-# do this here for freetype include
|
|
-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
|
|
-
|
|
-
|
|
dnl ------ Check for Pango ---------------------------------------------------
|
|
|
|
if test x$enable_pango != xno; then
|
|
@@ -172,7 +170,7 @@ if test x$enable_png != xno; then
|
|
AC_DEFINE(USE_PNG, [1], [Use Png])
|
|
SUPPORTS_PNG=1
|
|
PNG_LIBS="-lpng -lz"
|
|
- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
|
|
+ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
|
|
else
|
|
AC_MSG_WARN([*** Cannot find PNG, disabling support])
|
|
enable_png=no
|
|
@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS)
|
|
AC_SUBST(XLIBS_REQUIRED)
|
|
AC_SUBST(PANGO_REQUIRED)
|
|
AC_SUBST(PNG_REQUIRED)
|
|
+AC_SUBST(XFT_REQUIRED)
|
|
|
|
dnl ------ Below used for mbconfig.h ----------------------------------------
|
|
|
|
Index: libmatchbox-1.9/libmb.pc.in
|
|
===================================================================
|
|
--- libmatchbox-1.9.orig/libmb.pc.in 2007-11-11 22:30:47.000000000 +0000
|
|
+++ libmatchbox-1.9/libmb.pc.in 2007-11-11 22:31:01.000000000 +0000
|
|
@@ -7,6 +7,6 @@ Name: libmb
|
|
Description: Utility Library used by Matchbox utilities.
|
|
Version: @VERSION@
|
|
|
|
-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
|
|
+Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
|
|
Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
|
|
Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
|