Split meta-extras and meta-moblin out of the main repository

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
author: Richard Purdie <rpurdie@linux.intel.com> 2010-09-30 22:15:13 +0100
committer: Richard Purdie <rpurdie@linux.intel.com> 2010-09-30 22:16:10 +0100
commit: c0c657bd92911788b96d9670620eabf024453752 (patch)
tree: 774a5e2d966d6ee87da17cd063580d5970564d00 /meta-moblin
parent: e71a306f9cac8e30e689d607e2092e11a756ef5d (diff)
download: poky-c0c657bd92911788b96d9670620eabf024453752.tar.gz
225 files changed, 0 insertions, 10695 deletions
diff --git a/meta-moblin/classes/moblin-feed-incremental-bleeding.bbclass b/meta-moblin/classes/moblin-feed-incremental-bleeding.bbclass
deleted file mode 100644
index 4865ee2638..0000000000
--- a/meta-moblin/classes/moblin-feed-incremental-bleeding.bbclass
+++ /dev/null
@@ -1,3 +0,0 @@
-FEEDNAMEPREFIX = "moblin-bleeding"
-FEEDURIPREFIX = "output/moblin-incremental-bleeding/ipk/"
-EXTRAOPKGCONFIG = "moblin-feed-config-opkg"
diff --git a/meta-moblin/classes/moblin-image.bbclass b/meta-moblin/classes/moblin-image.bbclass
deleted file mode 100644
index f9bab011b0..0000000000
--- a/meta-moblin/classes/moblin-image.bbclass
+++ /dev/null
@@ -1,99 +0,0 @@
-# Common for Moblin images
-#
-# Copyright (C) 2007 OpenedHand LTD
-# IMAGE_FEATURES control content of images built with Poky.
-# 
-# By default we install task-moblin-boot and task-base packages - this gives us
-# working (console only) rootfs.
-#
-# Available IMAGE_FEATURES:
-#
-# - apps-console-core
-# - x11-base            - X11 server + minimal desktop  
-# - x11-sato            - OpenedHand Sato environment
-# - x11-netbook         - Metacity based environment for netbooks
-# - apps-x11-core       - X Terminal, file manager, file editor
-# - apps-x11-games
-# - apps-x11-pimlico    - OpenedHand Pimlico apps
-# - tools-sdk           - SDK
-# - tools-debug         - debugging tools
-# - tools-profile       - profiling tools
-# - tools-testapps      - tools usable to make some device tests
-# - nfs-server          - NFS server (exports / over NFS to everybody)
-# - dev-pkgs            - development packages
-# - dbg-pkgs            - debug packages
-#
-MOBLIN_BASE_INSTALL = '\
-    task-moblin-boot \
-    task-base-extended \
-    ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-moblin-boot-dbg task-base-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-moblin-boot-dev task-base-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-moblin-apps-console", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-moblin-apps-console-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-moblin-apps-console-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "x11-base", "task-moblin-x11-base", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-moblin-x11-base-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-moblin-x11-base-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-moblin-x11-sato", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-moblin-x11-sato-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-moblin-x11-sato-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-moblin-x11-netbook", "", d)} \
-    ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-moblin-x11-netbook-dbg", "", d)} \
-    ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-moblin-x11-netbook-dev", "", d)} \
-    ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-moblin-apps-x11-core", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-moblin-apps-x11-core-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-moblin-apps-x11-core-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-moblin-apps-x11-games", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-moblin-apps-x11-games-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-moblin-apps-x11-games-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-moblin-apps-x11-pimlico", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-moblin-apps-x11-pimlico-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-moblin-apps-x11-pimlico-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-moblin-tools-debug", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-moblin-tools-debug-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-moblin-tools-debug-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-moblin-tools-profile", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-moblin-tools-profile-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-moblin-tools-profile-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-moblin-tools-testapps", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-moblin-tools-testapps-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-moblin-tools-testapps-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-moblin-sdk task-moblin-standalone-sdk-target", "",d)} \    
-    ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-moblin-sdk-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-moblin-sdk-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-moblin-nfs-server", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-moblin-nfs-server-dbg", "",d)} \
-    ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-moblin-nfs-server-dev", "",d)} \
-    \
-    ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \
-    ${MOBLIN_EXTRA_INSTALL} \
-    '
-MOBLIN_EXTRA_INSTALL ?= ""
-IMAGE_INSTALL ?= "${MOBLIN_BASE_INSTALL}"
-X11_IMAGE_FEATURES  = "x11-base apps-x11-core package-management"
-ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"
-NETBOOK_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-netbook"
-inherit image
-# Create /etc/timestamp during image construction to give a reasonably sane default time setting
-ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
-ROOTFS_POSTINSTALL_COMMAND += "rootfs_trim_schemas ; "
diff --git a/meta-moblin/classes/qt3e.bbclass b/meta-moblin/classes/qt3e.bbclass
deleted file mode 100644
index 35958b34ab..0000000000
--- a/meta-moblin/classes/qt3e.bbclass
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# override variables set by qmake_base to compile Qt/X11 apps
-#
-export QTDIR="${STAGING_DIR_HOST}/qte3"
-export QTEDIR="${STAGING_DIR_HOST}/qte3"
-export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
-export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
-export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
-export OE_QMAKE_INCDIR_QT="${QTEDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib"
-export OE_QMAKE_LIBS_QT="qte"
diff --git a/meta-moblin/classes/qt3x11.bbclass b/meta-moblin/classes/qt3x11.bbclass
deleted file mode 100644
index 5408b7f342..0000000000
--- a/meta-moblin/classes/qt3x11.bbclass
+++ /dev/null
@@ -1,15 +0,0 @@
-DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
-EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
-#
-# override variables set by qmake_base to compile Qt/X11 apps
-#
-export QTDIR = "${STAGING_DIR_HOST}/qt3"
-export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
-export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
-export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
-export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT = "qt"
-export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
-export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
-export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
diff --git a/meta-moblin/classes/qt4x11.bbclass b/meta-moblin/classes/qt4x11.bbclass
deleted file mode 100644
index 76a45c33cb..0000000000
--- a/meta-moblin/classes/qt4x11.bbclass
+++ /dev/null
@@ -1,3 +0,0 @@
-DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}"
-inherit qmake2
diff --git a/meta-moblin/classes/qtopia4core.bbclass b/meta-moblin/classes/qtopia4core.bbclass
deleted file mode 100644
index b5f10fa486..0000000000
--- a/meta-moblin/classes/qtopia4core.bbclass
+++ /dev/null
@@ -1,13 +0,0 @@
-DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}"
-inherit qmake2
-QT_DIR_NAME = "qtopia"
-#
-# override variables set by qmake-base to compile QtopiaCore apps
-#
-export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
-export OE_QMAKE_LIBS_QT = "qt"
-export OE_QMAKE_LIBS_X11 = ""
-export OE_QMAKE_EXTRA_MODULES = "network"
-EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E "
diff --git a/meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc b/meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc
deleted file mode 100644
index 47a464e519..0000000000
--- a/meta-moblin/conf/distro/include/meta-moblin-scm-revisions.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-SRCREV_pn-anerley ??= "20c6ceffda21595d8894293700006fe3a4cb33ba"
-SRCREV_pn-bickley ??= "3cbd5ef693c117ad5c094ddd1678a1a04d0feae3"
-SRCREV_pn-bisho ??= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
-SRCREV_pn-bognor-regis ??= "c52c7f7013b4b62d7c59d25fc809ce951a5556af"
-SRCREV_pn-carrick ??= "9bd8f987b27d95694b1e63efe198b2dffbd4c5b0"
-SRCREV_pn-clutter-imcontext ??= "2cb6f0ff153db639a489e58e36802e0e928b1968"
-SRCREV_pn-dalston ??= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
-SRCREV_pn-gnet = "495"
-SRCREV_pn-hornsey ??= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
-SRCREV_pn-json-glib ??= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
-SRCREV_pn-libccss ??= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
-SRCREV_pn-libjana ??= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
-SRCREV_pn-librest ??= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
-SRCREV_pn-libsocialweb ??= "da8d57ea8dcd348d956715000ded39aa26c7f0f5"
-SRCREV_pn-libsynthesis ??= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
-SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc"
-SRCREV_pn-moblin-app-installer ??= "bc65c884d3a1ae37e69431417888126b2a3ea021"
-SRCREV_pn-moblin-gtk-engine ??= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f"
-SRCREV_pn-moblin-icon-theme ??= "36b7ac1e57ea6d95e6432779c4769c14fce24899"
-SRCREV_pn-moblin-menus ??= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a"
-SRCREV_pn-moblin-proto ??= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
-SRCREV_pn-moblin-user-skel ??= "356851e174085b874adb909e664aca321a047bcb"
-SRCREV_pn-moblin-panel-applications ??= "ba6b5f353203bb02728addb08da3d249f26eedbe"
-SRCREV_pn-moblin-panel-media ??= "4e93c6da0bbae8d1d0a5d3b1410761679aa7b83b"
-SRCREV_pn-moblin-panel-myzone ??= "54d9bee3a40a7700a69582a76aba89e213410046"
-SRCREV_pn-moblin-panel-pasteboard ??= "44411a4516e6ae22767662430fa37ed6a7d27a15"
-SRCREV_pn-moblin-panel-people ??= "0766282d120587919718b3bcb91553af1a1a00da"
-SRCREV_pn-moblin-panel-status ??= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
-SRCREV_pn-moblin-web-browser ??= "78ddd155cc297811720e4c4835d468ac6c4d9666"
-SRCREV_pn-mojito ??= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
-SRCREV_pn-mutter-moblin ??= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
-SRCREV_pn-mx ??= "94934b5d03a31ce76c4f9eea8dcfb1d94b396906"
-SRCREV_pn-nbtk ??= "635f9b4f1a2897aaa85ec1285e57dc5478517c2f"
-SRCREV_pn-syncevolution ??= "29972357bf6582c318258b7bdf1feb13c0fef824"
-SRCREV_pn-twitter-glib ??= "62b262bf7892b629f7de67498d58f549ffeb704e"
diff --git a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc
deleted file mode 100644
index 5992ed91ce..0000000000
--- a/meta-moblin/conf/distro/include/moblin-2.0-fixed-revisions.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Known good source dates/revisions/tags to use, *only* for where Moblin deviates
-# from Poky (or to lock down SCM based packages):
-#
-PREFERRED_VERSION_eds-dbus ?= "2.20.0"
-PREFERRED_VERSION_dbus ?= "1.2.14"
-PREFERRED_VERSION_dbus-native ?= "1.2.14"
-PREFERRED_VERSION_gtk+ ?= "2.16.4"
-PREFERRED_VERSION_udev ?= "145"
-PREFERRED_VERSION_mesa-dri ?= "7.5"
-PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0"
-PREFERRED_VERSION_libxcb ?= "1.3"
-PREFERRED_VERSION_xcb-proto ?= "1.5"
-PREFERRED_VERSION_libx11-trim ?= "1.2.1"
-PREFERRED_VERSION_libdrm ?= ""
-PREFERRED_VERSION_xf86-input-keyboard ?= ""
-PREFERRED_VERSION_dri2proto ?= ""
-SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
-SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
-SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
-SRCREV_pn-anerley ?= "0cb9ac6b82ff6658ae10d603bdfba04ef3df979e"
-SRCREV_pn-bickley ?= "761816f24e2aeb329d4f7270a2af324f85b7be8f"
-SRCREV_pn-bisho ?= "53cc5951be36cee818bef3beb5770f10aabdc7f1"
-SRCREV_pn-bognor-regis ?= "6b6cce0cb90ea47a3cc4ac2804c8b5664530ca80"
-SRCREV_pn-carrick ?= "0451a081309f11dd5e9b6e41778ab878d862cbd0"
-SRCREV_pn-connman ?= "6af0b24817b8712c755ef24ed0ee4c5e84550657"
-SRCREV_pn-connman-gnome ?= "857b149c7febe9b0ffd9790050a288f018644eda"
-SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
-# Still tosort:
-SRCREV_pn-clutter ?= "e860d939f9d9611dcf5b8c6e70272b6318a4ba94"
-1.0.0
-SRCREV_pn-clutter-1.0 ?= "420ed353b53bd624331bd249d7df98d14714b504"
-1.0.0
-SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
-clutter-box2d-0.9~20090609
-SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab"
-gst-0.10~20090729
-SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36"
-0.10.2
-SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968"
-0.1
-SRCREV_pn-clutter-mozembed ?= "5a5329425aec7fe7749e97fd8c430457259f6165"
-0.0~20090731
-SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
-SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
-SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
-SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
-SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
-SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
-SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571"
-SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
-SRCREV_pn-moblin-gtk-engine ?= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f"
-SRCREV_pn-moblin-icon-theme ?= "36b7ac1e57ea6d95e6432779c4769c14fce24899"
-SRCREV_pn-moblin-menus ?= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a"
-SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
-SRCREV_pn-moblin-user-skel ?= "356851e174085b874adb909e664aca321a047bcb"
-SRCREV_pn-moblin-panel-applications ?= "ba6b5f353203bb02728addb08da3d249f26eedbe"
-SRCREV_pn-moblin-panel-media ?= "4e93c6da0bbae8d1d0a5d3b1410761679aa7b83b"
-SRCREV_pn-moblin-panel-myzone ?= "54d9bee3a40a7700a69582a76aba89e213410046"
-SRCREV_pn-moblin-panel-pasteboard ?= "44411a4516e6ae22767662430fa37ed6a7d27a15"
-SRCREV_pn-moblin-panel-people ?= "0766282d120587919718b3bcb91553af1a1a00da"
-SRCREV_pn-moblin-panel-status ?= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
-SRCREV_pn-moblin-web-browser ?= "a3ea71159bef93dc03762195bd5404a51db5e4a6"
-SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
-SRCREV_pn-mozilla-headless-services ?= "9091da493c679c546ec7312b653e63f9701d5c8f"
-SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842"
-SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
-SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-nbtk ?= "635f9b4f1a2897aaa85ec1285e57dc5478517c2f"
-SRCREV_pn-mtpfs = "17"
-SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
-SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824"
-SRCREV_pn-tasks ?= "a3c6109973c2f39190f554b49dacda7ec5231ef4"
-SRCREV_pn-twitter-glib ?= "9dfca7cf38e3dddbda6dc82d0164f65814b8783e"
-SRCREVMOZILLAHEADLESS ?= "1a622cb7c384"
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
deleted file mode 100644
index 6cbc8d8aa3..0000000000
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Known good source dates/revisions/tags to use, *only* for where Moblin deviates
-# from Poky (or to lock down SCM based packages):
-#
-PREFERRED_VERSION_eds-dbus ?= "2.20.0"
-PREFERRED_VERSION_udev ?= "145"
-PREFERRED_VERSION_mesa-dri ?= "7.8.2"
-PREFERRED_VERSION_xf86-video-intel ?= "2.12.0"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
-PREFERRED_VERSION_libxcb ?= "1.3"
-PREFERRED_VERSION_xcb-proto ?= "1.5"
-PREFERRED_VERSION_libx11-trim ?= "1.3"
-PREFERRED_VERSION_libdrm ?= "2.4.17"
-PREFERRED_VERSION_xf86-input-keyboard ?= ""
-PREFERRED_VERSION_dri2proto ?= ""
-PREFERRED_VERSION_anerley ?= "0.1.7"
-PREFERRED_VERSION_bickley ?= "0.4"
-PREFERRED_VERSION_bisho ?= "0.17.1"
-PREFERRED_VERSION_bognor-regis ?= "0.5.0"
-PREFERRED_VERSION_carrick ?= "1.1.13"
-PREFERRED_VERSION_dalston ?= "0.1.12"
-PREFERRED_VERSION_gupnp-av ?= "0.4"
-PREFERRED_VERSION_hornsey ?= "1.0"
-PREFERRED_VERSION_mojito ?= "0.21.7"
-PREFERRED_VERSION_nbtk ?= "1.2.3"
-PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2"
-PREFERRED_VERSION_moblin-panel-media ?= "0.0.7"
-PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12"
-PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2"
-PREFERRED_VERSION_moblin-panel-people ?= "0.0.9"
-PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
-PREFERRED_VERSION_mutter ?= "2.28.1"
-PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
deleted file mode 100644
index 1634c03886..0000000000
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
-SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36"
-SRCREV_pn-clutter-gst ?= "24c84abf0cdd24b6f4696c5a920673a55218cfd4"
-SRCREV_pn-bisho ?= "7b97cf8a9e2ef228be71e549e622df5d59869b39"
-SRCREV_pn-ashford ?= "${AUTOREV}"
-SRCREV_pn-anerley ?= "${AUTOREV}"
-PREFERRED_VERSION_anerley ?= "0.1.7+git%"
-SRCREV_pn-bickley ?= "${AUTOREV}"
-PREFERRED_VERSION_bickley ?= "0.4+git%"
-SRCREV_pn-bisho ?= "${AUTOREV}"
-PREFERRED_VERSION_bisho ?= "0.17.1+git%"
-SRCREV_pn-bognor-regis ?= "${AUTOREV}"
-PREFERRED_VERSION_bognor-regis ?= "0.5.0+git%"
-SRCREV_pn-carrick ?= "${AUTOREV}"
-PREFERRED_VERSION_carrick ?= "1.2.0+git%"
-SRCREV_pn-clutter ?= "${AUTOREV}"
-SRCREV_pn-clutter-1.0 ?= "${AUTOREV}"
-SRCREV_pn-clutter-gtk ?= "${AUTOREV}"
-SRCREV_pn-clutter-gst ?= "${AUTOREV}"
-SRCREV_pn-clutter-imcontext ?= "${AUTOREV}"
-SRCREV_pn-clutter-mozembed ?= "${AUTOREV}"
-SRCREV_pn-connman ?= "${AUTOREV}"
-SRCREV_pn-connman-gnome ?= "${AUTOREV}"
-SRCREV_pn-contacts ?= "${AUTOREV}"
-SRCREV_pn-dalston ?= "${AUTOREV}"
-PREFERRED_VERSION_dalston ?= "0.1.12+git%"
-SRCREV_pn-dates ?= "${AUTOREV}"
-SRCREV_pn-eds-dbus ?= "${AUTOREV}"
-SRCREV_pn-gconnman ?= "${AUTOREV}"
-PREFERRED_VERSION_gupnp-av ?= "0.5.2"
-SRCREV_pn-hornsey ?= "${AUTOREV}"
-PREFERRED_VERSION_hornsey ?= "1.0+git%"
-SRCREV_pn-json-glib ?= "${AUTOREV}"
-SRCREV_pn-libccss ?= "${AUTOREV}"
-SRCREV_pn-libjana ?= "${AUTOREV}"
-SRCREV_pn-librest ?= "${AUTOREV}"
-SRCREV_pn-libsocialweb ?= "${AUTOREV}"
-PREFERRED_VERSION_libsocialweb ?= "0.0+git%"
-SRCREV_pn-libsynthesis ?= "${AUTOREV}"
-SRCREV_pn-linux-moblin ?= "${AUTOREV}"
-SRCREV_pn-mobile-broadband-provider-info ?= "${AUTOREV}"
-SRCREV_pn-moblin-app-installer ?= "${AUTOREV}"
-SRCREV_pn-moblin-gtk-engine ?= "${AUTOREV}"
-SRCREV_pn-moblin-menus ?= "${AUTOREV}"
-SRCREV_pn-moblin-web-browser ?= "${AUTOREV}"
-SRCREV_pn-moblin-icon-theme ?= "${AUTOREV}"
-SRCREV_pn-moblin-user-skel ?= "${AUTOREV}"
-SRCREV_pn-moblin-panel-applications ?= "${AUTOREV}"
-PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2+git%"
-SRCREV_pn-moblin-panel-media ?= "${AUTOREV}"
-PREFERRED_VERSION_moblin-panel-media ?= "0.0.7+git%"
-SRCREV_pn-moblin-panel-myzone ?= "${AUTOREV}"
-PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12+git%"
-SRCREV_pn-moblin-panel-pasteboard ?= "${AUTOREV}"
-PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2+git%"
-SRCREV_pn-moblin-panel-people ?= "${AUTOREV}"
-PREFERRED_VERSION_moblin-panel-people ?= "0.0.9+git%"
-SRCREV_pn-moblin-panel-status ?= "${AUTOREV}"
-PREFERRED_VERSION_moblin-panel-status ?= "0.0.9+git%"
-SRCREV_pn-mojito ?= "${AUTOREV}"
-PREFERRED_VERSION_mojito ?= "0.21.7+git%"
-SRCREV_pn-mozilla-headless ?= "${AUTOREV}"
-SRCREV_pn-mozilla-headless-services ?= "${AUTOREV}"
-SRCREV_pn-mutter ?= "${AUTOREV}"
-PREFERRED_VERSION_mutter ?= "2.28.1+git%"
-SRCREV_pn-mutter-moblin ?= "${AUTOREV}"
-PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%"
-SRCREV_pn-nbtk ?= "${AUTOREV}"
-PREFERRED_VERSION_nbtk ?= "1.2.3+git%"
-SRCREV_pn-mx ?= "${AUTOREV}"
-SRCREV_pn-qemugl ?= "${AUTOREV}"
-SRCREV_pn-sample-media ?= "${AUTOREV}"
-SRCREV_pn-syncevolution ?= "${AUTOREV}"
-SRCREV_pn-tasks ?= "${AUTOREV}"
-SRCREV_pn-twitter-glib ?= "${AUTOREV}"
-SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}"
-SRCREV_pn-libdrm ?= "${AUTOREV}"
-PREFERRED_VERSION_libdrm ?= "2.4.15+git%"
-SRCREV_pn-mesa-dri ?= "${AUTOREV}"
-PREFERRED_VERSION_mesa-dri ?= "7.5+git%"
-SRCREV_pn-xf86-video-intel ?= "${AUTOREV}"
-PREFERRED_VERSION_xf86-video-intel ?= "2.10.0+git%"
-SRCREV_pn-xserver-xf86-dri-lite ?= "${AUTOREV}"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0+git%"
-SRCREV_pn-xf86-input-keyboard ?= "${AUTOREV}"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2+git%"
-SRCREV_pn-dri2proto ?= "${AUTOREV}"
-PREFERRED_VERSION_dri2proto ?= "1.99.3+git%"
-SRCREV_pn-libx11-trim ?= "${AUTOREV}"
-PREFERRED_VERSION_libx11-trim ?= "1.2.1+git%"
-PREFERRED_VERSION_libxcb ?= "1.3"
-PREFERRED_VERSION_xcb-proto ?= "1.5"
-MOBLINBROWSERBRANCH = "mx"
-# Set to no browser in images for now to allow image builds
-MOBLINBROWSER = ""
diff --git a/meta-moblin/conf/distro/moblin-bleeding.conf b/meta-moblin/conf/distro/moblin-bleeding.conf
deleted file mode 100644
index 822958258e..0000000000
--- a/meta-moblin/conf/distro/moblin-bleeding.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-require conf/distro/include/moblin-floating-revisions.inc
-require conf/distro/moblin.conf
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
deleted file mode 100644
index a0d5af7393..0000000000
--- a/meta-moblin/conf/distro/moblin.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-require conf/distro/poky.conf
-DISTRO = "moblin"
-DISTRO_NAME = "Moblin (Poky Powered)"
-DISTRO_VERSION = "1.99+snapshot-${DATE}"
-require conf/distro/include/moblin-fixed-revisions.inc
-POKY_EXTRA_RDEPENDS = "task-moblin-boot"
-TOOLCHAIN_TARGET_SDKTASK ?= "task-moblin-standalone-sdk-target"
-#No debug info for now " task-moblin-standalone-sdk-target-dbg"
diff --git a/meta-moblin/conf/layer.conf b/meta-moblin/conf/layer.conf
deleted file mode 100644
index b5daea69ed..0000000000
--- a/meta-moblin/conf/layer.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
-# We have a packages directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
-BBFILE_COLLECTIONS += "moblin"
-BBFILE_PATTERN_moblin := "^${LAYERDIR}/"
-BBFILE_PRIORITY_moblin = "5"
-require conf/distro/include/meta-moblin-scm-revisions.inc
diff --git a/meta-moblin/packages/anerley/anerley.inc b/meta-moblin/packages/anerley/anerley.inc
deleted file mode 100644
index c18c9b2553..0000000000
--- a/meta-moblin/packages/anerley/anerley.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-DESCRIPTION = "People widgets for Moblin User Experience"
-SRC_URI = "http://download.moblin.org/sources/anerley/0.1/anerley-${PV}.tar.bz2"
-LICENSE = "LGPLv2.1"
-DEPENDS = "telepathy-glib glib-2.0 telepathy-mission-control nbtk eds-dbus"
-inherit autotools
diff --git a/meta-moblin/packages/anerley/anerley_0.1.7.bb b/meta-moblin/packages/anerley/anerley_0.1.7.bb
deleted file mode 100644
index a2d491bffe..0000000000
--- a/meta-moblin/packages/anerley/anerley_0.1.7.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require anerley.inc
-PR = "r0"
diff --git a/meta-moblin/packages/anerley/anerley_git.bb b/meta-moblin/packages/anerley/anerley_git.bb
deleted file mode 100644
index a656d424ff..0000000000
--- a/meta-moblin/packages/anerley/anerley_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require anerley.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.1.7+git${SRCPV}"
-PR = "r0"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/bickley/bickley.inc b/meta-moblin/packages/bickley/bickley.inc
deleted file mode 100644
index f386b862e3..0000000000
--- a/meta-moblin/packages/bickley/bickley.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "A meta data manager API and framework (including Media)"
-SRC_URI = "http://download.moblin.org/sources/bickley/0.4/bickley-0.4_20091124.tar.bz2"
-DEPENDS = "gtk+ dbus-glib clutter-gst-0.10 libexif taglib gupnp gupnp-av samba"
-RDEPENDS = "xdg-user-dirs"
-FILES_${PN} =+ "${datadir}/dbus-1/services/"
-inherit autotools
diff --git a/meta-moblin/packages/bickley/bickley_0.4.bb b/meta-moblin/packages/bickley/bickley_0.4.bb
deleted file mode 100644
index 9a8de22619..0000000000
--- a/meta-moblin/packages/bickley/bickley_0.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require bickley.inc
-S = "${WORKDIR}/${PN}-${PV}_20091124"
-PR = "r1"
diff --git a/meta-moblin/packages/bickley/bickley_git.bb b/meta-moblin/packages/bickley/bickley_git.bb
deleted file mode 100644
index a02d610ddc..0000000000
--- a/meta-moblin/packages/bickley/bickley_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require bickley.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.4+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/bisho/bisho.inc b/meta-moblin/packages/bisho/bisho.inc
deleted file mode 100644
index 5ff9b9e35a..0000000000
--- a/meta-moblin/packages/bisho/bisho.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Web Services Settings"
-SRC_URI = "http://download.moblin.org/sources/bisho/0.17/bisho-0.17.1.tar.bz2"
-LICENSE = "GPLv2"
-DEPENDS = "gtk+ mojito nbtk"
-inherit autotools
-FILES_${PN} += "${datadir}/icons/"
diff --git a/meta-moblin/packages/bisho/bisho_0.17.1.bb b/meta-moblin/packages/bisho/bisho_0.17.1.bb
deleted file mode 100644
index e483da5d79..0000000000
--- a/meta-moblin/packages/bisho/bisho_0.17.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-require bisho.inc
diff --git a/meta-moblin/packages/bisho/bisho_git.bb b/meta-moblin/packages/bisho/bisho_git.bb
deleted file mode 100644
index 21a2e7afc7..0000000000
--- a/meta-moblin/packages/bisho/bisho_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require bisho.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.17.1+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/bognor-regis/bognor-regis.inc b/meta-moblin/packages/bognor-regis/bognor-regis.inc
deleted file mode 100644
index 34563548f2..0000000000
--- a/meta-moblin/packages/bognor-regis/bognor-regis.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Media deamon and play queue manager"
-SRC_URI = "http://download.moblin.org/sources/bognor-regis/0.5/bognor-regis-0.5.0_20091116.tar.bz2"
-LICENSE = "GPLv2"
-DEPENDS = "glib-2.0 dbus-glib gtk+ libnotify gupnp gupnp-av bickley"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/bognor-regis/bognor-regis_0.5.0.bb b/meta-moblin/packages/bognor-regis/bognor-regis_0.5.0.bb
deleted file mode 100644
index 5bec1aa388..0000000000
--- a/meta-moblin/packages/bognor-regis/bognor-regis_0.5.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require bognor-regis.inc
-S = "${WORKDIR}/${PN}-${PV}_20091116"
diff --git a/meta-moblin/packages/bognor-regis/bognor-regis_git.bb b/meta-moblin/packages/bognor-regis/bognor-regis_git.bb
deleted file mode 100644
index 6bc69d8dee..0000000000
--- a/meta-moblin/packages/bognor-regis/bognor-regis_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require bognor-regis.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.5.0+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/carrick/carrick.inc b/meta-moblin/packages/carrick/carrick.inc
deleted file mode 100644
index 1924e9cbfe..0000000000
--- a/meta-moblin/packages/carrick/carrick.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCIPTION = "Connection Management Panel Applet"
-SRC_URI = "http://download.moblin.org/sources/carrick/1.1/carrick-${PV}.tar.bz2"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info"
-RDEPENDS = "connman"
-FILES_${PN} += "${datadir}/icons/hicolor"
-inherit autotools
-do_configure_prepend () {
-        mkdir -p ${S}/build/autotools
-}
diff --git a/meta-moblin/packages/carrick/carrick_1.1.13.bb b/meta-moblin/packages/carrick/carrick_1.1.13.bb
deleted file mode 100644
index f7ec5c017b..0000000000
--- a/meta-moblin/packages/carrick/carrick_1.1.13.bb
+++ /dev/null
@@ -1 +0,0 @@
-include carrick.inc
diff --git a/meta-moblin/packages/carrick/carrick_git.bb b/meta-moblin/packages/carrick/carrick_git.bb
deleted file mode 100644
index 3258e052b7..0000000000
--- a/meta-moblin/packages/carrick/carrick_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-include carrick.inc
-SRC_URI = "git://git.moblin.org/${PN}-ng.git;protocol=git"
-PV = "1.2.0+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb b/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb
deleted file mode 100644
index ead537d664..0000000000
--- a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "GPLv2"
-PV = "0.0+git${SRCPV}"
-PR = "r7"
-DEPENDS = "clutter-1.0 glib-2.0"
-S = "${WORKDIR}/git"
-inherit autotools
-do_configure_prepend () {
-    echo "EXTRA_DIST=" > ${S}/gtk-doc.make
-    echo "CLEANFILES=" >> ${S}/gtk-doc.make
-}
-\ No newline at end of file
diff --git a/meta-moblin/packages/clutter/clutter-mozembed.inc b/meta-moblin/packages/clutter/clutter-mozembed.inc
deleted file mode 100644
index 72c9412d04..0000000000
--- a/meta-moblin/packages/clutter/clutter-mozembed.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Clutter Mozilla Embedded"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-DEPENDS = "mozilla-headless mozilla-headless-services clutter-1.0"
-FILESPATH = "${FILE_DIRNAME}/clutter-mozembed"
-FILES_${PN} =+ "${datadir}/cluttermozembed/chrome/"
-EXTRA_OECONF = "--enable-plugins"
-inherit autotools pkgconfig gtk-doc
diff --git a/meta-moblin/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch b/meta-moblin/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
deleted file mode 100644
index 135b9e79f0..0000000000
--- a/meta-moblin/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/cluttermozembed/Makefile.am
-===================================================================
--- git.orig/cluttermozembed/Makefile.am        2009-06-10 15:04:54.000000000 +0100
-+++ git/cluttermozembed/Makefile.am     2009-06-10 15:10:12.000000000 +0100
-@@ -61,7 +61,7 @@
-        clutter-mozembed-private.h
- source_c = \
-        clutter-mozembed.c \
-       clutter-mozembed-download.c
-+       clutter-mozembed-download.c dummy.cpp
- 
- bin_PROGRAMS = clutter-mozheadless
- 
diff --git a/meta-moblin/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta-moblin/packages/clutter/clutter-mozembed/link-with-g++.patch
deleted file mode 100644
index cc9d43a674..0000000000
--- a/meta-moblin/packages/clutter/clutter-mozembed/link-with-g++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/cluttermozembed/Makefile.am
-===================================================================
--- git.orig/clutter-mozembed/Makefile.am       2009-07-24 16:58:24.000000000 +0100
-+++ git/clutter-mozembed/Makefile.am    2009-07-24 17:00:53.000000000 +0100
-@@ -66,7 +66,7 @@
-        clutter-mozembed.c \
-        clutter-mozembed-comms.c \
-        clutter-mozembed-comms.h \
-       clutter-mozembed-download.c
-+       clutter-mozembed-download.c dummy.cpp
- 
- bin_PROGRAMS = clutter-mozheadless
- 
diff --git a/meta-moblin/packages/clutter/clutter-mozembed_git.bb b/meta-moblin/packages/clutter/clutter-mozembed_git.bb
deleted file mode 100644
index e2da2d6a7d..0000000000
--- a/meta-moblin/packages/clutter/clutter-mozembed_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require clutter-mozembed.inc
-PV = "0.8.0+git${SRCPV}"
-PR = "r7"
-SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \
-           file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
-           file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41"
-S = "${WORKDIR}/git"
-do_configure_prepend () {
-        touch ${S}/clutter-mozembed/dummy.cpp
-        touch ${S}/clutter-mozembed/dummy2.cpp
-}
diff --git a/meta-moblin/packages/consolekit/consolekit_0.3.0.bb b/meta-moblin/packages/consolekit/consolekit_0.3.0.bb
deleted file mode 100644
index fcd735d7ad..0000000000
--- a/meta-moblin/packages/consolekit/consolekit_0.3.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats."
-LICENSE = "GPLv2"
-DEPENDS = "dbus"
-inherit gnome
-SRC_URI = "http://people.freedesktop.org/~mccann/dist/ConsoleKit-${PV}.tar.bz2 \
-           file://nopolkit.patch;patch=1"
-S = "${WORKDIR}/ConsoleKit-${PV}"
-FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit"
diff --git a/meta-moblin/packages/consolekit/files/nopolkit.patch b/meta-moblin/packages/consolekit/files/nopolkit.patch
deleted file mode 100644
index bebbcaffff..0000000000
--- a/meta-moblin/packages/consolekit/files/nopolkit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: ConsoleKit-0.3.0/configure.ac
-===================================================================
--- ConsoleKit-0.3.0.orig/configure.ac  2009-05-22 12:53:27.000000000 +0100
-+++ ConsoleKit-0.3.0/configure.ac       2009-05-22 12:53:56.000000000 +0100
-@@ -55,10 +55,7 @@
-   gthread-2.0 >= $GLIB_REQUIRED_VERSION
- )
- 
-PKG_CHECK_MODULES(POLKIT,
-  polkit >= $POLKIT_REQUIRED_VERSION,
-  have_polkit=yes,
-  have_polkit=no)
-+have_polkit=no
- if test "x$have_polkit" = "xyes" ; then
-        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
- fi
diff --git a/meta-moblin/packages/dalston/dalston.inc b/meta-moblin/packages/dalston/dalston.inc
deleted file mode 100644
index 204bccd697..0000000000
--- a/meta-moblin/packages/dalston/dalston.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "System Information Icons"
-SRC_URI = "http://download.moblin.org/sources/dalston/0.1/dalston-0.1.12.tar.bz2"
-LICENSE = "LGPLv2.1"
-DEPENDS = "glib-2.0 gtk+ pulseaudio libcanberra libnotify nbtk mutter-moblin"
-inherit autotools
diff --git a/meta-moblin/packages/dalston/dalston_0.1.12.bb b/meta-moblin/packages/dalston/dalston_0.1.12.bb
deleted file mode 100644
index 4af8ebeb21..0000000000
--- a/meta-moblin/packages/dalston/dalston_0.1.12.bb
+++ /dev/null
@@ -1 +0,0 @@
-require dalston.inc
diff --git a/meta-moblin/packages/dalston/dalston_git.bb b/meta-moblin/packages/dalston/dalston_git.bb
deleted file mode 100644
index c61cb2b772..0000000000
--- a/meta-moblin/packages/dalston/dalston_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require dalston.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.1.12+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-sans-fontconfig.conf b/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-sans-fontconfig.conf
deleted file mode 100644
index 6e08254bda..0000000000
--- a/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-sans-fontconfig.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Droid Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Droid Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <match target="scan">
-    <test name="family">
-      <string>Droid Sans Fallback</string>
-    </test>
-    <edit name="family">
-      <string>Droid Sans</string>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-sans-mono-fontconfig.conf b/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-sans-mono-fontconfig.conf
deleted file mode 100644
index 5c7f475419..0000000000
--- a/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-sans-mono-fontconfig.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>Droid Sans Mono</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Droid Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-serif-fontconfig.conf b/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-serif-fontconfig.conf
deleted file mode 100644
index 30c15015fc..0000000000
--- a/meta-moblin/packages/droid-fonts/droid-fonts/droid-fonts-serif-fontconfig.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>Droid Serif</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Droid Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/meta-moblin/packages/droid-fonts/droid-fonts_1.0.112.bb b/meta-moblin/packages/droid-fonts/droid-fonts_1.0.112.bb
deleted file mode 100644
index 19ef6f1420..0000000000
--- a/meta-moblin/packages/droid-fonts/droid-fonts_1.0.112.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-HOMEPAGE = "http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts"
-DESCRIPTION = "The Droid typeface family was designed in the fall of 2006 by Ascender's \
-               Steve Matteson, as a commission from Google to create a set of system fonts \
-               for its Android platform. The goal was to provide optimal quality and comfort \
-               on a mobile handset when rendered in application menus, web browsers and for \
-               other screen text."
-SRC_URI = "http://pokylinux.org/sources/droid-fonts-1.0.112.tar.gz \
-           file://droid-fonts-sans-fontconfig.conf \
-           file://droid-fonts-sans-mono-fontconfig.conf \
-           file://droid-fonts-serif-fontconfig.conf "
-LICENSE = "Apache License, Version 2.0"
-SECTION = "x11/fonts"
-RDEPENDS = "fontconfig-utils"
-PACKAGES = "${PN}"
-FILES_${PN} += "${sysconfdir} ${datadir}"
-do_install () {
-        install -d ${D}${datadir}/fonts/ttf/
-        for i in *.ttf; do
-                install -m 0644 $i ${D}${prefix}/share/fonts/ttf/${i}
-        done
-        install -d ${D}${sysconfdir}/fonts/conf.d/
-        install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/fonts/conf.d/
-        install -d ${D}${prefix}/share/doc/${PN}/
-        install -m 0644 README.txt ${D}${datadir}/doc/${PN}/
-        install -m 0644 NOTICE ${D}${datadir}/doc/${PN}/
-}
-pkg_postinst () {
-#!/bin/sh
-fc-cache
-}
diff --git a/meta-moblin/packages/gmime/gmime/iconv-detect.h b/meta-moblin/packages/gmime/gmime/iconv-detect.h
deleted file mode 100644
index 714cb5aa9d..0000000000
--- a/meta-moblin/packages/gmime/gmime/iconv-detect.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_10646 "iso-10646"
diff --git a/meta-moblin/packages/gmime/gmime/nodolt.patch b/meta-moblin/packages/gmime/gmime/nodolt.patch
deleted file mode 100644
index e4d5259c7b..0000000000
--- a/meta-moblin/packages/gmime/gmime/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gmime-2.4.10/configure.in
-===================================================================
--- gmime-2.4.10.orig/configure.in
-+++ gmime-2.4.10/configure.in
-@@ -80,7 +80,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
- 
- AC_EXEEXT
- AC_PROG_LIBTOOL
-DOLT
- 
- AM_MAINTAINER_MODE
- 
diff --git a/meta-moblin/packages/gmime/gmime_2.4.10.bb b/meta-moblin/packages/gmime/gmime_2.4.10.bb
deleted file mode 100644
index 3b9327a931..0000000000
--- a/meta-moblin/packages/gmime/gmime_2.4.10.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime libraries for parsing and creating MIME mail"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glib-2.0 zlib"
-inherit gnome autotools lib_package binconfig
-SRC_URI += "file://iconv-detect.h \
-            file://nodolt.patch;patch=1"
-EXTRA_OECONF += "--disable-mono"
-export ac_cv_have_iconv_detect_h=yes
-do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}"
-# we do not need GNOME 1 gnome-config support
-do_install_append () {
-        rm -f ${D}${libdir}/gmimeConf.sh
-}
diff --git a/meta-moblin/packages/gnet/files/buildfix.patch b/meta-moblin/packages/gnet/files/buildfix.patch
deleted file mode 100644
index 8067620264..0000000000
--- a/meta-moblin/packages/gnet/files/buildfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gnet/examples/Makefile.am
-===================================================================
--- gnet.orig/examples/Makefile.am
-+++ gnet/examples/Makefile.am
-@@ -2,7 +2,7 @@
- 
- @SET_MAKE@
- 
-SUBDIRS = xmlrpc
-+SUBDIRS =
- 
- if OS_WIN32
- noinst_PROGRAMS = echoclient       echoserver                  \
diff --git a/meta-moblin/packages/gnet/files/configure_fix.patch b/meta-moblin/packages/gnet/files/configure_fix.patch
deleted file mode 100644
index e6aadcc6a9..0000000000
--- a/meta-moblin/packages/gnet/files/configure_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: trunk/configure.ac
-===================================================================
--- trunk.orig/configure.ac
-+++ trunk/configure.ac
-@@ -332,53 +332,6 @@ AC_DEFINE_UNQUOTED(GNET_SOCKADDR_FAMILY_
-           [$gnet_sockaddr_family_field_name],
-           [Name of sockaddr_storage family field])
- 
-dnl #######################################
-dnl Check if abstract sockets are supported
-dnl #######################################
- 
-AC_LANG_PUSH(C)
-AC_CACHE_CHECK([for abstract socket namespace availability],
-               ac_cv_gnet_have_abstract_sockets,
-               [AC_RUN_IFELSE([AC_LANG_PROGRAM(
-[[
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <errno.h>
-]],
-[[
-  int listen_fd, len;
-  struct sockaddr_un addr;
-  
-  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
-  if (listen_fd < 0) {
-    perror ("socket() failed: ");
-    exit (1);
-  }
-  memset (&addr, '\0', sizeof (addr));
-  addr.sun_family = AF_UNIX;
-  strcpy (addr.sun_path, "X/tmp/gnet-fake-socket-path-used-in-configure-test");
-  len = SUN_LEN (&addr); /* calculate size before adding the \0 */
-  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
-  
-  if (bind (listen_fd, (struct sockaddr*) &addr, len) < 0) {
-    perror ("Abstract socket namespace bind() failed: ");
-    exit (1);
-  }
-  exit (0);
-]])],
-              [ac_cv_gnet_have_abstract_sockets=yes],
-              [ac_cv_gnet_have_abstract_sockets=no]
-)])
-AC_LANG_POP(C)
-
-if test x$ac_cv_gnet_have_abstract_sockets = xyes ; then
-   AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace])
-fi
-
- ###############################
- # Compiler characteristics
- AC_C_CONST
diff --git a/meta-moblin/packages/gnet/files/pkgconfig_fix.patch b/meta-moblin/packages/gnet/files/pkgconfig_fix.patch
deleted file mode 100644
index a4a433f1ce..0000000000
--- a/meta-moblin/packages/gnet/files/pkgconfig_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: trunk/gnet-2.0.pc.in
-===================================================================
--- trunk.orig/gnet-2.0.pc.in   2008-11-06 16:41:25.000000000 +0000
-+++ trunk/gnet-2.0.pc.in        2008-11-06 16:42:23.000000000 +0000
-@@ -6,5 +6,6 @@
- Name: Gnet
- Description: A network compatibility layer library
- Version: @VERSION@
-+Requires: glib-2.0 gthread-2.0
- Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ @GLIB_LIBS@ @GTHREAD_LIBS@
-Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@
-+Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/
diff --git a/meta-moblin/packages/gnet/gnet_svn.bb b/meta-moblin/packages/gnet/gnet_svn.bb
deleted file mode 100644
index fde58f0f32..0000000000
--- a/meta-moblin/packages/gnet/gnet_svn.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
-LICENSE = "LGPL"
-SECTION = "libs/network"
-HOMEPAGE = "http://www.gnetlibrary.org"
-DEPENDS = "glib-2.0"
-PV = "2.0.7+svnr${SRCREV}"
-PR = "r1"
-SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk;proto=http \
-           file://buildfix.patch;patch=1 \
-           file://configure_fix.patch;patch=1 \
-           file://pkgconfig_fix.patch;patch=1 "
-S = "${WORKDIR}/trunk"
-EXTRA_OECONF =  "--disable-pthreads"
-FILES_${PN}-dev += "${libdir}/gnet-2.0"
-inherit autotools pkgconfig
diff --git a/meta-moblin/packages/gnome/gnome-menus_2.24.1.bb b/meta-moblin/packages/gnome/gnome-menus_2.24.1.bb
deleted file mode 100644
index c36b3ef50b..0000000000
--- a/meta-moblin/packages/gnome/gnome-menus_2.24.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
-LICENSE = "GPL"
-inherit gnome pkgconfig
-DEPENDS += "intltool"
-PACKAGES += "${PN}-python"
-FILES_${PN} += "${datadir}/desktop-directories/"
-FILES_${PN}-python = "${libdir}/python*"
-FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \
-                    ${libdir}/python*/site-packages/.debug"
diff --git a/meta-moblin/packages/gnome/gvfs_1.0.2.bb b/meta-moblin/packages/gnome/gvfs_1.0.2.bb
deleted file mode 100644
index da071c4a64..0000000000
--- a/meta-moblin/packages/gnome/gvfs_1.0.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "gvfs is a userspace virtual filesystem"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 fuse gnome-keyring"
-PR = "r1"
-inherit gnome
-EXTRA_OECONF = "--disable-samba --disable-archive"
-PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
-FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
-FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
-FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
-FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
-FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
-FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
diff --git a/meta-moblin/packages/gnome/mobile-broadband-provider-info/fixpkgconfig.patch b/meta-moblin/packages/gnome/mobile-broadband-provider-info/fixpkgconfig.patch
deleted file mode 100644
index 1a0caadad1..0000000000
--- a/meta-moblin/packages/gnome/mobile-broadband-provider-info/fixpkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/Makefile.am
-===================================================================
--- git.orig/Makefile.am        2009-10-12 17:26:59.000000000 +0100
-+++ git/Makefile.am     2009-10-12 17:27:08.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- EXTRA_DIST = mobile-broadband-provider-info.pc.in
- 
-pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = mobile-broadband-provider-info.pc
- 
- check-local:
diff --git a/meta-moblin/packages/gnome/mobile-broadband-provider-info_git.bb b/meta-moblin/packages/gnome/mobile-broadband-provider-info_git.bb
deleted file mode 100644
index 56df4ff5c8..0000000000
--- a/meta-moblin/packages/gnome/mobile-broadband-provider-info_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit gnome pkgconfig
-SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info;protocol=git \
-           file://fixpkgconfig.patch;patch=1"
-S = "${WORKDIR}/git"
-PV = "0.0+git${SRCPV}"
diff --git a/meta-moblin/packages/hornsey/Makefile.am b/meta-moblin/packages/hornsey/Makefile.am
deleted file mode 100644
index bce92c4060..0000000000
--- a/meta-moblin/packages/hornsey/Makefile.am
+++ /dev/null
@@ -1,662 +0,0 @@
-## Process this file with automake to create Makefile.in.
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH.
-GPATH = $(srcdir)
-if HAVE_FREETYPE
-OPENTYPE_SUBDIR=opentype
-endif
-EXTRA_DIST = 
-BUILT_GIRSOURCES =
-FRIBIDI_SUBDIR=mini-fribidi
-SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
-DIST_SUBDIRS = mini-fribidi opentype
-INCLUDES =                                              \
-        -DG_LOG_DOMAIN=\"Pango\"                        \
-        -DPANGO_ENABLE_BACKEND                          \
-        -DPANGO_ENABLE_ENGINE                           \
-        -DSYSCONFDIR=\"$(sysconfdir)\"                  \
-        -DLIBDIR=\"$(libdir)\"                          \
-        -I$(top_srcdir)                                 \
-        $(PANGO_DEBUG_FLAGS)                            \
-        $(GLIB_CFLAGS)                                  \
-        $(XFT_CFLAGS)                                   \
-        $(CAIRO_CFLAGS)                                 \
-        $(FREETYPE_CFLAGS)                              \
-        $(X_CFLAGS)
-BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
-pangoincludedir=$(includedir)/pango-1.0/pango
-if OS_WIN32
-else
-libm = -lm
-endif
-# ------------------- libpango -------------------
-lib_LTLIBRARIES = libpango-1.0.la
-BUILT_GIRSOURCES += Pango-1.0.gir
-libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpango_1_0_la_LIBADD =                \
-        $(GLIB_LIBS)                    \
-        $(libm)                         \
-        $(INCLUDED_LANG_MODULES)
-libpango_1_0_la_DEPENDENCIES =          \
-        $(INCLUDED_LANG_MODULES)
-libpango_1_0_la_LIBADD += mini-fribidi/libmini-fribidi.la
-libpango_1_0_la_DEPENDENCIES += mini-fribidi/libmini-fribidi.la
-if PLATFORM_WIN32
-libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o
-libpango_1_0_la_DEPENDENCIES += pango-win32-res.o pango.def
-endif
-pango-win32-res.o: pango.rc
-        $(AM_V_GEN) $(WINDRES) $< $@
-libpango_1_0_la_SOURCES =                       \
-        break.c                                 \
-        ellipsize.c                             \
-        fonts.c                                 \
-        glyphstring.c                           \
-        modules.c                               \
-        pango-attributes.c                      \
-        pango-bidi-type.c                       \
-        pango-color.c                           \
-        pango-color-table.h                     \
-        pango-context.c                         \
-        pango-coverage.c                        \
-        pango-engine.c                          \
-        pango-engine-private.h                  \
-        pango-fontmap.c                         \
-        pango-fontset.c                         \
-        pango-glyph-item.c                      \
-        pango-gravity.c                         \
-        pango-impl-utils.h                      \
-        pango-item.c                            \
-        pango-language.c                        \
-        pango-language-sample-table.h           \
-        pango-layout.c                          \
-        pango-layout-private.h                  \
-        pango-markup.c                          \
-        pango-matrix.c                          \
-        pango-renderer.c                        \
-        pango-script.c                          \
-        pango-script-lang-table.h               \
-        pango-script-private.h                          \
-        pango-tabs.c                            \
-        pango-utils.c                           \
-        reorder-items.c                         \
-        shape.c                                 \
-        pango-enum-types.c                      \
-        module-defs-lang.c
-pango_headers =            \
-        pango.h            \
-        pango-attributes.h \
-        pango-bidi-type.h  \
-        pango-break.h      \
-        pango-context.h    \
-        pango-coverage.h   \
-        pango-engine.h     \
-        pango-font.h       \
-        pango-fontmap.h    \
-        pango-fontset.h    \
-        pango-glyph.h      \
-        pango-glyph-item.h \
-        pango-gravity.h    \
-        pango-item.h       \
-        pango-language.h   \
-        pango-layout.h     \
-        pango-matrix.h     \
-        pango-modules.h    \
-        pango-renderer.h   \
-        pango-script.h     \
-        pango-tabs.h       \
-        pango-types.h      \
-        pango-utils.h
-pangoinclude_HEADERS =     \
-        $(pango_headers)   \
-        pango-features.h   \
-        pango-enum-types.h
-pango-enum-types.h: s-enum-types-h
-        $(AM_V_GEN) true
-s-enum-types-h: @REBUILD@ $(pango_headers) Makefile
-        $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
-                        --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-                        --fprod "/* enumerations from \"@filename@\" */\n" \
-                        --vhead "GType @enum_name@_get_type (void);\n#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"  \
-                        --ftail "G_END_DECLS\n\n#endif /* __PANGO_ENUM_TYPES_H__ */" \
-                $(pango_headers) ) > tmp-pango-enum-types.h \
-        && (cmp -s tmp-pango-enum-types.h pango-enum-types.h || cp tmp-pango-enum-types.h pango-enum-types.h ) \
-        && rm -f tmp-pango-enum-types.h \
-        && echo timestamp > $(@F)
-pango-enum-types.c: s-enum-types-c
-        $(AM_V_GEN) true
-s-enum-types-c: @REBUILD@ $(pango_headers) Makefile
-        $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
-                        --fhead "#include <pango.h>" \
-                        --fprod "\n/* enumerations from \"@filename@\" */" \
-                        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
-                        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-                        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n  }\n  return etype;\n}\n" \
-                $(pango_headers) ) > tmp-pango-enum-types.c \
-        && (cmp -s tmp-pango-enum-types.c pango-enum-types.c || cp tmp-pango-enum-types.c pango-enum-types.c ) \
-        && rm -f tmp-pango-enum-types.c \
-        && echo timestamp > $(@F)
-pango-features.h:
-        $(AM_V_GEN) cd $(top_builddir) && ./config.status pango/pango-features.h
-Pango-1.0.gir: $(libpango_1_0_la_SOURCES)
-Pango-1.0.gir: $(pango_headers)
-Pango-1.0.gir: libpango-1.0.la
-Pango-1.0.gir: $(G_IR_SCANNER) Makefile
-        $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \
-            --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=cairo-1.0 \
-            --library=libpango-1.0.la \
-            --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg cairo \
-            --pkg freetype2 \
-            -I$(top_srcdir) \
-            $(PANGO_CFLAGS) \
-            $(libpango_1_0_la_SOURCES) \
-            $(pango_headers) \
-            pango-enum-types.h
-# ------------------- libpangox -------------------
-if HAVE_X
-pangoinclude_HEADERS += $(pangox_headers)
-lib_LTLIBRARIES += libpangox-1.0.la
-aliasdir = $(sysconfdir)/pango
-alias_DATA = pangox.aliases
-endif
-pangox_headers = pangox.h
-pangox_public_sources = pangox.c
-libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangox_1_0_la_LIBADD =                       \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(INCLUDED_X_MODULES)                   \
-        $(GLIB_LIBS)                            \
-        $(X_LIBS)                               \
-        $(X_EXTRA_LIBS)
-libpangox_1_0_la_DEPENDENCIES =                 \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(INCLUDED_X_MODULES)
-if PLATFORM_WIN32
-libpangox_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangox.def -Wl,pangox-win32-res.o
-libpangox_1_0_la_DEPENDENCIES += pangox-win32-res.o pangox.def
-endif
-pangox-win32-res.o: pangox.rc
-        $(WINDRES) $< $@
-libpangox_1_0_la_SOURCES =                      \
-        $(pangox_public_sources)                \
-        modules.h                               \
-        module-defs-x.c                         \
-        pangox-private.h                        \
-        pangox-fontcache.c                      \
-        pangox-fontmap.c
-# ------------------- libpangoft2 -------------------
-if HAVE_FREETYPE
-pangoinclude_HEADERS += $(pangoft2_headers)
-lib_LTLIBRARIES += libpangoft2-1.0.la
-BUILT_GIRSOURCES += PangoFT2-1.0.gir
-endif
-pangoft2_headers =              \
-        pango-ot.h              \
-        pangofc-font.h          \
-        pangofc-fontmap.h       \
-        pangofc-decoder.h       \
-        pangoft2.h
-pangoft2_public_sources =       \
-        pangofc-font.c          \
-        pangofc-fontmap.c       \
-        pangofc-decoder.c       \
-        pangoft2.c
-libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangoft2_1_0_la_LIBADD =                     \
-        opentype/libharfbuzz.la                 \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(INCLUDED_FC_MODULES)                  \
-        $(GLIB_LIBS)                            \
-        $(FREETYPE_LIBS)                        \
-        $(libm)
-libpangoft2_1_0_la_DEPENDENCIES =               \
-        opentype/libharfbuzz.la                 \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(INCLUDED_FC_MODULES)
-libpangoft2_1_0_la_SOURCES =    \
-        $(pangoft2_public_sources) \
-        modules.h               \
-        module-defs-fc.c        \
-        pangofc-private.h       \
-        pangoft2.h              \
-        pangoft2-private.h      \
-        pangoft2-fontmap.c      \
-        pangoft2-render.c       \
-        pango-ot-private.h      \
-        pango-ot-buffer.c       \
-        pango-ot-info.c         \
-        pango-ot-ruleset.c      \
-        pango-ot-tag.c
-if PLATFORM_WIN32
-libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o
-libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o pangoft2.def
-endif
-pangoft2-win32-res.o: pangoft2.rc
-        $(AM_V_GEN) $(WINDRES) $< $@
-PangoFT2-1.0.gir: $(pangoft2_headers)
-PangoFT2-1.0.gir: $(libpangoft2_1_0_la_SOURCES)
-PangoFT2-1.0.gir: libpangoft2-1.0.la
-PangoFT2-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER) Makefile
-        $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
-            --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=Pango-1.0 \
-            --include=freetype2-2.0 \
-            --include=fontconfig-2.0 \
-            --library=libpangoft2-1.0.la \
-            --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg freetype2 \
-            --pkg pangoft2 \
-            -I$(top_srcdir) \
-            $(pangoft2_headers) \
-            $(pangoft2_public_sources)
-# ------------------- libpangoxft -------------------
-if HAVE_XFT
-pangoinclude_HEADERS += $(pangoxft_headers)
-lib_LTLIBRARIES += libpangoxft-1.0.la
-BUILT_GIRSOURCES += PangoXft-1.0.gir
-endif
-pangoxft_headers = pangoxft.h pangoxft-render.h
-libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangoxft_1_0_la_LIBADD =                     \
-        libpangoft2-$(PANGO_API_VERSION).la     \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(GLIB_LIBS)                            \
-        $(X_LIBS)                               \
-        $(XFT_LIBS)                             \
-        $(FREETYPE_LIBS)                        \
-        $(libm)
-libpangoxft_1_0_la_DEPENDENCIES =               \
-        libpangoft2-$(PANGO_API_VERSION).la     \
-        libpango-$(PANGO_API_VERSION).la
-if PLATFORM_WIN32
-libpangoxft_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoxft.def -Wl,pangoxft-win32-res.o
-libpangoxft_1_0_la_DEPENDENCIES += pangoxft-win32-res.o pangoxft.def
-endif
-pangoxft-win32-res.o: pangoxft.rc
-        $(AM_V_GEN) $(WINDRES) $< $@
-libpangoxft_1_0_la_SOURCES =    \
-        pangoxft-font.c         \
-        pangoxft-fontmap.c      \
-        pangoxft-private.h      \
-        pangoxft-render.c
-PangoXft-1.0.gir: $(pangoxft_headers)
-PangoXft-1.0.gir: $(libpangoxft_1_0_la_SOURCES)
-PangoXft-1.0.gir: libpangoxft-1.0.la
-PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER) Makefile
-        $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
-            --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=xft-2.0 \
-            --include=xlib-2.0 \
-            --include=PangoFT2-1.0 \
-            --library=libpangoxft-1.0.la \
-            --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg freetype2 \
-            -I$(top_srcdir) \
-            $(PANGO_CFLAGS) \
-            $(pangoxft_headers) \
-            $(libpangoxft_1_0_la_SOURCES)
-# ------------------- libpangocairo -------------------
-if HAVE_CAIRO
-pangoinclude_HEADERS += $(pangocairo_headers)
-lib_LTLIBRARIES += libpangocairo-1.0.la
-BUILT_GIRSOURCES += PangoCairo-1.0.gir
-endif
-pangocairo_headers = pangocairo.h
-libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangocairo_1_0_la_LIBADD =                   \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(GLIB_LIBS)                            \
-        $(CAIRO_LIBS)                           \
-        $(libm)
-libpangocairo_1_0_la_DEPENDENCIES =             \
-        libpango-$(PANGO_API_VERSION).la
-libpangocairo_1_0_la_SOURCES =  \
-        pangocairo-context.c    \
-        pangocairo-font.c       \
-        pangocairo-fontmap.c    \
-        pangocairo-render.c     \
-        pangocairo-private.h
-if HAVE_CAIRO_WIN32
-if PLATFORM_WIN32
-libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
-libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
-endif
-libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
-libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la 
-libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h
-endif
-if HAVE_CAIRO_FREETYPE
-libpangocairo_1_0_la_LIBADD +=  libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS)
-libpangocairo_1_0_la_DEPENDENCIES += libpangoft2-$(PANGO_API_VERSION).la 
-PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoFT2-1.0
-libpangocairo_1_0_la_SOURCES += \
-        pangocairo-fcfont.c     \
-        pangocairo-fcfontmap.c  \
-        pangocairo-fc.h
-endif
-if HAVE_CAIRO_ATSUI
-libpangocairo_1_0_la_SOURCES += \
-        modules.h               \
-        module-defs-atsui.c     \
-        pangoatsui.h            \
-        pangoatsui.c            \
-        pangoatsui-private.h    \
-        pangoatsui-fontmap.c    \
-        pangocairo-atsui.h      \
-        pangocairo-atsuifont.c  \
-        pangocairo-atsuifont.h  \
-        pangocairo-atsuifontmap.c
-pangoinclude_HEADERS += pangoatsui.h
-libpangocairo_1_0_la_CFLAGS = -xobjective-c
-libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework Carbon -framework Cocoa
-libpangocairo_1_0_la_LIBADD += $(INCLUDED_ATSUI_MODULES)
-# We don't have an ATSUI GIR right now, so this is just hypothetical
-PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoATSUI-1.0
-endif
-PangoCairo-1.0.gir: $(libpangocairo_1_0_la_SOURCES)
-PangoCairo-1.0.gir: $(pangocairo_headers)
-PangoCairo-1.0.gir: libpangocairo-1.0.la
-PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir $(G_IR_SCANNER) Makefile
-        $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
-            --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=cairo-1.0 \
-            --include=Pango-1.0 \
-            --add-include-path=. \
-            --include=$(PANGOCAIRO_FONT_BACKEND_GI_MODULE) \
-            --library=libpangocairo-1.0.la \
-            --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg cairo \
-            -I$(top_srcdir) \
-            $(PANGO_CFLAGS) \
-            $(libpangocairo_1_0_la_SOURCES) \
-            $(pangocairo_headers)
-# ------------------- libpangowin32 -------------------
-if HAVE_WIN32
-pangoinclude_HEADERS += pangowin32.h
-lib_LTLIBRARIES += libpangowin32-1.0.la
-endif
-libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangowin32_1_0_la_LIBADD =                   \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(INCLUDED_WIN32_MODULES)               \
-        $(GLIB_LIBS)                            \
-        $(WIN32_LIBS)
-libpangowin32_1_0_la_DEPENDENCIES =             \
-        libpango-$(PANGO_API_VERSION).la        \
-        $(INCLUDED_WIN32_MODULES)
-libpangowin32_1_0_la_SOURCES =  \
-        modules.h               \
-        module-defs-win32.c     \
-        pangowin32.h            \
-        pangowin32.c            \
-        pangowin32-private.h    \
-        pangowin32-fontcache.c  \
-        pangowin32-fontmap.c
-if PLATFORM_WIN32
-libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o
-libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32-res.o pangowin32.def
-endif
-pangowin32-win32-res.o: pangowin32.rc
-        $(AM_V_GEN) $(WINDRES) $< $@
-# ------------------- win32 build stuff -------------------
-if OS_WIN32
-install-def-files:
-        $(AM_V_GEN) mkdir -p $(DESTDIR)$(libdir) && \
-        $(INSTALL) $(srcdir)/pango.def $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).def
-if HAVE_FREETYPE
-        $(INSTALL) $(srcdir)/pangoft2.def $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
-endif
-        $(INSTALL) $(srcdir)/pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
-        $(INSTALL) $(srcdir)/pangocairo.def $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
-if HAVE_X
-        $(INSTALL) $(srcdir)/pangox.def $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
-        $(INSTALL) $(srcdir)/pangoxft.def $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
-endif
-uninstall-def-files:
-        -rm $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def
-if HAVE_FREETYPE
-        -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
-endif
-        -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
-        -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
-if HAVE_X
-        -rm $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
-        -rm $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
-endif
-else
-install-def-files:
-uninstall-def-files:
-endif
-if MS_LIB_AVAILABLE
-MS_LIB_FILES = pango-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib
-if HAVE_FREETYPE
-MS_LIB_FILES += pangoft2-$(PANGO_API_VERSION).lib 
-endif
-noinst_DATA = $(MS_LIB_FILES)
-install-ms-lib: $(MS_LIB_FILES)
-        $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
-if HAVE_FREETYPE
-        $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
-endif
-        $(INSTALL) pangowin32-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
-        $(INSTALL) pangocairo-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
-uninstall-ms-lib:
-        -rm $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib
-        -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib
-        -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib
-        -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).lib
-else
-install-ms-lib:
-uninstall-ms-lib:
-endif
-pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la $(srcdir)/pango.def
-        $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
-pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir)/pangoft2.def
-        $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
-pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def
-        $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
-pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(srcdir)/pangocairo.def
-        $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
-# ------------------- introspection -------------------
-if HAVE_INTROSPECTION
-girdir = $(GIRDIR)
-gir_DATA = $(BUILT_GIRSOURCES)
-typelibsdir = $(TYPELIBDIR)
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-%.typelib: %.gir $(G_IR_COMPILER)
-        $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $(builddir)/$(@F)
-endif # HAVE_INTROSPECTION
-# ------------------- pango-querymodules -------------------
-bin_PROGRAMS = pango-querymodules
-#
-# As a temporary hack, we pull in libpangox here so that we can link
-#
-pango_querymodules_SOURCES = \
-        querymodules.c
-pango_querymodules_LDADD =
-if HAVE_X
-pango_querymodules_LDADD += libpangox-$(PANGO_API_VERSION).la
-endif
-if HAVE_XFT
-pango_querymodules_LDADD += libpangoxft-$(PANGO_API_VERSION).la
-endif
-if HAVE_FREETYPE
-pango_querymodules_LDADD += libpangoft2-$(PANGO_API_VERSION).la
-endif
-if HAVE_WIN32
-pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la
-endif
-pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
-EXTRA_DIST +=                                   \
-        pango-enum-types.h                      \
-        module-defs.h                           \
-        module-defs-fc.c.win32                  \
-        module-defs-win32.c.win32               \
-        pango.def                               \
-        pangocairo.def                          \
-        pangowin32.def                          \
-        pangoft2.def                            \
-        makefile.msc                            \
-        pango.rc                                \
-        pango.rc.in                             \
-        pangox.aliases                          \
-        pangoft2.rc                             \
-        pangoft2.rc.in                          \
-        pangowin32.rc                           \
-        pangowin32.rc.in                        \
-        pangox.rc                               \
-        pangox.rc.in                            \
-        pangoxft.rc                             \
-        pangoxft.rc.in                          \
-        check.defs
-if HAVE_INCLUDED_MODULES
-included-modules:
-        $(AM_V_GEN) cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules
-$(INCLUDED_LANG_MODULES) $(INCLUDED_X_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCLUDED_ATSUI_MODULES): included-modules
-        $(AM_V_GEN) true
-.PHONY: included-modules
-endif
-MODULE_DEF_FILES = \
-        module-defs.h \
-        module-defs-lang.c \
-        module-defs-x.c \
-        module-defs-fc.c \
-        module-defs-win32.c \
-        module-defs-atsui.c
-$(MODULE_DEF_FILES): $(top_builddir)/config.status
-        $(AM_V_GEN) cd $(top_builddir) && $(SHELL) ./config.status pango/$@
-CLEANFILES =                    \
-        pango-enum-types.h      \
-        s-enum-types-h          \
-        pango-enum-types.c      \
-        s-enum-types-c
-MOSTLYCLEANFILES =              \
-        *.list                  \
-        *.expected
-DISTCLEANFILES =                \
-        pango-features.h        \
-        $(MODULE_DEF_FILES)
-install-data-local: install-ms-lib install-def-files
-install-exec-hook: 
-if DISABLE_EXPLICIT_DEPS
-        -for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la libpangox-$(PANGO_API_VERSION).la libpangowin32-$(PANGO_API_VERSION).la; do \
-          test -f $(DESTDIR)$(libdir)/$$i && $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$$i ; \
-        done
-endif
-uninstall-local: uninstall-ms-lib uninstall-def-files
-TESTS = check.defs
-include $(top_srcdir)/git.mk
diff --git a/meta-moblin/packages/hornsey/hornsey.inc b/meta-moblin/packages/hornsey/hornsey.inc
deleted file mode 100644
index c9d9631a78..0000000000
--- a/meta-moblin/packages/hornsey/hornsey.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "The Moblin Media Player"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
-SRC_URI = "http://download.moblin.org/sources/hornsey/1.0/hornsey-1.0_20091116.tar.bz2"
-DEPENDS = "clutter-1.0 clutter-gtk-0.10 clutter-gst-1.0 bickley bognor-regis mx startup-notification libunique xtst tracker"
-EXTRA_OECONF = "--disable-shave"
-FILES_${PN} += "${datadir}/icons"
-inherit autotools
diff --git a/meta-moblin/packages/hornsey/hornsey_1.0.bb b/meta-moblin/packages/hornsey/hornsey_1.0.bb
deleted file mode 100644
index 5ac2852743..0000000000
--- a/meta-moblin/packages/hornsey/hornsey_1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require hornsey.inc
-DEPENDS = "clutter-1.0 clutter-gtk-0.10 clutter-gst-0.10 bickley bognor-regis nbtk startup-notification libunique xtst"
-S = "${WORKDIR}/${PN}-${PV}_20091116"
diff --git a/meta-moblin/packages/hornsey/hornsey_git.bb b/meta-moblin/packages/hornsey/hornsey_git.bb
deleted file mode 100644
index df01150017..0000000000
--- a/meta-moblin/packages/hornsey/hornsey_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require hornsey.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/images/moblin-image-directdisk.inc b/meta-moblin/packages/images/moblin-image-directdisk.inc
deleted file mode 100644
index bcce9d5389..0000000000
--- a/meta-moblin/packages/images/moblin-image-directdisk.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-inherit boot-directdisk
-do_bootdirectdisk_prepend () {
-        import bb
-        fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-        if 'ext3' not in fstypes:
-                bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
diff --git a/meta-moblin/packages/images/moblin-image-live.inc b/meta-moblin/packages/images/moblin-image-live.inc
deleted file mode 100644
index 453bc527c8..0000000000
--- a/meta-moblin/packages/images/moblin-image-live.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-AUTO_SYSLINUXCFG = "1"
-INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz"
-APPEND += "root=/dev/ram0 "
-TIMEOUT = "10"
-EXCLUDE_FROM_WORLD = "1"
-LABELS += "boot install"
-do_bootimg[depends] += "moblin-image-minimal-initramfs:do_rootfs"
-inherit bootimg
-do_bootimg_prepend () {
-        import bb
-        fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-        if 'ext3' not in fstypes:
-                bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-ROOTFS = "${DEPLOY_DIR_IMAGE}/${MOBLIN_LIVE_IMAGENAME}-${MACHINE}.ext3"
-do_bootimg[depends] += "${MOBLIN_LIVE_IMAGENAME}:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
deleted file mode 100644
index 6d0254fd0b..0000000000
--- a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Simple initramfs image. Mostly used for live images."
-IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd"
-export IMAGE_BASENAME = "moblin-image-minimal-initramfs"
-IMAGE_LINGUAS = ""
-inherit moblin-image
diff --git a/meta-moblin/packages/images/moblin-image-minimal-live.bb b/meta-moblin/packages/images/moblin-image-minimal-live.bb
deleted file mode 100644
index 9d7f789fa3..0000000000
--- a/meta-moblin/packages/images/moblin-image-minimal-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Minimal Bootable Live Image"
-MOBLIN_LIVE_IMAGENAME = "moblin-image-minimal"
-require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-minimal.bb b/meta-moblin/packages/images/moblin-image-minimal.bb
deleted file mode 100644
index 3178fff07f..0000000000
--- a/meta-moblin/packages/images/moblin-image-minimal.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}"
-IMAGE_LINGUAS = " "
-inherit moblin-image
-# remove not needed ipkg informations
-ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files"
diff --git a/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb b/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb
deleted file mode 100644
index 3de2944c80..0000000000
--- a/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2010 Intel Corporation.
-#
-require moblin-image-directdisk.inc
-DESCRIPTION = "Moblin Direct Disk Image"
-ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
-do_bootdirectdisk[depends] += "moblin-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-netbook-live.bb b/meta-moblin/packages/images/moblin-image-netbook-live.bb
deleted file mode 100644
index 78b579f779..0000000000
--- a/meta-moblin/packages/images/moblin-image-netbook-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Netbook Bootable Live Image"
-MOBLIN_LIVE_IMAGENAME = "moblin-image-netbook"
-require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-netbook.bb b/meta-moblin/packages/images/moblin-image-netbook.bb
deleted file mode 100644
index 8cbcf2a5e2..0000000000
--- a/meta-moblin/packages/images/moblin-image-netbook.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
-inherit moblin-image
diff --git a/meta-moblin/packages/images/moblin-image-sdk-live.bb b/meta-moblin/packages/images/moblin-image-sdk-live.bb
deleted file mode 100644
index 8301d97ad1..0000000000
--- a/meta-moblin/packages/images/moblin-image-sdk-live.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Bootable Live SDK Image"
-MOBLIN_LIVE_IMAGENAME = "moblin-image-sdk"
-require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-sdk.bb b/meta-moblin/packages/images/moblin-image-sdk.bb
deleted file mode 100644
index ddb352ca9d..0000000000
--- a/meta-moblin/packages/images/moblin-image-sdk.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs"
-inherit moblin-image
diff --git a/meta-moblin/packages/json-glib/json-glib_0.6.2.bb b/meta-moblin/packages/json-glib/json-glib_0.6.2.bb
deleted file mode 100644
index d96f8b3e19..0000000000
--- a/meta-moblin/packages/json-glib/json-glib_0.6.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SRC_URI = "http://folks.o-hand.com/~ebassi/sources/json-glib-0.6.2.tar.gz"
-PR = "r0"
-DEPENDS = "glib-2.0"
-inherit autotools
diff --git a/meta-moblin/packages/json-glib/json-glib_git.bb b/meta-moblin/packages/json-glib/json-glib_git.bb
deleted file mode 100644
index 0b32e3ae34..0000000000
--- a/meta-moblin/packages/json-glib/json-glib_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-HOMEPAGE = "http://live.gnome.org/JsonGlib"
-SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git"
-PV = "0.7.2+git${SRCPV}"
-PR = "r1"
-S = "${WORKDIR}/git"
-DEPENDS = "glib-2.0"
-inherit autotools
-EXTRA_OECONF = "--disable-introspection"
-acpaths = "-I ${S}/build/autotools "
-do_configure_prepend () {
-    echo "EXTRA_DIST = " > ${S}/gtk-doc.make
-}
diff --git a/meta-moblin/packages/libccss/libccss_git.bb b/meta-moblin/packages/libccss/libccss_git.bb
deleted file mode 100644
index 8bd93c940f..0000000000
--- a/meta-moblin/packages/libccss/libccss_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SRC_URI = "git://anongit.freedesktop.org/git/ccss.git;protocol=git"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
-DEPENDS = "glib-2.0 cairo librsvg libsoup-2.4"
-S = "${WORKDIR}/git"
-inherit autotools
-do_configure_prepend () {
-        echo "EXTRA_DIST=" > ${S}/gtk-doc.make
-        echo "CLEANFILES=" >> ${S}/gtk-doc.make
-}
diff --git a/meta-moblin/packages/libidl/libidl_0.8.12.bb b/meta-moblin/packages/libidl/libidl_0.8.12.bb
deleted file mode 100644
index 9cc9ea2ed8..0000000000
--- a/meta-moblin/packages/libidl/libidl_0.8.12.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "gnome/libs"
-DEPENDS = "glib-2.0 flex"
-PR = "r4"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
-BINCONFIG_GLOB = "*-config-2"
-inherit autotools pkgconfig binconfig
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}" 
-BBCLASSEXTEND = "native"
diff --git a/meta-moblin/packages/libjana/libjana/clockpatch.patch b/meta-moblin/packages/libjana/libjana/clockpatch.patch
deleted file mode 100644
index 7b20222239..0000000000
--- a/meta-moblin/packages/libjana/libjana/clockpatch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: jana/libjana-gtk/jana-gtk-clock.c
-===================================================================
--- jana.orig/libjana-gtk/jana-gtk-clock.c
-+++ jana/libjana-gtk/jana-gtk-clock.c
-@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock,
-        cairo_fill (cr);
- 
-        /* Draw dark outline frame */
-       thickness = width/20;
-+       thickness = width/40;
-        cairo_new_path (cr);
-        cairo_rectangle (cr, thickness/2, thickness/2,
-                width - thickness, height - thickness);
-@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock,
-        cairo_set_source_rgb (cr, base_color[0]/2,
-                base_color[1]/2, base_color[2]/2);
-        cairo_stroke (cr);
-       
-+#if 0  
-        /* Draw main outline frame */
-        cairo_new_path (cr);
-        cairo_rectangle (cr, thickness, thickness,
-@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock,
-                base_color[1]/1.5, base_color[2]/1.5);
-        cairo_set_line_width (cr, thickness/2);
-        cairo_stroke (cr);
-       
-+#endif 
-        cairo_identity_matrix (cr);
- }
- 
diff --git a/meta-moblin/packages/libjana/libjana_git.bb b/meta-moblin/packages/libjana/libjana_git.bb
deleted file mode 100644
index 7797580ca5..0000000000
--- a/meta-moblin/packages/libjana/libjana_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "O-Hand Jana Library"
-DEPENDS = "gtk+ eds-dbus gconf"
-PV = "0.4.4+git${SRCPV}"
-PR = "r0"
-inherit autotools pkgconfig lib_package
-SRC_URI = "git://git.gnome.org/jana;protocol=git"
-S = "${WORKDIR}/git/"
-EXTRA_OECONF = "--enable-examples "
-do_configure_prepend() {
-        touch gtk-doc.make
-}
-PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
-             libjana-gtk libjana-gtk-dbg \ 
-            "
-LEAD_SONAME = "libjana.so"
-FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
-FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*"
-FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
-FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*"
-FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png "
diff --git a/meta-moblin/packages/libnotify/libnotify_0.4.4.bb b/meta-moblin/packages/libnotify/libnotify_0.4.4.bb
deleted file mode 100644
index a3f622e84d..0000000000
--- a/meta-moblin/packages/libnotify/libnotify_0.4.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Send desktop notifications to a notification daemon"
-HOMEPAGE = "http://www.galago-project.org/"
-SECTION = "libs"
-LICENSE = "LGPL"
-DEPENDS = "dbus gtk+ dbus-glib"
-PR = "r0"
-SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
-inherit autotools pkgconfig
diff --git a/meta-moblin/packages/librest/librest_git.bb b/meta-moblin/packages/librest/librest_git.bb
deleted file mode 100644
index 33e714d6cf..0000000000
--- a/meta-moblin/packages/librest/librest_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.6.1+git${SRCPV}"
-PR = "r0"
-DEPENDS = "libsoup-2.4"
-S = "${WORKDIR}/git"
-inherit autotools
-do_configure_prepend () {
-        echo "EXTRA_DIST=" > ${S}/gtk-doc.make
-}
diff --git a/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb b/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb
deleted file mode 100644
index 10923404d0..0000000000
--- a/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "An audio Sample Rate Conversion library"
-SECTION = "libs"
-LICENSE = "GPL libsamplerate"
-DEPENDS = "flac"
-PR = "r3"
-SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
-S = "${WORKDIR}/libsamplerate-${PV}"
-inherit autotools pkgconfig
diff --git a/meta-moblin/packages/libsexy/files/libsexy-pkgconfig-fixes.patch b/meta-moblin/packages/libsexy/files/libsexy-pkgconfig-fixes.patch
deleted file mode 100644
index 61da9474df..0000000000
--- a/meta-moblin/packages/libsexy/files/libsexy-pkgconfig-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libsexy-0.1.11/libsexy.pc.in
-===================================================================
--- libsexy-0.1.11.orig/libsexy.pc.in   2005-11-10 10:21:18.000000000 +0000
-+++ libsexy-0.1.11/libsexy.pc.in        2008-03-05 14:36:39.000000000 +0000
-@@ -6,7 +6,8 @@
- Name: libsexy
- Description: Doing naughty things to good widgets
- Version: @VERSION@
-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
-Cflags: -I${includedir} @PACKAGE_CFLAGS@
- 
-+Requires: pango glib-2.0 gtk+-2.0 libxml-2.0
-+Libs: -L${libdir} -lsexy 
-+Cflags: -I${includedir}
- 
diff --git a/meta-moblin/packages/libsexy/libsexy.inc b/meta-moblin/packages/libsexy/libsexy.inc
deleted file mode 100644
index ff68c6d5e6..0000000000
--- a/meta-moblin/packages/libsexy/libsexy.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
-HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
-AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-SECTION = "x11/libs"
-DEPENDS = "gtk+ enchant libxml2"
-SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \
-           file://libsexy-pkgconfig-fixes.patch;patch=1"
-inherit autotools pkgconfig
diff --git a/meta-moblin/packages/libsexy/libsexy_0.1.11.bb b/meta-moblin/packages/libsexy/libsexy_0.1.11.bb
deleted file mode 100644
index 91784ffb49..0000000000
--- a/meta-moblin/packages/libsexy/libsexy_0.1.11.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require libsexy.inc
-PR = "r1"
diff --git a/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch b/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
deleted file mode 100644
index 46a21c19be..0000000000
--- a/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix m4 quoting to avoid an infinite loop in m4 with recent autoconf/automake
-RP 1/2/10
-Index: libsndfile-1.0.17/acinclude.m4
-===================================================================
--- libsndfile-1.0.17.orig/acinclude.m4 2010-02-01 14:53:35.517826746 +0000
-+++ libsndfile-1.0.17/acinclude.m4      2010-02-01 14:53:51.409122706 +0000
-@@ -255,7 +255,7 @@
- 
- )
- ]
-
-+[
- if test $ac_cv_c_byte_order = big ; then
-        ac_cv_c_big_endian=1
-        ac_cv_c_little_endian=0
-@@ -272,7 +272,7 @@
-        AC_MSG_WARN([[*** src/config.h may need to be hand editied.                    ]])
-        AC_MSG_WARN([[*****************************************************************]])
-        fi
-
-+]
- )# AC_C_FIND_ENDIAN
- 
- 
diff --git a/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch b/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
deleted file mode 100644
index da0c4010e6..0000000000
--- a/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---
- configure.ac |    1 +
- 1 file changed, 1 insertion(+)
--- libsndfile-1.0.17.orig/configure.ac
-+++ libsndfile-1.0.17/configure.ac
-@@ -29,10 +29,11 @@ AC_LANG([C])
- #     to 0.
- 
- SHARED_VERSION_INFO="1:17:0"
- 
- AC_PROG_CC
-+AC_PROG_CXX
- AM_PROG_LIBTOOL
- 
- AC_CHECK_PROG(autogen, autogen, yes, no)
- 
- AC_PROG_INSTALL
diff --git a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
deleted file mode 100644
index e46e3e15c0..0000000000
--- a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "An audio format Conversion library"
-HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
-AUTHOR = "Erik de Castro Lopo"
-DEPENDS = "sqlite3"
-SECTION = "libs/multimedia"
-LICENSE = "LGPL"
-PR = "r4"
-SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
-           file://acincludefix.patch;patch=1 \
-           file://add-cxx.patch;patch=1"
-S = "${WORKDIR}/libsndfile-${PV}"
-inherit autotools lib_package pkgconfig
-do_configure_prepend_arm() {
-        export ac_cv_sys_largefile_source=1
-        export ac_cv_sys_file_offset_bits=64
-        ac_cv_sizeof_off_t=8
-}
diff --git a/meta-moblin/packages/libsocialweb/libsocialweb.inc b/meta-moblin/packages/libsocialweb/libsocialweb.inc
deleted file mode 100644
index 9238125a74..0000000000
--- a/meta-moblin/packages/libsocialweb/libsocialweb.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_URI = "http://download.moblin.org/sources/${PN}/0.0/${PN}-0.0.tar.bz2"
-DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring"
-RDEPENDS_${PN} = "connman"
-inherit autotools
-FILES_${PN} += "${datadir}/dbus-1/services"
-FILES_${PN}-dbg += "${libdir}/libsocialweb/sources/.debug/* ${libdir}/libsocialweb/services/.debug/"
-PARALLEL_MAKE = ""
-EXTRA_OECONF = "--with-online=connman --disable-shave"
diff --git a/meta-moblin/packages/libsocialweb/libsocialweb_git.bb b/meta-moblin/packages/libsocialweb/libsocialweb_git.bb
deleted file mode 100644
index 3a72a5e5d7..0000000000
--- a/meta-moblin/packages/libsocialweb/libsocialweb_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require libsocialweb.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
deleted file mode 100644
index dfe3bdaa6b..0000000000
--- a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Synthesis SyncML Engine"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git;branch=syncevolution-0-9-x"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r2"
-DEPENDS = "libpcre sqlite3 zlib"
-S = "${WORKDIR}/git"
-inherit autotools
-do_configure_prepend () {
-        cd ${S}/src
-        ${S}/src/gen-makefile-am.sh
-        cd ${S}
-}
diff --git a/meta-moblin/packages/libunique/libunique_1.0.6.bb b/meta-moblin/packages/libunique/libunique_1.0.6.bb
deleted file mode 100644
index 55c3417f72..0000000000
--- a/meta-moblin/packages/libunique/libunique_1.0.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libunique/1.0/libunique-1.0.6.tar.bz2"
-PR = "r0"
-DEPENDS = "glib-2.0 gtk+ dbus"
-S = "${WORKDIR}/unique-${PV}"
-inherit autotools
diff --git a/meta-moblin/packages/matchbox-netbook-session/matchbox-session-netbook/session b/meta-moblin/packages/matchbox-netbook-session/matchbox-session-netbook/session
deleted file mode 100644
index f72b130e88..0000000000
--- a/meta-moblin/packages/matchbox-netbook-session/matchbox-session-netbook/session
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-export LIBGL_ALWAYS_INDIRECT=1
-export CLUTTER_DISABLE_MIPMAPPED_TEXT=1
-exec /usr/bin/mutter --mutter-plugins=moblin-netbook
diff --git a/meta-moblin/packages/matchbox-netbook-session/matchbox-session-netbook_0.1.bb b/meta-moblin/packages/matchbox-netbook-session/matchbox-session-netbook_0.1.bb
deleted file mode 100644
index 2a5827642d..0000000000
--- a/meta-moblin/packages/matchbox-netbook-session/matchbox-session-netbook_0.1.bb
+++ /dev/null
@@ -1,223 +0,0 @@
-DESCRIPTION = "Custom MB session files for poky"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS = "formfactor gtk-engines initscripts matchbox-session"
-PR = "r19"
-# This package is architecture specific because the session script is modified
-# based on the machine architecture.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-SRC_URI = "file://session"
-S = "${WORKDIR}"
-do_install() {
-        install -d ${D}/${sysconfdir}/matchbox
-        install ${S}/session ${D}/${sysconfdir}/matchbox/session
-        chmod +x ${D}/${sysconfdir}/matchbox/session
-}
-pkg_postinst_${PN} () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-. ${sysconfdir}/init.d/functions
-# Theme
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/general/theme "Moblin-Netbook"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/general/button_layout ":close"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/interface/gtk_theme "Moblin-Netbook"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/interface/icon_theme "moblin"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/peripherals/mouse/cursor_theme "moblin"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/interface/toolbar_style "icons"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /desktop/gnome/interface/menus_have_icons false
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /desktop/gnome/interface/buttons_have_icons false
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/sound/theme_name moblin
-# Screen shot
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/global_keybindings/run_command_screenshot \
-            "Print"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/keybinding_commands/command_screenshot \
-            "gnome-screenshot"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/global_keybindings/run_command_window_screenshot \
-            "<Alt>Print"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/keybinding_commands/command_window_screenshot \
-            "gnome-screenshot --window"
-# Window Actions
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/general/action_double_click_titlebar "none"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/general/action_middle_click_titlebar "none"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/metacity/general/action_right_click_titlebar "none"
-# UX Shell
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /apps/mutter/general/clutter_disabled false
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type list --list-type string -s \
-            /apps/mutter/general/clutter_plugins '[moblin-netbook]'
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/url-handlers/http/command 'moblin-web-browser %s'
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/url-handlers/https/command 'moblin-web-browser %s'
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/background/picture_filename \
-            '/usr/share/mutter-moblin/theme/moblin-panel-myzone/toys.jpg'
-# Fonts
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/interface/document_font_name \
-            'Liberation Sans 10'
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/interface/font_name \
-            'Liberation Sans 10'
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /desktop/gnome/interface/monospace_font_name \
-            'Liberation Mono 10'
-# Nautilus
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /apps/nautilus/preferences/always_use_browser true
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /apps/nautilus/preferences/exit_with_last_window false
-# Do not automount, this is done by g-s-d plugin
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /apps/nautilus/preferences/media_automount false
-# And should not open new window whenever media mounted
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /apps/nautilus/preferences/media_automount_open false
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type bool -s \
-            /apps/nautilus/icon_view/labels_beside_icons false
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/nautilus/icon_view/default_zoom_level standard
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type string -s \
-            /apps/gnome_settings_daemon/keybindings/power ""
-# General
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type float -s \
-            /desktop/gnome/peripherals/mouse/mouse_acceleration 0.8
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults \
-            --direct --type int -s \
-            /desktop/gnome/peripherals/mouse/mouse_threshold 2
-#
-# The interesting bit - we convert to run the system as the user "pokyuser"
-# and setup this user account as needed
-#
-if [ ! -d /home/pokyuser ]; then
-    adduser --disabled-password --ingroup users pokyuser
-    # Setup any .skel files
-    if [ -d ${sysconfdir}/skel ]; then
-        cp -pPR ${sysconfdir}/skel/.[a-zA-Z0-9]* /home/pokyuser/ || /bin/true
-        cp -pPR ${sysconfdir}/skel/* /home/pokyuser/ || /bin/true
-    fi
-    # Move any sample media into this user
-    if [ -d ${sysconfdir}/skel-media ]; then
-        mv ${sysconfdir}/skel-media/* /home/pokyuser/ || /bin/true
-    fi
-    chown pokyuser.users -R /home/pokyuser/* || /bin/true
-    chown pokyuser.users -R /home/pokyuser/.[a-zA-Z0-9]* || /bin/true
-    # Make sure Xorg is suid
-    chmod a+s /usr/bin/Xorg
-    # Tell X to run as this user
-    mkdir -p ${sysconfdir}/X11/
-    echo "pokyuser" > ${sysconfdir}/X11/Xusername
-    # Add pokyuser to the audio group
-    audiousers=`grep ^audio < /etc/group | cut -d ':' -f 4`
-    if [ "x$audiousers" == "x" ]; then
-        audiousers=pokyuser
-    else
-        audiousers=$audiousers,pokyuser
-    fi
-    sed -i -e "s/audio:\(.*\):\(.*\):\(.*\)/audio:\1:\2:$audiousers/" /etc/group
-    # Add pokyuser to the video group
-    videousers=`grep ^video < /etc/group | cut -d ':' -f 4`
-    if [ "x$videousers" == "x" ]; then
-        videousers=pokyuser
-    else
-        videousers=$videousers,pokyuser
-    fi
-    sed -i -e "s/video:\(.*\):\(.*\):\(.*\)/video:\1:\2:$videousers/" /etc/group
-fi
-}
diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg-7f7d50079c8bcc63874fd60a61f23d849e025445.patch b/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg-7f7d50079c8bcc63874fd60a61f23d849e025445.patch
deleted file mode 100644
index 1b57ffe32a..0000000000
--- a/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg-7f7d50079c8bcc63874fd60a61f23d849e025445.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: git/configure.ac
-===================================================================
--- git.orig/configure.ac       2009-10-05 17:05:14.000000000 +0100
-+++ git/configure.ac    2009-10-05 21:02:48.000000000 +0100
-@@ -34,7 +34,7 @@
-   gtk+-2.0
-   packagekit-glib >= 0.4
-   packagekit-glib < 0.5
-  rpm >= 4.6'
-+  libopkg'
- 
- AC_MSG_CHECKING([for available nbtk version])
- PKG_CHECK_EXISTS(nbtk-1.2,
-Index: git/src/mai-package.c
-===================================================================
--- git.orig/src/mai-package.c  2009-10-05 17:05:06.000000000 +0100
-+++ git/src/mai-package.c       2009-10-05 21:01:57.000000000 +0100
-@@ -23,7 +23,7 @@
- #include <gtk/gtk.h>
- 
- /* FIXME make conditional. */
-#include <rpm/rpmlib.h>
-+#include <libopkg/opkg.h>
- 
- #include "mai-model-priv.h"
- #include "mai-package.h"
-@@ -191,7 +191,7 @@
- 
-   if (priv->package_id &&
-       priv->version &&
-      rpmvercmp (version, priv->version) < 0)
-+      opkg_compare_versions (version, priv->version) < 0)
-   {
-     g_debug ("    skipping '%s'", version);
-     return;
-@@ -955,7 +955,7 @@
-     return -1;
- 
-   /* FIXME support deb. */
-  return rpmvercmp (priv->version, version);
-+  return opkg_compare_versions (priv->version, version);
- }
- 
- gboolean
diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch b/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch
deleted file mode 100644
index 3496c22bf5..0000000000
--- a/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: git/configure.ac
-===================================================================
--- git.orig/configure.ac       2009-12-10 21:37:39.000000000 +0000
-+++ git/configure.ac    2009-12-10 21:39:05.000000000 +0000
-@@ -34,7 +34,7 @@
-   clutter-1.0
-   clutter-gtk-0.10
-   gtk+-2.0
-  rpm >= 4.6'
-+  libopkg'
- 
- AC_MSG_CHECKING([for available nbtk version])
- PKG_CHECK_EXISTS(nbtk-1.2,
-Index: git/src/pk-glib/mai-package.c
-===================================================================
--- git.orig/src/pk-glib/mai-package.c  2009-12-10 21:42:24.000000000 +0000
-+++ git/src/pk-glib/mai-package.c       2009-12-10 21:43:48.000000000 +0000
-@@ -23,7 +23,7 @@
- #include <gtk/gtk.h>
- 
- /* FIXME make conditional. */
-#include <rpm/rpmlib.h>
-+#include <libopkg/opkg.h>
- 
- #include "mai-model-priv.h"
- #include "mai-package.h"
-@@ -230,7 +230,7 @@
- 
-   if (priv->package_id &&
-       priv->version &&
-      rpmvercmp (version, priv->version) < 0)
-+      opkg_compare_versions (version, priv->version) < 0)
-   {
-     g_debug ("    skipping '%s'", version);
-     return;
-@@ -998,7 +998,7 @@
-     return -1;
- 
-   /* FIXME support deb. */
-  return rpmvercmp (priv->version, version);
-+  return opkg_compare_versions (priv->version, version);
- }
- 
- gboolean
-Index: git/src/pk-glib2/mai-package.c
-===================================================================
--- git.orig/src/pk-glib2/mai-package.c 2009-12-10 21:41:01.000000000 +0000
-+++ git/src/pk-glib2/mai-package.c      2009-12-10 21:42:08.000000000 +0000
-@@ -23,7 +23,7 @@
- #include <gtk/gtk.h>
- 
- /* FIXME make conditional. */
-#include <rpm/rpmlib.h>
-+#include <libopkg/opkg.h>
- 
- #include "mai-model-priv.h"
- #include "mai-package.h"
-@@ -737,7 +737,7 @@
-     return -1;
- 
-   /* FIXME support deb. */
-  return rpmvercmp (priv->version, version);
-+  return opkg_compare_versions (priv->version, version);
- }
- 
- static void
-@@ -820,7 +820,7 @@
-       gchar **id = pk_package_id_split (package_id);
- 
-       if (!priv->version ||
-          rpmvercmp (id[PK_PACKAGE_ID_VERSION], priv->version) > 0)
-+          opkg_compare_versions (id[PK_PACKAGE_ID_VERSION], priv->version) > 0)
-       {
-         PkInfoEnum package_info;
- 
diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb
deleted file mode 100644
index 1f388a3b44..0000000000
--- a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Moblin Appliction Installer"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://opkg-7f7d50079c8bcc63874fd60a61f23d849e025445.patch;patch=1;rev=7f7d50079c8bcc63874fd60a61f23d849e025445 \
-           file://opkg.patch;patch=1;notrev=7f7d50079c8bcc63874fd60a61f23d849e025445"
-LICENSE = "GPLv2"
-PV = "0.0+git${SRCPV}"
-PR = "r0"
-S = "${WORKDIR}/git"
-DEPENDS = "clutter-1.0 glib-2.0 nbtk libxml2 gtk+ gnome-packagekit opkg"
-inherit autotools
diff --git a/meta-moblin/packages/moblin-cursor-theme/moblin-cursor-theme-0.1/moblin-cursor-theme-0.1.tar.bz2 b/meta-moblin/packages/moblin-cursor-theme/moblin-cursor-theme-0.1/moblin-cursor-theme-0.1.tar.bz2
deleted file mode 100644
index 47c3d7e8f8..0000000000
--- a/meta-moblin/packages/moblin-cursor-theme/moblin-cursor-theme-0.1/moblin-cursor-theme-0.1.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/meta-moblin/packages/moblin-cursor-theme/moblin-cursor-theme_0.1.bb b/meta-moblin/packages/moblin-cursor-theme/moblin-cursor-theme_0.1.bb
deleted file mode 100644
index af3f447083..0000000000
--- a/meta-moblin/packages/moblin-cursor-theme/moblin-cursor-theme_0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SRC_URI = "file://${PN}-${PV}.tar.bz2"
-PR = "r0"
-FILES_${PN} =+ "${datadir}/icons/moblin"
-DEPENDS = "icon-naming-utils-native"
-do_install () {
-        install -d ${D}${datadir}/icons/moblin/
-        cp -r ${S}/cursors ${D}${datadir}/icons/moblin/
-}
diff --git a/meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb b/meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb
deleted file mode 100644
index 8d4b29c8c3..0000000000
--- a/meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Moblin feed configuration files (Online package repositories)"
-PR = "r2"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-FEEDNAMEPREFIX ?= "INVALID"
-FEEDURIPREFIX ?= "INVALID"
-do_compile() {
-        mkdir -p ${S}/${sysconfdir}/opkg/
-        ipkgarchs="${PACKAGE_ARCHS}"
-        basefeedconf=${S}/${sysconfdir}/opkg/base-feeds.conf
-        rm -f $basefeedconf
-        for arch in $ipkgarchs; do
-                echo "src/gz ${FEEDNAMEPREFIX}-$arch http://pokylinux.org/${FEEDURIPREFIX}$arch" >> $basefeedconf
-        done
-}
-do_install () {
-        install -d ${D}${sysconfdir}/opkg
-        install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
-}
-FILES_${PN} = "${sysconfdir}/opkg/ "
-CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf"
diff --git a/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb b/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb
deleted file mode 100644
index e68a8541a7..0000000000
--- a/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r1"
-DEPENDS = "gtk+"
-S = "${WORKDIR}/git"
-inherit autotools
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so ${datadir}/icons ${datadir}/themes"
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.7/moblin-icon-theme-0.7.tar.gz b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.7/moblin-icon-theme-0.7.tar.gz
deleted file mode 100644
index 361e19f4e2..0000000000
--- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.7/moblin-icon-theme-0.7.tar.gz
+++ /dev/null
Binary files differ
diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
deleted file mode 100644
index 4544603e75..0000000000
--- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_URI = "file://${PN}-${PV}.tar.gz"
-PR = "r1"
-DEPENDS = "icon-naming-utils-native"
-FILES_${PN} += "${datadir}/icons/"
-inherit autotools
-do_install_append () {
-        ln -s ../apps/gnome-aisleriot.png ${D}${datadir}/icons/moblin/48x48/categories/applications-games.png
-}
diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb
deleted file mode 100644
index b73e8d32d8..0000000000
--- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.0+git${SRCPV}"
-PR = "r0"
-DEFAULT_PREFERENCE = "-1"
-BROKEN = "1"
-S = "${WORKDIR}/git"
-inherit autotools
diff --git a/meta-moblin/packages/moblin-menus/moblin-menus/configurefix.patch b/meta-moblin/packages/moblin-menus/moblin-menus/configurefix.patch
deleted file mode 100644
index 288746aa66..0000000000
--- a/meta-moblin/packages/moblin-menus/moblin-menus/configurefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/configure.in
-===================================================================
--- git.orig/configure.in       2009-01-17 18:57:24.000000000 +0000
-+++ git/configure.in    2009-01-17 18:57:29.000000000 +0000
-@@ -11,8 +11,6 @@
- 
- AM_MAINTAINER_MODE
- 
-AM_DISABLE_STATIC
-       
- changequote(,)dnl
- if test "x$GCC" = "xyes"; then
-   case " $CFLAGS " in
diff --git a/meta-moblin/packages/moblin-menus/moblin-menus_git.bb b/meta-moblin/packages/moblin-menus/moblin-menus_git.bb
deleted file mode 100644
index 2d6cb27d04..0000000000
--- a/meta-moblin/packages/moblin-menus/moblin-menus_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://configurefix.patch;patch=1;rev=e1d63681739dd16195d005b3cf15752df294bd3c"
-DEPENDS = "glib-2.0"
-PV = "0.1+git${SRCPV}"
-PR = "r1"
-S = "${WORKDIR}/git"
-FILES_${PN} += "${datadir}/desktop-directories/*"
-inherit autotools
diff --git a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme-0.1/moblin-sound-theme-0.1.tar.bz2 b/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme-0.1/moblin-sound-theme-0.1.tar.bz2
deleted file mode 100644
index 34dcc6a1cd..0000000000
--- a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme-0.1/moblin-sound-theme-0.1.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb b/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb
deleted file mode 100644
index 7d122dd4c1..0000000000
--- a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SRC_URI = "file://${PN}-${PV}.tar.bz2"
-PR = "r0"
-inherit autotools
-#FILES_${PN} =+ "${datadir}/icons/moblin"
diff --git a/meta-moblin/packages/moblin-user-skel/moblin-user-skel_git.bb b/meta-moblin/packages/moblin-user-skel/moblin-user-skel_git.bb
deleted file mode 100644
index ff71b5f92b..0000000000
--- a/meta-moblin/packages/moblin-user-skel/moblin-user-skel_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.0+git${SRCPV}"
-PR = "r0"
-S = "${WORKDIR}/git"
-do_compile () {
-        :
-}
-do_install () {
-        install -d ${D}${sysconfdir}/skel/.bkl-thumbnails/
-        cp -pPR ${S}/.bkl-thumbnails/* ${D}${sysconfdir}/skel/.bkl-thumbnails/
-        install -d ${D}${sysconfdir}/skel/.kozo/
-        cp -pPR ${S}/.kozo/* ${D}${sysconfdir}/skel/.kozo/
-        install -d ${D}${sysconfdir}/skel/.local/
-        cp -pPR ${S}/.local/* ${D}${sysconfdir}/skel/.local/
-}
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch
deleted file mode 100644
index d4785eaddf..0000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
--- git.orig/configure.ac       2010-01-13 14:57:52.000000000 +0000
-+++ git/configure.ac    2010-01-13 15:01:35.000000000 +0000
-@@ -57,6 +57,13 @@
- NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
- AC_SUBST(NBTKDATADIR)
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+   IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- if test "x$build_browser" = "xyes"; then
-    PKG_CHECK_MODULES(MWB,
-          clutter-1.0
-Index: git/libmwbpages/Makefile.am
-===================================================================
--- git.orig/libmwbpages/Makefile.am    2010-01-13 14:57:52.000000000 +0000
-+++ git/libmwbpages/Makefile.am 2010-01-13 15:02:20.000000000 +0000
-@@ -26,10 +26,10 @@
- mwb-pages-service.lo : MwbIPagesService.h
- 
- .idl.h :
-       $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
-       $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- xpt_DATA = MwbIPagesService.xpt
- xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch
deleted file mode 100644
index d4785eaddf..0000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
--- git.orig/configure.ac       2010-01-13 14:57:52.000000000 +0000
-+++ git/configure.ac    2010-01-13 15:01:35.000000000 +0000
-@@ -57,6 +57,13 @@
- NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
- AC_SUBST(NBTKDATADIR)
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+   IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- if test "x$build_browser" = "xyes"; then
-    PKG_CHECK_MODULES(MWB,
-          clutter-1.0
-Index: git/libmwbpages/Makefile.am
-===================================================================
--- git.orig/libmwbpages/Makefile.am    2010-01-13 14:57:52.000000000 +0000
-+++ git/libmwbpages/Makefile.am 2010-01-13 15:02:20.000000000 +0000
-@@ -26,10 +26,10 @@
- mwb-pages-service.lo : MwbIPagesService.h
- 
- .idl.h :
-       $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
-       $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- xpt_DATA = MwbIPagesService.xpt
- xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch
deleted file mode 100644
index e920b50eeb..0000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
--- git.orig/configure.ac       2009-06-23 17:46:31.000000000 +0100
-+++ git/configure.ac    2009-06-23 17:46:48.000000000 +0100
-@@ -44,6 +44,13 @@
- MOZIDLDIR=`${PKG_CONFIG} --variable=idldir libxul`""
- AC_SUBST([MOZIDLDIR])
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+    IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
- 
- AC_OUTPUT([
-Index: git/libmwbpages/Makefile.am
-===================================================================
--- git.orig/libmwbpages/Makefile.am    2009-06-23 17:46:31.000000000 +0100
-+++ git/libmwbpages/Makefile.am 2009-06-23 17:47:46.000000000 +0100
-@@ -27,10 +27,10 @@
- mwb-gettext.lo : MwbIGettext.h
- 
- .idl.h :
-       $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
-       $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- dist_xpt_DATA = MwbIStartPage.xpt MwbIGettext.xpt
- xptdir = $(MOZHOME)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
deleted file mode 100644
index 86aeae4248..0000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/configure.ac
-===================================================================
--- git.orig/configure.ac       2009-12-10 17:14:58.000000000 +0000
-+++ git/configure.ac    2009-12-10 17:15:01.000000000 +0000
-@@ -63,6 +63,13 @@
- NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
- AC_SUBST(NBTKDATADIR)
- 
-+IDLPREFIX=
-+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
-+if test x"${with_idl_prefix}" != x ; then
-+   IDLPREFIX=${with_idl_prefix}
-+fi
-+AC_SUBST([IDLPREFIX])
-+
- if test "x$build_browser" = "xyes"; then
-    PKG_CHECK_MODULES(MWB,
-          clutter-1.0
-Index: git/libmwbpages/Makefile.am
-===================================================================
--- git.orig/libmwbpages/Makefile.am    2009-12-10 17:15:08.000000000 +0000
-+++ git/libmwbpages/Makefile.am 2009-12-10 17:15:15.000000000 +0000
-@@ -28,10 +28,10 @@
- mwb-pages-service.lo : MwbIPagesService.h
- 
- .idl.h :
-       $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
- 
- .idl.xpt :
-       $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
-+       xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
- 
- xpt_DATA = MwbIPagesService.xpt
- xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
deleted file mode 100644
index 53c8a3531b..0000000000
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git;branch=${MOBLINBROWSERBRANCH} \
-           file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \
-           file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
-           file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r11"
-DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk-0.10 libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin"
-S = "${WORKDIR}/git"
-MOBLINBROWSERBRANCH ?= "master"
-EXTRA_OECONF = "--with-idl-prefix=${STAGING_DIR_TARGET}/"
-FILES_${PN} += "${datadir}/moblin-web-browser/chrome/* ${libdir}/xulrunner-*/chrome/* ${datadir}/dbus-1/services/*"
-FILES_${PN} += "${datadir}/moblin-web-browser/components/* ${libdir}/xulrunner-*/components/*"
-FILES_${PN}-dbg += "${datadir}/moblin-web-browser/components/.debug/* ${libdir}/xulrunner-*/components/.debug/*"
-inherit autotools
diff --git a/meta-moblin/packages/mojito/mojito.inc b/meta-moblin/packages/mojito/mojito.inc
deleted file mode 100644
index f823e7437d..0000000000
--- a/meta-moblin/packages/mojito/mojito.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_URI = "http://download.moblin.org/sources/mojito/0.21/mojito-0.21.7.tar.bz2"
-DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring"
-RDEPENDS_${PN} = "connman"
-inherit autotools
-FILES_${PN} += "${datadir}/dbus-1/services"
-FILES_${PN}-dbg += "${libdir}/mojito/sources/.debug/* ${libdir}/mojito/services/.debug/"
-PARALLEL_MAKE = ""
-EXTRA_OECONF = "--with-online=connman --disable-shave"
diff --git a/meta-moblin/packages/mojito/mojito_0.21.7.bb b/meta-moblin/packages/mojito/mojito_0.21.7.bb
deleted file mode 100644
index 9f880e72da..0000000000
--- a/meta-moblin/packages/mojito/mojito_0.21.7.bb
+++ /dev/null
@@ -1 +0,0 @@
-require mojito.inc
diff --git a/meta-moblin/packages/mojito/mojito_git.bb b/meta-moblin/packages/mojito/mojito_git.bb
deleted file mode 100644
index ddaf688bfa..0000000000
--- a/meta-moblin/packages/mojito/mojito_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require mojito.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.21.7+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/monit/monit-4.10.1/init b/meta-moblin/packages/monit/monit-4.10.1/init
deleted file mode 100644
index 325a552b28..0000000000
--- a/meta-moblin/packages/monit/monit-4.10.1/init
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh 
-#
-# This is an init script for openembedded
-# Copy it to /etc/init.d/monit and type
-# > update-rc.d monit defaults 99
-#
-monit=/usr/bin/monit
-pidfile=/var/run/monit.pid
-monit_args="-c /etc/monitrc"
-test -x "$monit" || exit 0
-case "$1" in
-  start)
-    echo -n "Starting Monit"
-    start-stop-daemon --start --quiet --exec $monit -- $monit_args
-    RETVAL=$?
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping Monit"
-    start-stop-daemon --stop --quiet --pidfile $pidfile
-    RETVAL=$?
-    echo "."
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    RETVAL=$?
-    ;;
-  status)
-    $monit $monit_args status
-    RETVAL=$?
-    echo "."
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|status}"
-    exit 1
-esac
-exit $RETVAL
diff --git a/meta-moblin/packages/monit/monit-4.10.1/nostrip.patch b/meta-moblin/packages/monit/monit-4.10.1/nostrip.patch
deleted file mode 100644
index 95e7eb0f10..0000000000
--- a/meta-moblin/packages/monit/monit-4.10.1/nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: monit-4.10.1/Makefile.in
-===================================================================
--- monit-4.10.1.orig/Makefile.in       2009-05-24 15:49:03.000000000 +0100
-+++ monit-4.10.1/Makefile.in    2009-05-24 15:49:12.000000000 +0100
-@@ -39,7 +39,7 @@
- MODE_DIRS       = 755
- 
- INSTALL         = @INSTALL@ 
-INSTALL_PROG    = $(INSTALL) -m $(MODE_PROGS) -s
-+INSTALL_PROG    = $(INSTALL) -m $(MODE_PROGS)
- INSTALL_FILE    = $(INSTALL) -m $(MODE_FILES)
- INSTALL_DIR     = $(INSTALL) -m $(MODE_DIRS) -d
- 
diff --git a/meta-moblin/packages/monit/monit_4.10.1.bb b/meta-moblin/packages/monit/monit_4.10.1.bb
deleted file mode 100644
index 84a6231a2a..0000000000
--- a/meta-moblin/packages/monit/monit_4.10.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-LICENSE = "GPL"
-DEPENDS = "openssl"
-SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz \
-           file://nostrip.patch;patch=1 \
-           file://init"
-PR = "r1"
-INITSCRIPT_NAME = "monit"
-INITSCRIPT_PARAMS = "defaults 99"
-inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl-lib-dir=${STAGING_LIBDIR} --with-ssl-incl-dir=${STAGING_INCDIR}" 
-do_install_append() {
-        install -d ${D}${sysconfdir}/init.d/
-        install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/monit
-        sed -i 's:# set daemon  120:set daemon  120:' ${S}/monitrc
-        sed -i 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' ${S}/monitrc
-        install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc
-        install -m 700 -d ${D}${sysconfdir}/monit.d/
-}
-CONFFILES_${PN} += "${sysconfdir}/monitrc"
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless-services/confighack.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless-services/confighack.patch
deleted file mode 100644
index dcfe11e0ff..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless-services/confighack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: places-glib/configure.ac
-===================================================================
--- places-glib.orig/configure.ac       2009-04-17 10:29:15.000000000 +0100
-+++ places-glib/configure.ac    2009-04-17 10:29:44.000000000 +0100
-@@ -99,6 +99,8 @@
- PKG_CHECK_MODULES(GLIB, [glib-2.0])
- PKG_CHECK_MODULES(DBUS, [dbus-glib-1])
- 
-+XUL_LIBS="$XUL_LIBS -lmozjs"
-+
- MOZHOME=`${PKG_CONFIG} --variable=prefix mozilla-headless`"/lib/xulrunner-"`${PKG_CONFIG} --modversion mozilla-headless`
- AC_SUBST([MOZHOME])
- 
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless-services_git.bb b/meta-moblin/packages/mozilla-headless/mozilla-headless-services_git.bb
deleted file mode 100644
index 14d64fa8c3..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless-services_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SRC_URI = "git://git.moblin.org/mozilla-headless-services.git;protocol=git \
-           file://confighack.patch;patch=1"
-PV = "0.1+git${SRCPV}"
-PR = "r1"
-DEPENDS = "glib-2.0 dbus mozilla-headless json-glib"
-EXTRA_OECONF = "--enable-gnome-proxy"
-S = "${WORKDIR}/git"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
deleted file mode 100644
index db9e147990..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
+++ /dev/null
@@ -1,1478 +0,0 @@
-From fb41f028badb4dfddfc47fb2a1a68c1aa90dcef5 Mon Sep 17 00:00:00 2001
-From: Robert Bragg <robert@linux.intel.com>
-Date: Fri, 8 May 2009 13:57:22 +0100
-Subject: [PATCH] Adds initial Gtk clipboard support to moz-headless
-If build with MOZ_X11 enabled then this now builds the clipboard code taken
-from the gtk2 backend.  This doesn't provide any embedding API yet to expose
-the clipboard.
---
- widget/src/headless/Makefile.in         |    6 +
- widget/src/headless/nsClipboard.cpp     |  948 +++++++++++++++++++++++++++++++
- widget/src/headless/nsClipboard.h       |   93 +++
- widget/src/headless/nsIImageToPixbuf.h  |   62 ++
- widget/src/headless/nsImageToPixbuf.cpp |  196 +++++++
- widget/src/headless/nsImageToPixbuf.h   |   71 +++
- widget/src/headless/nsWidgetFactory.cpp |   18 +
- 7 files changed, 1394 insertions(+), 0 deletions(-)
- create mode 100644 widget/src/headless/nsClipboard.cpp
- create mode 100644 widget/src/headless/nsClipboard.h
- create mode 100644 widget/src/headless/nsIImageToPixbuf.h
- create mode 100644 widget/src/headless/nsImageToPixbuf.cpp
- create mode 100644 widget/src/headless/nsImageToPixbuf.h
-Index: offscreen/widget/src/headless/Makefile.in
-===================================================================
--- offscreen.orig/widget/src/headless/Makefile.in      2009-05-16 18:23:25.000000000 +0100
-+++ offscreen/widget/src/headless/Makefile.in   2009-06-12 14:14:05.000000000 +0100
-@@ -95,6 +95,12 @@
-                nsScreenManagerHeadless.cpp \
-                $(NULL)
- 
-+ifdef MOZ_X11
-+CPPSRCS +=      nsClipboard.cpp \
-+               nsImageToPixbuf.cpp \
-+                $(NULL)
-+endif
-+
- # build our subdirs, too
- SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
- 
-Index: offscreen/widget/src/headless/nsClipboard.cpp
-===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsClipboard.cpp       2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,948 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* vim:expandtab:shiftwidth=4:tabstop=4:
-+ */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Christopher Blizzard
-+ * <blizzard@mozilla.org>.  Portions created by the Initial Developer
-+ * are Copyright (C) 2001 the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include "nsClipboard.h"
-+#include "nsSupportsPrimitives.h"
-+#include "nsString.h"
-+#include "nsReadableUtils.h"
-+#include "nsXPIDLString.h"
-+#include "nsPrimitiveHelpers.h"
-+#include "nsICharsetConverterManager.h"
-+#include "nsIServiceManager.h"
-+#include "nsIImage.h"
-+#include "nsImageToPixbuf.h"
-+#include "nsStringStream.h"
-+
-+#include <gtk/gtk.h>
-+
-+// For manipulation of the X event queue
-+#include <X11/Xlib.h>
-+#include <gdk/gdkx.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#ifdef POLL_WITH_XCONNECTIONNUMBER
-+#include <poll.h>
-+#endif
-+
-+// Callback when someone asks us for the selection
-+void
-+invisible_selection_get_cb (GtkWidget          *aWidget,
-+                            GtkSelectionData   *aSelectionData,
-+                            guint               aTime,
-+                            guint               aInfo,
-+                            nsClipboard        *aClipboard);
-+
-+gboolean
-+selection_clear_event_cb   (GtkWidget          *aWidget,
-+                            GdkEventSelection  *aEvent,
-+                            nsClipboard        *aClipboard);
-+
-+static void
-+ConvertHTMLtoUCS2          (guchar             *data,
-+                            PRInt32             dataLength,
-+                            PRUnichar         **unicodeData,
-+                            PRInt32            &outUnicodeLen);
-+
-+static void
-+GetHTMLCharset             (guchar * data, PRInt32 dataLength, nsCString& str);
-+
-+
-+// Our own versions of gtk_clipboard_wait_for_contents and
-+// gtk_clipboard_wait_for_text, which don't run the event loop while
-+// waiting for the data.  This prevents a lot of problems related to
-+// dispatching events at unexpected times.
-+
-+static GtkSelectionData *
-+wait_for_contents          (GtkClipboard *clipboard, GdkAtom target);
-+
-+static gchar *
-+wait_for_text              (GtkClipboard *clipboard);
-+
-+static Bool
-+checkEventProc(Display *display, XEvent *event, XPointer arg);
-+
-+struct retrieval_context
-+{
-+    PRBool   completed;
-+    void    *data;
-+
-+    retrieval_context() : completed(PR_FALSE), data(nsnull) { }
-+};
-+
-+static void
-+wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *transferData);
-+
-+static void
-+clipboard_contents_received(GtkClipboard     *clipboard,
-+                            GtkSelectionData *selection_data,
-+                            gpointer          data);
-+
-+static void
-+clipboard_text_received(GtkClipboard *clipboard,
-+                        const gchar  *text,
-+                        gpointer      data);
-+
-+nsClipboard::nsClipboard()
-+{
-+    mWidget = nsnull;
-+}
-+
-+nsClipboard::~nsClipboard()
-+{
-+    if (mWidget)
-+        gtk_widget_destroy(mWidget);
-+}
-+
-+NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard)
-+
-+nsresult
-+nsClipboard::Init(void)
-+{
-+    mWidget = gtk_invisible_new();
-+    if (!mWidget)
-+        return NS_ERROR_FAILURE;
-+
-+    g_signal_connect(G_OBJECT(mWidget), "selection_get",
-+                     G_CALLBACK(invisible_selection_get_cb), this);
-+
-+    g_signal_connect(G_OBJECT(mWidget), "selection_clear_event",
-+                     G_CALLBACK(selection_clear_event_cb), this);
-+
-+    // XXX make sure to set up the selection_clear event
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::SetData(nsITransferable *aTransferable,
-+                     nsIClipboardOwner *aOwner, PRInt32 aWhichClipboard)
-+{
-+    // See if we can short cut
-+    if ((aWhichClipboard == kGlobalClipboard &&
-+         aTransferable == mGlobalTransferable.get() &&
-+         aOwner == mGlobalOwner.get()) ||
-+        (aWhichClipboard == kSelectionClipboard &&
-+         aTransferable == mSelectionTransferable.get() &&
-+         aOwner == mSelectionOwner.get())) {
-+        return NS_OK;
-+    }
-+
-+    nsresult rv;
-+    if (!mPrivacyHandler) {
-+        rv = NS_NewClipboardPrivacyHandler(getter_AddRefs(mPrivacyHandler));
-+        NS_ENSURE_SUCCESS(rv, rv);
-+    }
-+    rv = mPrivacyHandler->PrepareDataForClipboard(aTransferable);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    // Clear out the clipboard in order to set the new data
-+    EmptyClipboard(aWhichClipboard);
-+
-+    if (aWhichClipboard == kSelectionClipboard) {
-+        mSelectionOwner = aOwner;
-+        mSelectionTransferable = aTransferable;
-+    }
-+    else {
-+        mGlobalOwner = aOwner;
-+        mGlobalTransferable = aTransferable;
-+    }
-+
-+    // Which selection are we about to claim, CLIPBOARD or PRIMARY?
-+    GdkAtom selectionAtom = GetSelectionAtom(aWhichClipboard);
-+
-+    // Make ourselves the owner.  If we fail to, return.
-+    if (!gtk_selection_owner_set(mWidget, selectionAtom, GDK_CURRENT_TIME))
-+        return NS_ERROR_FAILURE;
-+
-+    // Clear the old selection target list.
-+    gtk_selection_clear_targets(mWidget, selectionAtom);
-+
-+    // Get the types of supported flavors
-+    nsCOMPtr<nsISupportsArray> flavors;
-+
-+    rv = aTransferable->FlavorsTransferableCanExport(getter_AddRefs(flavors));
-+    if (!flavors || NS_FAILED(rv))
-+        return NS_ERROR_FAILURE;
-+
-+    // Add all the flavors to this widget's supported type.
-+    PRUint32 count;
-+    flavors->Count(&count);
-+    for (PRUint32 i=0; i < count; i++) {
-+        nsCOMPtr<nsISupports> tastesLike;
-+        flavors->GetElementAt(i, getter_AddRefs(tastesLike));
-+        nsCOMPtr<nsISupportsCString> flavor = do_QueryInterface(tastesLike);
-+
-+        if (flavor) {
-+            nsXPIDLCString flavorStr;
-+            flavor->ToString(getter_Copies(flavorStr));
-+
-+            // special case text/unicode since we can handle all of
-+            // the string types
-+            if (!strcmp(flavorStr, kUnicodeMime)) {
-+                AddTarget(gdk_atom_intern("UTF8_STRING", FALSE),
-+                          selectionAtom);
-+                AddTarget(gdk_atom_intern("COMPOUND_TEXT", FALSE),
-+                          selectionAtom);
-+                AddTarget(gdk_atom_intern("TEXT", FALSE), selectionAtom);
-+                AddTarget(GDK_SELECTION_TYPE_STRING, selectionAtom);
-+                // next loop iteration
-+                continue;
-+            }
-+
-+            // very special case for this one. since our selection mechanism doesn't work for images,
-+            // we must use GTK's clipboard utility functions
-+            if (!strcmp(flavorStr, kNativeImageMime) || !strcmp(flavorStr, kPNGImageMime) ||
-+                !strcmp(flavorStr, kJPEGImageMime) || !strcmp(flavorStr, kGIFImageMime)) {
-+                nsCOMPtr<nsISupports> item;
-+                PRUint32 len;
-+                rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(item), &len);
-+                nsCOMPtr<nsISupportsInterfacePointer> ptrPrimitive(do_QueryInterface(item));
-+                if (!ptrPrimitive)
-+                    continue;
-+
-+                nsCOMPtr<nsISupports> primitiveData;
-+                ptrPrimitive->GetData(getter_AddRefs(primitiveData));
-+                nsCOMPtr<nsIImage> image(do_QueryInterface(primitiveData));
-+                if (!image) // Not getting an image for an image mime type!?
-+                    continue;
-+
-+                if (NS_FAILED(image->LockImagePixels(PR_FALSE)))
-+                    continue;
-+                GdkPixbuf* pixbuf = nsImageToPixbuf::ImageToPixbuf(image);
-+                if (!pixbuf) {
-+                    image->UnlockImagePixels(PR_FALSE);
-+                    continue;
-+                }
-+
-+                GtkClipboard *aClipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
-+                gtk_clipboard_set_image(aClipboard, pixbuf);
-+                g_object_unref(pixbuf);
-+                image->UnlockImagePixels(PR_FALSE);
-+                continue;
-+            }
-+
-+            // Add this to our list of valid targets
-+            GdkAtom atom = gdk_atom_intern(flavorStr, FALSE);
-+            AddTarget(atom, selectionAtom);
-+        }
-+    }
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::GetData(nsITransferable *aTransferable, PRInt32 aWhichClipboard)
-+{
-+    if (!aTransferable)
-+        return NS_ERROR_FAILURE;
-+
-+    GtkClipboard *clipboard;
-+    clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
-+
-+    guchar        *data = NULL;
-+    gint           length = 0;
-+    PRBool         foundData = PR_FALSE;
-+    nsCAutoString  foundFlavor;
-+
-+    // Get a list of flavors this transferable can import
-+    nsCOMPtr<nsISupportsArray> flavors;
-+    nsresult rv;
-+    rv = aTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavors));
-+    if (!flavors || NS_FAILED(rv))
-+        return NS_ERROR_FAILURE;
-+
-+    PRUint32 count;
-+    flavors->Count(&count);
-+    for (PRUint32 i=0; i < count; i++) {
-+        nsCOMPtr<nsISupports> genericFlavor;
-+        flavors->GetElementAt(i, getter_AddRefs(genericFlavor));
-+
-+        nsCOMPtr<nsISupportsCString> currentFlavor;
-+        currentFlavor = do_QueryInterface(genericFlavor);
-+
-+        if (currentFlavor) {
-+            nsXPIDLCString flavorStr;
-+            currentFlavor->ToString(getter_Copies(flavorStr));
-+
-+            // Special case text/unicode since we can convert any
-+            // string into text/unicode
-+            if (!strcmp(flavorStr, kUnicodeMime)) {
-+                gchar* new_text = wait_for_text(clipboard);
-+                if (new_text) {
-+                    // Convert utf-8 into our unicode format.
-+                    NS_ConvertUTF8toUTF16 ucs2string(new_text);
-+                    data = (guchar *)ToNewUnicode(ucs2string);
-+                    length = ucs2string.Length() * 2;
-+                    g_free(new_text);
-+                    foundData = PR_TRUE;
-+                    foundFlavor = kUnicodeMime;
-+                    break;
-+                }
-+                // If the type was text/unicode and we couldn't get
-+                // text off the clipboard, run the next loop
-+                // iteration.
-+                continue;
-+            }
-+
-+            // For images, we must wrap the data in an nsIInputStream then return instead of break,
-+            // because that code below won't help us.
-+            if (!strcmp(flavorStr, kJPEGImageMime) || !strcmp(flavorStr, kPNGImageMime) || !strcmp(flavorStr, kGIFImageMime)) {
-+                GdkAtom atom;
-+                if (!strcmp(flavorStr, kJPEGImageMime)) // This is image/jpg, but X only understands image/jpeg
-+                    atom = gdk_atom_intern("image/jpeg", FALSE);
-+                else
-+                    atom = gdk_atom_intern(flavorStr, FALSE);
-+
-+                GtkSelectionData *selectionData = wait_for_contents(clipboard, atom);
-+                if (!selectionData)
-+                    continue;
-+
-+                nsCOMPtr<nsIInputStream> byteStream;
-+                NS_NewByteInputStream(getter_AddRefs(byteStream), (const char*)selectionData->data,
-+                                      selectionData->length, NS_ASSIGNMENT_COPY);
-+                aTransferable->SetTransferData(flavorStr, byteStream, sizeof(nsIInputStream*));
-+                gtk_selection_data_free(selectionData);
-+                return NS_OK;
-+            }
-+
-+            // Get the atom for this type and try to request it off
-+            // the clipboard.
-+            GdkAtom atom = gdk_atom_intern(flavorStr, FALSE);
-+            GtkSelectionData *selectionData;
-+            selectionData = wait_for_contents(clipboard, atom);
-+            if (selectionData) {
-+                length = selectionData->length;
-+                // Special case text/html since we can convert into UCS2
-+                if (!strcmp(flavorStr, kHTMLMime)) {
-+                    PRUnichar* htmlBody= nsnull;
-+                    PRInt32 htmlBodyLen = 0;
-+                    // Convert text/html into our unicode format
-+                    ConvertHTMLtoUCS2((guchar *)selectionData->data, length,
-+                                      &htmlBody, htmlBodyLen);
-+                    if (!htmlBodyLen)
-+                        break;
-+                    data = (guchar *)htmlBody;
-+                    length = htmlBodyLen * 2;
-+                } else {
-+                    data = (guchar *)nsMemory::Alloc(length);
-+                    if (!data)
-+                        break;
-+                    memcpy(data, selectionData->data, length);
-+                }
-+                foundData = PR_TRUE;
-+                foundFlavor = flavorStr;
-+                break;
-+            }
-+        }
-+    }
-+
-+    if (foundData) {
-+        nsCOMPtr<nsISupports> wrapper;
-+        nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor.get(),
-+                                                   data, length,
-+                                                   getter_AddRefs(wrapper));
-+        aTransferable->SetTransferData(foundFlavor.get(),
-+                                       wrapper, length);
-+    }
-+
-+    if (data)
-+        nsMemory::Free(data);
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::EmptyClipboard(PRInt32 aWhichClipboard)
-+{
-+    if (aWhichClipboard == kSelectionClipboard) {
-+        if (mSelectionOwner) {
-+            mSelectionOwner->LosingOwnership(mSelectionTransferable);
-+            mSelectionOwner = nsnull;
-+        }
-+        mSelectionTransferable = nsnull;
-+    }
-+    else {
-+        if (mGlobalOwner) {
-+            mGlobalOwner->LosingOwnership(mGlobalTransferable);
-+            mGlobalOwner = nsnull;
-+        }
-+        mGlobalTransferable = nsnull;
-+    }
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, PRUint32 aLength,
-+                                    PRInt32 aWhichClipboard, PRBool *_retval)
-+{
-+    if (!aFlavorList || !_retval)
-+        return NS_ERROR_NULL_POINTER;
-+
-+    *_retval = PR_FALSE;
-+
-+    GtkSelectionData *selection_data =
-+        GetTargets(GetSelectionAtom(aWhichClipboard));
-+    if (!selection_data)
-+        return NS_OK;
-+
-+    gint n_targets = 0;
-+    GdkAtom *targets = NULL;
-+
-+    if (!gtk_selection_data_get_targets(selection_data, 
-+                                        &targets, &n_targets) ||
-+        !n_targets)
-+        return NS_OK;
-+
-+    // Walk through the provided types and try to match it to a
-+    // provided type.
-+    for (PRUint32 i = 0; i < aLength && !*_retval; i++) {
-+        // We special case text/unicode here.
-+        if (!strcmp(aFlavorList[i], kUnicodeMime) && 
-+            gtk_selection_data_targets_include_text(selection_data)) {
-+            *_retval = PR_TRUE;
-+            break;
-+        }
-+
-+        for (PRInt32 j = 0; j < n_targets; j++) {
-+            gchar *atom_name = gdk_atom_name(targets[j]);
-+            if (!strcmp(atom_name, aFlavorList[i]))
-+                *_retval = PR_TRUE;
-+
-+            // X clipboard wants image/jpeg, not image/jpg
-+            if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg"))
-+                *_retval = PR_TRUE;
-+
-+            g_free(atom_name);
-+
-+            if (*_retval)
-+                break;
-+        }
-+    }
-+    gtk_selection_data_free(selection_data);
-+    g_free(targets);
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::SupportsSelectionClipboard(PRBool *_retval)
-+{
-+    *_retval = PR_TRUE; // yeah, unix supports the selection clipboard
-+    return NS_OK;
-+}
-+
-+/* static */
-+GdkAtom
-+nsClipboard::GetSelectionAtom(PRInt32 aWhichClipboard)
-+{
-+    if (aWhichClipboard == kGlobalClipboard)
-+        return GDK_SELECTION_CLIPBOARD;
-+
-+    return GDK_SELECTION_PRIMARY;
-+}
-+
-+/* static */
-+GtkSelectionData *
-+nsClipboard::GetTargets(GdkAtom aWhichClipboard)
-+{
-+    GtkClipboard *clipboard = gtk_clipboard_get(aWhichClipboard);
-+    return wait_for_contents(clipboard, gdk_atom_intern("TARGETS", FALSE));
-+}
-+
-+nsITransferable *
-+nsClipboard::GetTransferable(PRInt32 aWhichClipboard)
-+{
-+    nsITransferable *retval;
-+
-+    if (aWhichClipboard == kSelectionClipboard)
-+        retval = mSelectionTransferable.get();
-+    else
-+        retval = mGlobalTransferable.get();
-+        
-+    return retval;
-+}
-+
-+void
-+nsClipboard::AddTarget(GdkAtom aName, GdkAtom aClipboard)
-+{
-+    gtk_selection_add_target(mWidget, aClipboard, aName, 0);
-+}
-+
-+void
-+nsClipboard::SelectionGetEvent (GtkWidget        *aWidget,
-+                                GtkSelectionData *aSelectionData,
-+                                guint             aTime)
-+{
-+    // Someone has asked us to hand them something.  The first thing
-+    // that we want to do is see if that something includes text.  If
-+    // it does, try to give it text/unicode after converting it to
-+    // utf-8.
-+
-+    PRInt32 whichClipboard;
-+
-+    // which clipboard?
-+    if (aSelectionData->selection == GDK_SELECTION_PRIMARY)
-+        whichClipboard = kSelectionClipboard;
-+    else if (aSelectionData->selection == GDK_SELECTION_CLIPBOARD)
-+        whichClipboard = kGlobalClipboard;
-+    else
-+        return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
-+
-+    nsCOMPtr<nsITransferable> trans = GetTransferable(whichClipboard);
-+    
-+    nsresult rv;
-+    nsCOMPtr<nsISupports> item;
-+    PRUint32 len;
-+
-+    // Check to see if the selection data includes any of the string
-+    // types that we support.
-+    if (aSelectionData->target == gdk_atom_intern ("STRING", FALSE) ||
-+        aSelectionData->target == gdk_atom_intern ("TEXT", FALSE) ||
-+        aSelectionData->target == gdk_atom_intern ("COMPOUND_TEXT", FALSE) ||
-+        aSelectionData->target == gdk_atom_intern ("UTF8_STRING", FALSE)) {
-+        // Try to convert our internal type into a text string.  Get
-+        // the transferable for this clipboard and try to get the
-+        // text/unicode type for it.
-+        rv = trans->GetTransferData("text/unicode", getter_AddRefs(item),
-+                                    &len);
-+        if (!item || NS_FAILED(rv))
-+            return;
-+        
-+        nsCOMPtr<nsISupportsString> wideString;
-+        wideString = do_QueryInterface(item);
-+        if (!wideString)
-+            return;
-+
-+        nsAutoString ucs2string;
-+        wideString->GetData(ucs2string);
-+        char *utf8string = ToNewUTF8String(ucs2string);
-+        if (!utf8string)
-+            return;
-+        
-+        gtk_selection_data_set_text (aSelectionData, utf8string,
-+                                     strlen(utf8string));
-+
-+        nsMemory::Free(utf8string);
-+        return;
-+    }
-+
-+    // Try to match up the selection data target to something our
-+    // transferable provides.
-+    gchar *target_name = gdk_atom_name(aSelectionData->target);
-+    if (!target_name)
-+        return;
-+
-+    rv = trans->GetTransferData(target_name, getter_AddRefs(item), &len);
-+    // nothing found?
-+    if (!item || NS_FAILED(rv)) {
-+        g_free(target_name);
-+        return;
-+    }
-+
-+    void *primitive_data = nsnull;
-+    nsPrimitiveHelpers::CreateDataFromPrimitive(target_name, item,
-+                                                &primitive_data, len);
-+
-+    if (primitive_data) {
-+        // Check to see if the selection data is text/html
-+        if (aSelectionData->target == gdk_atom_intern (kHTMLMime, FALSE)) {
-+            /*
-+             * "text/html" can be encoded UCS2. It is recommended that
-+             * documents transmitted as UCS2 always begin with a ZERO-WIDTH
-+             * NON-BREAKING SPACE character (hexadecimal FEFF, also called
-+             * Byte Order Mark (BOM)). Adding BOM can help other app to
-+             * detect mozilla use UCS2 encoding when copy-paste.
-+             */
-+            guchar *buffer = (guchar *)
-+                    nsMemory::Alloc((len * sizeof(guchar)) + sizeof(PRUnichar));
-+            if (!buffer)
-+                return;
-+            PRUnichar prefix = 0xFEFF;
-+            memcpy(buffer, &prefix, sizeof(prefix));
-+            memcpy(buffer + sizeof(prefix), primitive_data, len);
-+            nsMemory::Free((guchar *)primitive_data);
-+            primitive_data = (guchar *)buffer;
-+            len += sizeof(prefix);
-+        }
-+  
-+        gtk_selection_data_set(aSelectionData, aSelectionData->target,
-+                               8, /* 8 bits in a unit */
-+                               (const guchar *)primitive_data, len);
-+        nsMemory::Free(primitive_data);
-+    }
-+
-+    g_free(target_name);
-+                           
-+}
-+
-+void
-+nsClipboard::SelectionClearEvent (GtkWidget         *aWidget,
-+                                  GdkEventSelection *aEvent)
-+{
-+    PRInt32 whichClipboard;
-+
-+    // which clipboard?
-+    if (aEvent->selection == GDK_SELECTION_PRIMARY)
-+        whichClipboard = kSelectionClipboard;
-+    else if (aEvent->selection == GDK_SELECTION_CLIPBOARD)
-+        whichClipboard = kGlobalClipboard;
-+    else
-+        return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
-+
-+    EmptyClipboard(whichClipboard);
-+}
-+
-+void
-+invisible_selection_get_cb (GtkWidget          *aWidget,
-+                            GtkSelectionData   *aSelectionData,
-+                            guint               aTime,
-+                            guint               aInfo,
-+                            nsClipboard        *aClipboard)
-+{
-+    aClipboard->SelectionGetEvent(aWidget, aSelectionData, aTime);
-+}
-+
-+gboolean
-+selection_clear_event_cb   (GtkWidget          *aWidget,
-+                            GdkEventSelection  *aEvent,
-+                            nsClipboard        *aClipboard)
-+{
-+    aClipboard->SelectionClearEvent(aWidget, aEvent);
-+    return TRUE;
-+}
-+
-+/*
-+ * when copy-paste, mozilla wants data encoded using UCS2,
-+ * other app such as StarOffice use "text/html"(RFC2854).
-+ * This function convert data(got from GTK clipboard)
-+ * to data mozilla wanted.
-+ *
-+ * data from GTK clipboard can be 3 forms:
-+ *  1. From current mozilla
-+ *     "text/html", charset = utf-16
-+ *  2. From old version mozilla or mozilla-based app
-+ *     content("body" only), charset = utf-16
-+ *  3. From other app who use "text/html" when copy-paste
-+ *     "text/html", has "charset" info
-+ *
-+ * data      : got from GTK clipboard
-+ * dataLength: got from GTK clipboard
-+ * body      : pass to Mozilla
-+ * bodyLength: pass to Mozilla
-+ */
-+void ConvertHTMLtoUCS2(guchar * data, PRInt32 dataLength,
-+                       PRUnichar** unicodeData, PRInt32& outUnicodeLen)
-+{
-+    nsCAutoString charset;
-+    GetHTMLCharset(data, dataLength, charset);// get charset of HTML
-+    if (charset.EqualsLiteral("UTF-16")) {//current mozilla
-+        outUnicodeLen = (dataLength / 2) - 1;
-+        *unicodeData = reinterpret_cast<PRUnichar*>
-+                                       (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
-+                       sizeof(PRUnichar)));
-+        if (*unicodeData) {
-+            memcpy(*unicodeData, data + sizeof(PRUnichar),
-+                   outUnicodeLen * sizeof(PRUnichar));
-+            (*unicodeData)[outUnicodeLen] = '\0';
-+        }
-+    } else if (charset.EqualsLiteral("UNKNOWN")) {
-+        outUnicodeLen = 0;
-+        return;
-+    } else {
-+        // app which use "text/html" to copy&paste
-+        nsCOMPtr<nsIUnicodeDecoder> decoder;
-+        nsresult rv;
-+        // get the decoder
-+        nsCOMPtr<nsICharsetConverterManager> ccm =
-+            do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv);
-+        if (NS_FAILED(rv)) {
-+#ifdef DEBUG_CLIPBOARD
-+            g_print("        can't get CHARSET CONVERTER MANAGER service\n");
-+#endif
-+            outUnicodeLen = 0;
-+            return;
-+        }
-+        rv = ccm->GetUnicodeDecoder(charset.get(), getter_AddRefs(decoder));
-+        if (NS_FAILED(rv)) {
-+#ifdef DEBUG_CLIPBOARD
-+            g_print("        get unicode decoder error\n");
-+#endif
-+            outUnicodeLen = 0;
-+            return;
-+        }
-+        // converting
-+        decoder->GetMaxLength((const char *)data, dataLength, &outUnicodeLen);
-+        // |outUnicodeLen| is number of chars
-+        if (outUnicodeLen) {
-+            *unicodeData = reinterpret_cast<PRUnichar*>
-+                                           (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
-+                           sizeof(PRUnichar)));
-+            if (*unicodeData) {
-+                PRInt32 numberTmp = dataLength;
-+                decoder->Convert((const char *)data, &numberTmp,
-+                                 *unicodeData, &outUnicodeLen);
-+#ifdef DEBUG_CLIPBOARD
-+                if (numberTmp != dataLength)
-+                    printf("didn't consume all the bytes\n");
-+#endif
-+                // null terminate. Convert() doesn't do it for us
-+                (*unicodeData)[outUnicodeLen] = '\0';
-+            }
-+        } // if valid length
-+    }
-+}
-+
-+/*
-+ * get "charset" information from clipboard data
-+ * return value can be:
-+ *  1. "UTF-16":      mozilla or "text/html" with "charset=utf-16"
-+ *  2. "UNKNOWN":     mozilla can't detect what encode it use
-+ *  3. other:         "text/html" with other charset than utf-16
-+ */
-+void GetHTMLCharset(guchar * data, PRInt32 dataLength, nsCString& str)
-+{
-+    // if detect "FFFE" or "FEFF", assume UTF-16
-+    PRUnichar* beginChar =  (PRUnichar*)data;
-+    if ((beginChar[0] == 0xFFFE) || (beginChar[0] == 0xFEFF)) {
-+        str.AssignLiteral("UTF-16");
-+        return;
-+    }
-+    // no "FFFE" and "FEFF", assume ASCII first to find "charset" info
-+    const nsDependentCString htmlStr((const char *)data, dataLength);
-+    nsACString::const_iterator start, end;
-+    htmlStr.BeginReading(start);
-+    htmlStr.EndReading(end);
-+    nsACString::const_iterator valueStart(start), valueEnd(start);
-+
-+    if (CaseInsensitiveFindInReadable(
-+        NS_LITERAL_CSTRING("CONTENT=\"text/html;"),
-+        start, end)) {
-+        start = end;
-+        htmlStr.EndReading(end);
-+
-+        if (CaseInsensitiveFindInReadable(
-+            NS_LITERAL_CSTRING("charset="),
-+            start, end)) {
-+            valueStart = end;
-+            start = end;
-+            htmlStr.EndReading(end);
-+          
-+            if (FindCharInReadable('"', start, end))
-+                valueEnd = start;
-+        }
-+    }
-+    // find "charset" in HTML
-+    if (valueStart != valueEnd) {
-+        str = Substring(valueStart, valueEnd);
-+        ToUpperCase(str);
-+#ifdef DEBUG_CLIPBOARD
-+        printf("Charset of HTML = %s\n", charsetUpperStr.get());
-+#endif
-+        return;
-+    }
-+    str.AssignLiteral("UNKNOWN");
-+}
-+
-+static void
-+DispatchSelectionNotifyEvent(GtkWidget *widget, XEvent *xevent)
-+{
-+    GdkEvent event;
-+    event.selection.type = GDK_SELECTION_NOTIFY;
-+    event.selection.window = widget->window;
-+    event.selection.selection = gdk_x11_xatom_to_atom(xevent->xselection.selection);
-+    event.selection.target = gdk_x11_xatom_to_atom(xevent->xselection.target);
-+    event.selection.property = gdk_x11_xatom_to_atom(xevent->xselection.property);
-+    event.selection.time = xevent->xselection.time;
-+
-+    gtk_widget_event(widget, &event);
-+}
-+
-+static void
-+DispatchPropertyNotifyEvent(GtkWidget *widget, XEvent *xevent)
-+{
-+    if (((GdkWindowObject *) widget->window)->event_mask & GDK_PROPERTY_CHANGE_MASK) {
-+        GdkEvent event;
-+        event.property.type = GDK_PROPERTY_NOTIFY;
-+        event.property.window = widget->window;
-+        event.property.atom = gdk_x11_xatom_to_atom(xevent->xproperty.atom);
-+        event.property.time = xevent->xproperty.time;
-+        event.property.state = xevent->xproperty.state;
-+
-+        gtk_widget_event(widget, &event);
-+    }
-+}
-+
-+struct checkEventContext
-+{
-+    GtkWidget *cbWidget;
-+    Atom       selAtom;
-+};
-+
-+static Bool
-+checkEventProc(Display *display, XEvent *event, XPointer arg)
-+{
-+    checkEventContext *context = (checkEventContext *) arg;
-+
-+    if (event->xany.type == SelectionNotify ||
-+        (event->xany.type == PropertyNotify &&
-+         event->xproperty.atom == context->selAtom)) {
-+
-+        GdkWindow *cbWindow = gdk_window_lookup(event->xany.window);
-+        if (cbWindow) {
-+            GtkWidget *cbWidget = NULL;
-+            gdk_window_get_user_data(cbWindow, (gpointer *)&cbWidget);
-+            if (cbWidget && GTK_IS_WIDGET(cbWidget)) {
-+                context->cbWidget = cbWidget;
-+                return True;
-+            }
-+        }
-+    }
-+
-+    return False;
-+}
-+
-+// Idle timeout for receiving selection and property notify events (microsec)
-+static const int kClipboardTimeout = 500000;
-+
-+static void
-+wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *r_context)
-+{
-+    if (r_context->completed)  // the request completed synchronously
-+        return;
-+
-+    Display *xDisplay = GDK_DISPLAY();
-+    checkEventContext context;
-+    context.cbWidget = NULL;
-+    context.selAtom = gdk_x11_atom_to_xatom(gdk_atom_intern("GDK_SELECTION",
-+                                                            FALSE));
-+
-+    // Send X events which are relevant to the ongoing selection retrieval
-+    // to the clipboard widget.  Wait until either the operation completes, or
-+    // we hit our timeout.  All other X events remain queued.
-+
-+    int select_result;
-+
-+#ifdef POLL_WITH_XCONNECTIONNUMBER
-+    struct pollfd fds[1];
-+    fds[0].fd = XConnectionNumber(xDisplay);
-+    fds[0].events = POLLIN;
-+#else
-+    int cnumber = ConnectionNumber(xDisplay);
-+    fd_set select_set;
-+    FD_ZERO(&select_set);
-+    FD_SET(cnumber, &select_set);
-+    ++cnumber;
-+    struct timeval tv;
-+#endif
-+
-+    do {
-+        XEvent xevent;
-+
-+        while (XCheckIfEvent(xDisplay, &xevent, checkEventProc,
-+                             (XPointer) &context)) {
-+
-+            if (xevent.xany.type == SelectionNotify)
-+                DispatchSelectionNotifyEvent(context.cbWidget, &xevent);
-+            else
-+                DispatchPropertyNotifyEvent(context.cbWidget, &xevent);
-+
-+            if (r_context->completed)
-+                return;
-+        }
-+
-+#ifdef POLL_WITH_XCONNECTIONNUMBER
-+        select_result = poll(fds, 1, kClipboardTimeout / 1000);
-+#else
-+        tv.tv_sec = 0;
-+        tv.tv_usec = kClipboardTimeout;
-+        select_result = select(cnumber, &select_set, NULL, NULL, &tv);
-+#endif
-+    } while (select_result == 1);
-+
-+#ifdef DEBUG_CLIPBOARD
-+    printf("exceeded clipboard timeout\n");
-+#endif
-+}
-+
-+static void
-+clipboard_contents_received(GtkClipboard     *clipboard,
-+                            GtkSelectionData *selection_data,
-+                            gpointer          data)
-+{
-+    retrieval_context *context = static_cast<retrieval_context *>(data);
-+    context->completed = PR_TRUE;
-+
-+    if (selection_data->length >= 0)
-+        context->data = gtk_selection_data_copy(selection_data);
-+}
-+
-+
-+static GtkSelectionData *
-+wait_for_contents(GtkClipboard *clipboard, GdkAtom target)
-+{
-+    retrieval_context context;
-+    gtk_clipboard_request_contents(clipboard, target,
-+                                   clipboard_contents_received,
-+                                   &context);
-+
-+    wait_for_retrieval(clipboard, &context);
-+    return static_cast<GtkSelectionData *>(context.data);
-+}
-+
-+static void
-+clipboard_text_received(GtkClipboard *clipboard,
-+                        const gchar  *text,
-+                        gpointer      data)
-+{
-+    retrieval_context *context = static_cast<retrieval_context *>(data);
-+    context->completed = PR_TRUE;
-+    context->data = g_strdup(text);
-+}
-+
-+static gchar *
-+wait_for_text(GtkClipboard *clipboard)
-+{
-+    retrieval_context context;
-+    gtk_clipboard_request_text(clipboard, clipboard_text_received, &context);
-+
-+    wait_for_retrieval(clipboard, &context);
-+    return static_cast<gchar *>(context.data);
-+}
-Index: offscreen/widget/src/headless/nsClipboard.h
-===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsClipboard.h 2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,93 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* vim:expandtab:shiftwidth=4:tabstop=4:
-+ */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Christopher Blizzard
-+ * <blizzard@mozilla.org>.  Portions created by the Initial Developer
-+ * are Copyright (C) 2001 the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef __nsClipboard_h_
-+#define __nsClipboard_h_
-+
-+#include "nsIClipboard.h"
-+#include "nsClipboardPrivacyHandler.h"
-+#include "nsAutoPtr.h"
-+#include <gtk/gtk.h>
-+
-+class nsClipboard : public nsIClipboard
-+{
-+public:
-+    nsClipboard();
-+    virtual ~nsClipboard();
-+    
-+    NS_DECL_ISUPPORTS
-+    
-+    NS_DECL_NSICLIPBOARD
-+
-+    // Make sure we are initialized, called from the factory
-+    // constructor
-+    nsresult  Init                (void);
-+    // Someone requested the selection from the hidden widget
-+    void      SelectionGetEvent   (GtkWidget         *aWidget,
-+                                   GtkSelectionData  *aSelectionData,
-+                                   guint              aTime);
-+    void      SelectionClearEvent (GtkWidget         *aWidget,
-+                                   GdkEventSelection *aEvent);
-+
-+
-+private:
-+    // Utility methods
-+    static GdkAtom               GetSelectionAtom (PRInt32 aWhichClipboard);
-+    static GtkSelectionData     *GetTargets       (GdkAtom aWhichClipboard);
-+
-+    // Get our hands on the correct transferable, given a specific
-+    // clipboard
-+    nsITransferable             *GetTransferable  (PRInt32 aWhichClipboard);
-+
-+    // Add a target type to the hidden widget
-+    void                         AddTarget        (GdkAtom aName,
-+                                                   GdkAtom aClipboard);
-+
-+    // The hidden widget where we do all of our operations
-+    GtkWidget                   *mWidget;
-+    // Hang on to our owners and transferables so we can transfer data
-+    // when asked.
-+    nsCOMPtr<nsIClipboardOwner>  mSelectionOwner;
-+    nsCOMPtr<nsIClipboardOwner>  mGlobalOwner;
-+    nsCOMPtr<nsITransferable>    mSelectionTransferable;
-+    nsCOMPtr<nsITransferable>    mGlobalTransferable;
-+    nsRefPtr<nsClipboardPrivacyHandler> mPrivacyHandler;
-+
-+};
-+
-+#endif /* __nsClipboard_h_ */
-Index: offscreen/widget/src/headless/nsIImageToPixbuf.h
-===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsIImageToPixbuf.h    2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,62 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org widget code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Christian Biesinger <cbiesinger@web.de>.
-+ * Portions created by the Initial Developer are Copyright (C) 2006
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef NSIIMAGETOPIXBUF_H_
-+#define NSIIMAGETOPIXBUF_H_
-+
-+#include "nsISupports.h"
-+
-+// dfa4ac93-83f2-4ab8-9b2a-0ff7022aebe2
-+#define NSIIMAGETOPIXBUF_IID \
-+{ 0xdfa4ac93, 0x83f2, 0x4ab8, \
-+  { 0x9b, 0x2a, 0x0f, 0xf7, 0x02, 0x2a, 0xeb, 0xe2 } }
-+
-+class nsIImage;
-+typedef struct _GdkPixbuf GdkPixbuf;
-+
-+/**
-+ * An interface that allows converting an nsIImage to a GdkPixbuf*.
-+ */
-+class nsIImageToPixbuf : public nsISupports {
-+    public:
-+        NS_DECLARE_STATIC_IID_ACCESSOR(NSIIMAGETOPIXBUF_IID)
-+
-+        NS_IMETHOD_(GdkPixbuf*) ConvertImageToPixbuf(nsIImage* aImage) = 0;
-+};
-+
-+NS_DEFINE_STATIC_IID_ACCESSOR(nsIImageToPixbuf, NSIIMAGETOPIXBUF_IID)
-+
-+#endif
-Index: offscreen/widget/src/headless/nsImageToPixbuf.cpp
-===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsImageToPixbuf.cpp   2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,196 @@
-+/* vim:set sw=4 sts=4 et cin: */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org widget code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Christian Biesinger <cbiesinger@web.de>.
-+ * Portions created by the Initial Developer are Copyright (C) 2006
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include <gdk-pixbuf/gdk-pixbuf.h>
-+
-+#include "gfxASurface.h"
-+#include "gfxImageSurface.h"
-+#include "gfxContext.h"
-+
-+#include "nsIImage.h"
-+
-+#include "nsAutoPtr.h"
-+
-+#include "nsImageToPixbuf.h"
-+
-+NS_IMPL_ISUPPORTS1(nsImageToPixbuf, nsIImageToPixbuf)
-+
-+inline unsigned char
-+unpremultiply (unsigned char color,
-+               unsigned char alpha)
-+{
-+    if (alpha == 0)
-+        return 0;
-+    // plus alpha/2 to round instead of truncate
-+    return (color * 255 + alpha / 2) / alpha;
-+}
-+
-+NS_IMETHODIMP_(GdkPixbuf*)
-+nsImageToPixbuf::ConvertImageToPixbuf(nsIImage* aImage)
-+{
-+    return ImageToPixbuf(aImage);
-+}
-+
-+GdkPixbuf*
-+nsImageToPixbuf::ImageToPixbuf(nsIImage* aImage)
-+{
-+    PRInt32 width = aImage->GetWidth(),
-+            height = aImage->GetHeight();
-+
-+    nsRefPtr<gfxPattern> pattern;
-+    aImage->GetPattern(getter_AddRefs(pattern));
-+
-+    return PatternToPixbuf(pattern, width, height);
-+}
-+
-+GdkPixbuf*
-+nsImageToPixbuf::ImgSurfaceToPixbuf(gfxImageSurface* aImgSurface, PRInt32 aWidth, PRInt32 aHeight)
-+{
-+    GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, PR_TRUE, 8,
-+                                       aWidth, aHeight);
-+    if (!pixbuf)
-+        return nsnull;
-+
-+    PRUint32 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-+    guchar* pixels = gdk_pixbuf_get_pixels (pixbuf);
-+
-+    long cairoStride = aImgSurface->Stride();
-+    unsigned char* cairoData = aImgSurface->Data();
-+
-+    gfxASurface::gfxImageFormat format = aImgSurface->Format();
-+
-+    for (PRInt32 row = 0; row < aHeight; ++row) {
-+        for (PRInt32 col = 0; col < aWidth; ++col) {
-+            guchar* pixel = pixels + row * rowstride + 4 * col;
-+
-+            PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
-+                                                   ((cairoData + row * cairoStride + 4 * col));
-+
-+            if (format == gfxASurface::ImageFormatARGB32) {
-+                const PRUint8 a = (*cairoPixel >> 24) & 0xFF;
-+                const PRUint8 r = unpremultiply((*cairoPixel >> 16) & 0xFF, a);
-+                const PRUint8 g = unpremultiply((*cairoPixel >>  8) & 0xFF, a);
-+                const PRUint8 b = unpremultiply((*cairoPixel >>  0) & 0xFF, a);
-+
-+                *pixel++ = r;
-+                *pixel++ = g;
-+                *pixel++ = b;
-+                *pixel++ = a;
-+            } else {
-+                NS_ASSERTION(format == gfxASurface::ImageFormatRGB24,
-+                             "unexpected format");
-+                const PRUint8 r = (*cairoPixel >> 16) & 0xFF;
-+                const PRUint8 g = (*cairoPixel >>  8) & 0xFF;
-+                const PRUint8 b = (*cairoPixel >>  0) & 0xFF;
-+
-+                *pixel++ = r;
-+                *pixel++ = g;
-+                *pixel++ = b;
-+                *pixel++ = 0xFF; // A
-+            }
-+        }
-+    }
-+
-+    return pixbuf;
-+}
-+
-+GdkPixbuf*
-+nsImageToPixbuf::SurfaceToPixbuf(gfxASurface* aSurface, PRInt32 aWidth, PRInt32 aHeight)
-+{
-+    if (aSurface->CairoStatus()) {
-+        NS_ERROR("invalid surface");
-+        return nsnull;
-+    }
-+
-+    nsRefPtr<gfxImageSurface> imgSurface;
-+    if (aSurface->GetType() == gfxASurface::SurfaceTypeImage) {
-+        imgSurface = static_cast<gfxImageSurface*>
-+                                (static_cast<gfxASurface*>(aSurface));
-+    } else {
-+        imgSurface = new gfxImageSurface(gfxIntSize(aWidth, aHeight),
-+                                        gfxImageSurface::ImageFormatARGB32);
-+                                       
-+        if (!imgSurface)
-+            return nsnull;
-+
-+        nsRefPtr<gfxContext> context = new gfxContext(imgSurface);
-+        if (!context)
-+            return nsnull;
-+
-+        context->SetOperator(gfxContext::OPERATOR_SOURCE);
-+        context->SetSource(aSurface);
-+        context->Paint();
-+    }
-+
-+    return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight);
-+}
-+  
-+GdkPixbuf*
-+nsImageToPixbuf::PatternToPixbuf(gfxPattern* aPattern, PRInt32 aWidth, PRInt32 aHeight)
-+{
-+    if (aPattern->CairoStatus()) {
-+        NS_ERROR("invalid pattern");
-+        return nsnull;
-+    }
-+
-+    nsRefPtr<gfxImageSurface> imgSurface;
-+    if (aPattern->GetType() == gfxPattern::PATTERN_SURFACE) {
-+        nsRefPtr<gfxASurface> surface = aPattern->GetSurface();
-+        if (surface->GetType() == gfxASurface::SurfaceTypeImage) {
-+            imgSurface = static_cast<gfxImageSurface*>
-+                                    (static_cast<gfxASurface*>(surface.get()));
-+        }
-+    } 
-+    
-+    if (!imgSurface) {
-+        imgSurface = new gfxImageSurface(gfxIntSize(aWidth, aHeight),
-+                                        gfxImageSurface::ImageFormatARGB32);
-+                                       
-+        if (!imgSurface)
-+            return nsnull;
-+
-+        nsRefPtr<gfxContext> context = new gfxContext(imgSurface);
-+        if (!context)
-+            return nsnull;
-+
-+        context->SetOperator(gfxContext::OPERATOR_SOURCE);
-+        context->SetPattern(aPattern);
-+        context->Paint();
-+    }
-+
-+    return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight);
-+}
-Index: offscreen/widget/src/headless/nsImageToPixbuf.h
-===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsImageToPixbuf.h     2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,71 @@
-+/* vim:set sw=4 sts=4 et cin: */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org widget code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Christian Biesinger <cbiesinger@web.de>.
-+ * Portions created by the Initial Developer are Copyright (C) 2006
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef NSIMAGETOPIXBUF_H_
-+#define NSIMAGETOPIXBUF_H_
-+
-+#include "nsIImageToPixbuf.h"
-+
-+class gfxASurface;
-+class gfxPattern;
-+class gfxImageSurface;
-+
-+class nsImageToPixbuf : public nsIImageToPixbuf {
-+    public:
-+        NS_DECL_ISUPPORTS
-+        NS_IMETHOD_(GdkPixbuf*) ConvertImageToPixbuf(nsIImage* aImage);
-+
-+        // Friendlier version of ConvertImageToPixbuf for callers inside of
-+        // widget
-+        static GdkPixbuf* ImageToPixbuf(nsIImage* aImage);
-+        static GdkPixbuf* SurfaceToPixbuf(gfxASurface* aSurface,
-+                                          PRInt32 aWidth, PRInt32 aHeight);
-+        static GdkPixbuf* PatternToPixbuf(gfxPattern* aPattern,
-+                                          PRInt32 aWidth, PRInt32 aHeight);
-+    private:
-+        static GdkPixbuf* ImgSurfaceToPixbuf(gfxImageSurface* aImgSurface,
-+                                             PRInt32 aWidth, PRInt32 aHeight);
-+        ~nsImageToPixbuf() {}
-+};
-+
-+
-+// fc2389b8-c650-4093-9e42-b05e5f0685b7
-+#define NS_IMAGE_TO_PIXBUF_CID \
-+{ 0xfc2389b8, 0xc650, 0x4093, \
-+  { 0x9e, 0x42, 0xb0, 0x5e, 0x5f, 0x06, 0x85, 0xb7 } }
-+
-+#endif
-Index: offscreen/widget/src/headless/nsWidgetFactory.cpp
-===================================================================
--- offscreen.orig/widget/src/headless/nsWidgetFactory.cpp      2009-06-12 14:08:56.000000000 +0100
-+++ offscreen/widget/src/headless/nsWidgetFactory.cpp   2009-06-12 14:15:24.000000000 +0100
-@@ -46,6 +46,10 @@
- #include "nsWindow.h"
- #include "nsTransferable.h"
- #include "nsHTMLFormatConverter.h"
-+#ifdef MOZ_X11
-+#include "nsClipboardHelper.h"
-+#include "nsClipboard.h"
-+#endif
- #include "nsSound.h"
- #include "nsBidiKeyboard.h"
- #include "nsScreenManagerHeadless.h"
-@@ -66,6 +70,10 @@
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
-+#ifdef MOZ_X11
-+NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsClipboard, Init)
-+#endif
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerHeadless)
- //NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageToPixbuf)
-@@ -142,6 +150,16 @@
-     NS_TRANSFERABLE_CID,
-     "@mozilla.org/widget/transferable;1",
-     nsTransferableConstructor },
-+#ifdef MOZ_X11
-+  { "Gtk Clipboard",
-+    NS_CLIPBOARD_CID,
-+    "@mozilla.org/widget/clipboard;1",
-+    nsClipboardConstructor },
-+  { "Clipboard Helper",
-+    NS_CLIPBOARDHELPER_CID,
-+    "@mozilla.org/widget/clipboardhelper;1",
-+    nsClipboardHelperConstructor },
-+#endif
-   { "HTML Format Converter",
-     NS_HTMLFORMATCONVERTER_CID,
-     "@mozilla.org/widget/htmlformatconverter;1",
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch
deleted file mode 100644
index 2874b0d832..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/autoconffix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Fixes to enable building with latest autoconf and automake
-RP 2/2/10
-Index: offscreen/js/ctypes/libffi/configure.ac
-===================================================================
--- offscreen.orig/js/ctypes/libffi/configure.ac        2010-02-02 19:53:16.753906134 +0000
-+++ offscreen/js/ctypes/libffi/configure.ac     2010-02-02 19:53:21.895155509 +0000
-@@ -17,10 +17,10 @@
- # the wrong, non-multilib-adjusted value will be used in multilibs.
- # As a side effect, we have to subst CFLAGS ourselves.
- 
-m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
-+m4_rename_force([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
- m4_define([_AC_ARG_VAR_PRECIOUS],[])
- AC_PROG_CC
-m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
-+m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
- 
- AC_SUBST(CFLAGS)
- 
-Index: offscreen/modules/libpr0n/build/Makefile.in
-===================================================================
--- offscreen.orig/modules/libpr0n/build/Makefile.in    2010-02-02 19:53:16.783906873 +0000
-+++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:21.895155509 +0000
-@@ -92,6 +92,7 @@
- 
- export::
-        @{ \
-+       \
-        $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
-                echo "#define IMG_BUILD_DECODER_${d}";) \
-        $(foreach d,$(MOZ_IMG_ENCODERS), \
-Index: offscreen/configure.in
-===================================================================
--- offscreen.orig/configure.in 2010-02-02 19:53:28.493904163 +0000
-+++ offscreen/configure.in      2010-02-02 16:33:09.000000000 +0000
-@@ -3250,11 +3250,7 @@
-     dnl ========================================================
-     AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
-         $XLIBS $XEXT_LIBS)
-    AC_CHECK_HEADER(X11/extensions/XShm.h)
-    if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" &&
-        test -n "$_HAVE_XSHM_XEXT"; then
-        AC_DEFINE(HAVE_XSHM)
-    fi
-+    AC_DEFINE(HAVE_XSHM)
- 
-     dnl ========================================================
-     dnl = Check for XIE
-@@ -8120,15 +8116,7 @@
- fi # COMPILE_ENVIRONMENT
- 
- if test "$USE_FC_FREETYPE"; then
-    if test "$COMPILE_ENVIRONMENT"; then
-       _SAVE_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
-        AC_CHECK_HEADERS(fontconfig/fcfreetype.h, , 
-            [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
-       CPPFLAGS="$_SAVE_CPPFLAGS"
-    else
-         AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H)
-    fi
- fi
- 
- dnl Set various defines and substitutions
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/buildfixhack.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/buildfixhack.patch
deleted file mode 100644
index 31fc40f28b..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/buildfixhack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r ad8be5166ccd layout/generic/nsFrame.h
--- a/layout/generic/nsFrame.h  Tue Nov 17 19:24:56 2009 +0000
-+++ b/layout/generic/nsFrame.h  Thu Nov 19 12:33:38 2009 +0000
-@@ -151,7 +151,7 @@
-   // Left undefined; nsFrame objects are never allocated from the heap.
-   void* operator new(size_t sz) CPP_THROW_NEW;
- 
-protected:
-+public:
-   // Overridden to prevent the global delete from being called, since
-   // the memory came out of an arena instead of the heap.
-   //
-  
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
deleted file mode 100644
index d31f91a42d..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
+++ /dev/null
@@ -1,764 +0,0 @@
-Index: offscreen/configure.in
-===================================================================
--- offscreen.orig/configure.in 2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/configure.in      2009-06-12 14:15:55.000000000 +0100
-@@ -62,7 +62,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(config/config.mk)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
- TARGET_VENDOR="${target_vendor}"
-@@ -103,7 +102,6 @@
- _SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
- _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
-_SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
-@@ -135,6 +133,9 @@
- 
- MSMANIFEST_TOOL=
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -285,7 +286,7 @@
-     ;;
- esac
- 
-if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -323,7 +324,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -331,7 +332,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -352,7 +353,7 @@
-         ;;
-     esac
- 
-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -376,37 +377,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
-     AC_DEFINE(CROSS_COMPILE)
-else
-    AC_PROG_CC
-    AC_PROG_CXX
-    AC_PROG_RANLIB
-    MOZ_PATH_PROGS(AS, $AS as, $CC)
-    AC_CHECK_PROGS(AR, ar, :)
-    AC_CHECK_PROGS(LD, ld, :)
-    AC_CHECK_PROGS(STRIP, strip, :)
-    AC_CHECK_PROGS(WINDRES, windres, :)
-    if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
-    fi
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-    if test -z "$HOST_CXX"; then
-        HOST_CXX="$CXX"
-    fi
-    if test -z "$HOST_CXXFLAGS"; then
-        HOST_CXXFLAGS="$CXXFLAGS"
-    fi
-    if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS="$LDFLAGS"
-    fi
-    if test -z "$HOST_RANLIB"; then
-        HOST_RANLIB="$RANLIB"
-    fi
-    if test -z "$HOST_AR"; then
-       HOST_AR="$AR"
-    fi
-fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1606,6 +1576,7 @@
- '
- 
- dnl test that the macros actually work:
-+ac_cv_static_assertion_macros_work="yes"
- AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
- AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
-  [AC_LANG_SAVE
-@@ -2767,9 +2738,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -3152,19 +3127,9 @@
- dnl We don't want to link against libm or libpthread on Darwin since
- dnl they both are just symlinks to libSystem and explicitly linking
- dnl against libSystem causes issues when debugging (see bug 299601).
-case $target in
-*-darwin*)
-    ;;
-*-beos*)
-    ;;
-*)
-     AC_CHECK_LIB(m, atan)
-     AC_CHECK_LIB(dl, dlopen,
-    AC_CHECK_HEADER(dlfcn.h, 
-        LIBS="-ldl $LIBS"
-        AC_DEFINE(HAVE_LIBDL)))
-    ;;
-esac
-+        AC_DEFINE(HAVE_LIBDL))
- 
- _SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -7007,18 +6972,13 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
-    MOZ_DEMANGLE_SYMBOLS=1
-    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
-+
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
-    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
-+
- 
- dnl ========================================================
- dnl =
-@@ -7530,10 +7490,7 @@
-     dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
-     dnl to either libIDL1 or libIDL2.
-     if test -z "$_LIBIDL_FOUND"; then
-        AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
-        if test -z "$_LIBIDL_FOUND"; then
-             PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
-        fi
-     fi
-     dnl
-     dnl If we don't have a libIDL config program & not cross-compiling, 
-@@ -7605,13 +7562,7 @@
- fi
- 
- if test -z "$SKIP_PATH_CHECKS"; then
-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
-    if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
-         PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
-    else
-        AM_PATH_GLIB(${GLIB_VERSION})
-    fi
-fi
- fi
- 
- if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
-@@ -8457,10 +8408,7 @@
- HAVE_WCRTOMB
- "
- 
-AC_CONFIG_HEADER(
-netwerk/necko-config.h
-xpcom/xpcom-config.h
-xpcom/xpcom-private.h
-+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
- )
- 
- # Save the defines header file before autoconf removes it.
-@@ -8519,31 +8467,11 @@
- dnl   To add new Makefiles, edit allmakefiles.sh.
- dnl   allmakefiles.sh sets the variable, MAKEFILES.
- . ${srcdir}/allmakefiles.sh
-dnl 
-dnl Run a perl script to quickly create the makefiles.
-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
-dnl   for the files it cannot handle correctly. This way, config.status
-dnl   will handle these files.
-dnl If it fails, nothing is set and config.status will run as usual.
-dnl
-dnl This does not change the $MAKEFILES variable.
-dnl
-dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
-dnl
-if test -z "${AS_PERL}"; then
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
-else
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
-fi
-. ./conftest.sh
-rm conftest.sh
- 
- echo $MAKEFILES > unallmakefiles
- 
- mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
- 
-AC_OUTPUT($MAKEFILES)
-
- dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
- if test "$CAIRO_FEATURES_H"; then
-   if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
-@@ -8569,14 +8497,14 @@
- HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
- RC=
- 
-unset MAKEFILES
-unset CONFIG_FILES
-+#unset MAKEFILES
-+#unset CONFIG_FILES
- 
- # No need to run subconfigures when building with LIBXUL_SDK_DIR
- if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-+    ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-     if test -z "$MOZ_DEBUG"; then
-         ac_configure_args="$ac_configure_args --disable-debug"
-     fi
-@@ -8592,8 +8520,7 @@
-     if test -n "$USE_ARM_KUSER"; then
-         ac_configure_args="$ac_configure_args --with-arm-kuser"
-     fi
-    AC_OUTPUT_SUBDIRS(nsprpub)
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+    AC_CONFIG_SUBDIRS(nsprpub)
- fi
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
-@@ -8610,7 +8537,6 @@
- 
- # Run the SpiderMonkey 'configure' script.
- dist=$MOZ_BUILD_ROOT/dist
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- ac_configure_args="$ac_configure_args --enable-threadsafe"
- if test -z "$MOZ_NATIVE_NSPR"; then
-     ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
-@@ -8627,11 +8553,14 @@
-      export MOZ_MEMORY_LDFLAGS
-    fi
- fi
-AC_OUTPUT_SUBDIRS(js/src)
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+AC_CONFIG_SUBDIRS(js/src)
- 
- fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
- 
-+m4_pattern_allow(AS_BIN)
-+
-+AC_OUTPUT($MAKEFILES)
-+
- dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
- dnl Needs to be at the end to respect possible changes from NSPR configure
- if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
-Index: offscreen/js/src/configure.in
-===================================================================
--- offscreen.orig/js/src/configure.in  2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/configure.in       2009-06-12 14:15:55.000000000 +0100
-@@ -62,7 +62,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(jsapi.h)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CONFIG_HEADER(js-config.h)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
-@@ -101,6 +100,9 @@
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
- _SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
- NSPR_VERSION=4
-@@ -113,6 +115,8 @@
- 
- MSMANIFEST_TOOL=
- 
-+m4_pattern_allow(AS_BIN)
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -198,7 +202,7 @@
- 
- if test "$COMPILE_ENVIRONMENT"; then
- 
-if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
- 
-     _SAVE_CC="$CC"
-@@ -235,7 +239,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -243,7 +247,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -298,7 +302,7 @@
-         ;;
-     esac
- 
-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -328,37 +332,6 @@
-     dnl able to run ppc code in a translated environment, making a cross
-     dnl compiler appear native.  So we override that here.
-     cross_compiling=yes
-else
-    AC_PROG_CC
-    AC_PROG_CXX
-    AC_PROG_RANLIB
-    MOZ_PATH_PROGS(AS, $AS as, $CC)
-    AC_CHECK_PROGS(AR, ar, :)
-    AC_CHECK_PROGS(LD, ld, :)
-    AC_CHECK_PROGS(STRIP, strip, :)
-    AC_CHECK_PROGS(WINDRES, windres, :)
-    if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
-    fi
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-    if test -z "$HOST_CXX"; then
-        HOST_CXX="$CXX"
-    fi
-    if test -z "$HOST_CXXFLAGS"; then
-        HOST_CXXFLAGS="$CXXFLAGS"
-    fi
-    if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS="$LDFLAGS"
-    fi
-    if test -z "$HOST_RANLIB"; then
-        HOST_RANLIB="$RANLIB"
-    fi
-    if test -z "$HOST_AR"; then
-       HOST_AR="$AR"
-    fi
-fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1424,6 +1397,8 @@
- fi # GNU_CC
- fi # COMPILE_ENVIRONMENT
- 
-+ac_cv_static_assertion_macros_work=yes
-+
- dnl =================================================================
- dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
- dnl which is bad when cross compiling.
-@@ -2579,9 +2554,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -2606,7 +2585,8 @@
- 
- AC_CHECK_HEADER(stdint.h)
- if test "$ac_cv_header_stdint_h" = yes; then
-    AC_DEFINE(JS_HAVE_STDINT_H)
-+    AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
-+    AC_DEFINE(HAVE_STDINT_H)
- else
-     dnl We'll figure them out for ourselves.  List more likely types
-     dnl earlier.  If we ever really encounter a size for which none of
-@@ -3004,10 +2984,7 @@
-     ;;
- *)
-     AC_CHECK_LIB(m, atan)
-    AC_CHECK_LIB(dl, dlopen,
-    AC_CHECK_HEADER(dlfcn.h, 
-        LIBS="-ldl $LIBS"
-        AC_DEFINE(HAVE_LIBDL)))
-+    AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
-     ;;
- esac
- 
-@@ -3903,6 +3880,7 @@
- [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
-                           See --with-nspr-cflags for more details.],
-     NSPR_LIBS=$withval)
-+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
- AC_SUBST(NSPR_CFLAGS)
- AC_SUBST(NSPR_LIBS)
- 
-@@ -4512,18 +4490,11 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
-    MOZ_DEMANGLE_SYMBOLS=1
-    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
-    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
- 
- dnl ========================================================
- dnl =
-@@ -5231,6 +5202,8 @@
- done
- AC_SUBST(LIBS_PATH)
- 
-+
-+
- dnl ========================================================
- dnl JavaScript shell
- dnl ========================================================
-@@ -5371,3 +5344,4 @@
- # 'js-config' in Makefile.in.
- AC_MSG_RESULT(invoking make to create js-config script)
- $MAKE js-config
-+
-Index: offscreen/nsprpub/configure.in
-===================================================================
--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/nsprpub/configure.in      2009-06-12 14:15:55.000000000 +0100
-@@ -42,7 +42,6 @@
- AC_PREREQ(2.12)
- AC_INIT(config/libc_r.h)
- 
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- 
- dnl ========================================================
-@@ -396,7 +395,7 @@
- dnl ========================================================
- dnl Checks for compilers.
- dnl ========================================================
-if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -423,7 +422,7 @@
- 
-     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
-+        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
-         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
- 
-     CC=$_SAVE_CC
-@@ -444,7 +443,7 @@
-         ;;        
-     esac            
- 
-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     if test -n "$USE_CPLUS"; then
-@@ -470,30 +469,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
- 
-else
-    AC_PROG_CC
-    if test -n "$USE_CPLUS"; then
-        if test "$CC" = "cl" -a -z "$CXX"; then
-            CXX=$CC
-        else        
-            AC_PROG_CXX
-        fi
-    fi
-    AC_PROG_CPP
-    AC_PROG_RANLIB
-    AC_PATH_PROGS(AS, as, $CC)
-    AC_PATH_PROGS(AR, ar, echo not_ar)
-    AC_PATH_PROGS(LD, ld link, echo not_ld)
-    AC_PATH_PROGS(STRIP, strip, echo not_strip)
-    AC_PATH_PROGS(WINDRES, windres, echo not_windres)
-    if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
-    fi
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-fi
-
- if test "$GCC" = "yes"; then
-     GNU_CC=1
- fi
-@@ -514,11 +489,8 @@
-         ;;
- esac
- 
-if test "$cross_compiling"  = "yes"; then
-+
-     CROSS_COMPILE=1
-else
-    CROSS_COMPILE=
-fi
- 
- dnl ========================================================
- dnl Check for gcc -pipe support
-@@ -2283,10 +2255,7 @@
- *-darwin*|*-beos*)
-     ;;
- *)
-    AC_CHECK_LIB(dl, dlopen,
-        AC_CHECK_HEADER(dlfcn.h,
-            OS_LIBS="-ldl $OS_LIBS"))
-    ;;
-+    AC_CHECK_LIB(dl, dlopen)
- esac
- 
- 
-@@ -2904,6 +2873,8 @@
- dnl pr/tests/w16gui/Makefile
- dnl tools/Makefile
- 
-+m4_pattern_allow(AS_BIN)
-+
- if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
-     MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
- elif test -n "$USE_PTHREADS"; then
-@@ -2919,3 +2890,5 @@
- echo $MAKEFILES > unallmakefiles
- 
- AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
-+
-+
-Index: offscreen/js/src/Makefile.in
-===================================================================
--- offscreen.orig/js/src/Makefile.in   2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/Makefile.in        2009-06-12 14:15:55.000000000 +0100
-@@ -514,20 +514,8 @@
- 
- export:: jsautocfg.h
- 
-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
-        touch $@
-else
-ifeq ($(OS_ARCH),WINCE)
-jsautocfg.h:
-       touch $@
-else
-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
-       @rm -f $@ jsautocfg.tmp
-       ./jscpucfg > jsautocfg.tmp
-       mv jsautocfg.tmp $@
-endif
-endif
- 
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
-@@ -557,7 +545,7 @@
-        echo no need to build jscpucfg $<
- else
- jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
-       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
-+       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
- endif
- endif
- 
-Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
-===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp  2009-06-12 14:15:55.000000000 +0100
-@@ -47,6 +47,8 @@
- 
- #include <stdarg.h>
- 
-+#include "mozilla-config.h"
-+
- #include "prlog.h"
- 
- #include "nsCOMPtr.h"
-Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
-===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp  2009-06-12 14:15:55.000000000 +0100
-@@ -39,6 +39,8 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
-+#include "mozilla-config.h"
-+
- #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
- 
- #include "mozJSSubScriptLoader.h"
-Index: offscreen/modules/lcms/include/icc34.h
-===================================================================
--- offscreen.orig/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/modules/lcms/include/icc34.h      2009-06-12 14:15:55.000000000 +0100
-@@ -144,7 +144,7 @@
-  */
- 
- 
-#ifdef PACKAGE_NAME
-+#if 0 
- /*
-   June 9, 2003, Adapted for use with configure by Bob Friesenhahn
-   Added the stupid check for autoconf by Marti Maria. 
-Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
-===================================================================
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in       2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in    2009-06-12 14:15:55.000000000 +0100
-@@ -60,7 +60,7 @@
- 
- LIBS += \
-        $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
-       $(BZ2_LIBS) \
-+       $(BZ2_LIBS) -lpthread \
-        $(NULL)
- 
- ifeq ($(OS_ARCH),WINNT)
-Index: offscreen/xpcom/sample/program/Makefile.in
-===================================================================
--- offscreen.orig/xpcom/sample/program/Makefile.in     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xpcom/sample/program/Makefile.in  2009-06-12 14:15:55.000000000 +0100
-@@ -57,7 +57,7 @@
- # that the application be linked against the XPCOM dynamic library or the NSPR
- # dynamic libraries.
- LIBS            = \
-               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xpcom/tools/registry/Makefile.in
-===================================================================
--- offscreen.orig/xpcom/tools/registry/Makefile.in     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xpcom/tools/registry/Makefile.in  2009-06-12 14:15:55.000000000 +0100
-@@ -54,7 +54,7 @@
- SIMPLE_PROGRAMS        = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
- 
- LIBS            = \
-               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xulrunner/app/Makefile.in
-===================================================================
--- offscreen.orig/xulrunner/app/Makefile.in    2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
-@@ -184,7 +184,7 @@
- RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
- endif
- 
-LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/xulrunner/stub/Makefile.in
-===================================================================
--- offscreen.orig/xulrunner/stub/Makefile.in   2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xulrunner/stub/Makefile.in        2009-06-12 14:15:55.000000000 +0100
-@@ -101,7 +101,7 @@
- endif
- endif
- 
-LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/modules/plugin/test/testplugin/Makefile.in
-===================================================================
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in   2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/modules/plugin/test/testplugin/Makefile.in        2009-06-12 14:15:55.000000000 +0100
-@@ -63,9 +63,7 @@
- CMMSRCS = nptest_macosx.mm
- endif
- 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- CPPSRCS += nptest_gtk2.cpp
-endif
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
- CPPSRCS += nptest_os2.cpp
-Index: offscreen/js/src/aclocal.m4
-===================================================================
--- offscreen.orig/js/src/aclocal.m4    2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
-@@ -9,4 +9,3 @@
- builtin(include, build/autoconf/moznbytetype.m4)dnl
- builtin(include, build/autoconf/mozprog.m4)dnl
- 
-MOZ_PROG_CHECKMSYS()
-Index: offscreen/toolkit/toolkit-makefiles.sh
-===================================================================
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-06-12 14:19:59.000000000 +0100
-+++ offscreen/toolkit/toolkit-makefiles.sh      2009-06-12 14:20:09.000000000 +0100
-@@ -342,7 +342,6 @@
-   modules/plugin/sdk/samples/Makefile
-   modules/plugin/sdk/samples/common/Makefile
-   modules/plugin/sdk/samples/basic/windows/Makefile
-  modules/plugin/sdk/samples/basic/unix/Makefile
-   modules/plugin/sdk/samples/winless/windows/Makefile
- "
- 
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/configurefix.patch
deleted file mode 100644
index 7ee1211f1a..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ /dev/null
@@ -1,774 +0,0 @@
-Index: offscreen/configure.in
-===================================================================
--- offscreen.orig/configure.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/configure.in      2009-12-09 13:38:51.000000000 +0000
-@@ -64,7 +64,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(config/config.mk)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
- TARGET_VENDOR="${target_vendor}"
-@@ -106,7 +105,6 @@
- _SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
- _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
-_SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
-@@ -139,6 +137,9 @@
- 
- MSMANIFEST_TOOL=
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -308,7 +309,7 @@
-     ;;
- esac
- 
-if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -346,7 +347,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -354,7 +355,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -375,7 +376,7 @@
-         ;;
-     esac
- 
-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -399,37 +400,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
-     AC_DEFINE(CROSS_COMPILE)
-else
-    AC_PROG_CC
-    AC_PROG_CXX
-    AC_PROG_RANLIB
-    MOZ_PATH_PROGS(AS, $AS as, $CC)
-    AC_CHECK_PROGS(AR, ar, :)
-    AC_CHECK_PROGS(LD, ld, :)
-    AC_CHECK_PROGS(STRIP, strip, :)
-    AC_CHECK_PROGS(WINDRES, windres, :)
-    if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
-    fi
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-    if test -z "$HOST_CXX"; then
-        HOST_CXX="$CXX"
-    fi
-    if test -z "$HOST_CXXFLAGS"; then
-        HOST_CXXFLAGS="$CXXFLAGS"
-    fi
-    if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS="$LDFLAGS"
-    fi
-    if test -z "$HOST_RANLIB"; then
-        HOST_RANLIB="$RANLIB"
-    fi
-    if test -z "$HOST_AR"; then
-       HOST_AR="$AR"
-    fi
-fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1586,6 +1556,7 @@
- '
- 
- dnl test that the macros actually work:
-+ac_cv_static_assertion_macros_work="yes"
- AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
- AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
-  [AC_LANG_SAVE
-@@ -2770,9 +2741,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -3174,21 +3149,9 @@
- dnl We don't want to link against libm or libpthread on Darwin since
- dnl they both are just symlinks to libSystem and explicitly linking
- dnl against libSystem causes issues when debugging (see bug 299601).
-case $target in
-*-darwin*)
-    ;;
-*-beos*)
-    ;;
-*-os2*)
-    ;;
-*)
-     AC_CHECK_LIB(m, atan)
-     AC_CHECK_LIB(dl, dlopen,
-    AC_CHECK_HEADER(dlfcn.h, 
-        LIBS="-ldl $LIBS"
-        AC_DEFINE(HAVE_LIBDL)))
-    ;;
-esac
-+        AC_DEFINE(HAVE_LIBDL))
- 
- _SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -6889,18 +6852,13 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
-    MOZ_DEMANGLE_SYMBOLS=1
-    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
-+
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
-    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
-+
- 
- dnl ========================================================
- dnl =
-@@ -7420,10 +7378,7 @@
-     dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
-     dnl to either libIDL1 or libIDL2.
-     if test -z "$_LIBIDL_FOUND"; then
-        AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
-        if test -z "$_LIBIDL_FOUND"; then
-             PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
-        fi
-     fi
-     dnl
-     dnl If we don't have a libIDL config program & not cross-compiling, 
-@@ -7495,13 +7450,7 @@
- fi
- 
- if test -z "$SKIP_PATH_CHECKS"; then
-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
-    if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
-         PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
-    else
-        AM_PATH_GLIB(${GLIB_VERSION})
-    fi
-fi
- fi
- 
- if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
-@@ -8278,10 +8227,7 @@
- HAVE_WCRTOMB
- "
- 
-AC_CONFIG_HEADER(
-netwerk/necko-config.h
-xpcom/xpcom-config.h
-xpcom/xpcom-private.h
-+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
- )
- 
- # Save the defines header file before autoconf removes it.
-@@ -8340,31 +8286,11 @@
- dnl   To add new Makefiles, edit allmakefiles.sh.
- dnl   allmakefiles.sh sets the variable, MAKEFILES.
- . ${srcdir}/allmakefiles.sh
-dnl 
-dnl Run a perl script to quickly create the makefiles.
-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
-dnl   for the files it cannot handle correctly. This way, config.status
-dnl   will handle these files.
-dnl If it fails, nothing is set and config.status will run as usual.
-dnl
-dnl This does not change the $MAKEFILES variable.
-dnl
-dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
-dnl
-if test -z "${AS_PERL}"; then
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
-else
-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
-fi
-. ./conftest.sh
-rm conftest.sh
- 
- echo $MAKEFILES > unallmakefiles
- 
- mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
- 
-AC_OUTPUT($MAKEFILES)
-
- dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
- if test "$CAIRO_FEATURES_H"; then
-   if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
-@@ -8390,14 +8316,14 @@
- HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
- RC=
- 
-unset MAKEFILES
-unset CONFIG_FILES
-+#unset MAKEFILES
-+#unset CONFIG_FILES
- 
- # No need to run subconfigures when building with LIBXUL_SDK_DIR
- if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-+    ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-     if test -z "$MOZ_DEBUG"; then
-         ac_configure_args="$ac_configure_args --disable-debug"
-     fi
-@@ -8413,8 +8339,7 @@
-     if test -n "$USE_ARM_KUSER"; then
-         ac_configure_args="$ac_configure_args --with-arm-kuser"
-     fi
-    AC_OUTPUT_SUBDIRS(nsprpub)
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+    AC_CONFIG_SUBDIRS(nsprpub)
- fi
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
-@@ -8431,7 +8356,6 @@
- 
- # Run the SpiderMonkey 'configure' script.
- dist=$MOZ_BUILD_ROOT/dist
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- ac_configure_args="$ac_configure_args --enable-threadsafe"
- if test -z "$MOZ_NATIVE_NSPR"; then
-     ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
-@@ -8448,8 +8372,7 @@
-      export MOZ_MEMORY_LDFLAGS
-    fi
- fi
-AC_OUTPUT_SUBDIRS(js/src)
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+AC_CONFIG_SUBDIRS(js/src)
- 
- # Build jsctypes on the platforms we can.
- if test "$BUILD_CTYPES"; then
-@@ -8465,20 +8388,14 @@
-     if test -n "$CROSS_COMPILE"; then
-       ac_configure_args="$ac_configure_args --build=$build --host=$target"
-     fi
-    if test "$SOLARIS_SUNPRO_CC"; then
-      # Always use gcc for libffi on Solaris
-      old_cache_file=$cache_file
-      cache_file=js/ctypes/libffi/config.cache
-      ac_configure_args="$ac_configure_args CC=gcc"
-      AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
-      cache_file=$old_cache_file
-    else
-      AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
-    fi
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+    AC_CONFIG_SUBDIRS(js/ctypes/libffi)
-   fi
- fi
- 
-+m4_pattern_allow(AS_BIN)
-+
-+AC_OUTPUT($MAKEFILES)
-+
- fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
- 
- dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
-Index: offscreen/js/src/configure.in
-===================================================================
--- offscreen.orig/js/src/configure.in  2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/configure.in       2009-12-09 13:38:51.000000000 +0000
-@@ -62,7 +62,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(jsapi.h)
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CONFIG_HEADER(js-config.h)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
-@@ -101,6 +100,9 @@
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
- _SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
- NSPR_VERSION=4
-@@ -113,6 +115,8 @@
- 
- MSMANIFEST_TOOL=
- 
-+m4_pattern_allow(AS_BIN)
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -212,7 +216,7 @@
- 
- if test "$COMPILE_ENVIRONMENT"; then
- 
-if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
- 
-     _SAVE_CC="$CC"
-@@ -249,7 +253,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -257,7 +261,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -312,7 +316,7 @@
-         ;;
-     esac
- 
-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -342,37 +346,6 @@
-     dnl able to run ppc code in a translated environment, making a cross
-     dnl compiler appear native.  So we override that here.
-     cross_compiling=yes
-else
-    AC_PROG_CC
-    AC_PROG_CXX
-    AC_PROG_RANLIB
-    MOZ_PATH_PROGS(AS, $AS as, $CC)
-    AC_CHECK_PROGS(AR, ar, :)
-    AC_CHECK_PROGS(LD, ld, :)
-    AC_CHECK_PROGS(STRIP, strip, :)
-    AC_CHECK_PROGS(WINDRES, windres, :)
-    if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
-    fi
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-    if test -z "$HOST_CXX"; then
-        HOST_CXX="$CXX"
-    fi
-    if test -z "$HOST_CXXFLAGS"; then
-        HOST_CXXFLAGS="$CXXFLAGS"
-    fi
-    if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS="$LDFLAGS"
-    fi
-    if test -z "$HOST_RANLIB"; then
-        HOST_RANLIB="$RANLIB"
-    fi
-    if test -z "$HOST_AR"; then
-       HOST_AR="$AR"
-    fi
-fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1370,6 +1343,8 @@
- fi # GNU_CC
- fi # COMPILE_ENVIRONMENT
- 
-+ac_cv_static_assertion_macros_work=yes
-+
- dnl =================================================================
- dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
- dnl which is bad when cross compiling.
-@@ -2557,9 +2532,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -2584,7 +2563,8 @@
- 
- AC_CHECK_HEADER(stdint.h)
- if test "$ac_cv_header_stdint_h" = yes; then
-    AC_DEFINE(JS_HAVE_STDINT_H)
-+    AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
-+    AC_DEFINE(HAVE_STDINT_H)
- else
-     dnl We'll figure them out for ourselves.  List more likely types
-     dnl earlier.  If we ever really encounter a size for which none of
-@@ -2938,10 +2918,7 @@
-     ;;
- *)
-     AC_CHECK_LIB(m, atan)
-    AC_CHECK_LIB(dl, dlopen,
-    AC_CHECK_HEADER(dlfcn.h, 
-        LIBS="-ldl $LIBS"
-        AC_DEFINE(HAVE_LIBDL)))
-+    AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
-     ;;
- esac
- 
-@@ -3847,6 +3824,7 @@
- [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
-                           See --with-nspr-cflags for more details.],
-     NSPR_LIBS=$withval)
-+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
- AC_SUBST(NSPR_CFLAGS)
- AC_SUBST(NSPR_LIBS)
- 
-@@ -4386,18 +4364,11 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
-    MOZ_DEMANGLE_SYMBOLS=1
-    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
-fi
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
-    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
- 
- dnl ========================================================
- dnl =
-@@ -5097,6 +5068,8 @@
- 
- AC_HAVE_FUNCS(setlocale)
- 
-+
-+
- dnl ========================================================
- dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
- dnl ========================================================
-@@ -5234,3 +5207,4 @@
- # 'js-config' in Makefile.in.
- AC_MSG_RESULT(invoking make to create js-config script)
- $MAKE js-config
-+
-Index: offscreen/nsprpub/configure.in
-===================================================================
--- offscreen.orig/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/nsprpub/configure.in      2009-12-09 13:10:12.000000000 +0000
-@@ -42,7 +42,6 @@
- AC_PREREQ(2.12)
- AC_INIT(config/libc_r.h)
- 
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- 
- dnl ========================================================
-@@ -396,7 +395,7 @@
- dnl ========================================================
- dnl Checks for compilers.
- dnl ========================================================
-if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -423,7 +422,7 @@
- 
-     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
-        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
-+        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
-         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
- 
-     CC=$_SAVE_CC
-@@ -444,7 +443,7 @@
-         ;;        
-     esac            
- 
-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     if test -n "$USE_CPLUS"; then
-@@ -470,30 +469,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
- 
-else
-    AC_PROG_CC
-    if test -n "$USE_CPLUS"; then
-        if test "$CC" = "cl" -a -z "$CXX"; then
-            CXX=$CC
-        else        
-            AC_PROG_CXX
-        fi
-    fi
-    AC_PROG_CPP
-    AC_PROG_RANLIB
-    AC_PATH_PROGS(AS, as, $CC)
-    AC_PATH_PROGS(AR, ar, echo not_ar)
-    AC_PATH_PROGS(LD, ld link, echo not_ld)
-    AC_PATH_PROGS(STRIP, strip, echo not_strip)
-    AC_PATH_PROGS(WINDRES, windres, echo not_windres)
-    if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
-    fi
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-fi
-
- if test "$GCC" = "yes"; then
-     GNU_CC=1
- fi
-@@ -514,11 +489,8 @@
-         ;;
- esac
- 
-if test "$cross_compiling"  = "yes"; then
-+
-     CROSS_COMPILE=1
-else
-    CROSS_COMPILE=
-fi
- 
- dnl ========================================================
- dnl Check for gcc -pipe support
-@@ -2286,10 +2258,7 @@
- *-darwin*|*-beos*|*-os2*)
-     ;;
- *)
-    AC_CHECK_LIB(dl, dlopen,
-        AC_CHECK_HEADER(dlfcn.h,
-            OS_LIBS="-ldl $OS_LIBS"))
-    ;;
-+    AC_CHECK_LIB(dl, dlopen)
- esac
- 
- 
-@@ -2907,6 +2876,8 @@
- dnl pr/tests/w16gui/Makefile
- dnl tools/Makefile
- 
-+m4_pattern_allow(AS_BIN)
-+
- if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
-     MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
- elif test -n "$USE_PTHREADS"; then
-@@ -2922,3 +2893,5 @@
- echo $MAKEFILES > unallmakefiles
- 
- AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
-+
-+
-Index: offscreen/js/src/Makefile.in
-===================================================================
--- offscreen.orig/js/src/Makefile.in   2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/Makefile.in        2009-12-09 13:10:12.000000000 +0000
-@@ -513,20 +513,8 @@
- 
- export:: jsautocfg.h
- 
-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
-        touch $@
-else
-ifeq ($(OS_ARCH),WINCE)
-jsautocfg.h:
-       touch $@
-else
-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
-       @rm -f $@ jsautocfg.tmp
-       ./jscpucfg > jsautocfg.tmp
-       mv jsautocfg.tmp $@
-endif
-endif
- 
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
-@@ -556,7 +544,7 @@
-        echo no need to build jscpucfg $<
- else
- jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
-       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
-+       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
- endif
- endif
- 
-Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
-===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp  2009-12-09 13:10:12.000000000 +0000
-@@ -47,6 +47,8 @@
- 
- #include <stdarg.h>
- 
-+#include "mozilla-config.h"
-+
- #include "prlog.h"
- 
- #include "nsCOMPtr.h"
-Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
-===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp  2009-12-09 13:10:12.000000000 +0000
-@@ -39,6 +39,8 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
-+#include "mozilla-config.h"
-+
- #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
- 
- #include "mozJSSubScriptLoader.h"
-Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
-===================================================================
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in       2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in    2009-12-09 13:10:12.000000000 +0000
-@@ -56,7 +56,7 @@
- 
- LIBS += \
-        $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
-       $(BZ2_LIBS) \
-+       $(BZ2_LIBS) -lpthread \
-        $(NULL)
- 
- ifeq ($(OS_ARCH),WINNT)
-Index: offscreen/xpcom/sample/program/Makefile.in
-===================================================================
--- offscreen.orig/xpcom/sample/program/Makefile.in     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xpcom/sample/program/Makefile.in  2009-12-09 13:10:12.000000000 +0000
-@@ -57,7 +57,7 @@
- # that the application be linked against the XPCOM dynamic library or the NSPR
- # dynamic libraries.
- LIBS            = \
-               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xpcom/tools/registry/Makefile.in
-===================================================================
--- offscreen.orig/xpcom/tools/registry/Makefile.in     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xpcom/tools/registry/Makefile.in  2009-12-09 13:10:12.000000000 +0000
-@@ -54,7 +54,7 @@
- SIMPLE_PROGRAMS        = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
- 
- LIBS            = \
-               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xulrunner/app/Makefile.in
-===================================================================
--- offscreen.orig/xulrunner/app/Makefile.in    2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-@@ -173,7 +173,7 @@
- RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
- endif
- 
-LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/xulrunner/stub/Makefile.in
-===================================================================
--- offscreen.orig/xulrunner/stub/Makefile.in   2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xulrunner/stub/Makefile.in        2009-12-09 13:10:12.000000000 +0000
-@@ -100,7 +100,7 @@
- endif
- endif
- 
-LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/modules/plugin/test/testplugin/Makefile.in
-===================================================================
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in   2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/modules/plugin/test/testplugin/Makefile.in        2009-12-09 13:10:12.000000000 +0000
-@@ -60,9 +60,7 @@
- CMMSRCS = nptest_macosx.mm
- endif
- 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- CPPSRCS += nptest_gtk2.cpp
-endif
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
- CPPSRCS += nptest_os2.cpp
-Index: offscreen/js/src/aclocal.m4
-===================================================================
--- offscreen.orig/js/src/aclocal.m4    2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/aclocal.m4 2009-12-09 13:39:01.000000000 +0000
-@@ -8,6 +8,4 @@
- builtin(include, build/autoconf/altoptions.m4)dnl
- builtin(include, build/autoconf/moznbytetype.m4)dnl
- builtin(include, build/autoconf/mozprog.m4)dnl
-builtin(include, build/autoconf/acwinpaths.m4)dnl
- 
-MOZ_PROG_CHECKMSYS()
-Index: offscreen/toolkit/toolkit-makefiles.sh
-===================================================================
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/toolkit/toolkit-makefiles.sh      2009-12-09 13:10:12.000000000 +0000
-@@ -369,7 +369,6 @@
-   modules/plugin/sdk/samples/Makefile
-   modules/plugin/sdk/samples/common/Makefile
-   modules/plugin/sdk/samples/basic/windows/Makefile
-  modules/plugin/sdk/samples/basic/unix/Makefile
-   modules/plugin/sdk/samples/winless/windows/Makefile
- "
- 
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h b/meta-moblin/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_THREADSAFE 1
-#define JS_STACK_GROWTH_DIRECTION (-1)
-#define JS_HAVE_LONG_LONG
-#endif /* js_cpucfg___ */
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h b/meta-moblin/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_THREADSAFE 1
-#define JS_STACK_GROWTH_DIRECTION (-1)
-#define JS_HAVE_LONG_LONG
-#endif /* js_cpucfg___ */
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h b/meta-moblin/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_THREADSAFE 1
-#define JS_STACK_GROWTH_DIRECTION (-1)
-#define JS_HAVE_LONG_LONG
-#endif /* js_cpucfg___ */
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h b/meta-moblin/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_THREADSAFE 1
-#define JS_STACK_GROWTH_DIRECTION (-1)
-#define JS_HAVE_LONG_LONG
-#endif /* js_cpucfg___ */
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/mozconfig b/meta-moblin/packages/mozilla-headless/mozilla-headless/mozconfig
deleted file mode 100644
index 6123d11d27..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-# this line sets the directory for all build output
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-release
-# comment out the previous line and uncomment these two for a debug build
-#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-debug
-#ac_add_options --disable-optimize --enable-debug
-# this is the line that enables the headless implementation
-ac_add_options --enable-default-toolkit=cairo-headless
-# comment out the previous line and uncomment these two for a GTK build
-#ac_add_options --enable-system-cairo
-#ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-tests
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-pango
-ac_add_options --disable-printing
-ac_add_options --disable-crashreporter
-ac_add_options --enable-plugins
-ac_add_options --disable-accessibility
-mk_add_options MOZ_CO_PROJECT=xulrunner
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch
deleted file mode 100644
index aabd6906e8..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- a/memory/jemalloc/jemalloc.h        Sat Nov 22 20:22:22 2008 +0100
-+++ b/memory/jemalloc/jemalloc.h        Mon Dec 01 16:53:06 2008 -0500
-@@ -45,14 +45,14 @@
- } jemalloc_stats_t;
- 
- #ifndef MOZ_MEMORY_DARWIN
-void   *malloc(size_t size);
-void   *valloc(size_t size);
-void   *calloc(size_t num, size_t size);
-void   *realloc(void *ptr, size_t size);
-void   free(void *ptr);
-+void   *malloc(size_t size)  __THROW __attribute_malloc__ __wur;
-+void   *valloc(size_t size)  __THROW __attribute_malloc__ __wur;
-+void   *calloc(size_t num, size_t size)  __THROW __attribute_malloc__ __wur;
-+void   *realloc(void *ptr, size_t size)  __THROW __attribute_malloc__ __wur;
-+void   free(void *ptr)  __THROW __attribute_malloc__ __wur;
- #endif
- 
-int    posix_memalign(void **memptr, size_t alignment, size_t size);
-+int    posix_memalign(void **memptr, size_t alignment, size_t size)  __THROW __attribute_malloc__ __wur;
- void   *memalign(size_t alignment, size_t size);
- size_t malloc_usable_size(const void *ptr);
- void   jemalloc_stats(jemalloc_stats_t *stats);
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
deleted file mode 100644
index 9409105780..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: offscreen/js/src/configure.in
-===================================================================
--- offscreen.orig/js/src/configure.in  2009-06-17 14:31:40.000000000 +0100
-+++ offscreen/js/src/configure.in       2009-06-17 14:31:40.000000000 +0100
-@@ -880,7 +880,7 @@
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
-Index: offscreen/configure.in
-===================================================================
--- offscreen.orig/configure.in 2009-06-17 15:09:44.000000000 +0100
-+++ offscreen/configure.in      2009-06-17 15:10:00.000000000 +0100
-@@ -1060,7 +1060,7 @@
- 
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless/removebadrpath.patch b/meta-moblin/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
deleted file mode 100644
index 53ae6d3251..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: offscreen/js/src/configure.in
-===================================================================
--- offscreen.orig/js/src/configure.in  2009-12-09 13:38:51.000000000 +0000
-+++ offscreen/js/src/configure.in       2009-12-09 14:14:08.000000000 +0000
-@@ -858,7 +858,7 @@
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- 
-@@ -3824,7 +3824,7 @@
- [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
-                           See --with-nspr-cflags for more details.],
-     NSPR_LIBS=$withval)
-$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
-+NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
- AC_SUBST(NSPR_CFLAGS)
- AC_SUBST(NSPR_LIBS)
- 
-Index: offscreen/configure.in
-===================================================================
--- offscreen.orig/configure.in 2009-12-09 13:38:51.000000000 +0000
-+++ offscreen/configure.in      2009-12-09 14:31:33.000000000 +0000
-@@ -1041,7 +1041,7 @@
- 
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
-@@ -8378,7 +8378,7 @@
- if test "$BUILD_CTYPES"; then
-   # Run the libffi 'configure' script on platforms that it supports.
-   if test -z "$_MSC_VER"; then
-    ac_configure_args="--disable-shared --enable-static --disable-raw-api"
-+    ac_configure_args="$ac_configure_args --disable-shared --enable-static --disable-raw-api"
-     if test "$MOZ_DEBUG"; then
-       ac_configure_args="$ac_configure_args --enable-debug"
-     fi
diff --git a/meta-moblin/packages/mozilla-headless/mozilla-headless_hg.bb b/meta-moblin/packages/mozilla-headless/mozilla-headless_hg.bb
deleted file mode 100644
index 669c526163..0000000000
--- a/meta-moblin/packages/mozilla-headless/mozilla-headless_hg.bb
+++ /dev/null
@@ -1,99 +0,0 @@
-#file://0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch;patch=1 \
-SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
-           file://configurefix-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
-           file://configurefix.patch;patch=1;notrev=1a622cb7c384 \
-           file://mozilla-jemalloc.patch;patch=1 \
-           file://removebadrpath-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
-           file://removebadrpath.patch;patch=1;notrev=1a622cb7c384 \
-           file://buildfixhack.patch;patch=1;notrev=1a622cb7c384 \
-           file://autoconffix.patch;patch=1 \
-           file://jsautocfg.h \
-           file://mozconfig"
-PV = "0.2+hg-1.0+${SRCPV}"
-PR = "r10"
-S = "${WORKDIR}/offscreen"
-DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl"
-FILES_${PN} += "${libdir}/xulrunner-${XULVERSION} ${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/*.so"
-FILES_${PN}-dev += "${libdir}/xulrunner-devel-${XULVERSION}"
-FILES_${PN}-dbg += "${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/.debug"
-# Mozilla's build rules search for -L paths to find libraries. Its
-# not clever enough to know where the sysroot is and hence finds host 
-# object files which is bad. We therefore tell pkg-config not to hide 
-# paths. See config/rules.mk and the LIBS_DEPS and _LIBDIRS variables.
-export PKG_CONFIG_ALLOW_SYSTEM_LIBS = "1"
-TARGET_CC_ARCH = ""
-CFLAGS = "${TARGET_CFLAGS}"
-TARGET_CFLAGS = "-Os -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse -fasynchronous-unwind-tables"
-LDFLAGS = "${TARGET_LDFLAGS}"
-TARGET_LDFLAGS = "-Wl,-rpath,${libdir}/xulrunner-${XULVERSION}"
-export target_alias=${TARGET_PREFIX}
-inherit autotools mozilla
-acpaths = "-I ${S}/build/autoconf "
-export topsrcdir = "${S}"
-do_configure () {
-        if [ "${SRCREV}" != "1a622cb7c384" ]; then
-                rm -rf ${S}/build/autoconf/acwinpaths.m4
-                rm -rf ${S}/js/src/build/autoconf/acwinpaths.m4
-                rm -rf ${S}/nsprpub/build/autoconf/acwinpaths.m4
-                mkdir -p ${S}/js/src/dist/include
-                ln -fs ../../../../nsprpub/dist/include/nspr ${S}/js/src/dist/include/nsprpub
-        fi
-        cp ${S}/build/autoconf/install-sh ${S}
-        autotools_do_configure
-        # Yes, we run this twice. The first pass sets up npsrpub-config which then 
-        # sets the values correctly on the second try. Ick.
-        autotools_do_configure
-}
-do_compile () {
-        cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-        #oe_runmake -f client.mk build_all
-        base_do_compile
-}
-XULVERSION = "1.9.3a1pre"
-do_install_append () {
-        install -d ${D}${sysconfdir}/ld.so.conf.d/
-        echo ${libdir}/xulrunner-${XULVERSION}/ > ${D}${sysconfdir}/ld.so.conf.d/mozilla-headless
-}
-EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-headless --with-pthreads \
-                 --enable-pango --enable-optimize --disable-debug --disable-tests \
-                 --disable-printing --disable-crashreporter --disable-accessibility \
-                 --disable-javaxpcom --enable-plugins --enable-system-sqlite --disable-necko-wifi"
-export LIBXUL_DIST="${S}/dist"
-SYSROOT_PREPROCESS_FUNCS += "mozilla_sysroot_preprocess"
-mozilla_sysroot_preprocess () {
-        autotools_stage_dir ${D}/${libdir}/xulrunner-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/
-        autotools_stage_dir ${D}/${libdir}/xulrunner-devel-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/
-        ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/bin
-        ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/idl
-        ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/include
-        ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/lib
-        install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
-        install -m 755 ${S}/dist/host/bin/host_xpidl ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/xpidl
-}
-__anonymous () {
-        if bb.data.getVar("SRCREV", d, True) == "1a622cb7c384":
-                bb.data.setVar("XULVERSION", "1.9.2a1pre", d)
-}
diff --git a/meta-moblin/packages/mutter-moblin/files/88mutter-panelapps.sh b/meta-moblin/packages/mutter-moblin/files/88mutter-panelapps.sh
deleted file mode 100644
index 1df0d06481..0000000000
--- a/meta-moblin/packages/mutter-moblin/files/88mutter-panelapps.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-for APP in /usr/libexec/moblin-panel-*; do
-        $APP &
-done
diff --git a/meta-moblin/packages/mutter-moblin/files/background-tile.png b/meta-moblin/packages/mutter-moblin/files/background-tile.png
deleted file mode 100644
index b71a55b679..0000000000
--- a/meta-moblin/packages/mutter-moblin/files/background-tile.png
+++ /dev/null
Binary files differ
diff --git a/meta-moblin/packages/mutter-moblin/files/startup-notify.patch b/meta-moblin/packages/mutter-moblin/files/startup-notify.patch
deleted file mode 100644
index 72ad42cd98..0000000000
--- a/meta-moblin/packages/mutter-moblin/files/startup-notify.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: git/src/mnb-drop-down.c
-===================================================================
--- git.orig/src/mnb-drop-down.c        2009-06-09 16:38:46.000000000 +0100
-+++ git/src/mnb-drop-down.c     2009-06-09 16:41:21.000000000 +0100
-@@ -68,6 +68,37 @@
-   gboolean hide_toolbar      : 1;
- };
- 
-+
-+#include <dbus/dbus.h>
-+
-+static gboolean
-+emit_loaded_signal (gpointer user_data)
-+{
-+  DBusError error = DBUS_ERROR_INIT;
-+  DBusConnection *conn;
-+  DBusMessage *msg;
-+
-+  conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
-+  if (!conn) {
-+    g_printerr ("Cannot connect to system bus: %s", error.message);
-+    dbus_error_free (&error);
-+    return FALSE;
-+  }
-+
-+  msg = dbus_message_new_signal ("/", "org.matchbox_project.desktop", "Loaded");
-+
-+  dbus_connection_send (conn, msg, NULL);
-+  dbus_message_unref (msg);
-+
-+  /* Flush explicitly because we're too lazy to integrate DBus into the main
-+     loop. We're only sending a signal, so if we got as far as here it's
-+     unlikely to block. */
-+  dbus_connection_flush (conn);
-+  dbus_connection_unref (conn);
-+
-+  return FALSE;
-+}
-+
- static void
- mnb_drop_down_get_property (GObject *object, guint property_id,
-                             GValue *value, GParamSpec *pspec)
-@@ -137,6 +168,8 @@
- 
-   g_signal_emit (actor, dropdown_signals[SHOW_COMPLETED], 0);
-   g_object_unref (actor);
-+
-+  g_idle_add (emit_loaded_signal, NULL);
- }
- 
- static void
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
deleted file mode 100644
index 3bf7108555..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mutter-moblin nbtk gtk+ glib-2.0 clutter-1.0 gnome-menus"
-SRC_URI = "http://download.moblin.org/sources/moblin-panel-applications/0.1/moblin-panel-applications-0.1.2.tar.bz2"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb
deleted file mode 100644
index b80506ee89..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-require moblin-panel-applications.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
deleted file mode 100644
index 21a42fb228..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require moblin-panel-applications.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.1.2+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
deleted file mode 100644
index 4170197fe5..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mutter-moblin bickley bognor-regis gtk+"
-SRC_URI = "http://download.moblin.org/sources/moblin-panel-media/0.0/moblin-panel-media-0.0.7.tar.bz2"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb
deleted file mode 100644
index 2d76297d8c..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb
+++ /dev/null
@@ -1 +0,0 @@
-require moblin-panel-media.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
deleted file mode 100644
index de1351bfdb..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require moblin-panel-media.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.0.7+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
deleted file mode 100644
index e8ca32f726..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mx mutter-moblin gtk+ libsocialweb gconf libjana"
-SRC_URI = "http://download.moblin.org/sources/moblin-panel-myzone/0.0/moblin-panel-myzone-0.0.12.tar.bz2"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb
deleted file mode 100644
index 549df6f273..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require moblin-panel-myzone.inc
-DEPENDS = "nbtk mutter-moblin gtk+ mojito gconf libjana"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
deleted file mode 100644
index 27a6fad0a4..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require moblin-panel-myzone.inc
-DEPENDS += "libical"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.0.12+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
deleted file mode 100644
index df01edc09c..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin gtk+ clutter-1.0"
-SRC_URI = "http://download.moblin.org/sources/moblin-panel-pasteboard/0.0/moblin-panel-pasteboard-0.0.2.tar.bz2"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb
deleted file mode 100644
index a992971092..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-require moblin-panel-pasteboard.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
deleted file mode 100644
index 27394b4ea3..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require moblin-panel-pasteboard.inc
-PV = "0.0.2+git${SRCPV}"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
deleted file mode 100644
index ca6880dfaf..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin anerley gtk+ glib-2.0"
-SRC_URI = "http://download.moblin.org/sources/moblin-panel-people/0.0/moblin-panel-people-0.0.9.tar.bz2"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb
deleted file mode 100644
index df52a0de4e..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb
+++ /dev/null
@@ -1 +0,0 @@
-require moblin-panel-people.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
deleted file mode 100644
index 1361068d34..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require moblin-panel-people.inc
-PV = "0.0.9+git${SRCPV}"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
deleted file mode 100644
index c5f45a730c..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mx mutter-moblin dbus-glib clutter-1.0 telepathy-mission-control libsocialweb"
-SRC_URI = "http://download.moblin.org/sources/moblin-panel-status/0.0/moblin-panel-status-0.0.9.tar.bz2"
-FILES_${PN} += "${datadir}/dbus-1/services"
-inherit autotools
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb
deleted file mode 100644
index 2a3c68b1da..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require moblin-panel-status.inc
-DEPENDS = "nbtk mutter-moblin dbus-glib clutter-1.0 telepathy-mission-control mojito"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
deleted file mode 100644
index 19fec102b8..0000000000
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require moblin-panel-status.inc
-PV = "0.0.9+git${SRCPV}"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
deleted file mode 100644
index 31a3d96733..0000000000
--- a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "A Moblin specific plugin for the Mutter composite window manager"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "clutter-1.0 nbtk mutter gnome-menus mojito libjana anerley clutter-mozembed bickley bognor-regis"
-SRC_URI = "http://download.moblin.org/sources/mutter-moblin/0.43/mutter-moblin-0.43.8.tar.bz2 \
-           file://startup-notify.patch;patch=1 \
-           file://88mutter-panelapps.sh \
-           file://background-tile.png"
-FILES_${PN} += "\
-        ${sysconfdir}/X11 \
-        ${libdir}/metacity/plugins/clutter/*.so* \
-        ${libdir}/mutter/plugins/*.so* \
-        ${datadir}/mutter-moblin-netbook-plugin \
-        ${datadir}/dbus-1/services \
-        ${datadir}/moblin-panel-applications/theme \
-        ${datadir}/moblin-panel-pasteboard/theme"
-FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*"
-FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
-ASNEEDED = ""
-EXTRA_OECONF = "--enable-ahoghill --enable-netpanel --enable-people"
-inherit autotools
-do_configure_prepend () {
-        rm -f ${S}/build/autotools/gtk-doc.m4
-        cp ${WORKDIR}/background-tile.png ${S}/data/theme/panel/
-}
-do_install_append () {
-        install -d ${D}${sysconfdir}/X11/Xsession.d/
-        install ${WORKDIR}/88mutter-panelapps.sh ${D}${sysconfdir}/X11/Xsession.d/
-}
-pkg_postinst_${PN} () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-. ${sysconfdir}/init.d/functions
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[moblin-netbook]'
-nbtk-create-image-cache ${datadir}/mutter-moblin/theme
-}
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb b/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb
deleted file mode 100644
index 1136163a95..0000000000
--- a/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require mutter-moblin.inc
-SRC_URI = "http://download.moblin.org/sources/mutter-moblin/0.43/mutter-moblin-0.43.8.tar.bz2 \
-           file://startup-notify.patch;patch=1 \
-           file://88mutter-panelapps.sh \
-           file://background-tile.png"
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb b/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
deleted file mode 100644
index 99ce5799a3..0000000000
--- a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require mutter-moblin.inc
-PV = "0.43.8+git${SRCPV}"
-PR = "r11"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://startup-notify.patch;patch=1 \
-           file://88mutter-panelapps.sh \
-           file://background-tile.png"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/mx/mx_git.bb b/meta-moblin/packages/mx/mx_git.bb
deleted file mode 100644
index 884b22313a..0000000000
--- a/meta-moblin/packages/mx/mx_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Moblin toolkit library for netbooks"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r1"
-DEPENDS = "clutter-1.0 clutter-imcontext"
-S = "${WORKDIR}/git"
-inherit autotools
-EXTRA_OECONF = "--disable-introspection --without-clutter-gesture"
-do_configure_prepend () {
-        echo "EXTRA_DIST=" > ${S}/gtk-doc.make
-        touch ${S}/INSTALL
-}
diff --git a/meta-moblin/packages/nautilus/nautilus/idl-sysroot.patch b/meta-moblin/packages/nautilus/nautilus/idl-sysroot.patch
deleted file mode 100644
index 0062cfb11a..0000000000
--- a/meta-moblin/packages/nautilus/nautilus/idl-sysroot.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-Index: nautilus-2.24.2/add-include-prefix
-===================================================================
--- nautilus-2.24.2.orig/add-include-prefix     2008-10-06 17:22:21.000000000 +0000
-+++ nautilus-2.24.2/add-include-prefix  2009-04-09 16:00:05.000000000 +0000
-@@ -1 +1 @@
-sed -e 's/^/ /' -e 's/  */ /g' -e 's/ / -I /g' -e 's/ -I $//'
-+sed -e 's:^: :' -e 's:  *: :g' -e 's: : -I '"$SYSROOT"':g' -e 's: -I '"$SYSROOT"'$::'
diff --git a/meta-moblin/packages/nautilus/nautilus/no-try-run-strftime.diff b/meta-moblin/packages/nautilus/nautilus/no-try-run-strftime.diff
deleted file mode 100644
index ccd2934b3a..0000000000
--- a/meta-moblin/packages/nautilus/nautilus/no-try-run-strftime.diff
+++ /dev/null
@@ -1,28 +0,0 @@
--- /tmp/configure.in   2009-04-13 11:26:43.000000000 +0200
-+++ nautilus-2.26.1/configure.in        2009-04-13 11:28:37.000000000 +0200
-@@ -375,25 +375,6 @@
- 
- dnl ===========================================================================
- 
-dnl strftime checks
-
-AC_TRY_RUN([#include <time.h>
-                int main ()
-                {
-                  char buf[100];
-                  struct tm tm = {0};
-                  tm.tm_year = 99;
-                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
-                     strcmp (buf, "1999")==0)
-                    return 0;
-                  return 1;
-                }
-            ],
-           AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
-            )
-
-dnl ===========================================================================
-
- #
- # Checks for Xft/XRender
- #
diff --git a/meta-moblin/packages/nautilus/nautilus_2.26.1.bb b/meta-moblin/packages/nautilus/nautilus_2.26.1.bb
deleted file mode 100644
index e653ae9918..0000000000
--- a/meta-moblin/packages/nautilus/nautilus_2.26.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-# nautilus OE build file
-# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-inherit gnome
-SRC_URI += "file://idl-sysroot.patch;patch=1 \
-            file://no-try-run-strftime.diff;patch=1 \
-"
-export SYSROOT = "${STAGING_DIR_HOST}"
-LICENSE = "GPL"
-DEPENDS = "gail gtk+ pango gnome-desktop libxml2 dbus-glib libunique libexif librsvg"
-#DEPENDS += "gvfs"
-#RDEPENDS = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash"
-EXTRA_OECONF = " --disable-gtk-doc  --disable-update-mimedb --disable-tracker --disable-beagle"
-PACKAGES += " libnautilus"
-FILES_${PN} += "${datadir}/icons  /usr/libexec/ "
-FILES_libnautilus = "/usr/lib/*.so*"
-FILES_${PN}-dbg += "/usr/libexec/.debug"
-do_configure_prepend() {
-        sed -i -e /docs/d Makefile.am
-}
diff --git a/meta-moblin/packages/nbtk/nbtk.inc b/meta-moblin/packages/nbtk/nbtk.inc
deleted file mode 100644
index 0ad2dff6c0..0000000000
--- a/meta-moblin/packages/nbtk/nbtk.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Moblin toolkit library for netbooks"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-SRC_URI = "http://download.moblin.org/sources/${PN}/1.2/${PN}-${PV}.tar.bz2"
-LICENSE = "LGPLv2.1"
-PR = "r4"
-DEPENDS = "clutter-1.0 libccss clutter-imcontext"
-EXTRA_OECONF = "--disable-introspection"
-inherit autotools
-do_configure_prepend () {
-        echo "EXTRA_DIST=" > ${S}/gtk-doc.make
-        touch ${S}/INSTALL
-}
diff --git a/meta-moblin/packages/nbtk/nbtk_1.2.3.bb b/meta-moblin/packages/nbtk/nbtk_1.2.3.bb
deleted file mode 100644
index d3eaf3449b..0000000000
--- a/meta-moblin/packages/nbtk/nbtk_1.2.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-require nbtk.inc
diff --git a/meta-moblin/packages/nbtk/nbtk_git.bb b/meta-moblin/packages/nbtk/nbtk_git.bb
deleted file mode 100644
index 0caf4ecc75..0000000000
--- a/meta-moblin/packages/nbtk/nbtk_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require nbtk.inc
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "1.2.3+git${SRCPV}"
-S = "${WORKDIR}/git"
diff --git a/meta-moblin/packages/packagekit/gnome-packagekit_2.28.2.bb b/meta-moblin/packages/packagekit/gnome-packagekit_2.28.2.bb
deleted file mode 100644
index 9b31e98ba3..0000000000
--- a/meta-moblin/packages/packagekit/gnome-packagekit_2.28.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "GNOME frontend for packagekit"
-LICENSE = "GPL"
-DEPENDS = "packagekit libsexy gconf-dbus polkit polkit-gnome libunique gnome-menus devicekit-power"
-inherit gnome
-SRC_URI = "http://www.packagekit.org/releases/gnome-packagekit-${PV}.tar.gz"
-EXTRA_OECONF = " --enable-compile-warnings=no  --disable-scrollkeeper "
-do_configure_prepend() {
-        sed -i -e s/help/docs/ Makefile.am 
-        sed -i -e s:-Werror::g configure.ac
-}
-FILES_${PN} += "${datadir}/icons ${datadir}/gnome"
diff --git a/meta-moblin/packages/packagekit/packagekit-0.5.6/configurefix.patch b/meta-moblin/packages/packagekit/packagekit-0.5.6/configurefix.patch
deleted file mode 100644
index 48f959186a..0000000000
--- a/meta-moblin/packages/packagekit/packagekit-0.5.6/configurefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: PackageKit-0.6.0/configure.ac
-===================================================================
--- PackageKit-0.6.0.orig/configure.ac  2010-01-04 16:32:18.000000000 +0000
-+++ PackageKit-0.6.0/configure.ac       2010-01-29 11:33:48.000000000 +0000
-@@ -90,7 +90,7 @@
-                                                        enable_strict=$default_strict)
- if test x$enable_strict != xno; then
-        if test "$GCC" = "yes"; then
-               WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror"
-+               :
-        fi
- fi
- 
diff --git a/meta-moblin/packages/packagekit/packagekit-0.5.6/opkgfixes.patch b/meta-moblin/packages/packagekit/packagekit-0.5.6/opkgfixes.patch
deleted file mode 100644
index 64da86a526..0000000000
--- a/meta-moblin/packages/packagekit/packagekit-0.5.6/opkgfixes.patch
+++ /dev/null
@@ -1,421 +0,0 @@
-Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c
-===================================================================
--- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c       2010-01-29 09:39:33.000000000 +0000
-+++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c    2010-01-29 11:30:51.000000000 +0000
-@@ -29,8 +29,6 @@
- 
- #include <libopkg/opkg.h>
- 
-static opkg_t *opkg;
-
- enum {
-        SEARCH_NAME,
-        SEARCH_DESCRIPTION,
-@@ -62,7 +60,7 @@
-  * check an opkg package for known GUI dependancies
-  */
- static gboolean
-opkg_is_gui_pkg (opkg_package_t *pkg)
-+opkg_is_gui_pkg (pkg_t *pkg)
- {
- 
-   /* TODO: check appropriate tag */
-@@ -84,7 +82,7 @@
-  * check an opkg package to determine if it is a development package
-  */
- static gboolean
-opkg_is_devel_pkg (opkg_package_t *pkg)
-+opkg_is_devel_pkg (pkg_t *pkg)
- {
-   if (g_strrstr (pkg->name, "-dev"))
-       return TRUE;
-@@ -105,7 +103,7 @@
-  * returns true if the tag is present
-  */
- static gboolean 
-opkg_check_tag (opkg_package_t *pkg, const gchar *tag)
-+opkg_check_tag (pkg_t *pkg, const gchar *tag)
- {
-        if (pkg->tags && tag)
-                return (g_strrstr (pkg->tags, tag) != NULL);
-@@ -118,7 +116,7 @@
- {
-        switch (err)
-        {
-       case OPKG_NO_ERROR:
-+/*     case OPKG_NO_ERROR:
-                break;
-        case OPKG_PACKAGE_NOT_INSTALLED:
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
-@@ -140,7 +138,7 @@
-                break;
-        case OPKG_PACKAGE_NOT_AVAILABLE:
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL);
-               break;
-+               break;*/
-        default:
-                opkg_unknown_error (backend, err, "Update package");
-        }
-@@ -152,7 +150,7 @@
- static void
- backend_initialize (PkBackend *backend)
- {
-       opkg = opkg_new ();
-+       int opkg = opkg_new ();
- 
-        if (!opkg) {
-                pk_backend_error_code (backend,
-@@ -162,8 +160,8 @@
-        }
- 
- #ifdef OPKG_OFFLINE_ROOT
-       opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT);
-       opkg_re_read_config_files (opkg);
-+       opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT);
-+       opkg_re_read_config_files ();
- #endif
- 
- }
-@@ -174,22 +172,22 @@
- static void
- backend_destroy (PkBackend *backend)
- {
-       opkg_free (opkg);
-+       opkg_free ();
- }
- 
- 
- static void
-pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data)
-+pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data)
- {
-       PkBackend *backend = PK_BACKEND (data);
-+       PkBackend *backend = (PkBackend*) data;
-        if (!backend)
-                return;
- 
-        pk_backend_set_percentage (backend, pdata->percentage);
-       if (pdata->package)
-+       if (pdata->pkg)
-        {
-                gchar *uid;
-               opkg_package_t *pkg = pdata->package;
-+               pkg_t *pkg = pdata->pkg;
-                gint status = PK_INFO_ENUM_UNKNOWN;
- 
-                uid = g_strdup_printf ("%s;%s;%s;",
-@@ -225,12 +223,12 @@
- {
-        int ret;
- 
-       ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend);
-+       ret = opkg_update_package_lists (pk_opkg_progress_cb, backend);
- 
-        if (ret) {
-               if (ret == OPKG_DOWNLOAD_FAILED)
-                       pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
-               else
-+//             if (ret == OPKG_DOWNLOAD_FAILED)
-+//                     pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
-+//             else
-                        opkg_unknown_error (backend, ret, "Refreshing cache");
-        }
-        pk_backend_finished (backend);
-@@ -256,7 +254,7 @@
-  */
- 
- static void
-pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
-+pk_opkg_package_list_cb (pkg_t *pkg, void *data)
- {
-        SearchParams *params = (SearchParams*) data;
-        gchar *uid;
-@@ -298,7 +296,7 @@
-        uid = g_strdup_printf ("%s;%s;%s;",
-                pkg->name, pkg->version, pkg->architecture);
- 
-       if (pkg->installed)
-+       if (pkg->state_status == SS_INSTALLED)
-                status = PK_INFO_ENUM_INSTALLED;
-        else
-                status = PK_INFO_ENUM_AVAILABLE;
-@@ -318,10 +316,10 @@
-                 opkg_is_gui_pkg (pkg))
-                goto end_handle;
-        if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) && 
-                (!pkg->installed))
-+                (pkg->state_status != SS_INSTALLED))
-                goto end_handle;
-        if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) && 
-                (pkg->installed))
-+                (pkg->state_status == SS_INSTALLED))
-                goto end_handle;
- 
-        pk_backend_package (params->backend, status, uid, pkg->description);
-@@ -338,7 +336,7 @@
- 
-        params = pk_backend_get_pointer (backend, "search-params");
- 
-       opkg_list_packages (opkg, pk_opkg_package_list_cb, params);
-+       opkg_list_packages (pk_opkg_package_list_cb, params);
- 
-        pk_backend_finished (params->backend);
- 
-@@ -349,7 +347,7 @@
- }
- 
- static void
-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
-+backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search)
- {
-        SearchParams *params;
- 
-@@ -360,7 +358,7 @@
-        params = g_new0 (SearchParams, 1);
-        params->filters = filters;
-        params->search_type = SEARCH_NAME;
-       params->needle = g_utf8_strdown (search, -1);
-+       params->needle = g_utf8_strdown (search[0], -1);
-        params->backend = backend;
- 
-        pk_backend_set_pointer (backend, "search-params", params);
-@@ -371,7 +369,7 @@
-  * backend_search_description:
-  */
- static void
-backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search)
-+backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search)
- {
-        SearchParams *params;
- 
-@@ -382,7 +380,7 @@
-        params = g_new0 (SearchParams, 1);
-        params->filters = filters;
-        params->search_type = SEARCH_DESCRIPTION;
-       params->needle = g_utf8_strdown (search, -1);
-+       params->needle = g_utf8_strdown (search[0], -1);
-        params->backend = backend;
- 
-        pk_backend_set_pointer (backend, "search-params", params);
-@@ -390,7 +388,7 @@
- }
- 
- static void
-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
-+backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search)
- {
-        SearchParams *params;
- 
-@@ -401,7 +399,7 @@
-        params = g_new0 (SearchParams, 1);
-        params->filters = filters;
-        params->search_type = SEARCH_TAG;
-       params->needle = g_strdup_printf ("group::%s", search);
-+       params->needle = g_strdup_printf ("group::%s", search[0]);
-        params->backend = backend;
- 
-        pk_backend_set_pointer (backend, "search-params", params);
-@@ -412,9 +410,9 @@
- static gboolean
- backend_install_packages_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-        gint err, i;
-        gchar **package_ids;
-+       gchar **parts;
- 
-        package_ids = pk_backend_get_strv (backend, "pkids");
- 
-@@ -424,13 +422,13 @@
-        {
-                pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL);
- 
-               pi = pk_package_id_new_from_string (package_ids[i]);
-+               parts = pk_package_id_split (package_ids[i]);
- 
-               err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend);
-+               err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
-                if (err)
-                        handle_install_error (backend, err);
- 
-               pk_package_id_free (pi);
-+               g_strfreev (parts);
-                if (err != 0)
-                        break;
-        }
-@@ -453,9 +451,9 @@
- static gboolean
- backend_remove_packages_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-        gint err, i;
-        gchar **package_ids;
-+       gchar **parts;
-        gboolean allow_deps;
-        gboolean autoremove;
-        gpointer *data;
-@@ -467,29 +465,30 @@
-        autoremove = GPOINTER_TO_INT (data[2]);
-        g_free (data);
- 
-       opkg_set_option (opkg, (char *)"autoremove", &autoremove);
-       opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps);
-+       opkg_set_option ((char *)"autoremove", &autoremove);
-+       opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps);
- 
-        err = 0;
- 
-        for (i = 0; package_ids[i]; i++)
-        {
-               pi = pk_package_id_new_from_string (package_ids[i]);
-                pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL);
- 
-               err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend);
-+               parts = pk_package_id_split (package_ids[i]);
-+
-+               err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
- 
-                switch (err)
-                {
-               case OPKG_NO_ERROR:
-                       break;
-               case OPKG_PACKAGE_NOT_INSTALLED:
-                       pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
-                       break;
-+               //case OPKG_NO_ERROR:
-+               //      break;
-+               //case OPKG_PACKAGE_NOT_INSTALLED:
-+               //      pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
-+               //      break;
-                default:
-                        opkg_unknown_error (backend, err, "Remove");
-                }
-               pk_package_id_free (pi);
-+               g_strfreev (parts);
- 
-                if (err != 0)
-                        break;
-@@ -540,7 +539,7 @@
-        gint err;
- 
-        /* FIXME: support only_trusted */
-       err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
-+       err = opkg_upgrade_all (pk_opkg_progress_cb, backend);
- 
-        if (err)
-                opkg_unknown_error (backend, err, "Upgrading system");
-@@ -564,29 +563,28 @@
- static gboolean
- backend_update_package_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-+        gchar **parts;
-        gint err = 0;
-        const gchar *package_id;
- 
-        /* FIXME: support only_trusted */
-        package_id = pk_backend_get_string (backend, "pkgid");
-       pi = pk_package_id_new_from_string (package_id);
-+       parts = pk_package_id_split (package_id);
- 
-       if (!pi->name || !pi->version)
-+       if (!parts)
-        {
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
-                                "Package not found");
-               pk_package_id_free (pi);
-                pk_backend_finished (backend);
-                return FALSE;
-        }
- 
-       err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend);
-+       err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
-        if (err)
-                handle_install_error (backend, err);
- 
- 
-       pk_package_id_free (pi);
-+       g_strfreev (parts);
-        pk_backend_finished (backend);
-        return (err != 0);
- }
-@@ -610,13 +608,13 @@
-  */
- 
- static void
-pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
-+pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data)
- {
-       PkBackend *backend = PK_BACKEND (data);
-+       PkBackend *backend = (PkBackend*) data;
-        gchar *uid;
-        gint status;
- 
-       if (pkg->installed)
-+       if (pkg->state_status == SS_INSTALLED)
-                status = PK_INFO_ENUM_INSTALLED;
-        else
-                status = PK_INFO_ENUM_AVAILABLE;
-@@ -631,7 +629,7 @@
- static gboolean
- backend_get_updates_thread (PkBackend *backend)
- {
-       opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend);
-+       opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend);
-        pk_backend_finished (backend);
-        return TRUE;
- }
-@@ -668,16 +666,18 @@
- static gboolean
- backend_get_details_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-        gchar **package_ids;
-+        gchar **parts;
-        int group_index;
-        PkGroupEnum group = 0;
-       opkg_package_t *pkg;
-+       pkg_t *pkg;
-        gchar *newid;
- 
-         package_ids = pk_backend_get_strv(backend, "package_ids");
-       pi = pk_package_id_new_from_string (package_ids[0]);
-       if (pi == NULL)
-+       parts = pk_package_id_split (package_ids[0]);
-+
-+
-+       if (!parts)
-        {
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id");
-                pk_backend_finished (backend);
-@@ -685,8 +685,8 @@
-        }
- 
- 
-       pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data);
-       pk_package_id_free (pi);
-+       pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]);
-+       g_strfreev (parts);
- 
-        if (!pkg)
-        {
-@@ -695,7 +695,7 @@
-                return FALSE;
-        }
- 
-       newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository);
-+       newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name);
- 
-        if (pkg->tags) {
-                for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) {
-@@ -706,9 +706,8 @@
-                }
-        }
- 
-       pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size);
-+       pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size);
-        g_free (newid);
-       opkg_package_free(pkg);
-        pk_backend_finished (backend);
-        return TRUE;
- }
diff --git a/meta-moblin/packages/packagekit/packagekit-0.6.0/configurefix.patch b/meta-moblin/packages/packagekit/packagekit-0.6.0/configurefix.patch
deleted file mode 100644
index 48f959186a..0000000000
--- a/meta-moblin/packages/packagekit/packagekit-0.6.0/configurefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: PackageKit-0.6.0/configure.ac
-===================================================================
--- PackageKit-0.6.0.orig/configure.ac  2010-01-04 16:32:18.000000000 +0000
-+++ PackageKit-0.6.0/configure.ac       2010-01-29 11:33:48.000000000 +0000
-@@ -90,7 +90,7 @@
-                                                        enable_strict=$default_strict)
- if test x$enable_strict != xno; then
-        if test "$GCC" = "yes"; then
-               WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror"
-+               :
-        fi
- fi
- 
diff --git a/meta-moblin/packages/packagekit/packagekit-0.6.0/opkgfixes.patch b/meta-moblin/packages/packagekit/packagekit-0.6.0/opkgfixes.patch
deleted file mode 100644
index 64da86a526..0000000000
--- a/meta-moblin/packages/packagekit/packagekit-0.6.0/opkgfixes.patch
+++ /dev/null
@@ -1,421 +0,0 @@
-Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c
-===================================================================
--- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c       2010-01-29 09:39:33.000000000 +0000
-+++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c    2010-01-29 11:30:51.000000000 +0000
-@@ -29,8 +29,6 @@
- 
- #include <libopkg/opkg.h>
- 
-static opkg_t *opkg;
-
- enum {
-        SEARCH_NAME,
-        SEARCH_DESCRIPTION,
-@@ -62,7 +60,7 @@
-  * check an opkg package for known GUI dependancies
-  */
- static gboolean
-opkg_is_gui_pkg (opkg_package_t *pkg)
-+opkg_is_gui_pkg (pkg_t *pkg)
- {
- 
-   /* TODO: check appropriate tag */
-@@ -84,7 +82,7 @@
-  * check an opkg package to determine if it is a development package
-  */
- static gboolean
-opkg_is_devel_pkg (opkg_package_t *pkg)
-+opkg_is_devel_pkg (pkg_t *pkg)
- {
-   if (g_strrstr (pkg->name, "-dev"))
-       return TRUE;
-@@ -105,7 +103,7 @@
-  * returns true if the tag is present
-  */
- static gboolean 
-opkg_check_tag (opkg_package_t *pkg, const gchar *tag)
-+opkg_check_tag (pkg_t *pkg, const gchar *tag)
- {
-        if (pkg->tags && tag)
-                return (g_strrstr (pkg->tags, tag) != NULL);
-@@ -118,7 +116,7 @@
- {
-        switch (err)
-        {
-       case OPKG_NO_ERROR:
-+/*     case OPKG_NO_ERROR:
-                break;
-        case OPKG_PACKAGE_NOT_INSTALLED:
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
-@@ -140,7 +138,7 @@
-                break;
-        case OPKG_PACKAGE_NOT_AVAILABLE:
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL);
-               break;
-+               break;*/
-        default:
-                opkg_unknown_error (backend, err, "Update package");
-        }
-@@ -152,7 +150,7 @@
- static void
- backend_initialize (PkBackend *backend)
- {
-       opkg = opkg_new ();
-+       int opkg = opkg_new ();
- 
-        if (!opkg) {
-                pk_backend_error_code (backend,
-@@ -162,8 +160,8 @@
-        }
- 
- #ifdef OPKG_OFFLINE_ROOT
-       opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT);
-       opkg_re_read_config_files (opkg);
-+       opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT);
-+       opkg_re_read_config_files ();
- #endif
- 
- }
-@@ -174,22 +172,22 @@
- static void
- backend_destroy (PkBackend *backend)
- {
-       opkg_free (opkg);
-+       opkg_free ();
- }
- 
- 
- static void
-pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data)
-+pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data)
- {
-       PkBackend *backend = PK_BACKEND (data);
-+       PkBackend *backend = (PkBackend*) data;
-        if (!backend)
-                return;
- 
-        pk_backend_set_percentage (backend, pdata->percentage);
-       if (pdata->package)
-+       if (pdata->pkg)
-        {
-                gchar *uid;
-               opkg_package_t *pkg = pdata->package;
-+               pkg_t *pkg = pdata->pkg;
-                gint status = PK_INFO_ENUM_UNKNOWN;
- 
-                uid = g_strdup_printf ("%s;%s;%s;",
-@@ -225,12 +223,12 @@
- {
-        int ret;
- 
-       ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend);
-+       ret = opkg_update_package_lists (pk_opkg_progress_cb, backend);
- 
-        if (ret) {
-               if (ret == OPKG_DOWNLOAD_FAILED)
-                       pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
-               else
-+//             if (ret == OPKG_DOWNLOAD_FAILED)
-+//                     pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
-+//             else
-                        opkg_unknown_error (backend, ret, "Refreshing cache");
-        }
-        pk_backend_finished (backend);
-@@ -256,7 +254,7 @@
-  */
- 
- static void
-pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
-+pk_opkg_package_list_cb (pkg_t *pkg, void *data)
- {
-        SearchParams *params = (SearchParams*) data;
-        gchar *uid;
-@@ -298,7 +296,7 @@
-        uid = g_strdup_printf ("%s;%s;%s;",
-                pkg->name, pkg->version, pkg->architecture);
- 
-       if (pkg->installed)
-+       if (pkg->state_status == SS_INSTALLED)
-                status = PK_INFO_ENUM_INSTALLED;
-        else
-                status = PK_INFO_ENUM_AVAILABLE;
-@@ -318,10 +316,10 @@
-                 opkg_is_gui_pkg (pkg))
-                goto end_handle;
-        if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) && 
-                (!pkg->installed))
-+                (pkg->state_status != SS_INSTALLED))
-                goto end_handle;
-        if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) && 
-                (pkg->installed))
-+                (pkg->state_status == SS_INSTALLED))
-                goto end_handle;
- 
-        pk_backend_package (params->backend, status, uid, pkg->description);
-@@ -338,7 +336,7 @@
- 
-        params = pk_backend_get_pointer (backend, "search-params");
- 
-       opkg_list_packages (opkg, pk_opkg_package_list_cb, params);
-+       opkg_list_packages (pk_opkg_package_list_cb, params);
- 
-        pk_backend_finished (params->backend);
- 
-@@ -349,7 +347,7 @@
- }
- 
- static void
-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
-+backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search)
- {
-        SearchParams *params;
- 
-@@ -360,7 +358,7 @@
-        params = g_new0 (SearchParams, 1);
-        params->filters = filters;
-        params->search_type = SEARCH_NAME;
-       params->needle = g_utf8_strdown (search, -1);
-+       params->needle = g_utf8_strdown (search[0], -1);
-        params->backend = backend;
- 
-        pk_backend_set_pointer (backend, "search-params", params);
-@@ -371,7 +369,7 @@
-  * backend_search_description:
-  */
- static void
-backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search)
-+backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search)
- {
-        SearchParams *params;
- 
-@@ -382,7 +380,7 @@
-        params = g_new0 (SearchParams, 1);
-        params->filters = filters;
-        params->search_type = SEARCH_DESCRIPTION;
-       params->needle = g_utf8_strdown (search, -1);
-+       params->needle = g_utf8_strdown (search[0], -1);
-        params->backend = backend;
- 
-        pk_backend_set_pointer (backend, "search-params", params);
-@@ -390,7 +388,7 @@
- }
- 
- static void
-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
-+backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search)
- {
-        SearchParams *params;
- 
-@@ -401,7 +399,7 @@
-        params = g_new0 (SearchParams, 1);
-        params->filters = filters;
-        params->search_type = SEARCH_TAG;
-       params->needle = g_strdup_printf ("group::%s", search);
-+       params->needle = g_strdup_printf ("group::%s", search[0]);
-        params->backend = backend;
- 
-        pk_backend_set_pointer (backend, "search-params", params);
-@@ -412,9 +410,9 @@
- static gboolean
- backend_install_packages_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-        gint err, i;
-        gchar **package_ids;
-+       gchar **parts;
- 
-        package_ids = pk_backend_get_strv (backend, "pkids");
- 
-@@ -424,13 +422,13 @@
-        {
-                pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL);
- 
-               pi = pk_package_id_new_from_string (package_ids[i]);
-+               parts = pk_package_id_split (package_ids[i]);
- 
-               err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend);
-+               err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
-                if (err)
-                        handle_install_error (backend, err);
- 
-               pk_package_id_free (pi);
-+               g_strfreev (parts);
-                if (err != 0)
-                        break;
-        }
-@@ -453,9 +451,9 @@
- static gboolean
- backend_remove_packages_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-        gint err, i;
-        gchar **package_ids;
-+       gchar **parts;
-        gboolean allow_deps;
-        gboolean autoremove;
-        gpointer *data;
-@@ -467,29 +465,30 @@
-        autoremove = GPOINTER_TO_INT (data[2]);
-        g_free (data);
- 
-       opkg_set_option (opkg, (char *)"autoremove", &autoremove);
-       opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps);
-+       opkg_set_option ((char *)"autoremove", &autoremove);
-+       opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps);
- 
-        err = 0;
- 
-        for (i = 0; package_ids[i]; i++)
-        {
-               pi = pk_package_id_new_from_string (package_ids[i]);
-                pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL);
- 
-               err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend);
-+               parts = pk_package_id_split (package_ids[i]);
-+
-+               err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
- 
-                switch (err)
-                {
-               case OPKG_NO_ERROR:
-                       break;
-               case OPKG_PACKAGE_NOT_INSTALLED:
-                       pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
-                       break;
-+               //case OPKG_NO_ERROR:
-+               //      break;
-+               //case OPKG_PACKAGE_NOT_INSTALLED:
-+               //      pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
-+               //      break;
-                default:
-                        opkg_unknown_error (backend, err, "Remove");
-                }
-               pk_package_id_free (pi);
-+               g_strfreev (parts);
- 
-                if (err != 0)
-                        break;
-@@ -540,7 +539,7 @@
-        gint err;
- 
-        /* FIXME: support only_trusted */
-       err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
-+       err = opkg_upgrade_all (pk_opkg_progress_cb, backend);
- 
-        if (err)
-                opkg_unknown_error (backend, err, "Upgrading system");
-@@ -564,29 +563,28 @@
- static gboolean
- backend_update_package_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-+        gchar **parts;
-        gint err = 0;
-        const gchar *package_id;
- 
-        /* FIXME: support only_trusted */
-        package_id = pk_backend_get_string (backend, "pkgid");
-       pi = pk_package_id_new_from_string (package_id);
-+       parts = pk_package_id_split (package_id);
- 
-       if (!pi->name || !pi->version)
-+       if (!parts)
-        {
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
-                                "Package not found");
-               pk_package_id_free (pi);
-                pk_backend_finished (backend);
-                return FALSE;
-        }
- 
-       err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend);
-+       err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
-        if (err)
-                handle_install_error (backend, err);
- 
- 
-       pk_package_id_free (pi);
-+       g_strfreev (parts);
-        pk_backend_finished (backend);
-        return (err != 0);
- }
-@@ -610,13 +608,13 @@
-  */
- 
- static void
-pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
-+pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data)
- {
-       PkBackend *backend = PK_BACKEND (data);
-+       PkBackend *backend = (PkBackend*) data;
-        gchar *uid;
-        gint status;
- 
-       if (pkg->installed)
-+       if (pkg->state_status == SS_INSTALLED)
-                status = PK_INFO_ENUM_INSTALLED;
-        else
-                status = PK_INFO_ENUM_AVAILABLE;
-@@ -631,7 +629,7 @@
- static gboolean
- backend_get_updates_thread (PkBackend *backend)
- {
-       opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend);
-+       opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend);
-        pk_backend_finished (backend);
-        return TRUE;
- }
-@@ -668,16 +666,18 @@
- static gboolean
- backend_get_details_thread (PkBackend *backend)
- {
-       PkPackageId *pi;
-        gchar **package_ids;
-+        gchar **parts;
-        int group_index;
-        PkGroupEnum group = 0;
-       opkg_package_t *pkg;
-+       pkg_t *pkg;
-        gchar *newid;
- 
-         package_ids = pk_backend_get_strv(backend, "package_ids");
-       pi = pk_package_id_new_from_string (package_ids[0]);
-       if (pi == NULL)
-+       parts = pk_package_id_split (package_ids[0]);
-+
-+
-+       if (!parts)
-        {
-                pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id");
-                pk_backend_finished (backend);
-@@ -685,8 +685,8 @@
-        }
- 
- 
-       pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data);
-       pk_package_id_free (pi);
-+       pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]);
-+       g_strfreev (parts);
- 
-        if (!pkg)
-        {
-@@ -695,7 +695,7 @@
-                return FALSE;
-        }
- 
-       newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository);
-+       newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name);
- 
-        if (pkg->tags) {
-                for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) {
-@@ -706,9 +706,8 @@
-                }
-        }
- 
-       pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size);
-+       pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size);
-        g_free (newid);
-       opkg_package_free(pkg);
-        pk_backend_finished (backend);
-        return TRUE;
- }
diff --git a/meta-moblin/packages/packagekit/packagekit_0.5.6.bb b/meta-moblin/packages/packagekit/packagekit_0.5.6.bb
deleted file mode 100644
index 57f05650c1..0000000000
--- a/meta-moblin/packages/packagekit/packagekit_0.5.6.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "PackageKit package management abstraction"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ python polkit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1) connman"
-RDEPENDS_${PN} = "opkg"
-inherit gnome autotools
-SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
-           file://configurefix.patch;patch=1 \
-           file://opkgfixes.patch;patch=1"
-PR = "r1"
-S = "${WORKDIR}/PackageKit-${PV}"
-EXTRA_OECONF = "--with-security-framework=dummy \
-                --with-default-backend=opkg \
-                --enable-opkg \
-                --disable-tests \
-                --disable-qt \
-                --disable-gstreamer-plugin \
-                --disable-local  \
-                --disable-networkmanager \
-                ac_cv_path_XMLTO=no \
-                "
-do_configure_prepend() {
-        mkdir -p m4
-        echo "EXTRA_DIST=" > gtk-doc.make
-}
-do_configure_append() {
-        for i in $(find . -name Makefile) ; do
-                sed -i -e s:${STAGING_DIR_NATIVE}::g \
-               -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \
-               -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \
-        $i
-        done
-}
-PACKAGES =+ "${PN}-website"
-FILES_${PN}-website = "${datadir}/PackageKit/website"
-PACKAGES =+ "${PN}-python"
-FILES_${PN}-python = "${libdir}/python*"
-PACKAGES =+ "${PN}-gtkmodule"
-FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so"
-FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit"
-FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug"
-FILES_${PN}-dev += "${libdir}/packagekit-backend/*a ${libdir}/gtk-2.0/*/*a"
diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch b/meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch
deleted file mode 100644
index 2172cac41e..0000000000
--- a/meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Double path references breaks recent autoconf+automake
-RP 2/1/10
-Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am
-===================================================================
--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am   2005-09-28 00:53:16.000000000 +0100
-+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am        2010-02-01 14:28:46.397820574 +0000
-@@ -25,7 +25,6 @@
-          README \
-        \
-          gcc/alpha.h gcc/arm.h gcc/x86.h \
-         gcc/hppa.h gcc/ia64.h \
-          gcc/powerpc.h gcc/sparc.h \
-          gcc/hppa.h gcc/m68k.h gcc/s390.h \
-          gcc/ia64.h gcc/x86_64.h gcc/cris.h \
-Index: libatomic_ops-1.2/doc/Makefile.am
-===================================================================
--- libatomic_ops-1.2.orig/doc/Makefile.am      2010-02-01 15:20:09.207788884 +0000
-+++ libatomic_ops-1.2/doc/Makefile.am   2010-02-01 15:20:20.909049794 +0000
-@@ -1,3 +1,3 @@
- # installed documentation
- #
-dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
-+dist_pkgdata_DATA=LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch b/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
deleted file mode 100644
index 51161dbe0f..0000000000
--- a/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://cvs.fedoraproject.org/viewcvs/devel/libatomic_ops/libatomic_ops-1.2-ppclwzfix.patch
-* add fix for bad variable handling on PPC
--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:29:52.000000000 +0200
-+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/powerpc.h      2007-05-29 19:30:48.000000000 +0200
-@@ -72,7 +72,7 @@
-   /* registers.  I always got "impossible constraint" when I   */
-   /* tried the "y" constraint.                                 */
-   __asm__ __volatile__ (
-    "lwz %0,%1\n"
-+    "lwz%U1%X1 %0,%1\n"
-     "cmpw cr7,%0,%0\n"
-     "bne- cr7,1f\n"
-     "1: isync\n"
diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
deleted file mode 100644
index 207f1b1ec6..0000000000
--- a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "A library for atomic integer operations"
-LICENSE = "MIT"
-PR = "r4"
-SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \
-           file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1 \
-           file://doublefix.patch;patch=1"
-S = "${WORKDIR}/libatomic_ops-${PV}"
-ALLOW_EMPTY_${PN} = "1"
-inherit autotools pkgconfig
diff --git a/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch b/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch
deleted file mode 100644
index 73a2ea6e49..0000000000
--- a/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Allow a slightly older autoconf and disable the inbuild libltdl
-RP - 16/4/09
-Index: libcanberra-0.10/Makefile.am
-===================================================================
--- libcanberra-0.10.orig/Makefile.am   2009-04-16 14:38:53.000000000 +0100
-+++ libcanberra-0.10/Makefile.am        2009-04-16 14:39:04.000000000 +0100
-@@ -19,7 +19,7 @@
- dist_doc_DATA = README
- 
- EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
-SUBDIRS = src gtkdoc libltdl doc
-+SUBDIRS = src gtkdoc doc
- 
- MAINTAINERCLEANFILES = README
- noinst_DATA = README
-Index: libcanberra-0.10/configure.ac
-===================================================================
--- libcanberra-0.10.orig/configure.ac  2009-04-16 14:32:33.000000000 +0100
-+++ libcanberra-0.10/configure.ac       2009-04-16 14:37:50.000000000 +0100
-@@ -19,7 +19,7 @@
- # License along with libcanberra. If not, see
- # <http://www.gnu.org/licenses/>.
- 
-AC_PREREQ(2.62)
-+AC_PREREQ(2.61)
- 
- AC_INIT([libcanberra], 0.10, [mzyvopnaoreen (at) 0pointer (dot) de])
- AC_CONFIG_SRCDIR([src/common.c])
-@@ -70,7 +70,6 @@
- AC_PROG_LIBTOOL
- AC_SUBST(LTDLINCL)
- AC_SUBST(LIBLTDL)
-AC_CONFIG_SUBDIRS(libltdl)
- 
- #### Determine build environment ####
- 
diff --git a/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch b/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch
deleted file mode 100644
index 89a4fbf9f1..0000000000
--- a/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libcanberra-0.10/src/sound-theme-spec.c
-===================================================================
--- libcanberra-0.10.orig/src/sound-theme-spec.c        2009-05-22 17:08:23.000000000 +0100
-+++ libcanberra-0.10/src/sound-theme-spec.c     2009-05-22 17:12:50.000000000 +0100
-@@ -398,9 +398,9 @@
-     if ((ret = load_theme_dir(t, name)) < 0)
-         goto fail;
- 
-+    /* The fallback theme may intentionally not exist so ignore failure */
-     if (!t->loaded_fallback_theme)
-        if ((ret = load_theme_dir(t, FALLBACK_THEME)) < 0)
-            goto fail;
-+        load_theme_dir(t, FALLBACK_THEME);
- 
-     if (*_t)
-         ca_theme_data_free(*_t);
diff --git a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
deleted file mode 100644
index c6d25dccb0..0000000000
--- a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops."
-LICENSE = "LGPL"
-DEPENDS = "gtk+ pulseaudio alsa-lib libtool"
-PR = "r3"
-inherit gconf autotools
-SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \
-           file://nofallbackfix.patch;patch=1 \
-           file://autoconf_version.patch;patch=1"
-EXTRA_OECONF = " --disable-oss --disable-ltdl-install" 
-do_configure_prepend () {
-        rm -f ${S}/libltdl/configure*
-}
-FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/alsaerror.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/alsaerror.patch
deleted file mode 100644
index 2efa3e89b8..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/alsaerror.patch
+++ /dev/null
@@ -1,525 +0,0 @@
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 19 Apr 2009 17:22:51 +0000 (+0200)
-Subject: alsa: properly convert return values of snd_strerror() to utf8
-X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=98a25c506e692ab091b4af7e1b37e8432fc08e8f
-alsa: properly convert return values of snd_strerror() to utf8
---
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index 2fbcd7b..41e8b47 100644
--- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -281,7 +281,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-     pa_assert(call);
-     pa_assert(err < 0);
- 
-    pa_log_debug("%s: %s", call, snd_strerror(err));
-+    pa_log_debug("%s: %s", call, pa_alsa_strerror(err));
- 
-     pa_assert(err != -EAGAIN);
- 
-@@ -289,7 +289,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-         pa_log_debug("%s: Buffer underrun!", call);
- 
-     if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
-        pa_log("%s: %s", call, snd_strerror(err));
-+        pa_log("%s: %s", call, pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -636,12 +636,12 @@ static void update_smoother(struct userdata *u) {
-     /* Let's update the time smoother */
- 
-     if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
-        pa_log_warn("Failed to query DSP status data: %s", snd_strerror(err));
-+        pa_log_warn("Failed to query DSP status data: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-     if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0))
-        pa_log_warn("Failed to get timestamp: %s", snd_strerror(err));
-+        pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err));
-     else {
-         snd_htimestamp_t htstamp = { 0, 0 };
-         snd_pcm_status_get_htstamp(status, &htstamp);
-@@ -764,7 +764,7 @@ static int update_sw_params(struct userdata *u) {
-     pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
- 
-     if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
-        pa_log("Failed to set software parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
-         return err;
-     }
- 
-@@ -792,7 +792,7 @@ static int unsuspend(struct userdata *u) {
-                             SND_PCM_NO_AUTO_RESAMPLE|
-                             SND_PCM_NO_AUTO_CHANNELS|
-                             SND_PCM_NO_AUTO_FORMAT)) < 0) {
-        pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
-+        pa_log("Error opening PCM device %s: %s", u->device_name, pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -803,7 +803,7 @@ static int unsuspend(struct userdata *u) {
-     d = u->use_tsched;
- 
-     if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
-        pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set hardware parameters: %s", pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -1030,7 +1030,7 @@ static void sink_get_volume_cb(pa_sink *s) {
-     return;
- 
- fail:
-    pa_log_error("Unable to read volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to read volume: %s", pa_alsa_strerror(err));
- }
- 
- static void sink_set_volume_cb(pa_sink *s) {
-@@ -1141,7 +1141,7 @@ static void sink_set_volume_cb(pa_sink *s) {
-     return;
- 
- fail:
-    pa_log_error("Unable to set volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to set volume: %s", pa_alsa_strerror(err));
- }
- 
- static void sink_get_mute_cb(pa_sink *s) {
-@@ -1152,7 +1152,7 @@ static void sink_get_mute_cb(pa_sink *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_get_playback_switch(u->mixer_elem, 0, &sw)) < 0) {
-        pa_log_error("Unable to get switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to get switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -1167,7 +1167,7 @@ static void sink_set_mute_cb(pa_sink *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_set_playback_switch_all(u->mixer_elem, !s->muted)) < 0) {
-        pa_log_error("Unable to set switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to set switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- }
-@@ -1206,7 +1206,7 @@ static int process_rewind(struct userdata *u) {
-     pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes);
- 
-     if (PA_UNLIKELY((unused = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
-        pa_log("snd_pcm_avail() failed: %s", snd_strerror((int) unused));
-+        pa_log("snd_pcm_avail() failed: %s", pa_alsa_strerror((int) unused));
-         return -1;
-     }
- 
-@@ -1228,7 +1228,7 @@ static int process_rewind(struct userdata *u) {
-         in_frames = (snd_pcm_sframes_t) (rewind_nbytes / u->frame_size);
-         pa_log_debug("before: %lu", (unsigned long) in_frames);
-         if ((out_frames = snd_pcm_rewind(u->pcm_handle, (snd_pcm_uframes_t) in_frames)) < 0) {
-            pa_log("snd_pcm_rewind() failed: %s", snd_strerror((int) out_frames));
-+            pa_log("snd_pcm_rewind() failed: %s", pa_alsa_strerror((int) out_frames));
-             return -1;
-         }
-         pa_log_debug("after: %lu", (unsigned long) out_frames);
-@@ -1359,7 +1359,7 @@ static void thread_func(void *userdata) {
-             pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
- 
-             if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
-                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
-+                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", pa_alsa_strerror(err));
-                 goto fail;
-             }
- 
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index c59fc75..843f70b 100644
--- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -278,7 +278,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-     pa_assert(call);
-     pa_assert(err < 0);
- 
-    pa_log_debug("%s: %s", call, snd_strerror(err));
-+    pa_log_debug("%s: %s", call, pa_alsa_strerror(err));
- 
-     pa_assert(err != -EAGAIN);
- 
-@@ -286,7 +286,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
-         pa_log_debug("%s: Buffer overrun!", call);
- 
-     if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
-        pa_log("%s: %s", call, snd_strerror(err));
-+        pa_log("%s: %s", call, pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -606,12 +606,12 @@ static void update_smoother(struct userdata *u) {
-     /* Let's update the time smoother */
- 
-     if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->source->sample_spec)) < 0)) {
-        pa_log_warn("Failed to get delay: %s", snd_strerror(err));
-+        pa_log_warn("Failed to get delay: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-     if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0))
-        pa_log_warn("Failed to get timestamp: %s", snd_strerror(err));
-+        pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err));
-     else {
-         snd_htimestamp_t htstamp = { 0, 0 };
-         snd_pcm_status_get_htstamp(status, &htstamp);
-@@ -721,7 +721,7 @@ static int update_sw_params(struct userdata *u) {
-     pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
- 
-     if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
-        pa_log("Failed to set software parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
-         return err;
-     }
- 
-@@ -747,7 +747,7 @@ static int unsuspend(struct userdata *u) {
-                             SND_PCM_NO_AUTO_RESAMPLE|
-                             SND_PCM_NO_AUTO_CHANNELS|
-                             SND_PCM_NO_AUTO_FORMAT)) < 0) {
-        pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
-+        pa_log("Error opening PCM device %s: %s", u->device_name, pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -758,7 +758,7 @@ static int unsuspend(struct userdata *u) {
-     d = u->use_tsched;
- 
-     if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
-        pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
-+        pa_log("Failed to set hardware parameters: %s", pa_alsa_strerror(err));
-         goto fail;
-     }
- 
-@@ -988,7 +988,7 @@ static void source_get_volume_cb(pa_source *s) {
-     return;
- 
- fail:
-    pa_log_error("Unable to read volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to read volume: %s", pa_alsa_strerror(err));
- }
- 
- static void source_set_volume_cb(pa_source *s) {
-@@ -1100,7 +1100,7 @@ static void source_set_volume_cb(pa_source *s) {
-     return;
- 
- fail:
-    pa_log_error("Unable to set volume: %s", snd_strerror(err));
-+    pa_log_error("Unable to set volume: %s", pa_alsa_strerror(err));
- }
- 
- static void source_get_mute_cb(pa_source *s) {
-@@ -1111,7 +1111,7 @@ static void source_get_mute_cb(pa_source *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_get_capture_switch(u->mixer_elem, 0, &sw)) < 0) {
-        pa_log_error("Unable to get switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to get switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -1126,7 +1126,7 @@ static void source_set_mute_cb(pa_source *s) {
-     pa_assert(u->mixer_elem);
- 
-     if ((err = snd_mixer_selem_set_capture_switch_all(u->mixer_elem, !s->muted)) < 0) {
-        pa_log_error("Unable to set switch: %s", snd_strerror(err));
-+        pa_log_error("Unable to set switch: %s", pa_alsa_strerror(err));
-         return;
-     }
- }
-@@ -1218,7 +1218,7 @@ static void thread_func(void *userdata) {
-             pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
- 
-             if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
-                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
-+                pa_log("snd_pcm_poll_descriptors_revents() failed: %s", pa_alsa_strerror(err));
-                 goto fail;
-             }
- 
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index d2dc6e8..ddc3c77 100644
--- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -33,6 +33,7 @@
- #include <pulse/timeval.h>
- #include <pulse/util.h>
- #include <pulse/i18n.h>
-+#include <pulse/utf8.h>
- 
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-@@ -40,6 +41,7 @@
- #include <pulsecore/atomic.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/once.h>
-+#include <pulsecore/thread.h>
- 
- #include "alsa-util.h"
- 
-@@ -106,7 +108,7 @@ static void io_cb(pa_mainloop_api*a, pa_io_event* e, int fd, pa_io_event_flags_t
-     pa_assert(i != fdl->num_fds);
- 
-     if ((err = snd_mixer_poll_descriptors_revents(fdl->mixer, fdl->work_fds, fdl->num_fds, &revents)) < 0) {
-        pa_log_error("Unable to get poll revent: %s", snd_strerror(err));
-+        pa_log_error("Unable to get poll revent: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -129,7 +131,7 @@ static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
-     a->defer_enable(fdl->defer, 0);
- 
-     if ((n = snd_mixer_poll_descriptors_count(fdl->mixer)) < 0) {
-        pa_log("snd_mixer_poll_descriptors_count() failed: %s", snd_strerror(n));
-+        pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
-         return;
-     }
-     num_fds = (unsigned) n;
-@@ -146,7 +148,7 @@ static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
-     memset(fdl->work_fds, 0, sizeof(struct pollfd) * num_fds);
- 
-     if ((err = snd_mixer_poll_descriptors(fdl->mixer, fdl->work_fds, num_fds)) < 0) {
-        pa_log_error("Unable to get poll descriptors: %s", snd_strerror(err));
-+        pa_log_error("Unable to get poll descriptors: %s", pa_alsa_strerror(err));
-         return;
-     }
- 
-@@ -482,42 +484,42 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
-     snd_pcm_sw_params_alloca(&swparams);
- 
-     if ((err = snd_pcm_sw_params_current(pcm, swparams) < 0)) {
-        pa_log_warn("Unable to determine current swparams: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to determine current swparams: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_period_event(pcm, swparams, 0)) < 0) {
-        pa_log_warn("Unable to disable period event: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to disable period event: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_tstamp_mode(pcm, swparams, SND_PCM_TSTAMP_ENABLE)) < 0) {
-        pa_log_warn("Unable to enable time stamping: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to enable time stamping: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_get_boundary(swparams, &boundary)) < 0) {
-        pa_log_warn("Unable to get boundary: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to get boundary: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_stop_threshold(pcm, swparams, boundary)) < 0) {
-        pa_log_warn("Unable to set stop threshold: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to set stop threshold: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_start_threshold(pcm, swparams, (snd_pcm_uframes_t) -1)) < 0) {
-        pa_log_warn("Unable to set start threshold: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to set start threshold: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params_set_avail_min(pcm, swparams, avail_min)) < 0) {
-        pa_log_error("snd_pcm_sw_params_set_avail_min() failed: %s", snd_strerror(err));
-+        pa_log_error("snd_pcm_sw_params_set_avail_min() failed: %s", pa_alsa_strerror(err));
-         return err;
-     }
- 
-     if ((err = snd_pcm_sw_params(pcm, swparams)) < 0) {
-        pa_log_warn("Unable to set sw params: %s\n", snd_strerror(err));
-+        pa_log_warn("Unable to set sw params: %s\n", pa_alsa_strerror(err));
-         return err;
-     }
- 
-@@ -854,7 +856,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
-                                 SND_PCM_NO_AUTO_RESAMPLE|
-                                 SND_PCM_NO_AUTO_CHANNELS|
-                                 (reformat ? 0 : SND_PCM_NO_AUTO_FORMAT))) < 0) {
-            pa_log_info("Error opening PCM device %s: %s", d, snd_strerror(err));
-+            pa_log_info("Error opening PCM device %s: %s", d, pa_alsa_strerror(err));
-             goto fail;
-         }
- 
-@@ -882,7 +884,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
-                 continue;
-             }
- 
-            pa_log_info("Failed to set hardware parameters on %s: %s", d, snd_strerror(err));
-+            pa_log_info("Failed to set hardware parameters on %s: %s", d, pa_alsa_strerror(err));
-             snd_pcm_close(pcm_handle);
- 
-             goto fail;
-@@ -1000,17 +1002,17 @@ int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) {
-     pa_assert(dev);
- 
-     if ((err = snd_mixer_attach(mixer, dev)) < 0) {
-        pa_log_info("Unable to attach to mixer %s: %s", dev, snd_strerror(err));
-+        pa_log_info("Unable to attach to mixer %s: %s", dev, pa_alsa_strerror(err));
-         return -1;
-     }
- 
-     if ((err = snd_mixer_selem_register(mixer, NULL, NULL)) < 0) {
-        pa_log_warn("Unable to register mixer: %s", snd_strerror(err));
-+        pa_log_warn("Unable to register mixer: %s", pa_alsa_strerror(err));
-         return -1;
-     }
- 
-     if ((err = snd_mixer_load(mixer)) < 0) {
-        pa_log_warn("Unable to load mixer: %s", snd_strerror(err));
-+        pa_log_warn("Unable to load mixer: %s", pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -1136,7 +1138,7 @@ int pa_alsa_find_mixer_and_elem(
-     }
- 
-     if ((err = snd_mixer_open(&m, 0)) < 0) {
-        pa_log("Error opening mixer: %s", snd_strerror(err));
-+        pa_log("Error opening mixer: %s", pa_alsa_strerror(err));
-         return -1;
-     }
- 
-@@ -1338,7 +1340,7 @@ void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm) {
-     pa_assert_se(snd_output_buffer_open(&out) == 0);
- 
-     if ((err = snd_pcm_dump(pcm, out)) < 0)
-        pa_logl(level, "snd_pcm_dump(): %s", snd_strerror(err));
-+        pa_logl(level, "snd_pcm_dump(): %s", pa_alsa_strerror(err));
-     else {
-         char *s = NULL;
-         snd_output_buffer_string(out, &s);
-@@ -1362,7 +1364,7 @@ void pa_alsa_dump_status(snd_pcm_t *pcm) {
-     pa_assert_se(snd_pcm_status(pcm, status) == 0);
- 
-     if ((err = snd_pcm_status_dump(status, out)) < 0)
-        pa_log_debug("snd_pcm_dump(): %s", snd_strerror(err));
-+        pa_log_debug("snd_pcm_dump(): %s", pa_alsa_strerror(err));
-     else {
-         char *s = NULL;
-         snd_output_buffer_string(out, &s);
-@@ -1524,7 +1526,7 @@ void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm, snd_m
-     snd_pcm_info_alloca(&info);
- 
-     if ((err = snd_pcm_hw_params_current(pcm, hwparams)) < 0)
-        pa_log_warn("Error fetching hardware parameter info: %s", snd_strerror(err));
-+        pa_log_warn("Error fetching hardware parameter info: %s", pa_alsa_strerror(err));
-     else {
- 
-         if ((bits = snd_pcm_hw_params_get_sbits(hwparams)) >= 0)
-@@ -1535,7 +1537,7 @@ void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm, snd_m
-         pa_proplist_sets(p, "alsa.mixer_element", snd_mixer_selem_get_name(elem));
- 
-     if ((err = snd_pcm_info(pcm, info)) < 0)
-        pa_log_warn("Error fetching PCM info: %s", snd_strerror(err));
-+        pa_log_warn("Error fetching PCM info: %s", pa_alsa_strerror(err));
-     else
-         pa_alsa_init_proplist_pcm_info(c, p, info);
- }
-@@ -1568,14 +1570,14 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
- 
-         case SND_PCM_STATE_XRUN:
-             if ((err = snd_pcm_recover(pcm, -EPIPE, 1)) != 0) {
-                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and XRUN: %s", snd_strerror(err));
-+                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and XRUN: %s", pa_alsa_strerror(err));
-                 return -1;
-             }
-             break;
- 
-         case SND_PCM_STATE_SUSPENDED:
-             if ((err = snd_pcm_recover(pcm, -ESTRPIPE, 1)) != 0) {
-                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and SUSPENDED: %s", snd_strerror(err));
-+                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and SUSPENDED: %s", pa_alsa_strerror(err));
-                 return -1;
-             }
-             break;
-@@ -1585,7 +1587,7 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
-             snd_pcm_drop(pcm);
- 
-             if ((err = snd_pcm_prepare(pcm)) < 0) {
-                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP with snd_pcm_prepare(): %s", snd_strerror(err));
-+                pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP with snd_pcm_prepare(): %s", pa_alsa_strerror(err));
-                 return -1;
-             }
-             break;
-@@ -1602,7 +1604,7 @@ pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll) {
-     pa_assert(pcm);
- 
-     if ((n = snd_pcm_poll_descriptors_count(pcm)) < 0) {
-        pa_log("snd_pcm_poll_descriptors_count() failed: %s", snd_strerror(n));
-+        pa_log("snd_pcm_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
-         return NULL;
-     }
- 
-@@ -1610,7 +1612,7 @@ pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll) {
-     pollfd = pa_rtpoll_item_get_pollfd(item, NULL);
- 
-     if ((err = snd_pcm_poll_descriptors(pcm, pollfd, (unsigned) n)) < 0) {
-        pa_log("snd_pcm_poll_descriptors() failed: %s", snd_strerror(err));
-+        pa_log("snd_pcm_poll_descriptors() failed: %s", pa_alsa_strerror(err));
-         pa_rtpoll_item_free(item);
-         return NULL;
-     }
-@@ -1819,3 +1821,30 @@ pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm) {
- 
-     return snd_pcm_info_get_class(info) == SND_PCM_CLASS_MODEM;
- }
-+
-+PA_STATIC_TLS_DECLARE(cstrerror, pa_xfree);
-+
-+const char* pa_alsa_strerror(int errnum) {
-+    const char *original = NULL;
-+    char *translated, *t;
-+    char errbuf[128];
-+
-+    if ((t = PA_STATIC_TLS_GET(cstrerror)))
-+        pa_xfree(t);
-+
-+    original = snd_strerror(errnum);
-+
-+    if (!original) {
-+        pa_snprintf(errbuf, sizeof(errbuf), "Unknown error %i", errnum);
-+        original = errbuf;
-+    }
-+
-+    if (!(translated = pa_locale_to_utf8(original))) {
-+        pa_log_warn("Unable to convert error string to locale, filtering.");
-+        translated = pa_utf8_filter(original);
-+    }
-+
-+    PA_STATIC_TLS_SET(cstrerror, translated);
-+
-+    return translated;
-+}
-diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
-index c8acc7c..77ac8a7 100644
--- a/src/modules/alsa/alsa-util.h
-+++ b/src/modules/alsa/alsa-util.h
-@@ -146,4 +146,6 @@ pa_bool_t pa_alsa_pcm_is_hw(snd_pcm_t *pcm);
- 
- pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm);
- 
-+const char* pa_alsa_strerror(int errnum);
-+
- #endif
-diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
-index fdc952d..51d466e 100644
--- a/src/modules/alsa/module-alsa-card.c
-+++ b/src/modules/alsa/module-alsa-card.c
-@@ -304,7 +304,7 @@ int pa__init(pa_module *m) {
-     u->modargs = ma;
- 
-     if ((alsa_card_index = snd_card_get_index(u->device_id)) < 0) {
-        pa_log("Card '%s' doesn't exist: %s", u->device_id, snd_strerror(alsa_card_index));
-+        pa_log("Card '%s' doesn't exist: %s", u->device_id, pa_alsa_strerror(alsa_card_index));
-         goto fail;
-     }
- 
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch
deleted file mode 100644
index 7a0759da13..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pulseaudio-0.9.15/configure.ac
-===================================================================
--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100
-+++ pulseaudio-0.9.15/configure.ac      2009-05-22 11:32:50.000000000 +0100
-@@ -20,7 +20,7 @@
- # along with PulseAudio; if not, write to the Free Software Foundation,
- # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-AC_PREREQ(2.63)
-+AC_PREREQ(2.61)
- 
- m4_define(pa_major, [0])
- m4_define(pa_minor, [9])
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch
deleted file mode 100644
index ca01e0d80f..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
-===================================================================
--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
-+++ pulseaudio-0.9.11/src/pulsecore/atomic.h
-@@ -40,6 +40,8 @@
- #error "Please include config.h before including this file!"
- #endif
- 
-+#include "macro.h"
-+
- #ifdef HAVE_ATOMIC_BUILTINS
- 
- /* __sync based implementation */
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/fallback.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/fallback.patch
deleted file mode 100644
index 2fae0d4e78..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/fallback.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 28 Apr 2009 23:58:18 +0000 (+0200)
-Subject: alsa: allow configuration of fallback device strings in profiles
-X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=d8710711fb0c74b4ad83ac99c2501218155b502b
-alsa: allow configuration of fallback device strings in profiles
-This has the benefit that we can properly support ALSA devices where
-only the raw 'hw' device exists but no 'front' although it's a proper
-2ch stereo device.
---
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index 18d6880..a3a0450 100644
--- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -528,7 +528,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
- 
- static const struct pa_alsa_profile_info device_table[] = {
-     {{ 1, { PA_CHANNEL_POSITION_MONO }},
-     "hw",
-+     "hw", NULL,
-      N_("Analog Mono"),
-      "analog-mono",
-      1,
-@@ -536,7 +536,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-      "Capture", "Mic" },
- 
-     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
-     "front",
-+     "front", "hw",
-      N_("Analog Stereo"),
-      "analog-stereo",
-      10,
-@@ -544,7 +544,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-      "Capture", "Mic" },
- 
-     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
-     "iec958",
-+     "iec958", NULL,
-      N_("Digital Stereo (IEC958)"),
-      "iec958-stereo",
-      5,
-@@ -552,7 +552,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-      "IEC958 In", NULL },
- 
-     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
-     "hdmi",
-+     "hdmi", NULL,
-      N_("Digital Stereo (HDMI)"),
-      "hdmi-stereo",
-      4,
-@@ -561,7 +561,7 @@ static const struct pa_alsa_profile_info device_table[] = {
- 
-     {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
-     "surround40",
-+     "surround40", NULL,
-      N_("Analog Surround 4.0"),
-      "analog-surround-40",
-      7,
-@@ -570,7 +570,7 @@ static const struct pa_alsa_profile_info device_table[] = {
- 
-     {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
-     "a52",
-+     "a52", NULL,
-      N_("Digital Surround 4.0 (IEC958/AC3)"),
-      "iec958-ac3-surround-40",
-      2,
-@@ -580,7 +580,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_LFE }},
-     "surround41",
-+     "surround41", NULL,
-      N_("Analog Surround 4.1"),
-      "analog-surround-41",
-      7,
-@@ -590,7 +590,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_CENTER }},
-     "surround50",
-+     "surround50", NULL,
-      N_("Analog Surround 5.0"),
-      "analog-surround-50",
-      7,
-@@ -600,7 +600,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE }},
-     "surround51",
-+     "surround51", NULL,
-      N_("Analog Surround 5.1"),
-      "analog-surround-51",
-      8,
-@@ -610,7 +610,7 @@ static const struct pa_alsa_profile_info device_table[] = {
-     {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE}},
-     "a52",
-+     "a52", NULL,
-      N_("Digital Surround 5.1 (IEC958/AC3)"),
-      "iec958-ac3-surround-51",
-      3,
-@@ -621,16 +621,72 @@ static const struct pa_alsa_profile_info device_table[] = {
-             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
-             PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE,
-             PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT }},
-     "surround71",
-+     "surround71", NULL,
-      N_("Analog Surround 7.1"),
-      "analog-surround-71",
-      7,
-      "Master", "PCM",
-      "Capture", "Mic" },
- 
-    {{ 0, { 0 }}, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
-+    {{ 0, { 0 }}, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
- };
- 
-+static snd_pcm_t *open_by_device_string_with_fallback(
-+        const char *prefix,
-+        const char *prefix_fallback,
-+        const char *dev_id,
-+        char **dev,
-+        pa_sample_spec *ss,
-+        pa_channel_map* map,
-+        int mode,
-+        uint32_t *nfrags,
-+        snd_pcm_uframes_t *period_size,
-+        snd_pcm_uframes_t tsched_size,
-+        pa_bool_t *use_mmap,
-+        pa_bool_t *use_tsched,
-+        pa_bool_t require_exact_channel_number) {
-+
-+    snd_pcm_t *pcm_handle;
-+    char *d;
-+
-+    d = pa_sprintf_malloc("%s:%s", prefix, dev_id);
-+
-+    pcm_handle = pa_alsa_open_by_device_string(
-+            d,
-+            dev,
-+            ss,
-+            map,
-+            mode,
-+            nfrags,
-+            period_size,
-+            tsched_size,
-+            use_mmap,
-+            use_tsched,
-+            require_exact_channel_number);
-+    pa_xfree(d);
-+
-+    if (!pcm_handle && prefix_fallback) {
-+
-+        d = pa_sprintf_malloc("%s:%s", prefix_fallback, dev_id);
-+
-+        pcm_handle = pa_alsa_open_by_device_string(
-+                d,
-+                dev,
-+                ss,
-+                map,
-+                mode,
-+                nfrags,
-+                period_size,
-+                tsched_size,
-+                use_mmap,
-+                use_tsched,
-+                require_exact_channel_number);
-+        pa_xfree(d);
-+    }
-+
-+    return pcm_handle;
-+}
-+
- snd_pcm_t *pa_alsa_open_by_device_id_auto(
-         const char *dev_id,
-         char **dev,
-@@ -671,14 +727,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
- 
-             pa_log_debug("Checking for %s (%s)", device_table[i].name, device_table[i].alsa_name);
- 
-            d = pa_sprintf_malloc("%s:%s", device_table[i].alsa_name, dev_id);
-
-             try_ss.channels = device_table[i].map.channels;
-             try_ss.rate = ss->rate;
-             try_ss.format = ss->format;
- 
-            pcm_handle = pa_alsa_open_by_device_string(
-                    d,
-+            pcm_handle = open_by_device_string_with_fallback(
-+                    device_table[i].alsa_name,
-+                    device_table[i].alsa_name_fallback,
-+                    dev_id,
-                     dev,
-                     &try_ss,
-                     map,
-@@ -690,8 +746,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
-                     use_tsched,
-                     TRUE);
- 
-            pa_xfree(d);
-
-             if (pcm_handle) {
- 
-                 *ss = try_ss;
-@@ -703,6 +757,7 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
- 
-                 return pcm_handle;
-             }
-+
-         }
- 
-         if (direction > 0) {
-@@ -775,7 +830,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
-         pa_bool_t *use_tsched,
-         const pa_alsa_profile_info *profile) {
- 
-    char *d;
-     snd_pcm_t *pcm_handle;
-     pa_sample_spec try_ss;
- 
-@@ -787,14 +841,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
-     pa_assert(period_size);
-     pa_assert(profile);
- 
-    d = pa_sprintf_malloc("%s:%s", profile->alsa_name, dev_id);
-
-     try_ss.channels = profile->map.channels;
-     try_ss.rate = ss->rate;
-     try_ss.format = ss->format;
- 
-    pcm_handle = pa_alsa_open_by_device_string(
-            d,
-+    pcm_handle = open_by_device_string_with_fallback(
-+            profile->alsa_name,
-+            profile->alsa_name_fallback,
-+            dev_id,
-             dev,
-             &try_ss,
-             map,
-@@ -806,8 +860,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
-             use_tsched,
-             TRUE);
- 
-    pa_xfree(d);
-
-     if (!pcm_handle)
-         return NULL;
- 
-@@ -860,6 +912,8 @@ snd_pcm_t *pa_alsa_open_by_device_string(
-             goto fail;
-         }
- 
-+        pa_log_debug("Managed to open %s", d);
-+
-         if ((err = pa_alsa_set_hw_params(pcm_handle, ss, nfrags, period_size, tsched_size, use_mmap, use_tsched, require_exact_channel_number)) < 0) {
- 
-             if (!reformat) {
-@@ -928,26 +982,25 @@ int pa_alsa_probe_profiles(
-         snd_pcm_t *pcm_i = NULL;
- 
-         if (i->alsa_name) {
-            char *id;
-             pa_sample_spec try_ss;
-             pa_channel_map try_map;
- 
-             pa_log_debug("Checking for playback on %s (%s)", i->name, i->alsa_name);
-            id = pa_sprintf_malloc("%s:%s", i->alsa_name, dev_id);
- 
-             try_ss = *ss;
-             try_ss.channels = i->map.channels;
-             try_map = i->map;
- 
-            pcm_i = pa_alsa_open_by_device_string(
-                    id, NULL,
-+            pcm_i = open_by_device_string_with_fallback(
-+                    i->alsa_name,
-+                    i->alsa_name_fallback,
-+                    dev_id,
-+                    NULL,
-                     &try_ss, &try_map,
-                     SND_PCM_STREAM_PLAYBACK,
-                     NULL, NULL, 0, NULL, NULL,
-                     TRUE);
- 
-            pa_xfree(id);
-
-             if (!pcm_i)
-                 continue;
-         }
-@@ -956,26 +1009,25 @@ int pa_alsa_probe_profiles(
-             snd_pcm_t *pcm_j = NULL;
- 
-             if (j->alsa_name) {
-                char *jd;
-                 pa_sample_spec try_ss;
-                 pa_channel_map try_map;
- 
-                 pa_log_debug("Checking for capture on %s (%s)", j->name, j->alsa_name);
-                jd = pa_sprintf_malloc("%s:%s", j->alsa_name, dev_id);
- 
-                 try_ss = *ss;
-                 try_ss.channels = j->map.channels;
-                 try_map = j->map;
- 
-                pcm_j = pa_alsa_open_by_device_string(
-                        jd, NULL,
-+                pcm_j = open_by_device_string_with_fallback(
-+                        j->alsa_name,
-+                        j->alsa_name_fallback,
-+                        dev_id,
-+                        NULL,
-                         &try_ss, &try_map,
-                         SND_PCM_STREAM_CAPTURE,
-                         NULL, NULL, 0, NULL, NULL,
-                         TRUE);
- 
-                pa_xfree(jd);
-
-                 if (!pcm_j)
-                     continue;
-             }
-diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
-index 77ac8a7..4c5d336 100644
--- a/src/modules/alsa/alsa-util.h
-+++ b/src/modules/alsa/alsa-util.h
-@@ -56,6 +56,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min);
- typedef struct pa_alsa_profile_info {
-     pa_channel_map map;
-     const char *alsa_name;
-+    const char *alsa_name_fallback;
-     const char *description; /* internationalized */
-     const char *name;
-     unsigned priority;
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch
deleted file mode 100644
index 34ad026e4d..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-| fix for more strict syntax compliance in gcc4.x
-| pulsecore/core-util.c: In function 'pa_raise_priority':
-| pulsecore/core-util.c:547: error: label at end of compound statement
-| Signed off: mickey@openmoko.org
-|
-Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
-===================================================================
--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
-+++ pulseaudio-0.9.6/src/pulsecore/core-util.c
-@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
-         pa_log_info("Successfully gained high priority class.");
- #endif
- 
-fail:
-+fail:;
- 
- #if defined(HAVE_SYS_CAPABILITY_H)
-     if (caps) {
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/periodfix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/periodfix.patch
deleted file mode 100644
index 3a1c605009..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/periodfix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=blobdiff_plain;f=src%2Fmodules%2Falsa%2Falsa-util.c;h=107bec357c7889f0197853f5e5f1951a5a2f5be0;hp=a3a045080dac0e1b30e8671443ce73a03337cf14;hb=4bffc7849f7898fa85dd6ac8e735db86b57814b3;hpb=d2b5ae5525e9036c4f91b1615879a5a07aac5bf2
-diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
-index a3a0450..107bec3 100644
--- a/src/modules/alsa/alsa-util.c
-+++ b/src/modules/alsa/alsa-util.c
-@@ -334,7 +334,6 @@ int pa_alsa_set_hw_params(
-     int ret = -1;
-     snd_pcm_uframes_t _period_size = period_size ? *period_size : 0;
-     unsigned int _periods = periods ? *periods : 0;
-    snd_pcm_uframes_t buffer_size;
-     unsigned int r = ss->rate;
-     unsigned int c = ss->channels;
-     pa_sample_format_t f = ss->format;
-@@ -390,39 +389,47 @@ int pa_alsa_set_hw_params(
-         goto finish;
- 
-     if (_period_size && tsched_size && _periods) {
-+
-         /* Adjust the buffer sizes, if we didn't get the rate we were asking for */
-         _period_size = (snd_pcm_uframes_t) (((uint64_t) _period_size * r) / ss->rate);
-         tsched_size = (snd_pcm_uframes_t) (((uint64_t) tsched_size * r) / ss->rate);
- 
-         if (_use_tsched) {
-            _period_size = tsched_size;
-            _periods = 1;
-+            snd_pcm_uframes_t buffer_size;
- 
-             pa_assert_se(snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size) == 0);
-             pa_log_debug("Maximum hw buffer size is %u ms", (unsigned) buffer_size * 1000 / r);
-+
-+            _period_size = tsched_size;
-+            _periods = 1;
-         }
- 
-+        if (_period_size > 0 && _periods > 0) {
-+            snd_pcm_uframes_t buffer_size;
-+
-         buffer_size = _periods * _period_size;
- 
-+            if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0)
-+                pa_log_info("snd_pcm_hw_params_set_buffer_size_near() failed: %s", pa_alsa_strerror(ret));
-+        }
-+
-         if (_periods > 0) {
- 
-            /* First we pass 0 as direction to get exactly what we asked
-             * for. That this is necessary is presumably a bug in ALSA */
-+            /* First we pass 0 as direction to get exactly what we
-+             * asked for. That this is necessary is presumably a bug
-+             * in ALSA. All in all this is mostly a hint to ALSA, so
-+             * we don't care if this fails. */
- 
-             dir = 0;
-            if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) {
-+            if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) {
-                 dir = 1;
-                if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) {
-+                if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) {
-                     dir = -1;
-                     if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0)
-                        goto finish;
-+                        pa_log_info("snd_pcm_hw_params_set_periods_near() failed: %s", pa_alsa_strerror(ret));
-                 }
-             }
-         }
-
-        if (_period_size > 0)
-            if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0)
-                goto finish;
-     }
- 
-     if  ((ret = snd_pcm_hw_params(pcm_handle, hwparams)) < 0)
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse
deleted file mode 100644
index 5b1998032b..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse
+++ /dev/null
@@ -1,2 +0,0 @@
-# <type> <owner> <group> <mode> <path> <linksource>
-d pulse pulse 0755 /var/run/pulse none
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc
deleted file mode 100644
index fd8e60c471..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio.inc
+++ /dev/null
@@ -1,126 +0,0 @@
-DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
-HOMEPAGE = "http://www.pulseaudio.org"
-AUTHOR = "Lennart Poettering"
-SECTION = "libs/multimedia"
-LICENSE = "LGPL"
-DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11"
-# optional
-DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal"
-SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
-           file://gcc4-compile-fix.patch;patch=1 \
-           file://volatiles.04_pulse"
-inherit autotools pkgconfig
-EXTRA_OECONF = "\
-                --disable-lynx \
-                --disable-bluez \
-                --disable-polkit \
-                --with-x \
-                --without-jack \
-                --with-glib \
-                --with-alsa \
-                --with-oss \
-                --with-hal \
-"
-PARALLEL_MAKE = ""
-export TARGET_PFPU = "${TARGET_FPU}"
-# TODO: Use more fine granular version
-#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:"
-OE_LT_RPATH_ALLOW = "any"
-OE_LT_RPATH_ALLOW[export]="1"
-do_install_append() {
-        install -d ${D}${sysconfdir}/default/volatiles
-        install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
-        
-        if [ "x${TARGET_PFPU}" == "xsoft" ] ; then 
-             sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
-        fi
-}
-PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
-             pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper"
-#upgrade path:
-RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
-PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
-FILES_libpulsecore = "${libdir}/libpulsecore*.so"
-FILES_libpulsecommon = "${libdir}/libpulsecommon*.so"
-FILES_libpulsedsp = "${libdir}/libpulsedsp*.so"
-FILES_libpulse = "${libdir}/libpulse.so.*"
-FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
-FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
-FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
-                                         
-FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
-                    ${libdir}/pulse-${PV}/modules/.debug"
-FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la"             
-FILES_${PN}-conf = "${sysconfdir}"
-FILES_${PN}-bin = "${bindir}/* \
-                   ${sysconfdir}/default/volatiles/volatiles.04_pulse"
-FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl"
-FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
-FILES_${PN}-misc = "${bindir}/*"
-# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it)
-ALLOW_EMPTY_${PN} = "1"
-CONFFILES_pulseaudio-server = "\ 
-  ${sysconfdir}/pulse/default.pa \
-  ${sysconfdir}/pulse/daemon.conf \
-  ${sysconfdir}/pulse/client.conf \
-  "
-pkg_postinst_${PN}-server() {
-        # can't do this offline
-        if [ "x$D" != "x" ]; then
-                exit 1
-        fi
-        grep -q pulse: /etc/group || addgroup pulse
-        grep -q pulse: /etc/passwd || \
-            adduser --disabled-password --home=/var/run/pulse --system \
-                    --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
-        addgroup pulse audio
-        /etc/init.d/populate-volatile.sh update
-}
-pkg_postrm_${PN}-server() {
-        deluser pulse || true
-}
-python populate_packages_prepend() {
-        #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
-        plugindir = bb.data.expand('${libdir}/pulse-${PV}/modules/', d)
-        do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
-        do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
-}
-RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
-RDEPENDS_pulseaudio-module-hal-detect =+ "hal"
-RDEPENDS_pulseaudio-server = " \
-    pulseaudio-module-device-restore \
-    pulseaudio-module-stream-restore \
-    pulseaudio-module-card-restore \
-    pulseaudio-module-augment-properties \
-    pulseaudio-module-detect \
-    pulseaudio-module-alsa-sink \
-    pulseaudio-module-alsa-source \
-    pulseaudio-module-alsa-card \
-    pulseaudio-module-native-protocol-unix \
-    pulseaudio-module-hal-detect \
-    pulseaudio-module-default-device-restore \
-    pulseaudio-module-rescue-streams \
-    pulseaudio-module-always-sink \
-    pulseaudio-module-suspend-on-idle \
-    pulseaudio-module-console-kit \
-    pulseaudio-module-position-event-sounds \
-    pulseaudio-module-cork-music-on-phone "
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb
deleted file mode 100644
index 49387ece83..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require pulseaudio.inc
-DEPENDS += "dbus gdbm speex"
-PR = "r14"
-SRC_URI += "\
-  file://buildfix.patch;patch=1 \
-  file://alsaerror.patch;patch=1 \
-  file://periodfix.patch;patch=1 \
-  file://fallback.patch;patch=1 \
-  file://autoconf_version.patch;patch=1 \
-"
-do_compile_prepend() {
-    cd ${S}
-    mkdir -p ${S}/libltdl
-    cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
-}
diff --git a/meta-moblin/packages/qmake/qmake-native/linux-oe-qmake.conf b/meta-moblin/packages/qmake/qmake-native/linux-oe-qmake.conf
deleted file mode 100644
index 205b693fda..0000000000
--- a/meta-moblin/packages/qmake/qmake-native/linux-oe-qmake.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org
-#
-MAKEFILE_GENERATOR      = UNIX
-TEMPLATE                = app
-CONFIG                  += qt warn_on release
-QMAKE_CC                = $(OE_QMAKE_CC)
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
-QMAKE_CFLAGS            = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   =
-QMAKE_CFLAGS_RELEASE    = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
-QMAKE_CFLAGS_DEBUG      = -g
-QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD     = -D_REENTRANT
-QMAKE_CXX               = $(OE_QMAKE_CXX)
-QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-QMAKE_INCDIR            =
-QMAKE_LIBDIR            =
-QMAKE_INCDIR_X11        = 
-QMAKE_LIBDIR_X11        = 
-QMAKE_INCDIR_QT         = $(OE_QMAKE_INCDIR_QT)
-QMAKE_LIBDIR_QT         = $(OE_QMAKE_LIBDIR_QT)
-QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-QMAKE_LINK              = $(OE_QMAKE_LINK)
-QMAKE_LINK_SHLIB        = $(OE_QMAKE_LINK)
-QMAKE_LFLAGS            = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_RPATH             = -Wl,-rpath-link,
-QMAKE_LIBS              = $(LIBS_EXTRA)
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11          = $(OE_QMAKE_LIBS_X11)
-QMAKE_LIBS_X11SM        = 
-QMAKE_LIBS_QT           = -l$(OE_QMAKE_LIBS_QT)
-QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
-QMAKE_LIBS_OPENGL       = $(OE_QMAKE_LIBS_OPENGL)
-QMAKE_LIBS_OPENGL_QT    = $(OE_QMAKE_LIBS_OPENGL_QT)
-QMAKE_LIBS_THREAD       = -lpthread
-QMAKE_MOC               = $(OE_QMAKE_MOC)
-QMAKE_UIC               = $(OE_QMAKE_UIC)
-QMAKE_AR                = $(OE_QMAKE_AR) cqs
-QMAKE_RANLIB            =
-QMAKE_TAR               = tar -cf
-QMAKE_GZIP              = gzip -9f
-QMAKE_COPY              = cp -f
-QMAKE_COPY_FILE         = $(COPY)
-QMAKE_COPY_DIR          = $(COPY) -r
-QMAKE_MOVE              = mv -f
-QMAKE_DEL_FILE          = rm -f
-QMAKE_DEL_DIR           = rmdir
-QMAKE_STRIP             = $(OE_QMAKE_STRIP)
-QMAKE_STRIPFLAGS_LIB    += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS    = test -d
-QMAKE_MKDIR             = mkdir -p
diff --git a/meta-moblin/packages/qmake/qmake-native_1.07a.bb b/meta-moblin/packages/qmake/qmake-native_1.07a.bb
deleted file mode 100644
index 82a24968af..0000000000
--- a/meta-moblin/packages/qmake/qmake-native_1.07a.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "TrollTech Makefile Generator"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-SECTION = "devel"
-LICENSE = "GPL QPL"
-PR = "r4"
-QTEVER = "qt-embedded-free-3.3.5"
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \
-           file://linux-oe-qmake.conf"
-S = "${WORKDIR}/${QTEVER}"
-inherit autotools native
-export QTDIR = "${S}"
-EXTRA_OEMAKE = "-e"
-do_configure() {
-        # Install the OE build templates
-        for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
-        do
-                install -d ${S}/mkspecs/$template
-                install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
-                ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
-        done
-        QMAKESPEC=
-        PLATFORM=${HOST_OS}-oe-g++
-        export PLATFORM
-        oenote ./configure ${EXTRA_OECONF}
-        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
-}
-do_compile() {
-        :
-}
-do_install() {
-        install -d ${D}${bindir}/
-        install -m 0755 ${S}/bin/qmake ${D}${bindir}/
-        install -d ${D}/qmake/
-        cp -fPR ${S}/mkspecs/* ${D}/qmake/
-}
-sysroot_stage_all_append() {
-        sysroot_stage_dir ${D}/qmake ${SYSROOT_DESTDIR}/${QMAKE_MKSPEC_PATH}
-}
diff --git a/meta-moblin/packages/samba/files/config-h.patch b/meta-moblin/packages/samba/files/config-h.patch
deleted file mode 100644
index eeb22684ee..0000000000
--- a/meta-moblin/packages/samba/files/config-h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN source.old//include/config.h.in source//include/config.h.in
--- source.old//include/config.h.in     2008-11-20 14:45:04.000000000 +0000
-+++ source//include/config.h.in 2008-11-30 21:04:17.990008933 +0000
-@@ -2672,7 +2672,7 @@
- #undef USE_SETEUID
- 
- /* Whether setresuid() is available */
-#undef USE_SETRESUID
-+#define USE_SETRESUID 1
- 
- /* Whether setreuid() is available */
- #undef USE_SETREUID
diff --git a/meta-moblin/packages/samba/files/config-lfs.patch b/meta-moblin/packages/samba/files/config-lfs.patch
deleted file mode 100644
index b37ed690ce..0000000000
--- a/meta-moblin/packages/samba/files/config-lfs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Cache the check for Linux LFS support, so it can be prepopulated from 
-the site cache for configure variables for cross-compiling.  Without this,
-samba gets the idea that it can use dirent64 and friends without defining
-the flags it needs to get it, such as _GNU_SOURCE and _LARGEFILE64_SOURCE.
-Symptoms of getting the configuration wrong on cross-compile inculde
-warnings such as
-  smbd/trans2.c: In function `get_lanman2_dir_entry':
-  smbd/trans2.c:1065: warning: right shift count >= width of type
-and errors like
-  smbd/vfs.c:630: error: dereferencing pointer to incomplete type
-(when trying to dereference dirent64.)
--- source/configure.in.orig    2005-05-29 14:46:18.000000000 -0700
-+++ source/configure.in 2005-05-29 14:51:57.000000000 -0700
-@@ -588,7 +588,7 @@
- # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
- #
-     *linux*)
-        AC_MSG_CHECKING([for LFS support])
-+       AC_CACHE_CHECK([for LFS support], samba_cv_LINUX_LFS_SUPPORT,[
-         old_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-        AC_TRY_RUN([
-@@ -627,15 +627,14 @@
-        exit(1);
- #endif
- }
-], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
-       CPPFLAGS="$old_CPPFLAGS"
-       if test x$LINUX_LFS_SUPPORT = xyes ; then
-+], [samba_cv_LINUX_LFS_SUPPORT=yes], [samba_cv_LINUX_LFS_SUPPORT=no], [samba_cv_LINUX_LFS_SUPPORT=cross])
-+       CPPFLAGS="$old_CPPFLAGS"])
-+       if test x"$samba_cv_LINUX_LFS_SUPPORT" = x"yes" ; then
-                CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-                AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
-                AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
-                AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
-        fi
-       AC_MSG_RESULT([$LINUX_LFS_SUPPORT])
-        ;;
- 
- #
diff --git a/meta-moblin/packages/samba/files/configure-3.3.0.patch b/meta-moblin/packages/samba/files/configure-3.3.0.patch
deleted file mode 100644
index a2e2544802..0000000000
--- a/meta-moblin/packages/samba/files/configure-3.3.0.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Index: source/configure
-===================================================================
--- source.orig/configure       2009-01-27 07:53:11.000000000 +0000
-+++ source/configure    2009-05-15 12:51:02.000000000 +0100
-@@ -43860,13 +43860,7 @@
-     *linux*)
-        # glibc <= 2.3.2 has a broken getgrouplist
-        if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-+linux_getgrouplist_ok=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-Index: source/configure.in
-===================================================================
--- source.orig/configure.in    2009-05-15 12:51:01.000000000 +0100
-+++ source/configure.in 2009-05-15 13:02:22.000000000 +0100
-@@ -280,6 +280,8 @@
- fi
- AC_SUBST(BROKEN_CC)
- 
-+AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC]))
-+
- dnl Check if the C compiler understands -Werror
- AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
-  AC_TRY_RUN_STRICT([
-@@ -330,25 +332,11 @@
- # a runtime test is needed here
- AC_SUBST(PIDL_ARGS)
- AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
-    AC_TRY_RUN(
-+    AC_TRY_COMPILE([],
- [
-       #include <stdio.h>
-        enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-       int main(void) {
-               enum negative_values v1 = NEGATIVE_VALUE;
-               unsigned v2 = NEGATIVE_VALUE;
-
-               if (v1 != 0xFFFFFFFF) {
-                       printf("%u != 0xFFFFFFFF\n", v1);
-                       return 1;
-               }
-               if (v2 != 0xFFFFFFFF) {
-                       printf("%u != 0xFFFFFFFF\n", v2);
-                       return 1;
-               }
-
-               return 0;
-       }
-+       (void)sizeof(char[1-2*(            (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]);
-+       (void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]);
- ],
-        samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)])
- if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-@@ -1223,22 +1211,12 @@
- case "$host_os" in
-     *linux*)
-        # glibc <= 2.3.2 has a broken getgrouplist
-       AC_TRY_RUN([
-#include <unistd.h>
-+       AC_TRY_COMPILE([ 
- #include <sys/utsname.h>
-main() {
-       /* glibc up to 2.3 has a broken getgrouplist */
-+],[
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-       int libc_major = __GLIBC__;
-       int libc_minor = __GLIBC_MINOR__;
-
-       if (libc_major < 2)
-              exit(1);
-       if ((libc_major == 2) && (libc_minor <= 3))
-              exit(1);
-+       (void)sizeof(char[1-2*(__GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)]);
- #endif
-       exit(0);
-}
- ], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-        if test x"$linux_getgrouplist_ok" = x"yes"; then
-           AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
diff --git a/meta-moblin/packages/samba/files/configure.patch b/meta-moblin/packages/samba/files/configure.patch
deleted file mode 100644
index b7ba287795..0000000000
--- a/meta-moblin/packages/samba/files/configure.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
--- source/configure.in~configure       2003-12-14 22:36:25.000000000 -0500
-+++ source/configure.in 2004-01-26 14:33:15.000000000 -0500
-@@ -959,7 +959,7 @@
- #endif
-        exit(0);
- }
-], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-+], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=cross])
-        if test x"$linux_getgrouplist_ok" = x"yes"; then
-           AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
-        fi
--- source/aclocal.m4~configure 2004-01-26 14:33:15.000000000 -0500
-+++ source/aclocal.m4   2004-01-26 17:34:28.000000000 -0500
-@@ -2,7 +2,7 @@
- dnl if the cache file is inconsistent with the current host,
- dnl target and build system types, execute CMD or print a default
- dnl error message.
-AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
-+AC_DEFUN([AC_VALIDATE_CACHE_SYSTEM_TYPE], [
-     AC_REQUIRE([AC_CANONICAL_SYSTEM])
-     AC_MSG_CHECKING([config.cache system type])
-     if { test x"${ac_cv_host_system_type+set}" = x"set" &&
-@@ -24,7 +24,7 @@
- 
- 
- dnl test whether dirent has a d_off member
-AC_DEFUN(AC_DIRENT_D_OFF,
-+AC_DEFUN([AC_DIRENT_D_OFF],
- [AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
- [AC_TRY_COMPILE([
- #include <unistd.h>
-@@ -38,7 +38,7 @@
- 
- dnl Mark specified module as shared
- dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
-AC_DEFUN(SMB_MODULE,
-+AC_DEFUN([SMB_MODULE],
- [
-        AC_MSG_CHECKING([how to build $1])
-        if test "$[MODULE_][$1]"; then
-@@ -68,7 +68,7 @@
-        fi
- ])
- 
-AC_DEFUN(SMB_SUBSYSTEM,
-+AC_DEFUN([SMB_SUBSYSTEM],
- [
-        AC_SUBST($1_STATIC)
-        AC_SUBST($1_MODULES)
-@@ -77,7 +77,7 @@
- ])
- 
- dnl AC_PROG_CC_FLAG(flag)
-AC_DEFUN(AC_PROG_CC_FLAG,
-+AC_DEFUN([AC_PROG_CC_FLAG],
- [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
- [echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
-@@ -91,7 +91,7 @@
- dnl see if a declaration exists for a function or variable
- dnl defines HAVE_function_DECL if it exists
- dnl AC_HAVE_DECL(var, includes)
-AC_DEFUN(AC_HAVE_DECL,
-+AC_DEFUN([AC_HAVE_DECL],
- [
-  AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
-     AC_TRY_COMPILE([$2],[int i = (int)$1],
-@@ -105,7 +105,7 @@
- dnl check for a function in a library, but don't
- dnl keep adding the same library to the LIBS variable.
- dnl AC_LIBTESTFUNC(lib,func)
-AC_DEFUN(AC_LIBTESTFUNC,
-+AC_DEFUN([AC_LIBTESTFUNC],
- [case "$LIBS" in
-   *-l$1*) AC_CHECK_FUNCS($2) ;;
-   *) AC_CHECK_LIB($1, $2) 
-@@ -223,7 +223,7 @@
- 
- dnl Define an AC_DEFINE with ifndef guard.
- dnl AC_N_DEFINE(VARIABLE [, VALUE])
-define(AC_N_DEFINE,
-+define([AC_N_DEFINE],
- [cat >> confdefs.h <<\EOF
- [#ifndef] $1
- [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-@@ -233,14 +233,14 @@
- 
- dnl Add an #include
- dnl AC_ADD_INCLUDE(VARIABLE)
-define(AC_ADD_INCLUDE,
-+define([AC_ADD_INCLUDE],
- [cat >> confdefs.h <<\EOF
- [#include] $1
- EOF
- ])
- 
- dnl Copied from libtool.m4
-AC_DEFUN(AC_PROG_LD_GNU,
-+AC_DEFUN([AC_PROG_LD_GNU],
- [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -259,7 +259,7 @@
- dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for XML, and define XML_CFLAGS and XML_LIBS
- dnl
-AC_DEFUN(AM_PATH_XML2,[ 
-+AC_DEFUN([AM_PATH_XML2],[ 
- AC_ARG_WITH(xml-prefix,
-             [  --with-xml-prefix=PFX   Prefix where libxml is installed (optional)],
-             xml_config_prefix="$withval", xml_config_prefix="")
-@@ -443,7 +443,7 @@
- dnl AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
- dnl
-AC_DEFUN(AM_PATH_MYSQL,
-+AC_DEFUN([AM_PATH_MYSQL],
- [dnl
- dnl Get the cflags and libraries from the mysql_config script
- dnl
-@@ -485,7 +485,7 @@
- ])
- 
- dnl Removes -I/usr/include/? from given variable
-AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
-+AC_DEFUN([CFLAGS_REMOVE_USR_INCLUDE],[
-   ac_new_flags=""
-   for i in [$]$1; do
-     case [$]i in
-@@ -497,7 +497,7 @@
- ])
-     
- dnl Removes -L/usr/lib/? from given variable
-AC_DEFUN(LIB_REMOVE_USR_LIB,[
-+AC_DEFUN([LIB_REMOVE_USR_LIB],[
-   ac_new_flags=""
-   for i in [$]$1; do
-     case [$]i in
-@@ -510,7 +510,7 @@
- 
- dnl From Bruno Haible.
- 
-AC_DEFUN(jm_ICONV,
-+AC_DEFUN([jm_ICONV],
- [
-   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-   dnl those with the standalone portable libiconv installed).
-@@ -607,7 +607,7 @@
-   fi
- ])
- 
-AC_DEFUN(rjs_CHARSET,[
-+AC_DEFUN([rjs_CHARSET],[
-   dnl Find out if we can convert from $1 to UCS2-LE
-   AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
-   AC_TRY_RUN([
-@@ -625,7 +625,7 @@
- 
- dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
- dnl This function doesn't add -I/usr/include into CFLAGS
-AC_DEFUN(CFLAGS_ADD_DIR,[
-+AC_DEFUN([CFLAGS_ADD_DIR],[
- if test "$2" != "/usr/include" ; then
-     $1="$$1 -I$2"
- fi
-@@ -633,7 +633,7 @@
- 
- dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
- dnl This function doesn't add -L/usr/lib into LDFLAGS
-AC_DEFUN(LIB_ADD_DIR,[
-+AC_DEFUN([LIB_ADD_DIR],[
- if test "$2" != "/usr/lib" ; then
-     $1="$$1 -L$2"
- fi
diff --git a/meta-moblin/packages/samba/files/init b/meta-moblin/packages/samba/files/init
deleted file mode 100644
index cb57b17de4..0000000000
--- a/meta-moblin/packages/samba/files/init
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh 
-#
-# This is an init script for openembedded
-# Copy it to /etc/init.d/samba and type
-# > update-rc.d samba defaults 60
-#
-smbd=/usr/sbin/smbd
-test -x "$smbd" || exit 0
-nmbd=/usr/sbin/nmbd
-test -x "$nmbd" || exit 0
-case "$1" in
-  start)
-    echo -n "Starting Samba: smbd"
-    start-stop-daemon --start --quiet --exec $smbd
-    echo -n " nmbd"
-    start-stop-daemon --start --quiet --exec $nmbd
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping Samba: smbd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid
-    echo -n " nmbd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid
-    echo "."
-    ;;
-  reload|force-reload)
-    start-stop-daemon --stop --quiet --signal 1 --exec $smbd
-    start-stop-daemon --stop --quiet --signal 1 --exec $nmbd
-    ;;
-  restart)
-    echo -n "Stopping Samba: smbd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid
-    echo -n " nmbd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid
-    echo ""
-    echo -n "Waiting for samba processes to die off"
-    for i in 1 2 3 ;
-    do
-        sleep 1
-        echo -n "."
-    done
-    echo ""
-    echo -n "Starting Samba: smbd"
-    start-stop-daemon --start --quiet --exec $smbd
-    echo -n " nmbd"
-    start-stop-daemon --start --quiet --exec $nmbd
-    echo "."
-    ;;
-  *)
-    echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
-    exit 1
-esac
-exit 0
-\ No newline at end of file
diff --git a/meta-moblin/packages/samba/files/mtab.patch b/meta-moblin/packages/samba/files/mtab.patch
deleted file mode 100644
index 2ee8ba0941..0000000000
--- a/meta-moblin/packages/samba/files/mtab.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN source/client/mtab.c samba-3.2.7//source/client/mtab.c
--- source/client/mtab.c        2008-12-19 13:57:33.000000000 +0000
-+++ source/client/mtab.c        2009-01-09 23:14:00.717671075 +0000
-@@ -32,6 +32,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <fcntl.h>
- #include <mntent.h>
diff --git a/meta-moblin/packages/samba/files/quota.patch b/meta-moblin/packages/samba/files/quota.patch
deleted file mode 100644
index 6f42ff868f..0000000000
--- a/meta-moblin/packages/samba/files/quota.patch
+++ /dev/null
@@ -1,11 +0,0 @@
--- lib/sysquotas_4A.c.old      2005-07-03 17:16:00.000000000 +0200
-+++ lib/sysquotas_4A.c  2005-07-03 17:10:09.000000000 +0200
-@@ -28,6 +28,8 @@
- /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */
- /* this is used by: HPUX,IRIX */
- 
-+ #define _LINUX_QUOTA_VERSION 1
-+
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
diff --git a/meta-moblin/packages/samba/files/smb.conf b/meta-moblin/packages/samba/files/smb.conf
deleted file mode 100644
index f07e3e4ec7..0000000000
--- a/meta-moblin/packages/samba/files/smb.conf
+++ /dev/null
@@ -1,266 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba, 
-# read the Samba-HOWTO-Collection. This may be obtained from:
-#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the 
-# Samba-Guide which is generated daily and can be downloaded from: 
-#  http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-   workgroup = MYGROUP
-# server string is the equivalent of the NT Description field
-   server string = Samba Server
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the Samba-HOWTO-Collection for details.
-   security = user
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-;   printing = cups
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration.
-;   passdb backend = tdbsam
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = /usr/local/samba/lib/smb.conf.%m
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#       Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one  WINS Server on the network. The default is NO.
-;   wins proxy = yes
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
-   dns proxy = no 
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = yes
-   writable = yes
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = /usr/local/samba/lib/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = /usr/local/samba/profiles
-;    browseable = no
-;    guest ok = yes
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = /var/spool/samba
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writable = no
-   printable = yes
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writable = yes
-;   printable = no
-;   write list = @staff
-# Other examples. 
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writable = yes
-;   printable = no
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
diff --git a/meta-moblin/packages/samba/files/tdb.pc b/meta-moblin/packages/samba/files/tdb.pc
deleted file mode 100644
index 6307a20a03..0000000000
--- a/meta-moblin/packages/samba/files/tdb.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-Name: tdb
-Description: A trivial database
-Version: 1.1.2
-Libs: -L${libdir} -ltdb
-Cflags: -I${includedir} 
-URL: http://tdb.samba.org/
diff --git a/meta-moblin/packages/samba/files/tdbheaderfix.patch b/meta-moblin/packages/samba/files/tdbheaderfix.patch
deleted file mode 100644
index e37c9b0d5c..0000000000
--- a/meta-moblin/packages/samba/files/tdbheaderfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: source/lib/tdb/include/tdb.h
-===================================================================
--- source.orig/lib/tdb/include/tdb.h   2009-05-17 17:42:41.000000000 +0100
-+++ source/lib/tdb/include/tdb.h        2009-05-17 17:42:46.000000000 +0100
-@@ -1,6 +1,9 @@
- #ifndef __TDB_H__
- #define __TDB_H__
- 
-+#include <signal.h>
-+
-+
- /* 
-    Unix SMB/CIFS implementation.
- 
diff --git a/meta-moblin/packages/samba/files/volatiles.03_samba b/meta-moblin/packages/samba/files/volatiles.03_samba
deleted file mode 100644
index 469bc9e7b0..0000000000
--- a/meta-moblin/packages/samba/files/volatiles.03_samba
+++ /dev/null
@@ -1,2 +0,0 @@
-# <type> <owner> <group> <mode> <path> <linksource>
-d root root 0755 /var/log/samba none
diff --git a/meta-moblin/packages/samba/samba-basic.inc b/meta-moblin/packages/samba/samba-basic.inc
deleted file mode 100644
index 209ba8ffc4..0000000000
--- a/meta-moblin/packages/samba/samba-basic.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
-            "
-EXTRA_OECONF += "\
-        --without-ads \
-        --without-winbind \
-        --without-ldap \
-        --without-krb5"
-PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc swat libtdb"
-RCONFLICTS_${PN} = "samba-ads"
-RCONFLICTS_libsmbclient = "libsmbclient-ads"
-RCONFLICTS_libsmbclient-dev = "libsmbclient-ads-dev"
-RCONFLICTS_cifs = "cifs-ads"
-RCONFLICTS_cifs-doc = "cifs-ads-doc"
-RCONFLICTS_swat = "swat-ads"
-FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
-FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
-FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
-FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
-FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
-FILES_libtdb = "${libdir}/libtdb.so.*"
-\ No newline at end of file
diff --git a/meta-moblin/packages/samba/samba.inc b/meta-moblin/packages/samba/samba.inc
deleted file mode 100644
index e6923e38a2..0000000000
--- a/meta-moblin/packages/samba/samba.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "readline virtual/libiconv"
-SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
-           file://volatiles.03_samba \
-           file://smb.conf \
-           file://init \
-           file://tdb.pc \
-           "
-S = "${WORKDIR}/samba-${PV}/source"
-inherit autotools update-rc.d
-FILES_${PN}     += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \
-                    ${libdir}/auth/*.so ${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \
-                    ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so"
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
-EXTRA_OECONF='--disable-cups \
-              --with-readline=${STAGING_LIBDIR}/.. \
-              --with-libiconv=${STAGING_LIBDIR}/.. \
-              --without-automount \
-              --with-configdir=${sysconfdir}/samba \
-              --with-privatedir=${sysconfdir}/samba/private \
-              --with-lockdir=${localstatedir}/lock \
-              --with-piddir=${localstatedir}/run \
-              --with-logfilebase=${localstatedir}/log \
-              --with-libdir=${libdir} \
-              --with-mandir=${mandir} \
-              --with-swatdir=${datadir}/swat \
-              samba_cv_struct_timespec=yes'
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-do_configure_prepend () {
-        ./script/mkversion.sh
-        if [ ! -e acinclude.m4 ]; then
-                touch aclocal.m4        
-                cat aclocal.m4 > acinclude.m4
-        fi
-}
-do_compile () {
-        oe_runmake proto_exists
-        base_do_compile
-}
-do_install_append() {
-        install -d ${D}${libdir}/pkgconfig/
-        cp ${WORKDIR}/tdb.pc ${D}${libdir}/pkgconfig/
-        mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true
-        ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
-        mkdir -p ${D}${base_sbindir}
-        rm -f ${D}${bindir}/*.old
-        rm -f ${D}${sbindir}/*.old
-        [ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/
-        [ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/
-        # This is needed for < 3.2.4
-        rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs
-        if [ -f ${D}${bindir}/smbmount ]; then
-                ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb
-                ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs
-        fi
-        
-        install -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
-        install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
-        install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba
-        install -d ${D}/var/log/samba
-        install -d ${D}/var/spool/samba
-}
diff --git a/meta-moblin/packages/samba/samba_3.3.0.bb b/meta-moblin/packages/samba/samba_3.3.0.bb
deleted file mode 100644
index 87a7c5e7f7..0000000000
--- a/meta-moblin/packages/samba/samba_3.3.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require samba.inc
-require samba-basic.inc
-LICENSE = "GPLv3"
-# 3.3.0 and newer will upgrade your tdb database to a
-# new version that you can not downgrade to use with older
-# releases. More testing will happen before this is removed
-# should there be further issues. Appears to work though :)
-DEFAULT_PREFERENCE = "-1"
-SRC_URI += "file://configure-3.3.0.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-            file://tdbheaderfix.patch;patch=1 "
-PR = "r3"
-EXTRA_OECONF += "\
-        SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
-        samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
-        linux_getgrouplist_ok=no \
-        samba_cv_HAVE_BROKEN_GETGROUPS=no \
-        samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
-        samba_cv_have_setresuid=yes \
-        samba_cv_have_setresgid=yes \
-        samba_cv_HAVE_WRFILE_KEYTAB=yes \
-        "
-do_configure() {
-        oe_runconf
-}
-do_compile () {
-        base_do_compile
-}
diff --git a/meta-moblin/packages/sreadahead/files/sreadahead-generate.sh b/meta-moblin/packages/sreadahead/files/sreadahead-generate.sh
deleted file mode 100755
index 19438f2935..0000000000
--- a/meta-moblin/packages/sreadahead/files/sreadahead-generate.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-if [ -e /etc/readahead.packed ]; then
-    exit 0
-fi
-if [ -e /etc/readahead.packed.first ]; then
-    mv /etc/readahead.packed.first /etc/readahead.packed.second
-    exit 0
-fi
-# That's our second boot, we can generate the sreadahead file list
-if [ -e /etc/readahead.packed.second ]; then
-    rm -f /etc/readahead.packed.second
-    find / -type f | grep -E -v "\/dev\/|\/proc\/|\/sys\/" > filelist.txt
-    /sbin/generate_filelist filelist.txt
-    rm filelist.txt
-    mv readahead.packed /etc/
-fi
diff --git a/meta-moblin/packages/sreadahead/files/sreadahead.sh b/meta-moblin/packages/sreadahead/files/sreadahead.sh
deleted file mode 100755
index c7378284b2..0000000000
--- a/meta-moblin/packages/sreadahead/files/sreadahead.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Start sreadahead, of the config file exists
-if [ -e /etc/readahead.packed ]; then
-    /sbin/sreadahead
-fi
diff --git a/meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch b/meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch
deleted file mode 100644
index a65c1088f5..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---
- readahead.c |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-Index: sreadahead-0.02/readahead.c
-===================================================================
--- sreadahead-0.02.orig/readahead.c    2008-09-23 22:35:20.000000000 +0200
-+++ sreadahead-0.02/readahead.c 2008-10-27 16:27:52.000000000 +0100
-@@ -69,7 +69,11 @@ void *one_thread(void *ptr)
- int main(int argc, char **argv)
- {
-        FILE *file = fopen("/etc/readahead.packed", "r");
-       
-+       if (!file) {
-+               perror("Couldnt open /etc/readahead.packed");
-+               return -errno;
-+       }
-+
-        daemon(0,0);
-        
-        total_files = fread(&files, sizeof(struct readahead), MAXR, file);
-@@ -81,7 +85,6 @@ int main(int argc, char **argv)
-        pthread_create(&three, NULL, one_thread, NULL);
-        pthread_create(&four, NULL, one_thread, NULL);
- 
-       printf("Waiting\n");
-        pthread_join(one, NULL);
-        pthread_join(two, NULL);
-        pthread_join(three, NULL);
diff --git a/meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch b/meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch
deleted file mode 100644
index b48659048a..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naurp sreadahead-0.02/readahead.c sreadahead-0.02-nice/readahead.c
--- sreadahead-0.02/readahead.c 2008-11-06 00:57:17.000000000 -0500
-+++ sreadahead-0.02-nice/readahead.c    2008-11-06 02:28:29.000000000 -0500
-@@ -26,7 +26,18 @@
- #include <errno.h>
- 
- #include "readahead.h"
-+#include <sys/syscall.h>
- 
-+# if defined(__i386__)
-+#  define __NR_ioprio_set      289
-+# elif defined(__x86_64__)
-+#  define __NR_ioprio_set      251
-+# else
-+#  error "Unsupported arch"
-+# endif
-+
-+#define IOPRIO_WHO_PROCESS     1
-+#define IOPRIO_CLASS_SHIFT     13
- #define MAXR 1024
- static struct readahead files[MAXR];
- static unsigned int total_files = 0;
-@@ -68,7 +79,15 @@ void *one_thread(void *ptr)
- 
- int main(int argc, char **argv)
- {
-       FILE *file = fopen("/etc/readahead.packed", "r");
-+       int iopriority = 7; /* hard code for idle */
-+       int iopriority_class = 3; /* 3 stands for idle */
-+       int pid = 0;
-+       FILE *file;
-+
-+       if (syscall(__NR_ioprio_set, IOPRIO_WHO_PROCESS, pid, iopriority | iopriority_class << IOPRIO_CLASS_SHIFT) == -1)
-+               perror("Can not set priority to idle class");
-+
-+       file = fopen("/etc/readahead.packed", "r");
-        if (!file) {
-                perror("Couldnt open /etc/readahead.packed");
-                return -errno;
diff --git a/meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch b/meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch
deleted file mode 100644
index d0ece663b5..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nrup sreadahead-0.02.orig/Makefile sreadahead-0.02/Makefile
--- sreadahead-0.02.orig/Makefile       2008-09-23 22:36:24.000000000 +0200
-+++ sreadahead-0.02/Makefile    2008-09-26 07:43:19.000000000 +0200
-@@ -1,11 +1,18 @@
-all: generate_filelist sreadahead
-+CFLAGS=-Os -g -Wall
-+PROGS=generate_filelist sreadahead
-+
-+all: $(PROGS)
- 
- 
- generate_filelist: readahead.h filelist.c Makefile
-       gcc -Os -g -Wall -W filelist.c -o generate_filelist
-+       $(CC) $(CFLAGS) -W filelist.c -o generate_filelist
- 
- sreadahead: readahead.h readahead.c Makefile
-       gcc -Os -g -Wall -lpthread -W readahead.c -o sreadahead
-+       $(CC) $(CFLAGS) -lpthread -W readahead.c -o sreadahead
-        
- clean:
-       rm -f *~ sreadahead generate_filelist
-\ No newline at end of file
-+       rm -f *~ sreadahead generate_filelist
-+
-+install: all
-+       mkdir -p $(DESTDIR)/sbin
-+       install -p -m 755 $(PROGS) $(DESTDIR)/sbin
diff --git a/meta-moblin/packages/sreadahead/sreadahead_0.02.bb b/meta-moblin/packages/sreadahead/sreadahead_0.02.bb
deleted file mode 100644
index c29a1defed..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead_0.02.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Super readahead, part of the fastboot tool set."
-SECTION = "base"
-HOMEPAGE = "http://www.moblin.org"
-LICENSE = "GPLv2"
-PR = "r13"
-inherit update-rc.d
-SRC_URI = "http://www.moblin.org/sites/all/files/sreadahead-${PV}.tar.gz \
-          file://sreadahead-0.02-make.patch;patch=1 \
-          file://readahead_c.patch;patch=1 \
-          file://set_to_idle.patch;patch=1 \
-          file://sreadahead-generate.sh \
-          file://sreadahead.sh"
-CFLAGS_prepend = "-I ${S}/include "
-#
-# Not compatible on arm due to the use of __sync_fetch_and_add
-# Would need to use a pthread mutex on arm
-#
-COMPATIBLE_HOST = "(i.86).*-linux"
-PACKAGES += "${PN}-generate"
-FILES_${PN} = "${base_sbindir}/sreadahead ${sysconfdir}/init.d/sreadahead.sh"
-FILES_${PN}-generate = "${base_sbindir}/generate_filelist ${sysconfdir}/init.d/sreadahead-generate.sh"
-INITSCRIPT_PACKAGES = "${PN} ${PN}-generate"
-INITSCRIPT_NAME = "sreadahead.sh"
-INITSCRIPT_NAME_${PN}-generate = "sreadahead-generate.sh" 
-INITSCRIPT_PARAMS = "start 00 S ."
-INITSCRIPT_PARAMS_${PN}-generate = "defaults 99"
-do_install() {
-        oe_runmake install DESTDIR=${D}
-        install -d ${D}${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/sreadahead.sh ${D}${sysconfdir}/init.d/
-        install -m 755 ${WORKDIR}/sreadahead-generate.sh ${D}${sysconfdir}/init.d/
-}
-pkg_postinst_${PN}-generate () {
-        # can't do this offline
-        if [ "x$D" != "x" ]; then
-                exit 1
-        fi
-        touch /etc/readahead.packed.first 
-}
diff --git a/meta-moblin/packages/syncevolution/syncevolution_git.bb b/meta-moblin/packages/syncevolution/syncevolution_git.bb
deleted file mode 100644
index 9d767ca949..0000000000
--- a/meta-moblin/packages/syncevolution/syncevolution_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Data synchronization tool"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git;branch=syncevolution-0-9-branch"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r1"
-DEPENDS = "libsynthesis libsoup curl boost nbtk dbus-glib glib-2.0 libglade libunique gnome-keyring eds-dbus"
-EXTRA_OECONF = "--enable-gui=moblin"
-S = "${WORKDIR}/git"
-inherit autotools
-do_configure_prepend () {
-    ${S}/gen-autotools.sh
-}
-\ No newline at end of file
diff --git a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
deleted file mode 100644
index 54fb8d2f3e..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "X11 Pimlico Appications List"
-PR = "r28"
-PACKAGES = "\
-    task-moblin-apps-x11-pimlico \
-    task-moblin-apps-x11-pimlico-dbg \
-    task-moblin-apps-x11-pimlico-dev \
-    "
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-RDEPENDS_task-moblin-apps-x11-pimlico = "\
-    eds-dbus \
-    contacts \
-    dates \
-    tasks \
-    gaku"
-\ No newline at end of file
diff --git a/meta-moblin/packages/tasks/task-moblin-boot.bb b/meta-moblin/packages/tasks/task-moblin-boot.bb
deleted file mode 100644
index 97d9a52f41..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-boot.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Task for Moblin - minimal bootable image"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
-PR = "r8"
-#
-# Set by the machine configuration with packages essential for device bootup
-#
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-RDEPENDS_task-moblin-boot = "\
-    base-files \
-    base-passwd \
-    busybox \
-    initscripts \
-    ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
-    modutils-initscripts \
-    netbase \
-    sysvinit \
-    tinylogin \
-    udev \
-    ${VIRTUAL-RUNTIME_update-alternatives} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-RDEPENDS_task-moblin-boot_append_netbook = "\
-    sreadahead \
-    sreadahead-generate \
-    "
-RDEPENDS_task-moblin-boot_append_menlow = "\
-    sreadahead \
-    sreadahead-generate \
-    "
-RRECOMMENDS_task-moblin-boot = "\
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
diff --git a/meta-moblin/packages/tasks/task-moblin-sdk.bb b/meta-moblin/packages/tasks/task-moblin-sdk.bb
deleted file mode 100644
index 328a377c53..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-sdk.bb
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTON = "Software Development Tasks for Moblin"
-DEPENDS = "task-moblin"
-PR = "r6"
-ALLOW_EMPTY = "1"
-#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
-PACKAGES = "\
-    task-moblin-sdk \
-    task-moblin-sdk-dbg \
-    task-moblin-sdk-dev"
-RDEPENDS_task-moblin-sdk = "\
-    autoconf \
-    automake \
-    binutils \
-    binutils-symlinks \
-    coreutils \
-    cpp \
-    cpp-symlinks \
-    diffutils \
-    gcc \
-    gcc-symlinks \
-    g++ \
-    g++-symlinks \
-    git \
-    gettext \
-    make \
-    intltool \
-    libstdc++ \
-    libstdc++-dev \
-    libtool \
-    perl-module-re \
-    perl-module-text-wrap \
-    pkgconfig \
-    subversion \
-    findutils \
-    quilt \
-    less \
-    distcc"
-#python generate_sdk_pkgs () {
-#    moblin_pkgs = read_pkgdata('task-moblin', d)['PACKAGES']
-#    pkgs = bb.data.getVar('PACKAGES', d, 1).split()
-#    for pkg in moblin_pkgs.split():
-#        newpkg = pkg.replace('task-moblin', 'task-moblin-sdk')
-#
-#        # for each of the task packages, add a corresponding sdk task
-#        pkgs.append(newpkg)
-#
-#        # for each sdk task, take the rdepends of the non-sdk task, and turn
-#        # that into rrecommends upon the -dev versions of those, not unlike
-#        # the package depchain code
-#        spkgdata = read_subpkgdata(pkg, d)
-#
-#        rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '')
-#        rreclist = []
-#
-#        for depend in rdepends:
-#            split_depend = depend.split(' (')
-#            name = split_depend[0].strip()
-#            if packaged('%s-dev' % name, d):
-#                rreclist.append('%s-dev' % name)
-#            else:
-#                deppkgdata = read_subpkgdata(name, d)
-#                rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '')
-#                for depend in rdepends2:
-#                    split_depend = depend.split(' (')
-#                    name = split_depend[0].strip()
-#                    if packaged('%s-dev' % name, d):
-#                        rreclist.append('%s-dev' % name)
-#
-#            oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or ''
-#            bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d)
-#            # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d)))
-#
-#    # bb.note('pkgs is %s' % pkgs)
-#    bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
-#}
-#
-#PACKAGES_DYNAMIC = "task-moblin-sdk-*"
diff --git a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
deleted file mode 100644
index 469bf15516..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2008-2010 Intel Corporation.
-#
-DESCRIPTION = "Target packages for the standalone Moblin SDK"
-PR = "r7"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN} ${PN}-dbg"
-RDEPENDS_${PN} = "\
-    libgcc \
-    libstdc++ \
-    task-poky-standalone-sdk-target \
-    dbus-dev \
-    dbus-glib-dev \
-    gtk+-dev \
-    gstreamer-dev \
-    bluez4-dev \
-    gconf-dbus-dev \
-    avahi-dev \
-    telepathy-glib-dev \
-    eds-dbus-dev \
-    libecal-dev \
-    libebook-dev \
-    libglade-dev \
-    libxi-dev \
-    libsqlite3-dev \
-    clutter-1.0-dev \
-    nbtk-dev \
-    mutter-dev \
-    mutter-moblin-dev \
-    clutter-gst-0.10-dev \
-    clutter-gtk-0.10-dev \
-    clutter-imcontext \
-    libccss \
-    "
-GLIBC_DEPENDENCIES = "\
-    libsegfault \
-    glibc \
-    glibc-dbg \
-    glibc-dev \
-    glibc-utils \
-    glibc-thread-db \
-    glibc-localedata-i18n \
-    glibc-gconv-ibm850 \
-    glibc-gconv-cp1252 \
-    glibc-gconv-iso8859-1 \
-    glibc-gconv-iso8859-15 \
-    locale-base-en-gb \
-    "
-RDEPENDS_${PN}_append_linux = "${GLIBC_DEPENDENCIES}"
-RDEPENDS_${PN}_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
-UCLIBC_DEPENDENCIES = "\
-    uclibc \
-    uclibc-dbg \
-    uclibc-dev \
-    uclibc-thread-db \
-    "
-RDEPENDS_${PN}_append_linux-uclibc = "${UCLIBC_DEPENDENCIES}"
-RDEPENDS_${PN}_append_linux-uclibcgnueabi = "${UCLIBC_DEPENDENCIES}"
diff --git a/meta-moblin/packages/tasks/task-moblin-tools.bb b/meta-moblin/packages/tasks/task-moblin-tools.bb
deleted file mode 100644
index a26f66c417..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-tools.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Debuggin and profiling tools tasks for Moblin"
-PR = "r5"
-PACKAGES = "\
-    task-moblin-tools-debug \
-    task-moblin-tools-debug-dbg \
-    task-moblin-tools-debug-dev \
-    task-moblin-tools-profile \
-    task-moblin-tools-profile-dbg \
-    task-moblin-tools-profile-dev \
-    task-moblin-tools-testapps \
-    task-moblin-tools-testapps-dbg \
-    task-moblin-tools-testapps-dev \
-    "
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-RDEPENDS_task-moblin-tools-debug = "\
-    gdb \
-    gdbserver \
-    strace"
-RDEPENDS_task-moblin-tools-profile = "\
-#    exmap-console \
-#    exmap-server \
-    oprofile \
-    oprofileui-server \
-    powertop \
-#    lttng-control \
-#    lttng-viewer \
-    "
-RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind"
-RRECOMMENDS_task-moblin-tools-profile = "\
-    kernel-module-oprofile"
-RDEPENDS_task-moblin-tools-testapps = "\
-    blktool \
-    tslib-calibrate \
-    tslib-tests \
-    lrzsz \
-    kexec-tools \
-    alsa-utils-amixer \
-    alsa-utils-aplay \
-    owl-video \
-    gst-meta-video \
-    gst-meta-audio \
-    xrestop \
-    xwininfo \
-    xprop \
-    xvideo-tests"
diff --git a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
deleted file mode 100644
index e2f8296e02..0000000000
--- a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Netbook GUI Tasks for Moblin"
-PR = "r21"
-PACKAGES = "\
-    task-moblin-x11-netbook \
-    task-moblin-x11-netbook-dbg \
-    task-moblin-x11-netbook-dev \
-    "
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-#    matchbox-config-gtk \
-#    xcursor-transparent-theme \
-MOBLINBROWSER ?= "moblin-web-browser"
-EXTRA_MOBLIN_PACKAGES ?= ""
-RDEPENDS_task-moblin-x11-netbook = "\
-    bickley \
-    mojito \
-    mutter \
-    droid-fonts \
-    gnome-settings-daemon \
-    librest \
-    nbtk \
-    nautilus \
-    mutter-moblin \
-    moblin-panel-applications \
-    moblin-panel-media \
-    moblin-panel-myzone \
-    moblin-panel-pasteboard \
-    moblin-panel-people \
-    moblin-panel-status \
-    moblin-gtk-engine \
-    moblin-menus \
-    moblin-user-skel \
-    bisho \
-    ${MOBLINBROWSER} \
-    dalston \
-    hornsey \
-    anerley \
-    bognor-regis \
-    moblin-icon-theme \
-    moblin-cursor-theme \
-    moblin-sound-theme \
-    matchbox-session-netbook \
-    carrick \
-    empathy \
-    gnome-terminal \
-    ${EXTRA_MOBLIN_PACKAGES}"
diff --git a/meta-moblin/packages/tasks/task-moblin.bb b/meta-moblin/packages/tasks/task-moblin.bb
deleted file mode 100644
index 7afc33a18c..0000000000
--- a/meta-moblin/packages/tasks/task-moblin.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Tasks for Moblin"
-PR = "r35"
-PACKAGES = "\
-    task-moblin-apps-console \
-    task-moblin-apps-console-dbg \
-    task-moblin-apps-console-dev \
-    task-moblin-apps-x11-core \
-    task-moblin-apps-x11-core-dbg \
-    task-moblin-apps-x11-core-dev \
-    task-moblin-apps-x11-games \
-    task-moblin-apps-x11-games-dbg \
-    task-moblin-apps-x11-games-dev \
-    task-moblin-x11-base \
-    task-moblin-x11-base-dbg \
-    task-moblin-x11-base-dev \
-    "
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-XSERVER ?= "xserver-kdrive-fbdev"
-ALLOW_EMPTY = "1"
-RDEPENDS_task-moblin-apps-console = "\
-    avahi-daemon \
-    alsa-utils-alsamixer \
-    dropbear \
-    dbus \
-    portmap \
-    psplash"
-RDEPENDS_task-moblin-x11-base = "\
-    dbus \
-    pointercal \
-    ${XSERVER} \
-    x11-common \
-    xserver-nodm-init \
-    liberation-fonts \
-    pulseaudio-server \
-    xauth \
-    xhost \
-    xset \
-    xrandr"
-RDEPENDS_task-moblin-apps-x11-core = "\
-    leafpad \
-    pcmanfm \
-    matchbox-terminal \
-    screenshot"
-RDEPENDS_task-moblin-apps-x11-games = "\
-    oh-puzzles"
diff --git a/meta-moblin/packages/tracker/tracker-0.7.18/20-tracker-defaults.patch b/meta-moblin/packages/tracker/tracker-0.7.18/20-tracker-defaults.patch
deleted file mode 100644
index 7f5b4a578b..0000000000
--- a/meta-moblin/packages/tracker/tracker-0.7.18/20-tracker-defaults.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tracker-0.7.18/src/tracker-miner-fs/tracker-config.c
-===================================================================
--- tracker-0.7.18.orig/src/tracker-miner-fs/tracker-config.c   2010-01-26 14:57:20.000000000 +0000
-+++ tracker-0.7.18/src/tracker-miner-fs/tracker-config.c        2010-02-04 16:47:46.000000000 +0000
-@@ -42,7 +42,7 @@
- #define DEFAULT_VERBOSITY                        0
- #define DEFAULT_INITIAL_SLEEP                    15       /* 0->1000 */
- #define DEFAULT_ENABLE_MONITORS                          TRUE
-#define DEFAULT_THROTTLE                         0        /* 0->20 */
-+#define DEFAULT_THROTTLE                         10        /* 0->20 */
- #define DEFAULT_SCAN_TIMEOUT                     0        /* 0->1000 */
- #define DEFAULT_CACHE_TIMEOUT                    60       /* 0->1000 */
- #define DEFAULT_INDEX_MOUNTED_DIRECTORIES        TRUE
diff --git a/meta-moblin/packages/tracker/tracker-0.7.18/90tracker b/meta-moblin/packages/tracker/tracker-0.7.18/90tracker
deleted file mode 100755
index 9594b91689..0000000000
--- a/meta-moblin/packages/tracker/tracker-0.7.18/90tracker
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-/usr/bin/trackerd -m &
diff --git a/meta-moblin/packages/tracker/tracker-0.7.18/munge-configure.ac-cross-compile.patch b/meta-moblin/packages/tracker/tracker-0.7.18/munge-configure.ac-cross-compile.patch
deleted file mode 100644
index 0e1736abe1..0000000000
--- a/meta-moblin/packages/tracker/tracker-0.7.18/munge-configure.ac-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: tracker-0.7.18/configure.ac
-===================================================================
--- tracker-0.7.18.orig/configure.ac    2010-01-28 18:16:36.000000000 +0000
-+++ tracker-0.7.18/configure.ac 2010-02-04 16:40:52.000000000 +0000
-@@ -1542,34 +1542,6 @@
- old_exec_message=""
- old_data_message=""
- 
-AC_CHECK_FILE("${prefix}/bin/trackerd", old_exec_trackerd=yes,,)
-AC_CHECK_FILE("${prefix}/bin/tracker-indexer", old_exec_tracker_indexer=yes,,)
-AC_CHECK_FILE("${prefix}/bin/tracker-extract", old_exec_tracker_extract=yes,,)
-AC_CHECK_FILE("${prefix}/bin/tracker-thumbnailer", old_exec_tracker_thumbnailer=yes,,)
-AC_CHECK_FILE("${DBUS_SERVICES_DIR}/tracker.service", old_data_dbus_service=yes,)
-AC_CHECK_FILE("${prefix}/share/tracker/tracker-introspect.xml", old_data_dbus_xml=yes,,)
-AC_CHECK_FILE("${prefix}/share/tracker/sqlite-service-stored-procs.sql", old_data_stored_procs=yes,,)
-
-if test "x$old_exec_trackerd" = "xyes" -o \
-        "x$old_exec_tracker_indexer" = "xyes" -o \
-        "x$old_exec_tracker_extract" = "xyes" -o \
-        "x$old_exec_tracker_thumbnailer" = "xyes"; then
-   old_exec_message="
-        Old Tracker executable files were found in your path.
-        (trackerd, tracker-indexer, tracker-thumbnailer, tracker-extract)"
-   old_file_action="
-       ** These files will be removed as part of the installation **"
-fi
-
-if test "x$old_data_dbus_service" = "xyes" -o \
-        "x$old_data_dbus_xml" = "xyes" -o \
-        "x$old_data_stored_procs" = "xyes"; then
-   old_data_message="
-        Old Tracker data files were found in the prefix you are installing to."
-   old_file_action="
-       ** These files will be removed as part of the installation **"
-fi
-
- AM_CONDITIONAL(OLD_EXEC_REMOVE_ALL, test -n "$old_exec_message")
- AM_CONDITIONAL(OLD_DATA_REMOVE_ALL, test -n "$old_data_message")
- 
diff --git a/meta-moblin/packages/tracker/tracker_0.7.18.bb b/meta-moblin/packages/tracker/tracker_0.7.18.bb
deleted file mode 100644
index 2b908641e4..0000000000
--- a/meta-moblin/packages/tracker/tracker_0.7.18.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly."
-LICENSE = "GPLv2"
-DEPENDS = "file gtk+ gstreamer gamin dbus poppler libexif libgsf libgnomecanvas"
-HOMEPAGE = "http://www.tracker-project.org/"
-inherit autotools pkgconfig gnome gettext
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/0.7/tracker-${PV}.tar.bz2 \
-           file://munge-configure.ac-cross-compile.patch;patch=1 \
-           file://20-tracker-defaults.patch;patch=1 \
-           file://90tracker"
-EXTRA_OECONF += " tracker_cv_have_ioprio=yes"
-LEAD_SONAME = "libtrackerclient.so.0"
-do_install_append() {
-   cp -dPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true 
-   install -d ${D}/${sysconfdir}/X11/Xsession.d/
-   install -m 0755 ${WORKDIR}/90tracker  ${D}/${sysconfdir}/X11/Xsession.d/
-}
-FILES_${PN} += "${datadir}/dbus-1/"
-FILES_${PN}-dbg += "${libdir}/*/*/.debug"
-CONFFILES_${PN} += "${sysconfdir}/X11/Xsession.d/90tracker"
diff --git a/meta-moblin/packages/twitter-glib/twitter-glib/nodolt.patch b/meta-moblin/packages/twitter-glib/twitter-glib/nodolt.patch
deleted file mode 100644
index 1eb9e3c8a8..0000000000
--- a/meta-moblin/packages/twitter-glib/twitter-glib/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
--- git.orig/configure.ac       2009-11-27 15:30:59.000000000 +0000
-+++ git/configure.ac    2009-11-27 15:31:07.000000000 +0000
-@@ -57,7 +57,6 @@
- 
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
-DOLT
- 
- AC_ISC_POSIX
- AC_HEADER_STDC
diff --git a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb b/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
deleted file mode 100644
index 7d4d990fec..0000000000
--- a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-HOMEPAGE = "http://live.gnome.org/TwitterGlib"
-SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git \
-           file://nodolt.patch;patch=1"
-PV = "0.1+git${SRCPV}"
-PR = "r1"
-DEPENDS = "glib-2.0 gtk+ json-glib libsoup-2.4"
-S = "${WORKDIR}/git"
-EXTRA_OECONF = "--disable-shave --disable-introspection --disable-maintainer-flags"
-inherit autotools
-do_configure_prepend () {
-         echo "EXTRA_DIST=" > ${S}/gtk-doc.make
-}
diff --git a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch b/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch
deleted file mode 100644
index 0e5d3ff153..0000000000
--- a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit-cleanup.patch
-+++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp
-@@ -40,6 +40,7 @@
- 
- #include <unistd.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -176,7 +177,7 @@
-                                 MAP_SHARED, fd, 0);
-     data += dataoffset;
- 
-    if ((int)data == -1) {
-+    if ((intptr_t)data == -1) {
-        perror("mapping /dev/fb0");
-        qWarning("Error: failed to map framebuffer device to memory.");
-        return FALSE;
-@@ -737,7 +738,7 @@
-     psize += 8;     // for alignment
-     psize &= ~0x7;  // align
- 
-    unsigned int pos=(unsigned int)data;
-+    uintptr_t pos=(uintptr_t)data;
-     pos += psize;
-     entryp = ((int *)pos);
-     lowest = ((unsigned int *)pos)+1;
--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit-cleanup.patch
-+++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp
-@@ -31,6 +31,7 @@
- **********************************************************************/
- 
- #include "qsharedmemory_p.h"
-+#include <stdint.h>
- 
- #if !defined(QT_QWS_NO_SHM)
- 
-@@ -132,7 +133,7 @@
-     shmId = shmget (key, shmSize, 0);
- 
-   shmBase = shmat (shmId, 0, 0);
-  if ((int) shmBase == -1 || shmBase == 0)
-+  if ((intptr_t) shmBase == -1 || shmBase == 0)
-     return FALSE;
-   else
-     return TRUE;
--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit-cleanup.patch
-+++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp
-@@ -107,6 +107,7 @@
- #include <locale.h>
- #include <errno.h>
- #include <sys/time.h>
-+#include <stdint.h>
- 
- #if defined(Q_OS_QNX)
- #include <sys/select.h>
-@@ -1879,7 +1880,7 @@
-        w = widgetAt(*qt_last_x, *qt_last_y, FALSE);
-     if ( !w )
-        w = desktop();
-    QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle());
-+    QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle());
- }
- 
- void QApplication::restoreOverrideCursor()
-@@ -1898,11 +1899,11 @@
-        cursorStack = 0;
-        qws_overrideCursor = FALSE;
-        if ( w->testWState(WState_OwnCursor) )
-           QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle());
-+           QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle());
-        else
-            QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor);
-     } else {
-       QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle());
-+       QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle());
-     }
- }
- #endif// QT_NO_CURSOR
-@@ -2130,7 +2131,7 @@
-                    }
-                    if ( !qws_overrideCursor ) {
-                        if (curs)
-                           QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle());
-+                           QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle());
-                        else
-                            QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor);
-                    }
--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit-cleanup.patch
-+++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp
-@@ -49,6 +49,7 @@
- #include "qgfx_qws.h"
- #include "qtextengine_p.h"
- #include "qfontengine_p.h"
-+#include <stdint.h>
- 
- QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript;
- 
-@@ -133,7 +134,7 @@
-        req.pointSize = req.pixelSize*10;
- 
-     if ( ! engineData ) {
-       QFontCache::Key key( req, QFont::NoScript, (int)paintdevice );
-+       QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice );
- 
-        // look for the requested font in the engine data cache
-        engineData = QFontCache::instance->findEngineData( key );
--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit-cleanup.patch
-+++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp
-@@ -32,6 +32,7 @@
- #include "qwsdisplay_qws.h"
- #include "qwsregionmanager_qws.h"
- #include <stdlib.h>
-+#include <stdint.h>
- 
- #ifndef QT_NO_QWS_MULTIPROCESS
- #include <sys/types.h>
-@@ -288,7 +289,7 @@
-            data = (unsigned char *)shmat( shmId, 0, 0 );
-     }
- 
-    return ( shmId != -1 && (int)data != -1 );
-+    return ( shmId != -1 && (intptr_t)data != -1 );
- #else
-        int dataSize = sizeof(QWSRegionHeader)                // header
-                    + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index
--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit-cleanup.patch
-+++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp
-@@ -53,6 +53,7 @@
- #include "qwsmanager_qws.h"
- #include "qwsregionmanager_qws.h"
- #include "qinputcontext_p.h"
-+#include <stdint.h>
- 
- void qt_insert_sip( QWidget*, int, int );      // defined in qapplication_x11.cpp
- int  qt_sip_count( QWidget* );                 // --- "" ---
-@@ -631,7 +632,7 @@
-        qt_mouseGrb->releaseMouse();
- 
-     qwsDisplay()->grabMouse(this,TRUE);
-    qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle());
-+    qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle());
-     qt_mouseGrb = this;
-     qt_pressGrab = 0;
- }
-@@ -1845,7 +1846,7 @@
-        QSize s( qt_screen->width(), qt_screen->height() );
-        QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s);
-        if ( r.contains(pos) )
-           qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle());
-+           qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle());
-     }
- }
- #endif
diff --git a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch b/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch
deleted file mode 100644
index b0ee6374ef..0000000000
--- a/meta-moblin/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
--- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200
-+++ qt-embedded-free-3.3.2/Makefile     2004-05-11 15:53:53.000000000 +0200
-@@ -11,7 +11,7 @@
- install: FORCE
-        @$(MAKE) qt.install
- 
-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
-+all: symlinks src-qmake src-moc sub-src sub-tools
-        @echo
-        @echo "The Qt library is now built in ./lib"
-        @echo "The Qt examples are built in the directories in ./examples"
diff --git a/meta-moblin/packages/uicmoc/uicmoc3-native_3.3.5.bb b/meta-moblin/packages/uicmoc/uicmoc3-native_3.3.5.bb
deleted file mode 100644
index 68582850a2..0000000000
--- a/meta-moblin/packages/uicmoc/uicmoc3-native_3.3.5.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x"
-HOMEPAGE = "http://www.trolltech.com"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "GPL QPL"
-DEPENDS = "qmake-native"
-PR = "r3"
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \
-           file://no-examples.patch;patch=1 \
-           file://64bit-cleanup.patch;patch=1"
-S = "${WORKDIR}/qt-embedded-free-${PV}"
-inherit native qmake_base qt3e
-export QTDIR = "${S}"
-export OE_QMAKE_LINK="${CXX}"
-CXXFLAGS += " -DQWS"
-QT_CONFIG_FLAGS = "-release -static -depths 8,16 -qt-zlib -no-nas-sound \
-                   -no-sm -no-libjpeg -no-libmng -no-gif -no-xshape -no-xinerama \
-                   -no-xcursor -no-xrandr -no-xrender -no-xft -no-tablet \
-                   -no-xkb -no-dlopen-opengl -no-freetype -no-thread \
-                   -no-nis -no-cups -prefix ${prefix} \
-                   -xplatform ${OE_QMAKE_PLATFORM} \
-                   -platform ${OE_QMAKE_PLATFORM}"
-do_configure() {
-    oe_qmake_mkspecs
-    echo "yes" | ./configure ${QT_CONFIG_FLAGS}
-}
-do_compile() {
-    oe_runmake symlinks  || die "Can't symlink include files"
-    oe_runmake src-moc   || die "Building moc failed"
-    oe_runmake sub-tools || die "Building tools failed"
-}
-do_install() {
-        install -d ${D}${bindir}/
-        install -d ${D}/qte3/lib/
-        install -d ${D}/qte3/include
-        install -m 0755 bin/moc ${D}${bindir}/
-        install -m 0755 bin/uic ${D}${bindir}/
-        install -m 0655 lib/*.a ${D}/qte3/lib/
-        for f in include/*.h
-        do
-                install -m 0644 $f ${D}/qte3/include/
-        done
-}
-sysroot_stage_all_append() {
-        sysroot_stage_dir ${D}/qte3 ${SYSROOT_DESTDIR}/${QTEDIR}/
-}
diff --git a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs/configurefix.patch b/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs/configurefix.patch
deleted file mode 100644
index 576cdde752..0000000000
--- a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs/configurefix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The AM_DISABLE_STATIC appears to pull in strange libtool junk so just remove it.
-RP - 27/5/09
-Index: xdg-user-dirs-0.10/configure.ac
-===================================================================
--- xdg-user-dirs-0.10.orig/configure.ac        2009-05-27 22:27:20.000000000 +0100
-+++ xdg-user-dirs-0.10/configure.ac     2009-05-27 22:27:28.000000000 +0100
-@@ -13,8 +13,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-AM_PROG_MKDIR_P        
-AM_DISABLE_STATIC
-+AM_PROG_MKDIR_P
- AM_ICONV
- 
- GETTEXT_PACKAGE=xdg-user-dirs
diff --git a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb b/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb
deleted file mode 100644
index 579672cf51..0000000000
--- a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder"
-SRC_URI = "http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.10.tar.gz \
-           file://configurefix.patch;patch=1 "
-DEPENDS = "gettext"
-PR = "r1"
-inherit autotools
-do_install_append () {
-        install -d ${D}${sysconfdir}/skel/.config/
-        mv ${D}${sysconfdir}/xdg/user-dirs.defaults ${D}${sysconfdir}/skel/.config/user-dirs.dirs
-}
diff --git a/meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch b/meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch
deleted file mode 100644
index d1fa2de9c1..0000000000
--- a/meta-moblin/packages/xerces-c/xerces-c/nolocallink.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: xercesc/Makefile.incl
-===================================================================
--- xercesc.orig/Makefile.incl  2009-11-18 00:31:14.000000000 +0000
-+++ xercesc/Makefile.incl       2009-11-18 00:31:58.000000000 +0000
-@@ -519,23 +519,23 @@
- 
-     ifeq (${BITSTOBUILD}, 64)
-       ifeq (${TRANSCODER}, ICU)
-        ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
-+        ALLLIBS = ${LIBS} -licuuc -licudata
-       else
-        ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
-+        ALLLIBS = ${LIBS} 
-       endif
- 
-       ifeq (${MESSAGELOADER}, ICU)
-        ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
-+        ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages
-       endif
-     else
-       ifeq (${TRANSCODER}, ICU)
-        ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
-+        ALLLIBS = ${LIBS} -licuuc -licudata
-       else
-        ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
-+        ALLLIBS = ${LIBS} 
-       endif
- 
-       ifeq (${MESSAGELOADER}, ICU)
-        ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
-+        ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages
-       endif
-     endif
- 
diff --git a/meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb b/meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb
deleted file mode 100644
index 23f5885628..0000000000
--- a/meta-moblin/packages/xerces-c/xerces-c_2.8.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Xerces-c is a validating xml parser written in C++"
-HOMEPAGE = "http://xerces.apache.org/xerces-c/"
-SECTION =  "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-PR = "r2"
-SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz \
-           file://nolocallink.patch;patch=1"
-S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc"
-inherit autotools pkgconfig
-CCACHE = ""
-export XERCESCROOT="${WORKDIR}/xerces-c-src_2_8_0"
-export cross_compiling = "yes"
-do_configure() {
-        ./runConfigure -plinux -c"${CC}" -x"${CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix} \
-                    -C--build=${BUILD_SYS} \
-                    -C--host=${HOST_SYS} \
-                    -C--target=${TARGET_SYS} \
-}
-do_compile() {
-        ${MAKE}
-}
-do_install () {
-        ${MAKE} install
-}
author	Richard Purdie <rpurdie@linux.intel.com>	2010-09-30 22:15:13 +0100
committer	Richard Purdie <rpurdie@linux.intel.com>	2010-09-30 22:16:10 +0100
commit	c0c657bd92911788b96d9670620eabf024453752 (patch)
tree	774a5e2d966d6ee87da17cd063580d5970564d00 /meta-moblin
parent	e71a306f9cac8e30e689d607e2092e11a756ef5d (diff)
download	poky-c0c657bd92911788b96d9670620eabf024453752.tar.gz