merge of '50409e326e2ff8f7448fc8f41f187589486432cb'

     and '89c62d328d708a711c2c20ac45d03d6fd73aef69'

9 files changed, 20 insertions, 40 deletions

diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index 5effeb8de6..cbeede90ab 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -7,12 +7,13 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r2"
+PR = "r3"
 RV = "1.0-0"
 
 SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
-           file://fix-pkgconfig-cflags.patch;patch=1 \
-	   file://mkdfiff.patch;patch=1"
+           file://fix-pkgconfig-specs.patch;patch=1 \
+	   file://mkdfiff.patch;patch=1 \
+	   file://getpagesize.patch;patch=1"
 
 S = "${WORKDIR}/DirectFB-1.0.0"
 
diff --git a/packages/directfb/files/getpagesize.patch b/packages/directfb/files/getpagesize.patch
new file mode 100644
index 0000000000..256b8db290
--- /dev/null
+++ b/packages/directfb/files/getpagesize.patch
@@ -0,0 +1,16 @@
+diff --git a/lib/direct/system.c b/lib/direct/system.c
+index 8dd3f12..0731fa2 100644
+--- a/lib/direct/system.c
++++ b/lib/direct/system.c
+@@ -36,8 +36,9 @@
+ 
+ #if HAVE_ASM_PAGE_H
+ #include <asm/page.h>
+-#else
+-#define PAGE_SIZE   sysconf( _SC_PAGESIZE )
++#endif
++#ifndef PAGE_SIZE
++# define PAGE_SIZE (getpagesize())
+ #endif
+ 
+ 
diff --git a/packages/libxfce4mcs/.mtn2git_empty b/packages/libxfce4mcs/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxfce4mcs/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
deleted file mode 100644
index 07d7a95ae1..0000000000
--- a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfce4mcs OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/libxfce4util/.mtn2git_empty b/packages/libxfce4util/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxfce4util/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libxfce4util/libxfce4util_4.3.99.2.bb b/packages/libxfce4util/libxfce4util_4.3.99.2.bb
deleted file mode 100644
index d1c29197d6..0000000000
--- a/packages/libxfce4util/libxfce4util_4.3.99.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require ${PN}.inc
-
-SRC_URI += "\
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-depends.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-features.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-python.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-xfce.m4"
-
-
-MACROS="m4/xdt*.m4"
-
-XFCE_HEADERS="debug.h utf8.h xfce-generics.h   xfce-resource.h \
-              i18n.h util.h xfce-kiosk.h libxfce4util-config.h  \
-              xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \
-              xfce-fileutils.h xfce-rc.h xfce-utf8.h \
-              xfce-license.h xfce-i18n.h libxfce4util-enum-types.h"
-
-do_configure_prepend() {
-    install -m 0755 -d ${S}/m4/
-    install -m 0644 ${WORKDIR}/xdt-*.m4 ${S}/m4/
-}
diff --git a/packages/libxfcegui4/.mtn2git_empty b/packages/libxfcegui4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxfcegui4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libxfcegui4/libxfcegui4_4.2.2.bb b/packages/libxfcegui4/libxfcegui4_4.2.2.bb
deleted file mode 100644
index 2def53685a..0000000000
--- a/packages/libxfcegui4/libxfcegui4_4.2.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
deleted file mode 100644
index 2def53685a..0000000000
--- a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc