meta-oe/recipes-devtools/tcltk/tk-8.5.8/fix-xft.diff


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

--- /tmp/configure.in	2010-05-19 13:29:03.000000000 +0200
+++ unix/configure.in	2010-05-19 13:42:05.000000000 +0200
@@ -526,13 +526,9 @@
 	found_xft="yes"
 	dnl make sure package configurator (xft-config or pkg-config
 	dnl says that xft is present.
-	XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
-	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
-	if test "$found_xft" = "no" ; then
 	    found_xft=yes
 	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
 	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
-	fi
 	AC_MSG_RESULT([$found_xft])
 	dnl make sure that compiling against Xft header file doesn't bomb
 	if test "$found_xft" = "yes" ; then

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

Upstream-Status: Inappropriate [OE-Specific]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ronan Le Martret <ronan.lemartret@open.eurogiciel.org> 

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index a4fe217..728c66c 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -396,6 +396,10 @@ static int initModule(PyObject *m)
     REGISTER_ENUM(RPMSENSE_STRONG);
     REGISTER_ENUM(RPMSENSE_CONFIG);
 
+#if defined(RPM_VENDOR_OE)
+    REGISTER_ENUM(RPMSENSE_MISSINGOK);
+#endif
+
     REGISTER_ENUM(RPMTRANS_FLAG_TEST);
     REGISTER_ENUM(RPMTRANS_FLAG_BUILD_PROBS);
     REGISTER_ENUM(RPMTRANS_FLAG_NOSCRIPTS);