summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:11 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:57 +0100
commitd62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch)
treef36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta
parentcaab7fc509bf27706ff3248689f6afd04225cfda (diff)
downloadpoky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libidl/libidl_0.8.12.bb16
-rw-r--r--meta/packages/librds/librds_0.0.1.bb11
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch13
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless-services_git.bb14
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch1478
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch66
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch14
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch764
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/configurefix.patch774
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h21
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h21
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h21
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h21
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/mozconfig23
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch24
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch26
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch44
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless_hg.bb99
-rw-r--r--meta/packages/mozilla/files/eabi-fix.patch66
-rw-r--r--meta/packages/mozilla/files/eabi-fix2.patch56
-rw-r--r--meta/packages/mozilla/files/eabi-fix3.patch15
-rw-r--r--meta/packages/mozilla/files/minimo.desktop9
-rw-r--r--meta/packages/mozilla/files/minimo.pngbin4323 -> 0 bytes
-rw-r--r--meta/packages/mozilla/minimo/bug-322806.diff13
-rw-r--r--meta/packages/mozilla/minimo/minimo4
-rw-r--r--meta/packages/mozilla/minimo/minimo.patch356
-rw-r--r--meta/packages/mozilla/minimo/minimo.pngbin4323 -> 0 bytes
-rw-r--r--meta/packages/mozilla/minimo/mozconfig36
-rw-r--r--meta/packages/mozilla/minimo_cvs.bb153
-rw-r--r--meta/packages/networkmanager/files/70NetworkManagerApplet.shbg4
-rw-r--r--meta/packages/networkmanager/files/99_networkmanager1
-rw-r--r--meta/packages/networkmanager/files/NetworkManager43
-rw-r--r--meta/packages/networkmanager/files/allow-disabling.patch45
-rw-r--r--meta/packages/networkmanager/files/applet-no-animation.patch234
-rw-r--r--meta/packages/networkmanager/files/applet-no-gnome.diff59
-rw-r--r--meta/packages/networkmanager/files/libnlfix.patch29
-rw-r--r--meta/packages/networkmanager/files/makefile-fix.patch17
-rw-r--r--meta/packages/networkmanager/files/nmutil-fix.patch12
-rw-r--r--meta/packages/networkmanager/files/no-restarts.diff21
-rw-r--r--meta/packages/networkmanager/files/no_vpn.patch13
-rw-r--r--meta/packages/networkmanager/networkmanager-applet_svn.bb33
-rw-r--r--meta/packages/networkmanager/networkmanager_svn.bb51
-rw-r--r--meta/packages/smart/smart_1.1.bb29
-rw-r--r--meta/packages/tar/tar-1.17/m4extensions.patch28
-rw-r--r--meta/packages/tar/tar.inc25
-rw-r--r--meta/packages/tar/tar_1.17.bb14
-rw-r--r--meta/packages/tar/tar_1.23.bb9
-rw-r--r--meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy (renamed from meta/packages/apmd/apmd-3.2.2-14/apmd_proxy)0
-rw-r--r--meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf (renamed from meta/packages/apmd/apmd-3.2.2-14/apmd_proxy.conf)0
-rw-r--r--meta/recipes-bsp/apmd/apmd-3.2.2-14/default (renamed from meta/packages/apmd/apmd-3.2.2-14/default)0
-rwxr-xr-xmeta/recipes-bsp/apmd/apmd-3.2.2-14/init (renamed from meta/packages/apmd/apmd-3.2.2-14/init)0
-rw-r--r--meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch (renamed from meta/packages/apmd/apmd-3.2.2-14/libtool.patch)0
-rw-r--r--meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch (renamed from meta/packages/apmd/apmd-3.2.2-14/unlinux.patch)0
-rw-r--r--meta/recipes-bsp/apmd/apmd-3.2.2-14/workaround.patch (renamed from meta/packages/apmd/apmd-3.2.2-14/workaround.patch)0
-rw-r--r--meta/recipes-bsp/apmd/apmd_3.2.2-14.bb (renamed from meta/packages/apmd/apmd_3.2.2-14.bb)0
-rw-r--r--meta/recipes-bsp/hostap/files/hostap-fw-load.patch (renamed from meta/packages/hostap/files/hostap-fw-load.patch)0
-rw-r--r--meta/recipes-bsp/hostap/files/hostap_cs.conf (renamed from meta/packages/hostap/files/hostap_cs.conf)0
-rw-r--r--meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream (renamed from meta/packages/hostap/files/hostap_cs.conf-upstream)0
-rw-r--r--meta/recipes-bsp/hostap/files/hostap_cs.modalias (renamed from meta/packages/hostap/files/hostap_cs.modalias)0
-rw-r--r--meta/recipes-bsp/hostap/hostap-conf_1.0.bb (renamed from meta/packages/hostap/hostap-conf_1.0.bb)0
-rw-r--r--meta/recipes-bsp/hostap/hostap-utils.inc (renamed from meta/packages/hostap/hostap-utils.inc)0
-rw-r--r--meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb (renamed from meta/packages/hostap/hostap-utils_0.4.7.bb)0
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch (renamed from meta/packages/lrzsz/lrzsz-0.12.20/autotools.patch)0
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch (renamed from meta/packages/lrzsz/lrzsz-0.12.20/gettext.patch)0
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch (renamed from meta/packages/lrzsz/lrzsz-0.12.20/makefile.patch)0
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb (renamed from meta/packages/lrzsz/lrzsz_0.12.20.bb)0
-rw-r--r--meta/recipes-bsp/pm-utils/pm-utils_1.3.0.bb (renamed from meta/packages/pm-utils/pm-utils_1.3.0.bb)0
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb (renamed from meta/packages/oh/qemu-config.bb)0
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run (renamed from meta/packages/oh/qemu-config/anjuta-remote-run)0
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config/distcc.sh (renamed from meta/packages/oh/qemu-config/distcc.sh)0
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config/exports (renamed from meta/packages/oh/qemu-config/exports)0
-rwxr-xr-xmeta/recipes-bsp/qemu-config/qemu-config/qemu-autostart (renamed from meta/packages/oh/qemu-config/qemu-autostart)0
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop (renamed from meta/packages/oh/qemu-config/qemuarm/shutdown.desktop)0
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop (renamed from meta/packages/oh/qemu-config/shutdown.desktop)0
-rw-r--r--meta/recipes-bsp/setserial/setserial_2.17.bb (renamed from meta/packages/setserial/setserial_2.17.bb)0
-rw-r--r--meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch (renamed from meta/packages/uboot/files/fix-arm920t-eabi.patch)0
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage-native_1.3.2.bb (renamed from meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb)0
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage_2009.08.bb (renamed from meta/packages/uboot/u-boot-mkimage_2009.08.bb)0
-rw-r--r--meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch (renamed from meta/packages/uboot/u-boot-omap3-git/beagleboard/name.patch)0
-rw-r--r--meta/recipes-bsp/uboot/u-boot-omap3_git.bb (renamed from meta/packages/uboot/u-boot-omap3_git.bb)0
-rw-r--r--meta/recipes-bsp/uboot/u-boot.inc (renamed from meta/packages/uboot/u-boot.inc)0
-rw-r--r--meta/recipes-bsp/usbinit/usbinit.bb (renamed from meta/packages/oh/usbinit.bb)0
-rwxr-xr-xmeta/recipes-bsp/usbinit/usbinit/usb-gether (renamed from meta/packages/oh/usbinit/usb-gether)0
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_0.86.bb (renamed from meta/packages/usbutils/usbutils_0.86.bb)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch (renamed from meta/packages/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch (renamed from meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch (renamed from meta/packages/dhcp/dhcp-4.1.1-P1/fixincludes.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch (renamed from meta/packages/dhcp/dhcp-4.1.1-P1/noattrmode.patch)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h (renamed from meta/packages/dhcp/dhcp-4.1.1-P1/site.h)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp3.inc (renamed from meta/packages/dhcp/dhcp3.inc)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp4.inc (renamed from meta/packages/dhcp/dhcp4.inc)0
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.1.1-P1.bb (renamed from meta/packages/dhcp/dhcp_4.1.1-P1.bb)0
-rw-r--r--meta/recipes-connectivity/dhcp/files/default-relay (renamed from meta/packages/dhcp/files/default-relay)0
-rw-r--r--meta/recipes-connectivity/dhcp/files/default-server (renamed from meta/packages/dhcp/files/default-server)0
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhclient.conf (renamed from meta/packages/dhcp/files/dhclient.conf)0
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcpd.conf (renamed from meta/packages/dhcp/files/dhcpd.conf)0
-rw-r--r--meta/recipes-connectivity/dhcp/files/init-relay (renamed from meta/packages/dhcp/files/init-relay)0
-rw-r--r--meta/recipes-connectivity/dhcp/files/init-server (renamed from meta/packages/dhcp/files/init-server)0
-rw-r--r--meta/recipes-connectivity/farsight/farsight2_0.0.9.bb (renamed from meta/packages/farsight/farsight2_0.0.9.bb)0
-rw-r--r--meta/recipes-connectivity/farsight/libnice_0.0.6.bb (renamed from meta/packages/farsight/libnice_0.0.6.bb)0
-rw-r--r--meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch (renamed from meta/packages/gsm/files/0001-Introduce-ports.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch (renamed from meta/packages/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch (renamed from meta/packages/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch (renamed from meta/packages/gsm/files/0004-Handle-read-and-write-return-values.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch (renamed from meta/packages/gsm/files/0005-Add-ask-ds-option-forSMS.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch (renamed from meta/packages/gsm/files/024_sms-text-in-bracket.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/025_sms-status-report.patch (renamed from meta/packages/gsm/files/025_sms-status-report.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch (renamed from meta/packages/gsm/files/027_phonebook-find-and-read-range-support.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch (renamed from meta/packages/gsm/files/028_shell-phonebook-find-and-read-range-support.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/default (renamed from meta/packages/gsm/files/default)0
-rw-r--r--meta/recipes-connectivity/gsm/files/fix_machine_init.patch (renamed from meta/packages/gsm/files/fix_machine_init.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/gsmd (renamed from meta/packages/gsm/files/gsmd)0
-rw-r--r--meta/recipes-connectivity/gsm/files/install-ts-headers.patch (renamed from meta/packages/gsm/files/install-ts-headers.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch (renamed from meta/packages/gsm/files/lgsm_send_fix_return_value.patch)0
-rw-r--r--meta/recipes-connectivity/gsm/gsmd.inc (renamed from meta/packages/gsm/gsmd.inc)0
-rw-r--r--meta/recipes-connectivity/gsm/libgsmd_svn.bb (renamed from meta/packages/gsm/libgsmd_svn.bb)0
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch (renamed from meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch)0
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc (renamed from meta/packages/iproute2/iproute2.inc)0
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb (renamed from meta/packages/iproute2/iproute2_2.6.34.bb)0
-rw-r--r--meta/recipes-connectivity/libetpan/files/cxx-is-here.patch (renamed from meta/packages/libetpan/files/cxx-is-here.patch)0
-rw-r--r--meta/recipes-connectivity/libetpan/libetpan_0.54.bb (renamed from meta/packages/libetpan/libetpan_0.54.bb)0
-rw-r--r--meta/recipes-connectivity/libnss-mdns/files/alignment-fix.patch (renamed from meta/packages/libnss-mdns/files/alignment-fix.patch)0
-rw-r--r--meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb (renamed from meta/packages/libnss-mdns/libnss-mdns_0.10.bb)0
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch (renamed from meta/packages/libpcap/libpcap-1.1.1/aclocal.patch)0
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch (renamed from meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch)0
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc (renamed from meta/packages/libpcap/libpcap.inc)0
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb (renamed from meta/packages/libpcap/libpcap_1.1.1.bb)0
-rw-r--r--meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb (renamed from meta/packages/network-suspend-scripts/network-suspend-scripts.bb)0
-rw-r--r--meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown (renamed from meta/packages/network-suspend-scripts/network-suspend-scripts/ifupdown)0
-rw-r--r--meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet (renamed from meta/packages/network-suspend-scripts/network-suspend-scripts/usbnet)0
-rw-r--r--meta/recipes-connectivity/nfs-utils/libnfsidmap_0.23.bb (renamed from meta/packages/nfs-utils/libnfsidmap_0.23.bb)0
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch (renamed from meta/packages/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch)0
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver (renamed from meta/packages/nfs-utils/nfs-utils/nfsserver)0
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.2.bb (renamed from meta/packages/nfs-utils/nfs-utils_1.2.2.bb)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/configure-targets.patch (renamed from meta/packages/openssl/openssl-0.9.8o/configure-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/ca.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/ca.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/config-hurd.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/config-hurd.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/debian-targets.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/debian-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/engines-path.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/engines-path.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/make-targets.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/make-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-dir.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/man-dir.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-section.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/man-section.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-rpath.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/no-rpath.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-symbolic.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/no-symbolic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/perl-path.diff (renamed from meta/packages/openssl/openssl-0.9.8o/debian/perl-path.diff)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pic.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/pic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pkg-config.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/pkg-config.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rc4-amd64.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/rc4-amd64.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash-crt.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/rehash-crt.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash_pod.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/rehash_pod.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/series (renamed from meta/packages/openssl/openssl-0.9.8o/debian/series)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/stddef.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/stddef.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/valgrind.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/valgrind.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/version-script.patch (renamed from meta/packages/openssl/openssl-0.9.8o/debian/version-script.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8o/shared-libs.patch (renamed from meta/packages/openssl/openssl-0.9.8o/shared-libs.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc (renamed from meta/packages/openssl/openssl.inc)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8o.bb (renamed from meta/packages/openssl/openssl_0.9.8o.bb)0
-rw-r--r--meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch (renamed from meta/packages/openswan/openswan-2.4.7/installflags.patch)0
-rw-r--r--meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch (renamed from meta/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch)0
-rw-r--r--meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch (renamed from meta/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch)0
-rw-r--r--meta/recipes-connectivity/openswan/openswan_2.4.7.bb (renamed from meta/packages/openswan/openswan_2.4.7.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch (renamed from meta/packages/opensync/libopensync-0.37/build-in-src.patch)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch (renamed from meta/packages/opensync/libopensync-0.37/cmake.patch)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch (renamed from meta/packages/opensync/libopensync-0.37/no-python-check.patch)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch (renamed from meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb (renamed from meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb (renamed from meta/packages/opensync/libopensync-plugin-file_0.37.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb (renamed from meta/packages/opensync/libopensync-plugin-google-calendar_0.36.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb (renamed from meta/packages/opensync/libopensync-plugin-irmc_0.36.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch (renamed from meta/packages/opensync/libopensync-plugin-syncml/fixerror.patch)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb (renamed from meta/packages/opensync/libopensync-plugin-syncml_0.38.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb (renamed from meta/packages/opensync/libopensync-plugin-vformat_0.37.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc (renamed from meta/packages/opensync/libopensync-plugin_0.36.inc)0
-rw-r--r--meta/recipes-connectivity/opensync/libopensync_0.37.bb (renamed from meta/packages/opensync/libopensync_0.37.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libsync_svn.bb (renamed from meta/packages/sync/libsync_svn.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch (renamed from meta/packages/opensync/libsyncml/build-in-src.patch)0
-rw-r--r--meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb (renamed from meta/packages/opensync/libsyncml_0.5.4.bb)0
-rw-r--r--meta/recipes-connectivity/opensync/msynctool_0.37.bb (renamed from meta/packages/opensync/msynctool_0.37.bb)0
-rw-r--r--meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch (renamed from meta/packages/portmap/portmap-6.0/destdir-no-strip.patch)0
-rw-r--r--meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch (renamed from meta/packages/portmap/portmap-6.0/tcpd-config.patch)0
-rw-r--r--meta/recipes-connectivity/portmap/portmap.inc (renamed from meta/packages/portmap/portmap.inc)0
-rwxr-xr-xmeta/recipes-connectivity/portmap/portmap/portmap.init (renamed from meta/packages/portmap/portmap/portmap.init)0
-rw-r--r--meta/recipes-connectivity/portmap/portmap_6.0.bb (renamed from meta/packages/portmap/portmap_6.0.bb)0
-rw-r--r--meta/recipes-connectivity/ppp-dialin/files/host-peer (renamed from meta/packages/ppp-dialin/files/host-peer)0
-rw-r--r--meta/recipes-connectivity/ppp-dialin/files/ppp-dialin (renamed from meta/packages/ppp-dialin/files/ppp-dialin)0
-rw-r--r--meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb (renamed from meta/packages/ppp-dialin/ppp-dialin_0.1.bb)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns (renamed from meta/packages/ppp/ppp-2.4.5/08setupdns)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns (renamed from meta/packages/ppp/ppp-2.4.5/92removedns)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch (renamed from meta/packages/ppp/ppp-2.4.5/cifdefroute.patch)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch (renamed from meta/packages/ppp/ppp-2.4.5/enable-ipv6.patch)0
-rwxr-xr-xmeta/recipes-connectivity/ppp/ppp-2.4.5/init (renamed from meta/packages/ppp/ppp-2.4.5/init)0
-rwxr-xr-xmeta/recipes-connectivity/ppp/ppp-2.4.5/ip-down (renamed from meta/packages/ppp/ppp-2.4.5/ip-down)0
-rwxr-xr-xmeta/recipes-connectivity/ppp/ppp-2.4.5/ip-up (renamed from meta/packages/ppp/ppp-2.4.5/ip-up)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch (renamed from meta/packages/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch (renamed from meta/packages/ppp/ppp-2.4.5/makefile.patch)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/poff (renamed from meta/packages/ppp/ppp-2.4.5/poff)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/pon (renamed from meta/packages/ppp/ppp-2.4.5/pon)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch (renamed from meta/packages/ppp/ppp-2.4.5/pppd-resolv-varrun.patch)0
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb (renamed from meta/packages/ppp/ppp_2.4.5.bb)0
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb (renamed from meta/packages/resolvconf/resolvconf_1.43.bb)0
-rw-r--r--meta/recipes-connectivity/wbxml/files/no-doc-install.patch (renamed from meta/packages/wbxml/files/no-doc-install.patch)0
-rw-r--r--meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb (renamed from meta/packages/wbxml/wbxml2_0.9.2.bb)0
-rw-r--r--meta/recipes-core/coreutils/coreutils-6.9/futimens.patch (renamed from meta/packages/coreutils/coreutils-6.9/futimens.patch)0
-rw-r--r--meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch (renamed from meta/packages/coreutils/coreutils-6.9/gnulib_m4.patch)0
-rw-r--r--meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch (renamed from meta/packages/coreutils/coreutils-6.9/man-touch.patch)0
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb (renamed from meta/packages/coreutils/coreutils_6.9.bb)0
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.5.bb (renamed from meta/packages/coreutils/coreutils_8.5.bb)0
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc (renamed from meta/packages/ncurses/ncurses.inc)0
-rw-r--r--meta/recipes-core/ncurses/ncurses/makefile_tweak.patch (renamed from meta/packages/ncurses/ncurses/makefile_tweak.patch)0
-rw-r--r--meta/recipes-core/ncurses/ncurses/visibility.patch (renamed from meta/packages/ncurses/ncurses/visibility.patch)0
-rw-r--r--meta/recipes-core/ncurses/ncurses_5.4.bb (renamed from meta/packages/ncurses/ncurses_5.4.bb)0
-rw-r--r--meta/recipes-core/readline/files/acinclude.m4 (renamed from meta/packages/readline/files/acinclude.m4)0
-rw-r--r--meta/recipes-core/readline/files/configure-fix.patch (renamed from meta/packages/readline/files/configure-fix.patch)0
-rw-r--r--meta/recipes-core/readline/readline.inc (renamed from meta/packages/readline/readline.inc)0
-rw-r--r--meta/recipes-core/readline/readline_5.2.bb (renamed from meta/packages/readline/readline_5.2.bb)0
-rw-r--r--meta/recipes-core/readline/readline_6.1.bb (renamed from meta/packages/readline/readline_6.1.bb)0
-rw-r--r--meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb (renamed from meta/packages/sysfsutils/sysfsutils_2.1.0.bb)0
-rw-r--r--meta/recipes-core/util-linux/files/MCONFIG (renamed from meta/packages/util-linux/files/MCONFIG)0
-rw-r--r--meta/recipes-core/util-linux/files/debian-bug392236.patch (renamed from meta/packages/util-linux/files/debian-bug392236.patch)0
-rw-r--r--meta/recipes-core/util-linux/files/defines.h (renamed from meta/packages/util-linux/files/defines.h)0
-rw-r--r--meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff (renamed from meta/packages/util-linux/files/fdiskbsdlabel_thumb.diff)0
-rw-r--r--meta/recipes-core/util-linux/files/fix-make-c.patch (renamed from meta/packages/util-linux/files/fix-make-c.patch)0
-rw-r--r--meta/recipes-core/util-linux/files/gcc34.patch (renamed from meta/packages/util-linux/files/gcc34.patch)0
-rw-r--r--meta/recipes-core/util-linux/files/glibc-fix.patch (renamed from meta/packages/util-linux/files/glibc-fix.patch)0
-rw-r--r--meta/recipes-core/util-linux/files/make_include (renamed from meta/packages/util-linux/files/make_include)0
-rw-r--r--meta/recipes-core/util-linux/files/optional-uuid.patch (renamed from meta/packages/util-linux/files/optional-uuid.patch)0
-rw-r--r--meta/recipes-core/util-linux/files/swapargs.h (renamed from meta/packages/util-linux/files/swapargs.h)0
-rw-r--r--meta/recipes-core/util-linux/files/umount.diff (renamed from meta/packages/util-linux/files/umount.diff)0
-rw-r--r--meta/recipes-core/util-linux/files/uuid.patch (renamed from meta/packages/util-linux/files/uuid.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.17.2/tls.patch (renamed from meta/packages/util-linux/util-linux-2.17.2/tls.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.17.2/uclibc-compile.patch (renamed from meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch (renamed from meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc (renamed from meta/packages/util-linux/util-linux.inc)0
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.17.2.bb (renamed from meta/packages/util-linux/util-linux_2.17.2.bb)0
-rw-r--r--meta/recipes-devtools/exmap-console/exmap-console.inc (renamed from meta/packages/exmap-console/exmap-console.inc)0
-rw-r--r--meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb (renamed from meta/packages/exmap-console/exmap-console_0.4.1.bb)0
-rw-r--r--meta/recipes-devtools/exmap-console/exmap-console_svn.bb (renamed from meta/packages/exmap-console/exmap-console_svn.bb)0
-rw-r--r--meta/recipes-devtools/insserv/files/40_segfault_virtprov.dpatch (renamed from meta/packages/insserv/files/40_segfault_virtprov.dpatch)0
-rw-r--r--meta/recipes-devtools/insserv/files/42_loopnochangemsg.dpatch (renamed from meta/packages/insserv/files/42_loopnochangemsg.dpatch)0
-rw-r--r--meta/recipes-devtools/insserv/files/crosscompile_fix.patch (renamed from meta/packages/insserv/files/crosscompile_fix.patch)0
-rw-r--r--meta/recipes-devtools/insserv/files/insserv.conf (renamed from meta/packages/insserv/files/insserv.conf)0
-rw-r--r--meta/recipes-devtools/insserv/files/make.patch (renamed from meta/packages/insserv/files/make.patch)0
-rw-r--r--meta/recipes-devtools/insserv/insserv_1.11.0.bb (renamed from meta/packages/insserv/insserv_1.11.0.bb)0
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch (renamed from meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch)0
-rw-r--r--meta/recipes-devtools/intltool/intltool.inc (renamed from meta/packages/intltool/intltool.inc)0
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.40.6.bb (renamed from meta/packages/intltool/intltool_0.40.6.bb)0
-rw-r--r--meta/recipes-devtools/nasm/nasm_2.07.bb (renamed from meta/packages/nasm/nasm_2.07.bb)0
-rw-r--r--meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf (renamed from meta/packages/rsync/rsync-2.6.9/rsyncd.conf)0
-rw-r--r--meta/recipes-devtools/strace/strace_4.5.20.bb (renamed from meta/packages/strace/strace_4.5.20.bb)0
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch (renamed from meta/packages/tcf-agent/tcf-agent/fix_tcf-agent.init.patch)0
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch (renamed from meta/packages/tcf-agent/tcf-agent/terminals_agent.patch)0
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb (renamed from meta/packages/tcf-agent/tcf-agent_svn.bb)0
-rw-r--r--meta/recipes-devtools/ubootchart/files/sysvinit.patch (renamed from meta/packages/ubootchart/files/sysvinit.patch)0
-rw-r--r--meta/recipes-devtools/ubootchart/files/ubootchart-stop (renamed from meta/packages/ubootchart/files/ubootchart-stop)0
-rw-r--r--meta/recipes-devtools/ubootchart/files/ubootchart.desktop (renamed from meta/packages/ubootchart/files/ubootchart.desktop)0
-rw-r--r--meta/recipes-devtools/ubootchart/ubootchart_svn.bb (renamed from meta/packages/ubootchart/ubootchart_svn.bb)0
-rw-r--r--meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch (renamed from meta/packages/yaffs2/files/mkyaffs2image.patch)0
-rw-r--r--meta/recipes-devtools/yaffs2/files/yaffs2-unioob.patch (renamed from meta/packages/yaffs2/files/yaffs2-unioob.patch)0
-rw-r--r--meta/recipes-devtools/yaffs2/yaffs2-utils.inc (renamed from meta/packages/yaffs2/yaffs2-utils.inc)0
-rw-r--r--meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb (renamed from meta/packages/yaffs2/yaffs2-utils_cvs.bb)0
-rw-r--r--meta/recipes-extended/blktool/blktool_4-6.bb (renamed from meta/packages/blktool/blktool_4-6.bb)0
-rw-r--r--meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am (renamed from meta/packages/bzip2/bzip2-1.0.5/Makefile.am)0
-rw-r--r--meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac (renamed from meta/packages/bzip2/bzip2-1.0.5/configure.ac)0
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.5.bb (renamed from meta/packages/bzip2/bzip2_1.0.5.bb)0
-rw-r--r--meta/recipes-extended/devicekit/devicekit-power_014.bb (renamed from meta/packages/devicekit/devicekit-power_014.bb)0
-rw-r--r--meta/recipes-extended/devicekit/devicekit/volatile (renamed from meta/packages/devicekit/devicekit/volatile)0
-rw-r--r--meta/recipes-extended/devicekit/devicekit_003.bb (renamed from meta/packages/devicekit/devicekit_003.bb)0
-rw-r--r--meta/recipes-extended/devicekit/devicekit_git.bb (renamed from meta/packages/devicekit/devicekit_git.bb)0
-rw-r--r--meta/recipes-extended/diffutils/diffutils_2.8.1.bb (renamed from meta/packages/diffutils/diffutils_2.8.1.bb)0
-rw-r--r--meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch (renamed from meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch)0
-rw-r--r--meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch (renamed from meta/packages/findutils/findutils-4.4.2/01-27017.patch)0
-rw-r--r--meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch (renamed from meta/packages/findutils/findutils-4.4.2/02-28824.patch)0
-rw-r--r--meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch (renamed from meta/packages/findutils/findutils-4.4.2/03-28872.patch)0
-rw-r--r--meta/recipes-extended/findutils/findutils.inc (renamed from meta/packages/findutils/findutils.inc)0
-rw-r--r--meta/recipes-extended/findutils/findutils_4.2.31.bb (renamed from meta/packages/findutils/findutils_4.2.31.bb)0
-rw-r--r--meta/recipes-extended/findutils/findutils_4.4.2.bb (renamed from meta/packages/findutils/findutils_4.4.2.bb)0
-rw-r--r--meta/recipes-extended/gperf/gperf.inc (renamed from meta/packages/gperf/gperf.inc)0
-rw-r--r--meta/recipes-extended/gperf/gperf_3.0.3.bb (renamed from meta/packages/gperf/gperf_3.0.3.bb)0
-rw-r--r--meta/recipes-extended/gperf/gperf_3.0.4.bb (renamed from meta/packages/gperf/gperf_3.0.4.bb)0
-rw-r--r--meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch (renamed from meta/packages/grep/grep-2.5.1a/uclibc-fix.patch)0
-rw-r--r--meta/recipes-extended/grep/grep_2.5.1a.bb (renamed from meta/packages/grep/grep_2.5.1a.bb)0
-rw-r--r--meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch (renamed from meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch)0
-rw-r--r--meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch (renamed from meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch)0
-rw-r--r--meta/recipes-extended/gzip/gzip.inc (renamed from meta/packages/gzip/gzip.inc)0
-rw-r--r--meta/recipes-extended/gzip/gzip_1.3.12.bb (renamed from meta/packages/gzip/gzip_1.3.12.bb)0
-rw-r--r--meta/recipes-extended/gzip/gzip_1.4.bb (renamed from meta/packages/gzip/gzip_1.4.bb)0
-rw-r--r--meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch (renamed from meta/packages/hdparm/hdparm-6.3/bswap.patch)0
-rw-r--r--meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch (renamed from meta/packages/hdparm/hdparm-6.3/uclibc.patch)0
-rw-r--r--meta/recipes-extended/hdparm/hdparm_6.3.bb (renamed from meta/packages/hdparm/hdparm_6.3.bb)0
-rw-r--r--meta/recipes-extended/libidn/libidn_0.6.14.bb (renamed from meta/packages/libidn/libidn_0.6.14.bb)0
-rw-r--r--meta/recipes-extended/libidn/libidn_1.19.bb (renamed from meta/packages/libidn/libidn_1.19.bb)0
-rw-r--r--meta/recipes-extended/lsof/lsof_4.83.bb (renamed from meta/packages/lsof/lsof_4.83.bb)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/99_pam (renamed from meta/packages/pam/libpam-1.1.1/99_pam)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch (renamed from meta/packages/pam/libpam-1.1.1/disable_crossbinary.patch)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account (renamed from meta/packages/pam/libpam-1.1.1/pam.d/common-account)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth (renamed from meta/packages/pam/libpam-1.1.1/pam.d/common-auth)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password (renamed from meta/packages/pam/libpam-1.1.1/pam.d/common-password)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session (renamed from meta/packages/pam/libpam-1.1.1/pam.d/common-session)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive (renamed from meta/packages/pam/libpam-1.1.1/pam.d/common-session-noninteractive)0
-rw-r--r--meta/recipes-extended/pam/libpam-1.1.1/pam.d/other (renamed from meta/packages/pam/libpam-1.1.1/pam.d/other)0
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.1.bb (renamed from meta/packages/pam/libpam_1.1.1.bb)0
-rw-r--r--meta/recipes-extended/parted/parted-1.9.0/no_check.patch (renamed from meta/packages/parted/parted-1.9.0/no_check.patch)0
-rw-r--r--meta/recipes-extended/parted/parted-1.9.0/syscalls.patch (renamed from meta/packages/parted/parted-1.9.0/syscalls.patch)0
-rw-r--r--meta/recipes-extended/parted/parted_1.9.0.bb (renamed from meta/packages/parted/parted_1.9.0.bb)0
-rw-r--r--meta/recipes-extended/polkit/polkit-gnome_0.96.bb (renamed from meta/packages/polkit/polkit-gnome_0.96.bb)0
-rw-r--r--meta/recipes-extended/polkit/polkit_0.96.bb (renamed from meta/packages/polkit/polkit_0.96.bb)0
-rw-r--r--meta/recipes-extended/psmisc/files/libintl-link.patch (renamed from meta/packages/psmisc/files/libintl-link.patch)0
-rw-r--r--meta/recipes-extended/psmisc/psmisc.inc (renamed from meta/packages/psmisc/psmisc.inc)0
-rw-r--r--meta/recipes-extended/psmisc/psmisc_22.2.bb (renamed from meta/packages/psmisc/psmisc_22.2.bb)0
-rw-r--r--meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch (renamed from meta/packages/sed/sed-4.1.2/fix_return_type.patch)0
-rw-r--r--meta/recipes-extended/sed/sed_4.1.2.bb (renamed from meta/packages/sed/sed_4.1.2.bb)0
-rw-r--r--meta/recipes-extended/sudo/files/autofoo.patch (renamed from meta/packages/sudo/files/autofoo.patch)0
-rw-r--r--meta/recipes-extended/sudo/files/noexec-link.patch (renamed from meta/packages/sudo/files/noexec-link.patch)0
-rw-r--r--meta/recipes-extended/sudo/files/nostrip.patch (renamed from meta/packages/sudo/files/nostrip.patch)0
-rw-r--r--meta/recipes-extended/sudo/site/bit-32 (renamed from meta/packages/sudo/site/bit-32)0
-rw-r--r--meta/recipes-extended/sudo/site/bit-64 (renamed from meta/packages/sudo/site/bit-64)0
-rw-r--r--meta/recipes-extended/sudo/sudo.inc (renamed from meta/packages/sudo/sudo.inc)0
-rw-r--r--meta/recipes-extended/sudo/sudo_1.7.2p7.bb (renamed from meta/packages/sudo/sudo_1.7.2p7.bb)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8 (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/size_t.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8 (renamed from meta/packages/tcp-wrappers/tcp-wrappers-7.6/try-from.8)0
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb (renamed from meta/packages/tcp-wrappers/tcp-wrappers_7.6.bb)0
-rw-r--r--meta/recipes-extended/tzcode/tzcode-native_2009r.bb (renamed from meta/packages/tzcode/tzcode-native_2009r.bb)0
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2010j.bb (renamed from meta/packages/tzdata/tzdata_2010j.bb)0
-rw-r--r--meta/recipes-extended/unzip/unzip_6.0.bb (renamed from meta/packages/unzip/unzip_6.0.bb)0
-rw-r--r--meta/recipes-extended/watchdog/watchdog_5.9.bb (renamed from meta/packages/watchdog/watchdog_5.9.bb)0
-rw-r--r--meta/recipes-extended/zile/files/for_build.patch (renamed from meta/packages/zile/files/for_build.patch)0
-rw-r--r--meta/recipes-extended/zile/zile_1.7+2.0beta6.bb (renamed from meta/packages/zile/zile_1.7+2.0beta6.bb)0
-rw-r--r--meta/recipes-extended/zip/zip.inc (renamed from meta/packages/zip/zip.inc)0
-rw-r--r--meta/recipes-extended/zip/zip_3.0.bb (renamed from meta/packages/zip/zip_3.0.bb)0
-rw-r--r--meta/recipes-gnome/libffi/libffi_3.0.8.bb (renamed from meta/packages/libffi/libffi_3.0.8.bb)0
-rw-r--r--meta/recipes-gnome/libgsf/libgsf_1.14.5.bb (renamed from meta/packages/libgsf/libgsf_1.14.5.bb)0
-rw-r--r--meta/recipes-gnome/libgtkstylus/files/gtkstylus.sh (renamed from meta/packages/libgtkstylus/files/gtkstylus.sh)0
-rw-r--r--meta/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb (renamed from meta/packages/libgtkstylus/libgtkstylus_0.5.bb)0
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.18.2.bb (renamed from meta/packages/librsvg/librsvg_2.18.2.bb)0
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.22.3.bb (renamed from meta/packages/librsvg/librsvg_2.22.3.bb)0
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.26.3.bb (renamed from meta/packages/librsvg/librsvg_2.26.3.bb)0
-rw-r--r--meta/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch (renamed from meta/packages/wv/wv-1.2.0/pkgconfig.patch)0
-rw-r--r--meta/recipes-gnome/wv/wv_1.2.0.bb (renamed from meta/packages/wv/wv_1.2.0.bb)0
-rw-r--r--meta/recipes-graphics/clutter/clutter-helix.inc15
-rw-r--r--meta/recipes-graphics/clutter/clutter-helix_git.bb8
-rw-r--r--meta/recipes-graphics/clutter/clutter-mozembed.inc14
-rw-r--r--meta/recipes-graphics/clutter/clutter-mozembed_git.bb14
-rw-r--r--meta/recipes-graphics/fstests/fstests_svn.bb (renamed from meta/packages/fstests/fstests_svn.bb)0
-rw-r--r--meta/recipes-graphics/libsdl/files/acinclude.m4 (renamed from meta/packages/libsdl/files/acinclude.m4)0
-rw-r--r--meta/recipes-graphics/libsdl/files/configure_tweak.patch (renamed from meta/packages/libsdl/files/configure_tweak.patch)0
-rw-r--r--meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch (renamed from meta/packages/libsdl/files/directfb_obsolete_calls.patch)0
-rw-r--r--meta/recipes-graphics/libsdl/files/extra-keys.patch (renamed from meta/packages/libsdl/files/extra-keys.patch)0
-rw-r--r--meta/recipes-graphics/libsdl/files/kernel-asm-page.patch (renamed from meta/packages/libsdl/files/kernel-asm-page.patch)0
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb (renamed from meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb)0
-rw-r--r--meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c (renamed from meta/packages/pong-clock/pong-clock/pong-clock-no-flicker.c)0
-rw-r--r--meta/recipes-graphics/pong-clock/pong-clock_1.0.bb (renamed from meta/packages/pong-clock/pong-clock_1.0.bb)0
-rw-r--r--meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb (renamed from meta/packages/x11vnc/x11vnc_0.9.3.bb)0
-rw-r--r--meta/recipes-graphics/xrestop/xrestop_0.4.bb (renamed from meta/packages/xrestop/xrestop_0.4.bb)0
-rw-r--r--meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb (renamed from meta/packages/xvideo-tests/xvideo-tests_svn.bb)0
-rw-r--r--meta/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch (renamed from meta/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch)0
-rw-r--r--meta/recipes-kernel/fuse/fuse.inc (renamed from meta/packages/fuse/fuse.inc)0
-rw-r--r--meta/recipes-kernel/fuse/fuse_2.7.2.bb (renamed from meta/packages/fuse/fuse_2.7.2.bb)0
-rw-r--r--meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb (renamed from meta/packages/libomxil/libomxil_0.3.3.bb)0
-rw-r--r--meta/recipes-multimedia/speex/speex_1.2rc1.bb (renamed from meta/packages/speex/speex_1.2rc1.bb)0
-rw-r--r--meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch120
-rw-r--r--meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf1
-rw-r--r--meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch22
-rw-r--r--meta/recipes-qt/qmake/qmake2-cross_2.10a.bb74
-rw-r--r--meta/recipes-qt/uicmoc/uicmoc4-native.inc67
-rw-r--r--meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb1
-rw-r--r--meta/recipes-sato/claws-mail/claws-mail.inc (renamed from meta/packages/claws-mail/claws-mail.inc)0
-rw-r--r--meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb (renamed from meta/packages/claws-mail/claws-mail_2.9.1.bb)0
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb (renamed from meta/packages/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb)0
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb (renamed from meta/packages/claws-mail/claws-plugin-maildir_0.24.4.bb)0
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb (renamed from meta/packages/claws-mail/claws-plugin-mailmbox_1.13.bb)0
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb (renamed from meta/packages/claws-mail/claws-plugin-rssyl_0.13.bb)0
-rw-r--r--meta/recipes-sato/claws-mail/files/desktop.patch (renamed from meta/packages/claws-mail/files/desktop.patch)0
-rw-r--r--meta/recipes-sato/claws-mail/files/fix-build.patch (renamed from meta/packages/claws-mail/files/fix-build.patch)0
-rw-r--r--meta/recipes-sato/claws-mail/files/owl-window-menu.patch (renamed from meta/packages/claws-mail/files/owl-window-menu.patch)0
-rw-r--r--meta/recipes-sato/claws-mail/files/streamline-ui.patch (renamed from meta/packages/claws-mail/files/streamline-ui.patch)0
-rw-r--r--meta/recipes-sato/libical/libical_0.44.bb (renamed from meta/packages/libical/libical_0.44.bb)0
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/makefile.patch (renamed from meta/packages/rxvt-unicode/files/makefile.patch)0
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/rxvt.desktop (renamed from meta/packages/rxvt-unicode/files/rxvt.desktop)0
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/rxvt.png (renamed from meta/packages/rxvt-unicode/files/rxvt.png)bin2847 -> 2847 bytes
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/signedchar.patch (renamed from meta/packages/rxvt-unicode/files/signedchar.patch)0
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/xwc.patch (renamed from meta/packages/rxvt-unicode/files/xwc.patch)0
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch (renamed from meta/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch)0
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb (renamed from meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb)0
-rw-r--r--meta/recipes-sato/webkit/files/GNUmakefile.am (renamed from meta/packages/webkit/files/GNUmakefile.am)0
-rw-r--r--meta/recipes-sato/webkit/files/Makefile (renamed from meta/packages/webkit/files/Makefile)0
-rw-r--r--meta/recipes-sato/webkit/files/Makefile.shared (renamed from meta/packages/webkit/files/Makefile.shared)0
-rw-r--r--meta/recipes-sato/webkit/files/WebKit.pri (renamed from meta/packages/webkit/files/WebKit.pri)0
-rw-r--r--meta/recipes-sato/webkit/files/WebKit.pro (renamed from meta/packages/webkit/files/WebKit.pro)0
-rwxr-xr-xmeta/recipes-sato/webkit/files/autogen.sh (renamed from meta/packages/webkit/files/autogen.sh)0
-rw-r--r--meta/recipes-sato/webkit/files/configure.ac (renamed from meta/packages/webkit/files/configure.ac)0
-rw-r--r--meta/recipes-sato/webkit/files/fix_im.patch (renamed from meta/packages/webkit/files/fix_im.patch)0
-rw-r--r--meta/recipes-sato/webkit/files/gtk-doc.make (renamed from meta/packages/webkit/files/gtk-doc.make)0
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_svn.bb (renamed from meta/packages/webkit/webkit-gtk_svn.bb)0
-rw-r--r--meta/recipes-support/apr/apr-util/configfix.patch (renamed from meta/packages/apr/apr-util/configfix.patch)0
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch (renamed from meta/packages/apr/apr-util/configure_fixes.patch)0
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch.old (renamed from meta/packages/apr/apr-util/configure_fixes.patch.old)0
-rw-r--r--meta/recipes-support/apr/apr-util_1.3.4.bb (renamed from meta/packages/apr/apr-util_1.3.4.bb)0
-rw-r--r--meta/recipes-support/apr/apr/cleanup.patch (renamed from meta/packages/apr/apr/cleanup.patch)0
-rw-r--r--meta/recipes-support/apr/apr/configfix.patch (renamed from meta/packages/apr/apr/configfix.patch)0
-rw-r--r--meta/recipes-support/apr/apr/configure_fixes.patch (renamed from meta/packages/apr/apr/configure_fixes.patch)0
-rw-r--r--meta/recipes-support/apr/apr_1.3.3.bb (renamed from meta/packages/apr/apr_1.3.3.bb)0
-rw-r--r--meta/recipes-support/aspell/aspell_0.60.6.bb (renamed from meta/packages/aspell/aspell_0.60.6.bb)0
-rw-r--r--meta/recipes-support/atk/atk.inc (renamed from meta/packages/atk/atk.inc)0
-rw-r--r--meta/recipes-support/atk/atk_1.30.0.bb (renamed from meta/packages/atk/atk_1.30.0.bb)0
-rw-r--r--meta/recipes-support/attr/acl.inc (renamed from meta/packages/attr/acl.inc)0
-rw-r--r--meta/recipes-support/attr/acl_2.2.49.bb (renamed from meta/packages/attr/acl_2.2.49.bb)0
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/double-free.patch (renamed from meta/packages/attr/attr-2.4.44/double-free.patch)0
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch (renamed from meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch)0
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch (renamed from meta/packages/attr/attr-2.4.44/memory-leak2.patch)0
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch (renamed from meta/packages/attr/attr-2.4.44/pull-in-string.h.patch)0
-rw-r--r--meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch (renamed from meta/packages/attr/attr-2.4.44/thinko-in-restore.patch)0
-rw-r--r--meta/recipes-support/attr/attr.inc (renamed from meta/packages/attr/attr.inc)0
-rw-r--r--meta/recipes-support/attr/attr_2.4.44.bb (renamed from meta/packages/attr/attr_2.4.44.bb)0
-rw-r--r--meta/recipes-support/attr/ea-acl.inc (renamed from meta/packages/attr/ea-acl.inc)0
-rw-r--r--meta/recipes-support/attr/files/relative-libdir.patch (renamed from meta/packages/attr/files/relative-libdir.patch)0
-rw-r--r--meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch (renamed from meta/packages/beecrypt/beecrypt/disable-icu-check.patch)0
-rw-r--r--meta/recipes-support/beecrypt/beecrypt/fix-security.patch (renamed from meta/packages/beecrypt/beecrypt/fix-security.patch)0
-rw-r--r--meta/recipes-support/beecrypt/beecrypt/x64fix.patch (renamed from meta/packages/beecrypt/beecrypt/x64fix.patch)0
-rw-r--r--meta/recipes-support/beecrypt/beecrypt_4.1.2.bb (renamed from meta/packages/beecrypt/beecrypt_4.1.2.bb)0
-rw-r--r--meta/recipes-support/boost/boost-36.inc (renamed from meta/packages/boost/boost-36.inc)0
-rw-r--r--meta/recipes-support/boost/boost-jam-native.inc (renamed from meta/packages/boost/boost-jam-native.inc)0
-rw-r--r--meta/recipes-support/boost/boost-jam-native_3.1.18.bb (renamed from meta/packages/boost/boost-jam-native_3.1.18.bb)0
-rw-r--r--meta/recipes-support/boost/boost_1.44.0.bb (renamed from meta/packages/boost/boost_1.44.0.bb)0
-rw-r--r--meta/recipes-support/boost/files/1.34.1-gcc43.patch (renamed from meta/packages/boost/files/1.34.1-gcc43.patch)0
-rw-r--r--meta/recipes-support/boost/files/arm-intrinsics.patch (renamed from meta/packages/boost/files/arm-intrinsics.patch)0
-rw-r--r--meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch (renamed from meta/packages/boost/files/atomic_count_gcc_atomicity.patch)0
-rw-r--r--meta/recipes-support/boost/files/gcc41.patch (renamed from meta/packages/boost/files/gcc41.patch)0
-rw-r--r--meta/recipes-support/boost/files/gcc43.patch (renamed from meta/packages/boost/files/gcc43.patch)0
-rw-r--r--meta/recipes-support/boost/files/linux-uclibc.patch (renamed from meta/packages/boost/files/linux-uclibc.patch)0
-rw-r--r--meta/recipes-support/boost/files/unit_test_log10f.patch (renamed from meta/packages/boost/files/unit_test_log10f.patch)0
-rw-r--r--meta/recipes-support/curl/curl/noldlibpath.patch (renamed from meta/packages/curl/curl/noldlibpath.patch)0
-rw-r--r--meta/recipes-support/curl/curl/pkgconfig_fix.patch (renamed from meta/packages/curl/curl/pkgconfig_fix.patch)0
-rw-r--r--meta/recipes-support/curl/curl_7.21.0.bb (renamed from meta/packages/curl/curl_7.21.0.bb)0
-rw-r--r--meta/recipes-support/db/db/arm-thumb-mutex.patch (renamed from meta/packages/db/db/arm-thumb-mutex.patch)0
-rw-r--r--meta/recipes-support/db/db/configure_fixes.patch (renamed from meta/packages/db/db/configure_fixes.patch)0
-rw-r--r--meta/recipes-support/db/db_4.2.52.bb (renamed from meta/packages/db/db_4.2.52.bb)0
-rw-r--r--meta/recipes-support/db/db_4.3.29.bb (renamed from meta/packages/db/db_4.3.29.bb)0
-rw-r--r--meta/recipes-support/enchant/enchant_1.6.0.bb (renamed from meta/packages/enchant/enchant_1.6.0.bb)0
-rw-r--r--meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch (renamed from meta/packages/gdbm/gdbm-1.8.3/libtool-mode.patch)0
-rw-r--r--meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch (renamed from meta/packages/gdbm/gdbm-1.8.3/makefile.patch)0
-rw-r--r--meta/recipes-support/gdbm/gdbm_1.8.3.bb (renamed from meta/packages/gdbm/gdbm_1.8.3.bb)0
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch (renamed from meta/recipes-devtools/gmp/gmp-4.2.1/disable-stdc.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp.inc (renamed from meta/recipes-devtools/gmp/gmp.inc)0
-rw-r--r--meta/recipes-support/gmp/gmp/amd64.patch (renamed from meta/recipes-devtools/gmp/gmp/amd64.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp/configure.patch (renamed from meta/recipes-devtools/gmp/gmp/configure.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp/sh4-asmfix.patch (renamed from meta/recipes-devtools/gmp/gmp/sh4-asmfix.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp/use-includedir.patch (renamed from meta/recipes-devtools/gmp/gmp/use-includedir.patch)0
-rw-r--r--meta/recipes-support/gmp/gmp_4.2.1.bb (renamed from meta/recipes-devtools/gmp/gmp_4.2.1.bb)0
-rw-r--r--meta/recipes-support/gmp/gmp_5.0.1.bb (renamed from meta/recipes-devtools/gmp/gmp_5.0.1.bb)0
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch (renamed from meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch (renamed from meta/packages/gnutls/gnutls-2.8.6/gnutls-openssl.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch (renamed from meta/packages/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc (renamed from meta/packages/gnutls/gnutls.inc)0
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.8.6.bb (renamed from meta/packages/gnutls/gnutls_2.8.6.bb)0
-rw-r--r--meta/recipes-support/gnutls/libtasn1_2.7.bb (renamed from meta/packages/gnutls/libtasn1_2.7.bb)0
-rw-r--r--meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch (renamed from meta/packages/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch)0
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.3.0.bb (renamed from meta/packages/gpgme/gpgme_1.3.0.bb)0
-rwxr-xr-xmeta/recipes-support/hal/files/20hal (renamed from meta/packages/hal/files/20hal)0
-rw-r--r--meta/recipes-support/hal/files/autoconf.diff (renamed from meta/packages/hal/files/autoconf.diff)0
-rw-r--r--meta/recipes-support/hal/files/hal-right-input-h.patch (renamed from meta/packages/hal/files/hal-right-input-h.patch)0
-rw-r--r--meta/recipes-support/hal/files/sg-inhibit.patch (renamed from meta/packages/hal/files/sg-inhibit.patch)0
-rw-r--r--meta/recipes-support/hal/hal-info.inc (renamed from meta/packages/hal/hal-info.inc)0
-rw-r--r--meta/recipes-support/hal/hal-info_20091130.bb (renamed from meta/packages/hal/hal-info_20091130.bb)0
-rw-r--r--meta/recipes-support/hal/hal-info_git.bb (renamed from meta/packages/hal/hal-info_git.bb)0
-rw-r--r--meta/recipes-support/hal/hal.inc (renamed from meta/packages/hal/hal.inc)0
-rw-r--r--meta/recipes-support/hal/hal/configure_fix.patch (renamed from meta/packages/hal/hal/configure_fix.patch)0
-rw-r--r--meta/recipes-support/hal/hal_0.5.14.bb (renamed from meta/packages/hal/hal_0.5.14.bb)0
-rw-r--r--meta/recipes-support/hal/hal_git.bb (renamed from meta/packages/hal/hal_git.bb)0
-rw-r--r--meta/recipes-support/icu/files/gccfix.patch (renamed from meta/packages/icu/files/gccfix.patch)0
-rw-r--r--meta/recipes-support/icu/files/noldlibpath.patch (renamed from meta/packages/icu/files/noldlibpath.patch)0
-rw-r--r--meta/recipes-support/icu/files/use-g++-for-linking.patch (renamed from meta/packages/icu/files/use-g++-for-linking.patch)0
-rw-r--r--meta/recipes-support/icu/icu-3.6.inc (renamed from meta/packages/icu/icu-3.6.inc)0
-rw-r--r--meta/recipes-support/icu/icu_3.6.bb (renamed from meta/packages/icu/icu_3.6.bb)0
-rw-r--r--meta/recipes-support/iso-codes/iso-codes_3.3.bb (renamed from meta/packages/iso-codes/iso-codes_3.3.bb)0
-rw-r--r--meta/recipes-support/js/files/buildcc.patch (renamed from meta/packages/js/files/buildcc.patch)0
-rw-r--r--meta/recipes-support/js/files/configure.ac (renamed from meta/packages/js/files/configure.ac)0
-rw-r--r--meta/recipes-support/js/files/jsautocfg.h (renamed from meta/packages/js/files/jsautocfg.h)0
-rw-r--r--meta/recipes-support/js/files/link_with_gcc.patch (renamed from meta/packages/js/files/link_with_gcc.patch)0
-rw-r--r--meta/recipes-support/js/files/usepic.patch (renamed from meta/packages/js/files/usepic.patch)0
-rw-r--r--meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb (renamed from meta/packages/js/js_1.7.0+1.8.0rc1.bb)0
-rw-r--r--meta/recipes-support/libassuan/libassuan_2.0.0.bb (renamed from meta/packages/libassuan/libassuan_2.0.0.bb)0
-rw-r--r--meta/recipes-support/libcap/libcap.inc (renamed from meta/packages/libcap/libcap.inc)0
-rw-r--r--meta/recipes-support/libcap/libcap_2.19.bb (renamed from meta/packages/libcap/libcap_2.19.bb)0
-rw-r--r--meta/recipes-support/libcheck/libcheck_0.9.8.bb (renamed from meta/packages/libcheck/libcheck_0.9.8.bb)0
-rw-r--r--meta/recipes-support/libcroco/files/croco.patch (renamed from meta/packages/libcroco/files/croco.patch)0
-rw-r--r--meta/recipes-support/libcroco/libcroco_0.6.2.bb (renamed from meta/packages/libcroco/libcroco_0.6.2.bb)0
-rw-r--r--meta/recipes-support/libdaemon/libdaemon_0.14.bb (renamed from meta/packages/libdaemon/libdaemon_0.14.bb)0
-rw-r--r--meta/recipes-support/libevent/libevent_1.4.14b.bb (renamed from meta/packages/libevent/libevent_1.4.14b.bb)0
-rw-r--r--meta/recipes-support/libfm/libfm_0.1.12.bb (renamed from meta/packages/libfm/libfm_0.1.12.bb)0
-rw-r--r--meta/recipes-support/libfribidi/files/libtool-update.patch (renamed from meta/packages/libfribidi/files/libtool-update.patch)0
-rw-r--r--meta/recipes-support/libfribidi/libfribidi_0.10.4.bb (renamed from meta/packages/libfribidi/libfribidi_0.10.4.bb)0
-rw-r--r--meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch (renamed from meta/packages/libgcrypt/files/add-pkgconfig-support.patch)0
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt.inc (renamed from meta/packages/libgcrypt/libgcrypt.inc)0
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb (renamed from meta/packages/libgcrypt/libgcrypt_1.4.6.bb)0
-rw-r--r--meta/recipes-support/libgdbus/libgdbus_git.bb (renamed from meta/packages/libgdbus/libgdbus_git.bb)0
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch (renamed from meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch)0
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.8.bb (renamed from meta/packages/libgpg-error/libgpg-error_1.8.bb)0
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.9.2.bb (renamed from meta/packages/libiconv/libiconv_1.9.2.bb)0
-rw-r--r--meta/recipes-support/libmpc/libmpc.inc (renamed from meta/packages/libmpc/libmpc.inc)0
-rw-r--r--meta/recipes-support/libmpc/libmpc_0.8.2.bb (renamed from meta/packages/libmpc/libmpc_0.8.2.bb)0
-rw-r--r--meta/recipes-support/libnl/libnl/compilefix.patch (renamed from meta/packages/libnl/libnl/compilefix.patch)0
-rw-r--r--meta/recipes-support/libnl/libnl/local-includes.patch (renamed from meta/packages/libnl/libnl/local-includes.patch)0
-rw-r--r--meta/recipes-support/libnl/libnl_1.1.bb (renamed from meta/packages/libnl/libnl_1.1.bb)0
-rw-r--r--meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch (renamed from meta/packages/liboil/liboil-0.3.17/no-tests.patch)0
-rw-r--r--meta/recipes-support/liboil/liboil_0.3.17.bb (renamed from meta/packages/liboil/liboil_0.3.17.bb)0
-rw-r--r--meta/recipes-support/libpcre/files/pcre-cross.patch (renamed from meta/packages/libpcre/files/pcre-cross.patch)0
-rw-r--r--meta/recipes-support/libpcre/libpcre_8.10.bb (renamed from meta/packages/libpcre/libpcre_8.10.bb)0
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.3.bb (renamed from meta/packages/libproxy/libproxy_0.4.3.bb)0
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.31.2.bb (renamed from meta/packages/libsoup/libsoup-2.4_2.31.2.bb)0
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.4.1.bb (renamed from meta/packages/libsoup/libsoup-2.4_2.4.1.bb)0
-rw-r--r--meta/recipes-support/libsoup/libsoup_2.2.100.bb (renamed from meta/packages/libsoup/libsoup_2.2.100.bb)0
-rw-r--r--meta/recipes-support/liburcu/liburcu_0.4.6.bb (renamed from meta/packages/liburcu/liburcu_0.4.6.bb)0
-rw-r--r--meta/recipes-support/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch (renamed from meta/packages/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch)0
-rw-r--r--meta/recipes-support/libusb/libusb-compat_0.1.3.bb (renamed from meta/packages/libusb/libusb-compat_0.1.3.bb)0
-rw-r--r--meta/recipes-support/libusb/libusb1_1.0.8.bb (renamed from meta/packages/libusb/libusb1_1.0.8.bb)0
-rw-r--r--meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch (renamed from meta/packages/libxslt/libxslt/pkgconfig_fix.patch)0
-rw-r--r--meta/recipes-support/libxslt/libxslt_1.1.26.bb (renamed from meta/packages/libxslt/libxslt_1.1.26.bb)0
-rw-r--r--meta/recipes-support/lzo/lzo-2.03/acinclude.m4 (renamed from meta/packages/lzo/lzo-2.03/acinclude.m4)0
-rw-r--r--meta/recipes-support/lzo/lzo-2.03/autofoo.patch (renamed from meta/packages/lzo/lzo-2.03/autofoo.patch)0
-rw-r--r--meta/recipes-support/lzo/lzo_2.03.bb (renamed from meta/packages/lzo/lzo_2.03.bb)0
-rw-r--r--meta/recipes-support/mpfr/mpfr.inc (renamed from meta/recipes-devtools/mpfr/mpfr.inc)0
-rw-r--r--meta/recipes-support/mpfr/mpfr_3.0.0.bb (renamed from meta/recipes-devtools/mpfr/mpfr_3.0.0.bb)0
-rw-r--r--meta/recipes-support/neon/neon-0.29.3/pkgconfig.patch (renamed from meta/packages/neon/neon-0.29.3/pkgconfig.patch)0
-rw-r--r--meta/recipes-support/neon/neon_0.29.3.bb (renamed from meta/packages/neon/neon_0.29.3.bb)0
-rw-r--r--meta/recipes-support/ohm/ohm/fix_configure.patch (renamed from meta/packages/ohm/ohm/fix_configure.patch)0
-rw-r--r--meta/recipes-support/ohm/ohm_git.bb (renamed from meta/packages/ohm/ohm_git.bb)0
-rw-r--r--meta/recipes-support/openobex/files/disable-cable-test.patch (renamed from meta/packages/openobex/files/disable-cable-test.patch)0
-rw-r--r--meta/recipes-support/openobex/files/libusb_crosscompile_check.patch (renamed from meta/packages/openobex/files/libusb_crosscompile_check.patch)0
-rw-r--r--meta/recipes-support/openobex/openobex_1.5.bb (renamed from meta/packages/openobex/openobex_1.5.bb)0
-rw-r--r--meta/recipes-support/popt/popt_1.16.bb (renamed from meta/packages/popt/popt_1.16.bb)0
-rw-r--r--meta/recipes-support/pth/pth_2.0.7.bb (renamed from meta/packages/pth/pth_2.0.7.bb)0
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info.inc (renamed from meta/packages/shared-mime-info/shared-mime-info.inc)0
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_0.71.bb (renamed from meta/packages/shared-mime-info/shared-mime-info_0.71.bb)0
-rw-r--r--meta/recipes-support/sqlite/sqlite3.inc (renamed from meta/packages/sqlite/sqlite3.inc)0
-rw-r--r--meta/recipes-support/sqlite/sqlite3/libtool.patch (renamed from meta/packages/sqlite/sqlite3/libtool.patch)0
-rw-r--r--meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb (renamed from meta/packages/sqlite/sqlite3_3.6.23.1.bb)0
-rw-r--r--meta/recipes-support/vte/vte.inc (renamed from meta/packages/vte/vte.inc)0
-rw-r--r--meta/recipes-support/vte/vte_0.24.3.bb (renamed from meta/packages/vte/vte_0.24.3.bb)0
-rw-r--r--meta/recipes-tbd/poppler/poppler-data_0.1.bb (renamed from meta/packages/poppler/poppler-data_0.1.bb)0
-rw-r--r--meta/recipes-tbd/poppler/poppler-fpu.inc (renamed from meta/packages/poppler/poppler-fpu.inc)0
-rw-r--r--meta/recipes-tbd/poppler/poppler.inc (renamed from meta/packages/poppler/poppler.inc)0
-rw-r--r--meta/recipes-tbd/poppler/poppler_0.9.2.bb (renamed from meta/packages/poppler/poppler_0.9.2.bb)0
-rw-r--r--meta/recipes-tbd/xournal/files/ldflags.patch (renamed from meta/packages/xournal/files/ldflags.patch)0
-rw-r--r--meta/recipes-tbd/xournal/files/no-printing.diff (renamed from meta/packages/xournal/files/no-printing.diff)0
-rw-r--r--meta/recipes-tbd/xournal/xournal_0.2.bb (renamed from meta/packages/xournal/xournal_0.2.bb)0
569 files changed, 0 insertions, 5161 deletions
diff --git a/meta/packages/libidl/libidl_0.8.12.bb b/meta/packages/libidl/libidl_0.8.12.bb
deleted file mode 100644
index 9cc9ea2ed8..0000000000
--- a/meta/packages/libidl/libidl_0.8.12.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1LICENSE = "LGPL"
2DESCRIPTION = "Library for parsing CORBA IDL files"
3SECTION = "gnome/libs"
4DEPENDS = "glib-2.0 flex"
5PR = "r4"
6
7SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
8S = "${WORKDIR}/libIDL-${PV}"
9
10BINCONFIG_GLOB = "*-config-2"
11inherit autotools pkgconfig binconfig
12
13FILES_${PN} = "${libdir}/*.so.*"
14FILES_${PN}-dev += " ${bindir}"
15
16BBCLASSEXTEND = "native"
diff --git a/meta/packages/librds/librds_0.0.1.bb b/meta/packages/librds/librds_0.0.1.bb
deleted file mode 100644
index 3c99ec1ba0..0000000000
--- a/meta/packages/librds/librds_0.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "A software library for accessing RDS data"
2HOMEPAGE = "http://rdsd.berlios.de/"
3SECTION = "libs"
4PROVIDES = "librds"
5LICENSE = "GPLv2"
6
7PR = "r1"
8
9SRC_URI = "http://download.berlios.de/rdsd/librds-${PV}.tar.gz"
10
11inherit autotools pkgconfig
diff --git a/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch b/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch
deleted file mode 100644
index dcfe11e0ff..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: places-glib/configure.ac
2===================================================================
3--- places-glib.orig/configure.ac 2009-04-17 10:29:15.000000000 +0100
4+++ places-glib/configure.ac 2009-04-17 10:29:44.000000000 +0100
5@@ -99,6 +99,8 @@
6 PKG_CHECK_MODULES(GLIB, [glib-2.0])
7 PKG_CHECK_MODULES(DBUS, [dbus-glib-1])
8
9+XUL_LIBS="$XUL_LIBS -lmozjs"
10+
11 MOZHOME=`${PKG_CONFIG} --variable=prefix mozilla-headless`"/lib/xulrunner-"`${PKG_CONFIG} --modversion mozilla-headless`
12 AC_SUBST([MOZHOME])
13
diff --git a/meta/packages/mozilla-headless/mozilla-headless-services_git.bb b/meta/packages/mozilla-headless/mozilla-headless-services_git.bb
deleted file mode 100644
index 14d64fa8c3..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless-services_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SRC_URI = "git://git.moblin.org/mozilla-headless-services.git;protocol=git \
2 file://confighack.patch;patch=1"
3PV = "0.1+git${SRCPV}"
4PR = "r1"
5
6DEPENDS = "glib-2.0 dbus mozilla-headless json-glib"
7
8EXTRA_OECONF = "--enable-gnome-proxy"
9
10S = "${WORKDIR}/git"
11
12FILES_${PN} += "${datadir}/dbus-1/services"
13
14inherit autotools
diff --git a/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch b/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
deleted file mode 100644
index db9e147990..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
+++ /dev/null
@@ -1,1478 +0,0 @@
1From fb41f028badb4dfddfc47fb2a1a68c1aa90dcef5 Mon Sep 17 00:00:00 2001
2From: Robert Bragg <robert@linux.intel.com>
3Date: Fri, 8 May 2009 13:57:22 +0100
4Subject: [PATCH] Adds initial Gtk clipboard support to moz-headless
5
6If build with MOZ_X11 enabled then this now builds the clipboard code taken
7from the gtk2 backend. This doesn't provide any embedding API yet to expose
8the clipboard.
9---
10 widget/src/headless/Makefile.in | 6 +
11 widget/src/headless/nsClipboard.cpp | 948 +++++++++++++++++++++++++++++++
12 widget/src/headless/nsClipboard.h | 93 +++
13 widget/src/headless/nsIImageToPixbuf.h | 62 ++
14 widget/src/headless/nsImageToPixbuf.cpp | 196 +++++++
15 widget/src/headless/nsImageToPixbuf.h | 71 +++
16 widget/src/headless/nsWidgetFactory.cpp | 18 +
17 7 files changed, 1394 insertions(+), 0 deletions(-)
18 create mode 100644 widget/src/headless/nsClipboard.cpp
19 create mode 100644 widget/src/headless/nsClipboard.h
20 create mode 100644 widget/src/headless/nsIImageToPixbuf.h
21 create mode 100644 widget/src/headless/nsImageToPixbuf.cpp
22 create mode 100644 widget/src/headless/nsImageToPixbuf.h
23
24Index: offscreen/widget/src/headless/Makefile.in
25===================================================================
26--- offscreen.orig/widget/src/headless/Makefile.in 2009-05-16 18:23:25.000000000 +0100
27+++ offscreen/widget/src/headless/Makefile.in 2009-06-12 14:14:05.000000000 +0100
28@@ -95,6 +95,12 @@
29 nsScreenManagerHeadless.cpp \
30 $(NULL)
31
32+ifdef MOZ_X11
33+CPPSRCS += nsClipboard.cpp \
34+ nsImageToPixbuf.cpp \
35+ $(NULL)
36+endif
37+
38 # build our subdirs, too
39 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
40
41Index: offscreen/widget/src/headless/nsClipboard.cpp
42===================================================================
43--- /dev/null 1970-01-01 00:00:00.000000000 +0000
44+++ offscreen/widget/src/headless/nsClipboard.cpp 2009-06-12 14:14:05.000000000 +0100
45@@ -0,0 +1,948 @@
46+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
47+/* vim:expandtab:shiftwidth=4:tabstop=4:
48+ */
49+/* ***** BEGIN LICENSE BLOCK *****
50+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
51+ *
52+ * The contents of this file are subject to the Mozilla Public License Version
53+ * 1.1 (the "License"); you may not use this file except in compliance with
54+ * the License. You may obtain a copy of the License at
55+ * http://www.mozilla.org/MPL/
56+ *
57+ * Software distributed under the License is distributed on an "AS IS" basis,
58+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
59+ * for the specific language governing rights and limitations under the
60+ * License.
61+ *
62+ * The Original Code is mozilla.org code.
63+ *
64+ * The Initial Developer of the Original Code is Christopher Blizzard
65+ * <blizzard@mozilla.org>. Portions created by the Initial Developer
66+ * are Copyright (C) 2001 the Initial Developer. All Rights Reserved.
67+ *
68+ * Contributor(s):
69+ *
70+ * Alternatively, the contents of this file may be used under the terms of
71+ * either the GNU General Public License Version 2 or later (the "GPL"), or
72+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
73+ * in which case the provisions of the GPL or the LGPL are applicable instead
74+ * of those above. If you wish to allow use of your version of this file only
75+ * under the terms of either the GPL or the LGPL, and not to allow others to
76+ * use your version of this file under the terms of the MPL, indicate your
77+ * decision by deleting the provisions above and replace them with the notice
78+ * and other provisions required by the GPL or the LGPL. If you do not delete
79+ * the provisions above, a recipient may use your version of this file under
80+ * the terms of any one of the MPL, the GPL or the LGPL.
81+ *
82+ * ***** END LICENSE BLOCK ***** */
83+
84+#include "nsClipboard.h"
85+#include "nsSupportsPrimitives.h"
86+#include "nsString.h"
87+#include "nsReadableUtils.h"
88+#include "nsXPIDLString.h"
89+#include "nsPrimitiveHelpers.h"
90+#include "nsICharsetConverterManager.h"
91+#include "nsIServiceManager.h"
92+#include "nsIImage.h"
93+#include "nsImageToPixbuf.h"
94+#include "nsStringStream.h"
95+
96+#include <gtk/gtk.h>
97+
98+// For manipulation of the X event queue
99+#include <X11/Xlib.h>
100+#include <gdk/gdkx.h>
101+#include <sys/time.h>
102+#include <sys/types.h>
103+#include <unistd.h>
104+
105+#ifdef POLL_WITH_XCONNECTIONNUMBER
106+#include <poll.h>
107+#endif
108+
109+// Callback when someone asks us for the selection
110+void
111+invisible_selection_get_cb (GtkWidget *aWidget,
112+ GtkSelectionData *aSelectionData,
113+ guint aTime,
114+ guint aInfo,
115+ nsClipboard *aClipboard);
116+
117+gboolean
118+selection_clear_event_cb (GtkWidget *aWidget,
119+ GdkEventSelection *aEvent,
120+ nsClipboard *aClipboard);
121+
122+static void
123+ConvertHTMLtoUCS2 (guchar *data,
124+ PRInt32 dataLength,
125+ PRUnichar **unicodeData,
126+ PRInt32 &outUnicodeLen);
127+
128+static void
129+GetHTMLCharset (guchar * data, PRInt32 dataLength, nsCString& str);
130+
131+
132+// Our own versions of gtk_clipboard_wait_for_contents and
133+// gtk_clipboard_wait_for_text, which don't run the event loop while
134+// waiting for the data. This prevents a lot of problems related to
135+// dispatching events at unexpected times.
136+
137+static GtkSelectionData *
138+wait_for_contents (GtkClipboard *clipboard, GdkAtom target);
139+
140+static gchar *
141+wait_for_text (GtkClipboard *clipboard);
142+
143+static Bool
144+checkEventProc(Display *display, XEvent *event, XPointer arg);
145+
146+struct retrieval_context
147+{
148+ PRBool completed;
149+ void *data;
150+
151+ retrieval_context() : completed(PR_FALSE), data(nsnull) { }
152+};
153+
154+static void
155+wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *transferData);
156+
157+static void
158+clipboard_contents_received(GtkClipboard *clipboard,
159+ GtkSelectionData *selection_data,
160+ gpointer data);
161+
162+static void
163+clipboard_text_received(GtkClipboard *clipboard,
164+ const gchar *text,
165+ gpointer data);
166+
167+nsClipboard::nsClipboard()
168+{
169+ mWidget = nsnull;
170+}
171+
172+nsClipboard::~nsClipboard()
173+{
174+ if (mWidget)
175+ gtk_widget_destroy(mWidget);
176+}
177+
178+NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard)
179+
180+nsresult
181+nsClipboard::Init(void)
182+{
183+ mWidget = gtk_invisible_new();
184+ if (!mWidget)
185+ return NS_ERROR_FAILURE;
186+
187+ g_signal_connect(G_OBJECT(mWidget), "selection_get",
188+ G_CALLBACK(invisible_selection_get_cb), this);
189+
190+ g_signal_connect(G_OBJECT(mWidget), "selection_clear_event",
191+ G_CALLBACK(selection_clear_event_cb), this);
192+
193+ // XXX make sure to set up the selection_clear event
194+
195+ return NS_OK;
196+}
197+
198+NS_IMETHODIMP
199+nsClipboard::SetData(nsITransferable *aTransferable,
200+ nsIClipboardOwner *aOwner, PRInt32 aWhichClipboard)
201+{
202+ // See if we can short cut
203+ if ((aWhichClipboard == kGlobalClipboard &&
204+ aTransferable == mGlobalTransferable.get() &&
205+ aOwner == mGlobalOwner.get()) ||
206+ (aWhichClipboard == kSelectionClipboard &&
207+ aTransferable == mSelectionTransferable.get() &&
208+ aOwner == mSelectionOwner.get())) {
209+ return NS_OK;
210+ }
211+
212+ nsresult rv;
213+ if (!mPrivacyHandler) {
214+ rv = NS_NewClipboardPrivacyHandler(getter_AddRefs(mPrivacyHandler));
215+ NS_ENSURE_SUCCESS(rv, rv);
216+ }
217+ rv = mPrivacyHandler->PrepareDataForClipboard(aTransferable);
218+ NS_ENSURE_SUCCESS(rv, rv);
219+
220+ // Clear out the clipboard in order to set the new data
221+ EmptyClipboard(aWhichClipboard);
222+
223+ if (aWhichClipboard == kSelectionClipboard) {
224+ mSelectionOwner = aOwner;
225+ mSelectionTransferable = aTransferable;
226+ }
227+ else {
228+ mGlobalOwner = aOwner;
229+ mGlobalTransferable = aTransferable;
230+ }
231+
232+ // Which selection are we about to claim, CLIPBOARD or PRIMARY?
233+ GdkAtom selectionAtom = GetSelectionAtom(aWhichClipboard);
234+
235+ // Make ourselves the owner. If we fail to, return.
236+ if (!gtk_selection_owner_set(mWidget, selectionAtom, GDK_CURRENT_TIME))
237+ return NS_ERROR_FAILURE;
238+
239+ // Clear the old selection target list.
240+ gtk_selection_clear_targets(mWidget, selectionAtom);
241+
242+ // Get the types of supported flavors
243+ nsCOMPtr<nsISupportsArray> flavors;
244+
245+ rv = aTransferable->FlavorsTransferableCanExport(getter_AddRefs(flavors));
246+ if (!flavors || NS_FAILED(rv))
247+ return NS_ERROR_FAILURE;
248+
249+ // Add all the flavors to this widget's supported type.
250+ PRUint32 count;
251+ flavors->Count(&count);
252+ for (PRUint32 i=0; i < count; i++) {
253+ nsCOMPtr<nsISupports> tastesLike;
254+ flavors->GetElementAt(i, getter_AddRefs(tastesLike));
255+ nsCOMPtr<nsISupportsCString> flavor = do_QueryInterface(tastesLike);
256+
257+ if (flavor) {
258+ nsXPIDLCString flavorStr;
259+ flavor->ToString(getter_Copies(flavorStr));
260+
261+ // special case text/unicode since we can handle all of
262+ // the string types
263+ if (!strcmp(flavorStr, kUnicodeMime)) {
264+ AddTarget(gdk_atom_intern("UTF8_STRING", FALSE),
265+ selectionAtom);
266+ AddTarget(gdk_atom_intern("COMPOUND_TEXT", FALSE),
267+ selectionAtom);
268+ AddTarget(gdk_atom_intern("TEXT", FALSE), selectionAtom);
269+ AddTarget(GDK_SELECTION_TYPE_STRING, selectionAtom);
270+ // next loop iteration
271+ continue;
272+ }
273+
274+ // very special case for this one. since our selection mechanism doesn't work for images,
275+ // we must use GTK's clipboard utility functions
276+ if (!strcmp(flavorStr, kNativeImageMime) || !strcmp(flavorStr, kPNGImageMime) ||
277+ !strcmp(flavorStr, kJPEGImageMime) || !strcmp(flavorStr, kGIFImageMime)) {
278+ nsCOMPtr<nsISupports> item;
279+ PRUint32 len;
280+ rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(item), &len);
281+ nsCOMPtr<nsISupportsInterfacePointer> ptrPrimitive(do_QueryInterface(item));
282+ if (!ptrPrimitive)
283+ continue;
284+
285+ nsCOMPtr<nsISupports> primitiveData;
286+ ptrPrimitive->GetData(getter_AddRefs(primitiveData));
287+ nsCOMPtr<nsIImage> image(do_QueryInterface(primitiveData));
288+ if (!image) // Not getting an image for an image mime type!?
289+ continue;
290+
291+ if (NS_FAILED(image->LockImagePixels(PR_FALSE)))
292+ continue;
293+ GdkPixbuf* pixbuf = nsImageToPixbuf::ImageToPixbuf(image);
294+ if (!pixbuf) {
295+ image->UnlockImagePixels(PR_FALSE);
296+ continue;
297+ }
298+
299+ GtkClipboard *aClipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
300+ gtk_clipboard_set_image(aClipboard, pixbuf);
301+ g_object_unref(pixbuf);
302+ image->UnlockImagePixels(PR_FALSE);
303+ continue;
304+ }
305+
306+ // Add this to our list of valid targets
307+ GdkAtom atom = gdk_atom_intern(flavorStr, FALSE);
308+ AddTarget(atom, selectionAtom);
309+ }
310+ }
311+
312+ return NS_OK;
313+}
314+
315+NS_IMETHODIMP
316+nsClipboard::GetData(nsITransferable *aTransferable, PRInt32 aWhichClipboard)
317+{
318+ if (!aTransferable)
319+ return NS_ERROR_FAILURE;
320+
321+ GtkClipboard *clipboard;
322+ clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
323+
324+ guchar *data = NULL;
325+ gint length = 0;
326+ PRBool foundData = PR_FALSE;
327+ nsCAutoString foundFlavor;
328+
329+ // Get a list of flavors this transferable can import
330+ nsCOMPtr<nsISupportsArray> flavors;
331+ nsresult rv;
332+ rv = aTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavors));
333+ if (!flavors || NS_FAILED(rv))
334+ return NS_ERROR_FAILURE;
335+
336+ PRUint32 count;
337+ flavors->Count(&count);
338+ for (PRUint32 i=0; i < count; i++) {
339+ nsCOMPtr<nsISupports> genericFlavor;
340+ flavors->GetElementAt(i, getter_AddRefs(genericFlavor));
341+
342+ nsCOMPtr<nsISupportsCString> currentFlavor;
343+ currentFlavor = do_QueryInterface(genericFlavor);
344+
345+ if (currentFlavor) {
346+ nsXPIDLCString flavorStr;
347+ currentFlavor->ToString(getter_Copies(flavorStr));
348+
349+ // Special case text/unicode since we can convert any
350+ // string into text/unicode
351+ if (!strcmp(flavorStr, kUnicodeMime)) {
352+ gchar* new_text = wait_for_text(clipboard);
353+ if (new_text) {
354+ // Convert utf-8 into our unicode format.
355+ NS_ConvertUTF8toUTF16 ucs2string(new_text);
356+ data = (guchar *)ToNewUnicode(ucs2string);
357+ length = ucs2string.Length() * 2;
358+ g_free(new_text);
359+ foundData = PR_TRUE;
360+ foundFlavor = kUnicodeMime;
361+ break;
362+ }
363+ // If the type was text/unicode and we couldn't get
364+ // text off the clipboard, run the next loop
365+ // iteration.
366+ continue;
367+ }
368+
369+ // For images, we must wrap the data in an nsIInputStream then return instead of break,
370+ // because that code below won't help us.
371+ if (!strcmp(flavorStr, kJPEGImageMime) || !strcmp(flavorStr, kPNGImageMime) || !strcmp(flavorStr, kGIFImageMime)) {
372+ GdkAtom atom;
373+ if (!strcmp(flavorStr, kJPEGImageMime)) // This is image/jpg, but X only understands image/jpeg
374+ atom = gdk_atom_intern("image/jpeg", FALSE);
375+ else
376+ atom = gdk_atom_intern(flavorStr, FALSE);
377+
378+ GtkSelectionData *selectionData = wait_for_contents(clipboard, atom);
379+ if (!selectionData)
380+ continue;
381+
382+ nsCOMPtr<nsIInputStream> byteStream;
383+ NS_NewByteInputStream(getter_AddRefs(byteStream), (const char*)selectionData->data,
384+ selectionData->length, NS_ASSIGNMENT_COPY);
385+ aTransferable->SetTransferData(flavorStr, byteStream, sizeof(nsIInputStream*));
386+ gtk_selection_data_free(selectionData);
387+ return NS_OK;
388+ }
389+
390+ // Get the atom for this type and try to request it off
391+ // the clipboard.
392+ GdkAtom atom = gdk_atom_intern(flavorStr, FALSE);
393+ GtkSelectionData *selectionData;
394+ selectionData = wait_for_contents(clipboard, atom);
395+ if (selectionData) {
396+ length = selectionData->length;
397+ // Special case text/html since we can convert into UCS2
398+ if (!strcmp(flavorStr, kHTMLMime)) {
399+ PRUnichar* htmlBody= nsnull;
400+ PRInt32 htmlBodyLen = 0;
401+ // Convert text/html into our unicode format
402+ ConvertHTMLtoUCS2((guchar *)selectionData->data, length,
403+ &htmlBody, htmlBodyLen);
404+ if (!htmlBodyLen)
405+ break;
406+ data = (guchar *)htmlBody;
407+ length = htmlBodyLen * 2;
408+ } else {
409+ data = (guchar *)nsMemory::Alloc(length);
410+ if (!data)
411+ break;
412+ memcpy(data, selectionData->data, length);
413+ }
414+ foundData = PR_TRUE;
415+ foundFlavor = flavorStr;
416+ break;
417+ }
418+ }
419+ }
420+
421+ if (foundData) {
422+ nsCOMPtr<nsISupports> wrapper;
423+ nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor.get(),
424+ data, length,
425+ getter_AddRefs(wrapper));
426+ aTransferable->SetTransferData(foundFlavor.get(),
427+ wrapper, length);
428+ }
429+
430+ if (data)
431+ nsMemory::Free(data);
432+
433+ return NS_OK;
434+}
435+
436+NS_IMETHODIMP
437+nsClipboard::EmptyClipboard(PRInt32 aWhichClipboard)
438+{
439+ if (aWhichClipboard == kSelectionClipboard) {
440+ if (mSelectionOwner) {
441+ mSelectionOwner->LosingOwnership(mSelectionTransferable);
442+ mSelectionOwner = nsnull;
443+ }
444+ mSelectionTransferable = nsnull;
445+ }
446+ else {
447+ if (mGlobalOwner) {
448+ mGlobalOwner->LosingOwnership(mGlobalTransferable);
449+ mGlobalOwner = nsnull;
450+ }
451+ mGlobalTransferable = nsnull;
452+ }
453+
454+ return NS_OK;
455+}
456+
457+NS_IMETHODIMP
458+nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, PRUint32 aLength,
459+ PRInt32 aWhichClipboard, PRBool *_retval)
460+{
461+ if (!aFlavorList || !_retval)
462+ return NS_ERROR_NULL_POINTER;
463+
464+ *_retval = PR_FALSE;
465+
466+ GtkSelectionData *selection_data =
467+ GetTargets(GetSelectionAtom(aWhichClipboard));
468+ if (!selection_data)
469+ return NS_OK;
470+
471+ gint n_targets = 0;
472+ GdkAtom *targets = NULL;
473+
474+ if (!gtk_selection_data_get_targets(selection_data,
475+ &targets, &n_targets) ||
476+ !n_targets)
477+ return NS_OK;
478+
479+ // Walk through the provided types and try to match it to a
480+ // provided type.
481+ for (PRUint32 i = 0; i < aLength && !*_retval; i++) {
482+ // We special case text/unicode here.
483+ if (!strcmp(aFlavorList[i], kUnicodeMime) &&
484+ gtk_selection_data_targets_include_text(selection_data)) {
485+ *_retval = PR_TRUE;
486+ break;
487+ }
488+
489+ for (PRInt32 j = 0; j < n_targets; j++) {
490+ gchar *atom_name = gdk_atom_name(targets[j]);
491+ if (!strcmp(atom_name, aFlavorList[i]))
492+ *_retval = PR_TRUE;
493+
494+ // X clipboard wants image/jpeg, not image/jpg
495+ if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg"))
496+ *_retval = PR_TRUE;
497+
498+ g_free(atom_name);
499+
500+ if (*_retval)
501+ break;
502+ }
503+ }
504+ gtk_selection_data_free(selection_data);
505+ g_free(targets);
506+
507+ return NS_OK;
508+}
509+
510+NS_IMETHODIMP
511+nsClipboard::SupportsSelectionClipboard(PRBool *_retval)
512+{
513+ *_retval = PR_TRUE; // yeah, unix supports the selection clipboard
514+ return NS_OK;
515+}
516+
517+/* static */
518+GdkAtom
519+nsClipboard::GetSelectionAtom(PRInt32 aWhichClipboard)
520+{
521+ if (aWhichClipboard == kGlobalClipboard)
522+ return GDK_SELECTION_CLIPBOARD;
523+
524+ return GDK_SELECTION_PRIMARY;
525+}
526+
527+/* static */
528+GtkSelectionData *
529+nsClipboard::GetTargets(GdkAtom aWhichClipboard)
530+{
531+ GtkClipboard *clipboard = gtk_clipboard_get(aWhichClipboard);
532+ return wait_for_contents(clipboard, gdk_atom_intern("TARGETS", FALSE));
533+}
534+
535+nsITransferable *
536+nsClipboard::GetTransferable(PRInt32 aWhichClipboard)
537+{
538+ nsITransferable *retval;
539+
540+ if (aWhichClipboard == kSelectionClipboard)
541+ retval = mSelectionTransferable.get();
542+ else
543+ retval = mGlobalTransferable.get();
544+
545+ return retval;
546+}
547+
548+void
549+nsClipboard::AddTarget(GdkAtom aName, GdkAtom aClipboard)
550+{
551+ gtk_selection_add_target(mWidget, aClipboard, aName, 0);
552+}
553+
554+void
555+nsClipboard::SelectionGetEvent (GtkWidget *aWidget,
556+ GtkSelectionData *aSelectionData,
557+ guint aTime)
558+{
559+ // Someone has asked us to hand them something. The first thing
560+ // that we want to do is see if that something includes text. If
561+ // it does, try to give it text/unicode after converting it to
562+ // utf-8.
563+
564+ PRInt32 whichClipboard;
565+
566+ // which clipboard?
567+ if (aSelectionData->selection == GDK_SELECTION_PRIMARY)
568+ whichClipboard = kSelectionClipboard;
569+ else if (aSelectionData->selection == GDK_SELECTION_CLIPBOARD)
570+ whichClipboard = kGlobalClipboard;
571+ else
572+ return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
573+
574+ nsCOMPtr<nsITransferable> trans = GetTransferable(whichClipboard);
575+
576+ nsresult rv;
577+ nsCOMPtr<nsISupports> item;
578+ PRUint32 len;
579+
580+ // Check to see if the selection data includes any of the string
581+ // types that we support.
582+ if (aSelectionData->target == gdk_atom_intern ("STRING", FALSE) ||
583+ aSelectionData->target == gdk_atom_intern ("TEXT", FALSE) ||
584+ aSelectionData->target == gdk_atom_intern ("COMPOUND_TEXT", FALSE) ||
585+ aSelectionData->target == gdk_atom_intern ("UTF8_STRING", FALSE)) {
586+ // Try to convert our internal type into a text string. Get
587+ // the transferable for this clipboard and try to get the
588+ // text/unicode type for it.
589+ rv = trans->GetTransferData("text/unicode", getter_AddRefs(item),
590+ &len);
591+ if (!item || NS_FAILED(rv))
592+ return;
593+
594+ nsCOMPtr<nsISupportsString> wideString;
595+ wideString = do_QueryInterface(item);
596+ if (!wideString)
597+ return;
598+
599+ nsAutoString ucs2string;
600+ wideString->GetData(ucs2string);
601+ char *utf8string = ToNewUTF8String(ucs2string);
602+ if (!utf8string)
603+ return;
604+
605+ gtk_selection_data_set_text (aSelectionData, utf8string,
606+ strlen(utf8string));
607+
608+ nsMemory::Free(utf8string);
609+ return;
610+ }
611+
612+ // Try to match up the selection data target to something our
613+ // transferable provides.
614+ gchar *target_name = gdk_atom_name(aSelectionData->target);
615+ if (!target_name)
616+ return;
617+
618+ rv = trans->GetTransferData(target_name, getter_AddRefs(item), &len);
619+ // nothing found?
620+ if (!item || NS_FAILED(rv)) {
621+ g_free(target_name);
622+ return;
623+ }
624+
625+ void *primitive_data = nsnull;
626+ nsPrimitiveHelpers::CreateDataFromPrimitive(target_name, item,
627+ &primitive_data, len);
628+
629+ if (primitive_data) {
630+ // Check to see if the selection data is text/html
631+ if (aSelectionData->target == gdk_atom_intern (kHTMLMime, FALSE)) {
632+ /*
633+ * "text/html" can be encoded UCS2. It is recommended that
634+ * documents transmitted as UCS2 always begin with a ZERO-WIDTH
635+ * NON-BREAKING SPACE character (hexadecimal FEFF, also called
636+ * Byte Order Mark (BOM)). Adding BOM can help other app to
637+ * detect mozilla use UCS2 encoding when copy-paste.
638+ */
639+ guchar *buffer = (guchar *)
640+ nsMemory::Alloc((len * sizeof(guchar)) + sizeof(PRUnichar));
641+ if (!buffer)
642+ return;
643+ PRUnichar prefix = 0xFEFF;
644+ memcpy(buffer, &prefix, sizeof(prefix));
645+ memcpy(buffer + sizeof(prefix), primitive_data, len);
646+ nsMemory::Free((guchar *)primitive_data);
647+ primitive_data = (guchar *)buffer;
648+ len += sizeof(prefix);
649+ }
650+
651+ gtk_selection_data_set(aSelectionData, aSelectionData->target,
652+ 8, /* 8 bits in a unit */
653+ (const guchar *)primitive_data, len);
654+ nsMemory::Free(primitive_data);
655+ }
656+
657+ g_free(target_name);
658+
659+}
660+
661+void
662+nsClipboard::SelectionClearEvent (GtkWidget *aWidget,
663+ GdkEventSelection *aEvent)
664+{
665+ PRInt32 whichClipboard;
666+
667+ // which clipboard?
668+ if (aEvent->selection == GDK_SELECTION_PRIMARY)
669+ whichClipboard = kSelectionClipboard;
670+ else if (aEvent->selection == GDK_SELECTION_CLIPBOARD)
671+ whichClipboard = kGlobalClipboard;
672+ else
673+ return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
674+
675+ EmptyClipboard(whichClipboard);
676+}
677+
678+void
679+invisible_selection_get_cb (GtkWidget *aWidget,
680+ GtkSelectionData *aSelectionData,
681+ guint aTime,
682+ guint aInfo,
683+ nsClipboard *aClipboard)
684+{
685+ aClipboard->SelectionGetEvent(aWidget, aSelectionData, aTime);
686+}
687+
688+gboolean
689+selection_clear_event_cb (GtkWidget *aWidget,
690+ GdkEventSelection *aEvent,
691+ nsClipboard *aClipboard)
692+{
693+ aClipboard->SelectionClearEvent(aWidget, aEvent);
694+ return TRUE;
695+}
696+
697+/*
698+ * when copy-paste, mozilla wants data encoded using UCS2,
699+ * other app such as StarOffice use "text/html"(RFC2854).
700+ * This function convert data(got from GTK clipboard)
701+ * to data mozilla wanted.
702+ *
703+ * data from GTK clipboard can be 3 forms:
704+ * 1. From current mozilla
705+ * "text/html", charset = utf-16
706+ * 2. From old version mozilla or mozilla-based app
707+ * content("body" only), charset = utf-16
708+ * 3. From other app who use "text/html" when copy-paste
709+ * "text/html", has "charset" info
710+ *
711+ * data : got from GTK clipboard
712+ * dataLength: got from GTK clipboard
713+ * body : pass to Mozilla
714+ * bodyLength: pass to Mozilla
715+ */
716+void ConvertHTMLtoUCS2(guchar * data, PRInt32 dataLength,
717+ PRUnichar** unicodeData, PRInt32& outUnicodeLen)
718+{
719+ nsCAutoString charset;
720+ GetHTMLCharset(data, dataLength, charset);// get charset of HTML
721+ if (charset.EqualsLiteral("UTF-16")) {//current mozilla
722+ outUnicodeLen = (dataLength / 2) - 1;
723+ *unicodeData = reinterpret_cast<PRUnichar*>
724+ (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
725+ sizeof(PRUnichar)));
726+ if (*unicodeData) {
727+ memcpy(*unicodeData, data + sizeof(PRUnichar),
728+ outUnicodeLen * sizeof(PRUnichar));
729+ (*unicodeData)[outUnicodeLen] = '\0';
730+ }
731+ } else if (charset.EqualsLiteral("UNKNOWN")) {
732+ outUnicodeLen = 0;
733+ return;
734+ } else {
735+ // app which use "text/html" to copy&paste
736+ nsCOMPtr<nsIUnicodeDecoder> decoder;
737+ nsresult rv;
738+ // get the decoder
739+ nsCOMPtr<nsICharsetConverterManager> ccm =
740+ do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv);
741+ if (NS_FAILED(rv)) {
742+#ifdef DEBUG_CLIPBOARD
743+ g_print(" can't get CHARSET CONVERTER MANAGER service\n");
744+#endif
745+ outUnicodeLen = 0;
746+ return;
747+ }
748+ rv = ccm->GetUnicodeDecoder(charset.get(), getter_AddRefs(decoder));
749+ if (NS_FAILED(rv)) {
750+#ifdef DEBUG_CLIPBOARD
751+ g_print(" get unicode decoder error\n");
752+#endif
753+ outUnicodeLen = 0;
754+ return;
755+ }
756+ // converting
757+ decoder->GetMaxLength((const char *)data, dataLength, &outUnicodeLen);
758+ // |outUnicodeLen| is number of chars
759+ if (outUnicodeLen) {
760+ *unicodeData = reinterpret_cast<PRUnichar*>
761+ (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
762+ sizeof(PRUnichar)));
763+ if (*unicodeData) {
764+ PRInt32 numberTmp = dataLength;
765+ decoder->Convert((const char *)data, &numberTmp,
766+ *unicodeData, &outUnicodeLen);
767+#ifdef DEBUG_CLIPBOARD
768+ if (numberTmp != dataLength)
769+ printf("didn't consume all the bytes\n");
770+#endif
771+ // null terminate. Convert() doesn't do it for us
772+ (*unicodeData)[outUnicodeLen] = '\0';
773+ }
774+ } // if valid length
775+ }
776+}
777+
778+/*
779+ * get "charset" information from clipboard data
780+ * return value can be:
781+ * 1. "UTF-16": mozilla or "text/html" with "charset=utf-16"
782+ * 2. "UNKNOWN": mozilla can't detect what encode it use
783+ * 3. other: "text/html" with other charset than utf-16
784+ */
785+void GetHTMLCharset(guchar * data, PRInt32 dataLength, nsCString& str)
786+{
787+ // if detect "FFFE" or "FEFF", assume UTF-16
788+ PRUnichar* beginChar = (PRUnichar*)data;
789+ if ((beginChar[0] == 0xFFFE) || (beginChar[0] == 0xFEFF)) {
790+ str.AssignLiteral("UTF-16");
791+ return;
792+ }
793+ // no "FFFE" and "FEFF", assume ASCII first to find "charset" info
794+ const nsDependentCString htmlStr((const char *)data, dataLength);
795+ nsACString::const_iterator start, end;
796+ htmlStr.BeginReading(start);
797+ htmlStr.EndReading(end);
798+ nsACString::const_iterator valueStart(start), valueEnd(start);
799+
800+ if (CaseInsensitiveFindInReadable(
801+ NS_LITERAL_CSTRING("CONTENT=\"text/html;"),
802+ start, end)) {
803+ start = end;
804+ htmlStr.EndReading(end);
805+
806+ if (CaseInsensitiveFindInReadable(
807+ NS_LITERAL_CSTRING("charset="),
808+ start, end)) {
809+ valueStart = end;
810+ start = end;
811+ htmlStr.EndReading(end);
812+
813+ if (FindCharInReadable('"', start, end))
814+ valueEnd = start;
815+ }
816+ }
817+ // find "charset" in HTML
818+ if (valueStart != valueEnd) {
819+ str = Substring(valueStart, valueEnd);
820+ ToUpperCase(str);
821+#ifdef DEBUG_CLIPBOARD
822+ printf("Charset of HTML = %s\n", charsetUpperStr.get());
823+#endif
824+ return;
825+ }
826+ str.AssignLiteral("UNKNOWN");
827+}
828+
829+static void
830+DispatchSelectionNotifyEvent(GtkWidget *widget, XEvent *xevent)
831+{
832+ GdkEvent event;
833+ event.selection.type = GDK_SELECTION_NOTIFY;
834+ event.selection.window = widget->window;
835+ event.selection.selection = gdk_x11_xatom_to_atom(xevent->xselection.selection);
836+ event.selection.target = gdk_x11_xatom_to_atom(xevent->xselection.target);
837+ event.selection.property = gdk_x11_xatom_to_atom(xevent->xselection.property);
838+ event.selection.time = xevent->xselection.time;
839+
840+ gtk_widget_event(widget, &event);
841+}
842+
843+static void
844+DispatchPropertyNotifyEvent(GtkWidget *widget, XEvent *xevent)
845+{
846+ if (((GdkWindowObject *) widget->window)->event_mask & GDK_PROPERTY_CHANGE_MASK) {
847+ GdkEvent event;
848+ event.property.type = GDK_PROPERTY_NOTIFY;
849+ event.property.window = widget->window;
850+ event.property.atom = gdk_x11_xatom_to_atom(xevent->xproperty.atom);
851+ event.property.time = xevent->xproperty.time;
852+ event.property.state = xevent->xproperty.state;
853+
854+ gtk_widget_event(widget, &event);
855+ }
856+}
857+
858+struct checkEventContext
859+{
860+ GtkWidget *cbWidget;
861+ Atom selAtom;
862+};
863+
864+static Bool
865+checkEventProc(Display *display, XEvent *event, XPointer arg)
866+{
867+ checkEventContext *context = (checkEventContext *) arg;
868+
869+ if (event->xany.type == SelectionNotify ||
870+ (event->xany.type == PropertyNotify &&
871+ event->xproperty.atom == context->selAtom)) {
872+
873+ GdkWindow *cbWindow = gdk_window_lookup(event->xany.window);
874+ if (cbWindow) {
875+ GtkWidget *cbWidget = NULL;
876+ gdk_window_get_user_data(cbWindow, (gpointer *)&cbWidget);
877+ if (cbWidget && GTK_IS_WIDGET(cbWidget)) {
878+ context->cbWidget = cbWidget;
879+ return True;
880+ }
881+ }
882+ }
883+
884+ return False;
885+}
886+
887+// Idle timeout for receiving selection and property notify events (microsec)
888+static const int kClipboardTimeout = 500000;
889+
890+static void
891+wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *r_context)
892+{
893+ if (r_context->completed) // the request completed synchronously
894+ return;
895+
896+ Display *xDisplay = GDK_DISPLAY();
897+ checkEventContext context;
898+ context.cbWidget = NULL;
899+ context.selAtom = gdk_x11_atom_to_xatom(gdk_atom_intern("GDK_SELECTION",
900+ FALSE));
901+
902+ // Send X events which are relevant to the ongoing selection retrieval
903+ // to the clipboard widget. Wait until either the operation completes, or
904+ // we hit our timeout. All other X events remain queued.
905+
906+ int select_result;
907+
908+#ifdef POLL_WITH_XCONNECTIONNUMBER
909+ struct pollfd fds[1];
910+ fds[0].fd = XConnectionNumber(xDisplay);
911+ fds[0].events = POLLIN;
912+#else
913+ int cnumber = ConnectionNumber(xDisplay);
914+ fd_set select_set;
915+ FD_ZERO(&select_set);
916+ FD_SET(cnumber, &select_set);
917+ ++cnumber;
918+ struct timeval tv;
919+#endif
920+
921+ do {
922+ XEvent xevent;
923+
924+ while (XCheckIfEvent(xDisplay, &xevent, checkEventProc,
925+ (XPointer) &context)) {
926+
927+ if (xevent.xany.type == SelectionNotify)
928+ DispatchSelectionNotifyEvent(context.cbWidget, &xevent);
929+ else
930+ DispatchPropertyNotifyEvent(context.cbWidget, &xevent);
931+
932+ if (r_context->completed)
933+ return;
934+ }
935+
936+#ifdef POLL_WITH_XCONNECTIONNUMBER
937+ select_result = poll(fds, 1, kClipboardTimeout / 1000);
938+#else
939+ tv.tv_sec = 0;
940+ tv.tv_usec = kClipboardTimeout;
941+ select_result = select(cnumber, &select_set, NULL, NULL, &tv);
942+#endif
943+ } while (select_result == 1);
944+
945+#ifdef DEBUG_CLIPBOARD
946+ printf("exceeded clipboard timeout\n");
947+#endif
948+}
949+
950+static void
951+clipboard_contents_received(GtkClipboard *clipboard,
952+ GtkSelectionData *selection_data,
953+ gpointer data)
954+{
955+ retrieval_context *context = static_cast<retrieval_context *>(data);
956+ context->completed = PR_TRUE;
957+
958+ if (selection_data->length >= 0)
959+ context->data = gtk_selection_data_copy(selection_data);
960+}
961+
962+
963+static GtkSelectionData *
964+wait_for_contents(GtkClipboard *clipboard, GdkAtom target)
965+{
966+ retrieval_context context;
967+ gtk_clipboard_request_contents(clipboard, target,
968+ clipboard_contents_received,
969+ &context);
970+
971+ wait_for_retrieval(clipboard, &context);
972+ return static_cast<GtkSelectionData *>(context.data);
973+}
974+
975+static void
976+clipboard_text_received(GtkClipboard *clipboard,
977+ const gchar *text,
978+ gpointer data)
979+{
980+ retrieval_context *context = static_cast<retrieval_context *>(data);
981+ context->completed = PR_TRUE;
982+ context->data = g_strdup(text);
983+}
984+
985+static gchar *
986+wait_for_text(GtkClipboard *clipboard)
987+{
988+ retrieval_context context;
989+ gtk_clipboard_request_text(clipboard, clipboard_text_received, &context);
990+
991+ wait_for_retrieval(clipboard, &context);
992+ return static_cast<gchar *>(context.data);
993+}
994Index: offscreen/widget/src/headless/nsClipboard.h
995===================================================================
996--- /dev/null 1970-01-01 00:00:00.000000000 +0000
997+++ offscreen/widget/src/headless/nsClipboard.h 2009-06-12 14:14:05.000000000 +0100
998@@ -0,0 +1,93 @@
999+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1000+/* vim:expandtab:shiftwidth=4:tabstop=4:
1001+ */
1002+/* ***** BEGIN LICENSE BLOCK *****
1003+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
1004+ *
1005+ * The contents of this file are subject to the Mozilla Public License Version
1006+ * 1.1 (the "License"); you may not use this file except in compliance with
1007+ * the License. You may obtain a copy of the License at
1008+ * http://www.mozilla.org/MPL/
1009+ *
1010+ * Software distributed under the License is distributed on an "AS IS" basis,
1011+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1012+ * for the specific language governing rights and limitations under the
1013+ * License.
1014+ *
1015+ * The Original Code is mozilla.org code.
1016+ *
1017+ * The Initial Developer of the Original Code is Christopher Blizzard
1018+ * <blizzard@mozilla.org>. Portions created by the Initial Developer
1019+ * are Copyright (C) 2001 the Initial Developer. All Rights Reserved.
1020+ *
1021+ * Contributor(s):
1022+ *
1023+ * Alternatively, the contents of this file may be used under the terms of
1024+ * either the GNU General Public License Version 2 or later (the "GPL"), or
1025+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1026+ * in which case the provisions of the GPL or the LGPL are applicable instead
1027+ * of those above. If you wish to allow use of your version of this file only
1028+ * under the terms of either the GPL or the LGPL, and not to allow others to
1029+ * use your version of this file under the terms of the MPL, indicate your
1030+ * decision by deleting the provisions above and replace them with the notice
1031+ * and other provisions required by the GPL or the LGPL. If you do not delete
1032+ * the provisions above, a recipient may use your version of this file under
1033+ * the terms of any one of the MPL, the GPL or the LGPL.
1034+ *
1035+ * ***** END LICENSE BLOCK ***** */
1036+
1037+#ifndef __nsClipboard_h_
1038+#define __nsClipboard_h_
1039+
1040+#include "nsIClipboard.h"
1041+#include "nsClipboardPrivacyHandler.h"
1042+#include "nsAutoPtr.h"
1043+#include <gtk/gtk.h>
1044+
1045+class nsClipboard : public nsIClipboard
1046+{
1047+public:
1048+ nsClipboard();
1049+ virtual ~nsClipboard();
1050+
1051+ NS_DECL_ISUPPORTS
1052+
1053+ NS_DECL_NSICLIPBOARD
1054+
1055+ // Make sure we are initialized, called from the factory
1056+ // constructor
1057+ nsresult Init (void);
1058+ // Someone requested the selection from the hidden widget
1059+ void SelectionGetEvent (GtkWidget *aWidget,
1060+ GtkSelectionData *aSelectionData,
1061+ guint aTime);
1062+ void SelectionClearEvent (GtkWidget *aWidget,
1063+ GdkEventSelection *aEvent);
1064+
1065+
1066+private:
1067+ // Utility methods
1068+ static GdkAtom GetSelectionAtom (PRInt32 aWhichClipboard);
1069+ static GtkSelectionData *GetTargets (GdkAtom aWhichClipboard);
1070+
1071+ // Get our hands on the correct transferable, given a specific
1072+ // clipboard
1073+ nsITransferable *GetTransferable (PRInt32 aWhichClipboard);
1074+
1075+ // Add a target type to the hidden widget
1076+ void AddTarget (GdkAtom aName,
1077+ GdkAtom aClipboard);
1078+
1079+ // The hidden widget where we do all of our operations
1080+ GtkWidget *mWidget;
1081+ // Hang on to our owners and transferables so we can transfer data
1082+ // when asked.
1083+ nsCOMPtr<nsIClipboardOwner> mSelectionOwner;
1084+ nsCOMPtr<nsIClipboardOwner> mGlobalOwner;
1085+ nsCOMPtr<nsITransferable> mSelectionTransferable;
1086+ nsCOMPtr<nsITransferable> mGlobalTransferable;
1087+ nsRefPtr<nsClipboardPrivacyHandler> mPrivacyHandler;
1088+
1089+};
1090+
1091+#endif /* __nsClipboard_h_ */
1092Index: offscreen/widget/src/headless/nsIImageToPixbuf.h
1093===================================================================
1094--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1095+++ offscreen/widget/src/headless/nsIImageToPixbuf.h 2009-06-12 14:14:05.000000000 +0100
1096@@ -0,0 +1,62 @@
1097+/* ***** BEGIN LICENSE BLOCK *****
1098+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
1099+ *
1100+ * The contents of this file are subject to the Mozilla Public License Version
1101+ * 1.1 (the "License"); you may not use this file except in compliance with
1102+ * the License. You may obtain a copy of the License at
1103+ * http://www.mozilla.org/MPL/
1104+ *
1105+ * Software distributed under the License is distributed on an "AS IS" basis,
1106+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1107+ * for the specific language governing rights and limitations under the
1108+ * License.
1109+ *
1110+ * The Original Code is mozilla.org widget code.
1111+ *
1112+ * The Initial Developer of the Original Code is
1113+ * Christian Biesinger <cbiesinger@web.de>.
1114+ * Portions created by the Initial Developer are Copyright (C) 2006
1115+ * the Initial Developer. All Rights Reserved.
1116+ *
1117+ * Contributor(s):
1118+ *
1119+ * Alternatively, the contents of this file may be used under the terms of
1120+ * either the GNU General Public License Version 2 or later (the "GPL"), or
1121+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1122+ * in which case the provisions of the GPL or the LGPL are applicable instead
1123+ * of those above. If you wish to allow use of your version of this file only
1124+ * under the terms of either the GPL or the LGPL, and not to allow others to
1125+ * use your version of this file under the terms of the MPL, indicate your
1126+ * decision by deleting the provisions above and replace them with the notice
1127+ * and other provisions required by the GPL or the LGPL. If you do not delete
1128+ * the provisions above, a recipient may use your version of this file under
1129+ * the terms of any one of the MPL, the GPL or the LGPL.
1130+ *
1131+ * ***** END LICENSE BLOCK ***** */
1132+
1133+#ifndef NSIIMAGETOPIXBUF_H_
1134+#define NSIIMAGETOPIXBUF_H_
1135+
1136+#include "nsISupports.h"
1137+
1138+// dfa4ac93-83f2-4ab8-9b2a-0ff7022aebe2
1139+#define NSIIMAGETOPIXBUF_IID \
1140+{ 0xdfa4ac93, 0x83f2, 0x4ab8, \
1141+ { 0x9b, 0x2a, 0x0f, 0xf7, 0x02, 0x2a, 0xeb, 0xe2 } }
1142+
1143+class nsIImage;
1144+typedef struct _GdkPixbuf GdkPixbuf;
1145+
1146+/**
1147+ * An interface that allows converting an nsIImage to a GdkPixbuf*.
1148+ */
1149+class nsIImageToPixbuf : public nsISupports {
1150+ public:
1151+ NS_DECLARE_STATIC_IID_ACCESSOR(NSIIMAGETOPIXBUF_IID)
1152+
1153+ NS_IMETHOD_(GdkPixbuf*) ConvertImageToPixbuf(nsIImage* aImage) = 0;
1154+};
1155+
1156+NS_DEFINE_STATIC_IID_ACCESSOR(nsIImageToPixbuf, NSIIMAGETOPIXBUF_IID)
1157+
1158+#endif
1159Index: offscreen/widget/src/headless/nsImageToPixbuf.cpp
1160===================================================================
1161--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1162+++ offscreen/widget/src/headless/nsImageToPixbuf.cpp 2009-06-12 14:14:05.000000000 +0100
1163@@ -0,0 +1,196 @@
1164+/* vim:set sw=4 sts=4 et cin: */
1165+/* ***** BEGIN LICENSE BLOCK *****
1166+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
1167+ *
1168+ * The contents of this file are subject to the Mozilla Public License Version
1169+ * 1.1 (the "License"); you may not use this file except in compliance with
1170+ * the License. You may obtain a copy of the License at
1171+ * http://www.mozilla.org/MPL/
1172+ *
1173+ * Software distributed under the License is distributed on an "AS IS" basis,
1174+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1175+ * for the specific language governing rights and limitations under the
1176+ * License.
1177+ *
1178+ * The Original Code is mozilla.org widget code.
1179+ *
1180+ * The Initial Developer of the Original Code is
1181+ * Christian Biesinger <cbiesinger@web.de>.
1182+ * Portions created by the Initial Developer are Copyright (C) 2006
1183+ * the Initial Developer. All Rights Reserved.
1184+ *
1185+ * Contributor(s):
1186+ *
1187+ * Alternatively, the contents of this file may be used under the terms of
1188+ * either the GNU General Public License Version 2 or later (the "GPL"), or
1189+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1190+ * in which case the provisions of the GPL or the LGPL are applicable instead
1191+ * of those above. If you wish to allow use of your version of this file only
1192+ * under the terms of either the GPL or the LGPL, and not to allow others to
1193+ * use your version of this file under the terms of the MPL, indicate your
1194+ * decision by deleting the provisions above and replace them with the notice
1195+ * and other provisions required by the GPL or the LGPL. If you do not delete
1196+ * the provisions above, a recipient may use your version of this file under
1197+ * the terms of any one of the MPL, the GPL or the LGPL.
1198+ *
1199+ * ***** END LICENSE BLOCK ***** */
1200+
1201+#include <gdk-pixbuf/gdk-pixbuf.h>
1202+
1203+#include "gfxASurface.h"
1204+#include "gfxImageSurface.h"
1205+#include "gfxContext.h"
1206+
1207+#include "nsIImage.h"
1208+
1209+#include "nsAutoPtr.h"
1210+
1211+#include "nsImageToPixbuf.h"
1212+
1213+NS_IMPL_ISUPPORTS1(nsImageToPixbuf, nsIImageToPixbuf)
1214+
1215+inline unsigned char
1216+unpremultiply (unsigned char color,
1217+ unsigned char alpha)
1218+{
1219+ if (alpha == 0)
1220+ return 0;
1221+ // plus alpha/2 to round instead of truncate
1222+ return (color * 255 + alpha / 2) / alpha;
1223+}
1224+
1225+NS_IMETHODIMP_(GdkPixbuf*)
1226+nsImageToPixbuf::ConvertImageToPixbuf(nsIImage* aImage)
1227+{
1228+ return ImageToPixbuf(aImage);
1229+}
1230+
1231+GdkPixbuf*
1232+nsImageToPixbuf::ImageToPixbuf(nsIImage* aImage)
1233+{
1234+ PRInt32 width = aImage->GetWidth(),
1235+ height = aImage->GetHeight();
1236+
1237+ nsRefPtr<gfxPattern> pattern;
1238+ aImage->GetPattern(getter_AddRefs(pattern));
1239+
1240+ return PatternToPixbuf(pattern, width, height);
1241+}
1242+
1243+GdkPixbuf*
1244+nsImageToPixbuf::ImgSurfaceToPixbuf(gfxImageSurface* aImgSurface, PRInt32 aWidth, PRInt32 aHeight)
1245+{
1246+ GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, PR_TRUE, 8,
1247+ aWidth, aHeight);
1248+ if (!pixbuf)
1249+ return nsnull;
1250+
1251+ PRUint32 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1252+ guchar* pixels = gdk_pixbuf_get_pixels (pixbuf);
1253+
1254+ long cairoStride = aImgSurface->Stride();
1255+ unsigned char* cairoData = aImgSurface->Data();
1256+
1257+ gfxASurface::gfxImageFormat format = aImgSurface->Format();
1258+
1259+ for (PRInt32 row = 0; row < aHeight; ++row) {
1260+ for (PRInt32 col = 0; col < aWidth; ++col) {
1261+ guchar* pixel = pixels + row * rowstride + 4 * col;
1262+
1263+ PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
1264+ ((cairoData + row * cairoStride + 4 * col));
1265+
1266+ if (format == gfxASurface::ImageFormatARGB32) {
1267+ const PRUint8 a = (*cairoPixel >> 24) & 0xFF;
1268+ const PRUint8 r = unpremultiply((*cairoPixel >> 16) & 0xFF, a);
1269+ const PRUint8 g = unpremultiply((*cairoPixel >> 8) & 0xFF, a);
1270+ const PRUint8 b = unpremultiply((*cairoPixel >> 0) & 0xFF, a);
1271+
1272+ *pixel++ = r;
1273+ *pixel++ = g;
1274+ *pixel++ = b;
1275+ *pixel++ = a;
1276+ } else {
1277+ NS_ASSERTION(format == gfxASurface::ImageFormatRGB24,
1278+ "unexpected format");
1279+ const PRUint8 r = (*cairoPixel >> 16) & 0xFF;
1280+ const PRUint8 g = (*cairoPixel >> 8) & 0xFF;
1281+ const PRUint8 b = (*cairoPixel >> 0) & 0xFF;
1282+
1283+ *pixel++ = r;
1284+ *pixel++ = g;
1285+ *pixel++ = b;
1286+ *pixel++ = 0xFF; // A
1287+ }
1288+ }
1289+ }
1290+
1291+ return pixbuf;
1292+}
1293+
1294+GdkPixbuf*
1295+nsImageToPixbuf::SurfaceToPixbuf(gfxASurface* aSurface, PRInt32 aWidth, PRInt32 aHeight)
1296+{
1297+ if (aSurface->CairoStatus()) {
1298+ NS_ERROR("invalid surface");
1299+ return nsnull;
1300+ }
1301+
1302+ nsRefPtr<gfxImageSurface> imgSurface;
1303+ if (aSurface->GetType() == gfxASurface::SurfaceTypeImage) {
1304+ imgSurface = static_cast<gfxImageSurface*>
1305+ (static_cast<gfxASurface*>(aSurface));
1306+ } else {
1307+ imgSurface = new gfxImageSurface(gfxIntSize(aWidth, aHeight),
1308+ gfxImageSurface::ImageFormatARGB32);
1309+
1310+ if (!imgSurface)
1311+ return nsnull;
1312+
1313+ nsRefPtr<gfxContext> context = new gfxContext(imgSurface);
1314+ if (!context)
1315+ return nsnull;
1316+
1317+ context->SetOperator(gfxContext::OPERATOR_SOURCE);
1318+ context->SetSource(aSurface);
1319+ context->Paint();
1320+ }
1321+
1322+ return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight);
1323+}
1324+
1325+GdkPixbuf*
1326+nsImageToPixbuf::PatternToPixbuf(gfxPattern* aPattern, PRInt32 aWidth, PRInt32 aHeight)
1327+{
1328+ if (aPattern->CairoStatus()) {
1329+ NS_ERROR("invalid pattern");
1330+ return nsnull;
1331+ }
1332+
1333+ nsRefPtr<gfxImageSurface> imgSurface;
1334+ if (aPattern->GetType() == gfxPattern::PATTERN_SURFACE) {
1335+ nsRefPtr<gfxASurface> surface = aPattern->GetSurface();
1336+ if (surface->GetType() == gfxASurface::SurfaceTypeImage) {
1337+ imgSurface = static_cast<gfxImageSurface*>
1338+ (static_cast<gfxASurface*>(surface.get()));
1339+ }
1340+ }
1341+
1342+ if (!imgSurface) {
1343+ imgSurface = new gfxImageSurface(gfxIntSize(aWidth, aHeight),
1344+ gfxImageSurface::ImageFormatARGB32);
1345+
1346+ if (!imgSurface)
1347+ return nsnull;
1348+
1349+ nsRefPtr<gfxContext> context = new gfxContext(imgSurface);
1350+ if (!context)
1351+ return nsnull;
1352+
1353+ context->SetOperator(gfxContext::OPERATOR_SOURCE);
1354+ context->SetPattern(aPattern);
1355+ context->Paint();
1356+ }
1357+
1358+ return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight);
1359+}
1360Index: offscreen/widget/src/headless/nsImageToPixbuf.h
1361===================================================================
1362--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1363+++ offscreen/widget/src/headless/nsImageToPixbuf.h 2009-06-12 14:14:05.000000000 +0100
1364@@ -0,0 +1,71 @@
1365+/* vim:set sw=4 sts=4 et cin: */
1366+/* ***** BEGIN LICENSE BLOCK *****
1367+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
1368+ *
1369+ * The contents of this file are subject to the Mozilla Public License Version
1370+ * 1.1 (the "License"); you may not use this file except in compliance with
1371+ * the License. You may obtain a copy of the License at
1372+ * http://www.mozilla.org/MPL/
1373+ *
1374+ * Software distributed under the License is distributed on an "AS IS" basis,
1375+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1376+ * for the specific language governing rights and limitations under the
1377+ * License.
1378+ *
1379+ * The Original Code is mozilla.org widget code.
1380+ *
1381+ * The Initial Developer of the Original Code is
1382+ * Christian Biesinger <cbiesinger@web.de>.
1383+ * Portions created by the Initial Developer are Copyright (C) 2006
1384+ * the Initial Developer. All Rights Reserved.
1385+ *
1386+ * Contributor(s):
1387+ *
1388+ * Alternatively, the contents of this file may be used under the terms of
1389+ * either the GNU General Public License Version 2 or later (the "GPL"), or
1390+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1391+ * in which case the provisions of the GPL or the LGPL are applicable instead
1392+ * of those above. If you wish to allow use of your version of this file only
1393+ * under the terms of either the GPL or the LGPL, and not to allow others to
1394+ * use your version of this file under the terms of the MPL, indicate your
1395+ * decision by deleting the provisions above and replace them with the notice
1396+ * and other provisions required by the GPL or the LGPL. If you do not delete
1397+ * the provisions above, a recipient may use your version of this file under
1398+ * the terms of any one of the MPL, the GPL or the LGPL.
1399+ *
1400+ * ***** END LICENSE BLOCK ***** */
1401+
1402+#ifndef NSIMAGETOPIXBUF_H_
1403+#define NSIMAGETOPIXBUF_H_
1404+
1405+#include "nsIImageToPixbuf.h"
1406+
1407+class gfxASurface;
1408+class gfxPattern;
1409+class gfxImageSurface;
1410+
1411+class nsImageToPixbuf : public nsIImageToPixbuf {
1412+ public:
1413+ NS_DECL_ISUPPORTS
1414+ NS_IMETHOD_(GdkPixbuf*) ConvertImageToPixbuf(nsIImage* aImage);
1415+
1416+ // Friendlier version of ConvertImageToPixbuf for callers inside of
1417+ // widget
1418+ static GdkPixbuf* ImageToPixbuf(nsIImage* aImage);
1419+ static GdkPixbuf* SurfaceToPixbuf(gfxASurface* aSurface,
1420+ PRInt32 aWidth, PRInt32 aHeight);
1421+ static GdkPixbuf* PatternToPixbuf(gfxPattern* aPattern,
1422+ PRInt32 aWidth, PRInt32 aHeight);
1423+ private:
1424+ static GdkPixbuf* ImgSurfaceToPixbuf(gfxImageSurface* aImgSurface,
1425+ PRInt32 aWidth, PRInt32 aHeight);
1426+ ~nsImageToPixbuf() {}
1427+};
1428+
1429+
1430+// fc2389b8-c650-4093-9e42-b05e5f0685b7
1431+#define NS_IMAGE_TO_PIXBUF_CID \
1432+{ 0xfc2389b8, 0xc650, 0x4093, \
1433+ { 0x9e, 0x42, 0xb0, 0x5e, 0x5f, 0x06, 0x85, 0xb7 } }
1434+
1435+#endif
1436Index: offscreen/widget/src/headless/nsWidgetFactory.cpp
1437===================================================================
1438--- offscreen.orig/widget/src/headless/nsWidgetFactory.cpp 2009-06-12 14:08:56.000000000 +0100
1439+++ offscreen/widget/src/headless/nsWidgetFactory.cpp 2009-06-12 14:15:24.000000000 +0100
1440@@ -46,6 +46,10 @@
1441 #include "nsWindow.h"
1442 #include "nsTransferable.h"
1443 #include "nsHTMLFormatConverter.h"
1444+#ifdef MOZ_X11
1445+#include "nsClipboardHelper.h"
1446+#include "nsClipboard.h"
1447+#endif
1448 #include "nsSound.h"
1449 #include "nsBidiKeyboard.h"
1450 #include "nsScreenManagerHeadless.h"
1451@@ -66,6 +70,10 @@
1452 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
1453 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
1454 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
1455+#ifdef MOZ_X11
1456+NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
1457+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsClipboard, Init)
1458+#endif
1459 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
1460 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerHeadless)
1461 //NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageToPixbuf)
1462@@ -142,6 +150,16 @@
1463 NS_TRANSFERABLE_CID,
1464 "@mozilla.org/widget/transferable;1",
1465 nsTransferableConstructor },
1466+#ifdef MOZ_X11
1467+ { "Gtk Clipboard",
1468+ NS_CLIPBOARD_CID,
1469+ "@mozilla.org/widget/clipboard;1",
1470+ nsClipboardConstructor },
1471+ { "Clipboard Helper",
1472+ NS_CLIPBOARDHELPER_CID,
1473+ "@mozilla.org/widget/clipboardhelper;1",
1474+ nsClipboardHelperConstructor },
1475+#endif
1476 { "HTML Format Converter",
1477 NS_HTMLFORMATCONVERTER_CID,
1478 "@mozilla.org/widget/htmlformatconverter;1",
diff --git a/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch b/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
deleted file mode 100644
index 2874b0d832..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1Fixes to enable building with latest autoconf and automake
2
3RP 2/2/10
4
5Index: offscreen/js/ctypes/libffi/configure.ac
6===================================================================
7--- offscreen.orig/js/ctypes/libffi/configure.ac 2010-02-02 19:53:16.753906134 +0000
8+++ offscreen/js/ctypes/libffi/configure.ac 2010-02-02 19:53:21.895155509 +0000
9@@ -17,10 +17,10 @@
10 # the wrong, non-multilib-adjusted value will be used in multilibs.
11 # As a side effect, we have to subst CFLAGS ourselves.
12
13-m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
14+m4_rename_force([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
15 m4_define([_AC_ARG_VAR_PRECIOUS],[])
16 AC_PROG_CC
17-m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
18+m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
19
20 AC_SUBST(CFLAGS)
21
22Index: offscreen/modules/libpr0n/build/Makefile.in
23===================================================================
24--- offscreen.orig/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:16.783906873 +0000
25+++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:21.895155509 +0000
26@@ -92,6 +92,7 @@
27
28 export::
29 @{ \
30+ \
31 $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
32 echo "#define IMG_BUILD_DECODER_${d}";) \
33 $(foreach d,$(MOZ_IMG_ENCODERS), \
34Index: offscreen/configure.in
35===================================================================
36--- offscreen.orig/configure.in 2010-02-02 19:53:28.493904163 +0000
37+++ offscreen/configure.in 2010-02-02 16:33:09.000000000 +0000
38@@ -3250,11 +3250,7 @@
39 dnl ========================================================
40 AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
41 $XLIBS $XEXT_LIBS)
42- AC_CHECK_HEADER(X11/extensions/XShm.h)
43- if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" &&
44- test -n "$_HAVE_XSHM_XEXT"; then
45- AC_DEFINE(HAVE_XSHM)
46- fi
47+ AC_DEFINE(HAVE_XSHM)
48
49 dnl ========================================================
50 dnl = Check for XIE
51@@ -8120,15 +8116,7 @@
52 fi # COMPILE_ENVIRONMENT
53
54 if test "$USE_FC_FREETYPE"; then
55- if test "$COMPILE_ENVIRONMENT"; then
56- _SAVE_CPPFLAGS="$CPPFLAGS"
57- CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
58- AC_CHECK_HEADERS(fontconfig/fcfreetype.h, ,
59- [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
60- CPPFLAGS="$_SAVE_CPPFLAGS"
61- else
62 AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H)
63- fi
64 fi
65
66 dnl Set various defines and substitutions
diff --git a/meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch b/meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch
deleted file mode 100644
index 31fc40f28b..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1diff -r ad8be5166ccd layout/generic/nsFrame.h
2--- a/layout/generic/nsFrame.h Tue Nov 17 19:24:56 2009 +0000
3+++ b/layout/generic/nsFrame.h Thu Nov 19 12:33:38 2009 +0000
4@@ -151,7 +151,7 @@
5 // Left undefined; nsFrame objects are never allocated from the heap.
6 void* operator new(size_t sz) CPP_THROW_NEW;
7
8-protected:
9+public:
10 // Overridden to prevent the global delete from being called, since
11 // the memory came out of an arena instead of the heap.
12 //
13
14
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
deleted file mode 100644
index d31f91a42d..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
+++ /dev/null
@@ -1,764 +0,0 @@
1Index: offscreen/configure.in
2===================================================================
3--- offscreen.orig/configure.in 2009-06-12 14:15:55.000000000 +0100
4+++ offscreen/configure.in 2009-06-12 14:15:55.000000000 +0100
5@@ -62,7 +62,6 @@
6
7 AC_PREREQ(2.13)
8 AC_INIT(config/config.mk)
9-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
10 AC_CANONICAL_SYSTEM
11 TARGET_CPU="${target_cpu}"
12 TARGET_VENDOR="${target_vendor}"
13@@ -103,7 +102,6 @@
14 _SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
15 _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
16 _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
17-_SUBDIR_CONFIG_ARGS="$ac_configure_args"
18
19 dnl Set the version number of the libs included with mozilla
20 dnl ========================================================
21@@ -135,6 +133,9 @@
22
23 MSMANIFEST_TOOL=
24
25+ac_cv_have_usable_wchar_v2=no
26+ac_cv_have_usable_wchar_option_v2=no
27+
28 dnl Set various checks
29 dnl ========================================================
30 MISSING_X=
31@@ -285,7 +286,7 @@
32 ;;
33 esac
34
35-if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
36+
37 echo "cross compiling from $host to $target"
38 cross_compiling=yes
39
40@@ -323,7 +324,7 @@
41
42 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
43 AC_TRY_COMPILE([], [return(0);],
44- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
45+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
46 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
47
48 CC="$HOST_CXX"
49@@ -331,7 +332,7 @@
50
51 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
52 AC_TRY_COMPILE([], [return(0);],
53- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
54+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
55 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
56
57 CC=$_SAVE_CC
58@@ -352,7 +353,7 @@
59 ;;
60 esac
61
62- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
63+ CC="${target_alias}-gcc"
64 unset ac_cv_prog_CC
65 AC_PROG_CC
66 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
67@@ -376,37 +377,6 @@
68 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
69 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
70 AC_DEFINE(CROSS_COMPILE)
71-else
72- AC_PROG_CC
73- AC_PROG_CXX
74- AC_PROG_RANLIB
75- MOZ_PATH_PROGS(AS, $AS as, $CC)
76- AC_CHECK_PROGS(AR, ar, :)
77- AC_CHECK_PROGS(LD, ld, :)
78- AC_CHECK_PROGS(STRIP, strip, :)
79- AC_CHECK_PROGS(WINDRES, windres, :)
80- if test -z "$HOST_CC"; then
81- HOST_CC="$CC"
82- fi
83- if test -z "$HOST_CFLAGS"; then
84- HOST_CFLAGS="$CFLAGS"
85- fi
86- if test -z "$HOST_CXX"; then
87- HOST_CXX="$CXX"
88- fi
89- if test -z "$HOST_CXXFLAGS"; then
90- HOST_CXXFLAGS="$CXXFLAGS"
91- fi
92- if test -z "$HOST_LDFLAGS"; then
93- HOST_LDFLAGS="$LDFLAGS"
94- fi
95- if test -z "$HOST_RANLIB"; then
96- HOST_RANLIB="$RANLIB"
97- fi
98- if test -z "$HOST_AR"; then
99- HOST_AR="$AR"
100- fi
101-fi
102
103 GNU_AS=
104 GNU_LD=
105@@ -1606,6 +1576,7 @@
106 '
107
108 dnl test that the macros actually work:
109+ac_cv_static_assertion_macros_work="yes"
110 AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
111 AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
112 [AC_LANG_SAVE
113@@ -2767,9 +2738,13 @@
114 AC_LANG_C
115 AC_HEADER_STDC
116 AC_C_CONST
117+ac_cv_type_mode_t=yes
118 AC_TYPE_MODE_T
119+ac_cv_type_off_t=yes
120 AC_TYPE_OFF_T
121+ac_cv_type_pid_t=yes
122 AC_TYPE_PID_T
123+ac_cv_type_size_t=yes
124 AC_TYPE_SIZE_T
125 AC_STRUCT_ST_BLKSIZE
126 AC_MSG_CHECKING(for siginfo_t)
127@@ -3152,19 +3127,9 @@
128 dnl We don't want to link against libm or libpthread on Darwin since
129 dnl they both are just symlinks to libSystem and explicitly linking
130 dnl against libSystem causes issues when debugging (see bug 299601).
131-case $target in
132-*-darwin*)
133- ;;
134-*-beos*)
135- ;;
136-*)
137 AC_CHECK_LIB(m, atan)
138 AC_CHECK_LIB(dl, dlopen,
139- AC_CHECK_HEADER(dlfcn.h,
140- LIBS="-ldl $LIBS"
141- AC_DEFINE(HAVE_LIBDL)))
142- ;;
143-esac
144+ AC_DEFINE(HAVE_LIBDL))
145
146 _SAVE_CFLAGS="$CFLAGS"
147 CFLAGS="$CFLAGS -D_GNU_SOURCE"
148@@ -7007,18 +6972,13 @@
149
150 # Demangle only for debug or trace-malloc builds
151 MOZ_DEMANGLE_SYMBOLS=
152-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
153- MOZ_DEMANGLE_SYMBOLS=1
154- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
155-fi
156+
157 AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
158
159 dnl ========================================================
160 dnl = Support for gcc stack unwinding (from gcc 3.3)
161 dnl ========================================================
162-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
163- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
164-fi
165+
166
167 dnl ========================================================
168 dnl =
169@@ -7530,10 +7490,7 @@
170 dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
171 dnl to either libIDL1 or libIDL2.
172 if test -z "$_LIBIDL_FOUND"; then
173- AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
174- if test -z "$_LIBIDL_FOUND"; then
175 PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
176- fi
177 fi
178 dnl
179 dnl If we don't have a libIDL config program & not cross-compiling,
180@@ -7605,13 +7562,7 @@
181 fi
182
183 if test -z "$SKIP_PATH_CHECKS"; then
184-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
185- if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
186 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
187- else
188- AM_PATH_GLIB(${GLIB_VERSION})
189- fi
190-fi
191 fi
192
193 if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
194@@ -8457,10 +8408,7 @@
195 HAVE_WCRTOMB
196 "
197
198-AC_CONFIG_HEADER(
199-netwerk/necko-config.h
200-xpcom/xpcom-config.h
201-xpcom/xpcom-private.h
202+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
203 )
204
205 # Save the defines header file before autoconf removes it.
206@@ -8519,31 +8467,11 @@
207 dnl To add new Makefiles, edit allmakefiles.sh.
208 dnl allmakefiles.sh sets the variable, MAKEFILES.
209 . ${srcdir}/allmakefiles.sh
210-dnl
211-dnl Run a perl script to quickly create the makefiles.
212-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
213-dnl for the files it cannot handle correctly. This way, config.status
214-dnl will handle these files.
215-dnl If it fails, nothing is set and config.status will run as usual.
216-dnl
217-dnl This does not change the $MAKEFILES variable.
218-dnl
219-dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
220-dnl
221-if test -z "${AS_PERL}"; then
222-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
223-else
224-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
225-fi
226-. ./conftest.sh
227-rm conftest.sh
228
229 echo $MAKEFILES > unallmakefiles
230
231 mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
232
233-AC_OUTPUT($MAKEFILES)
234-
235 dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
236 if test "$CAIRO_FEATURES_H"; then
237 if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
238@@ -8569,14 +8497,14 @@
239 HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
240 RC=
241
242-unset MAKEFILES
243-unset CONFIG_FILES
244+#unset MAKEFILES
245+#unset CONFIG_FILES
246
247 # No need to run subconfigures when building with LIBXUL_SDK_DIR
248 if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
249
250 if test -z "$MOZ_NATIVE_NSPR"; then
251- ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
252+ ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
253 if test -z "$MOZ_DEBUG"; then
254 ac_configure_args="$ac_configure_args --disable-debug"
255 fi
256@@ -8592,8 +8520,7 @@
257 if test -n "$USE_ARM_KUSER"; then
258 ac_configure_args="$ac_configure_args --with-arm-kuser"
259 fi
260- AC_OUTPUT_SUBDIRS(nsprpub)
261- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
262+ AC_CONFIG_SUBDIRS(nsprpub)
263 fi
264
265 if test -z "$MOZ_NATIVE_NSPR"; then
266@@ -8610,7 +8537,6 @@
267
268 # Run the SpiderMonkey 'configure' script.
269 dist=$MOZ_BUILD_ROOT/dist
270-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
271 ac_configure_args="$ac_configure_args --enable-threadsafe"
272 if test -z "$MOZ_NATIVE_NSPR"; then
273 ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
274@@ -8627,11 +8553,14 @@
275 export MOZ_MEMORY_LDFLAGS
276 fi
277 fi
278-AC_OUTPUT_SUBDIRS(js/src)
279-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
280+AC_CONFIG_SUBDIRS(js/src)
281
282 fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
283
284+m4_pattern_allow(AS_BIN)
285+
286+AC_OUTPUT($MAKEFILES)
287+
288 dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
289 dnl Needs to be at the end to respect possible changes from NSPR configure
290 if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
291Index: offscreen/js/src/configure.in
292===================================================================
293--- offscreen.orig/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
294+++ offscreen/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
295@@ -62,7 +62,6 @@
296
297 AC_PREREQ(2.13)
298 AC_INIT(jsapi.h)
299-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
300 AC_CONFIG_HEADER(js-config.h)
301 AC_CANONICAL_SYSTEM
302 TARGET_CPU="${target_cpu}"
303@@ -101,6 +100,9 @@
304 _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
305 _SUBDIR_CONFIG_ARGS="$ac_configure_args"
306
307+ac_cv_have_usable_wchar_v2=no
308+ac_cv_have_usable_wchar_option_v2=no
309+
310 dnl Set the version number of the libs included with mozilla
311 dnl ========================================================
312 NSPR_VERSION=4
313@@ -113,6 +115,8 @@
314
315 MSMANIFEST_TOOL=
316
317+m4_pattern_allow(AS_BIN)
318+
319 dnl Set various checks
320 dnl ========================================================
321 MISSING_X=
322@@ -198,7 +202,7 @@
323
324 if test "$COMPILE_ENVIRONMENT"; then
325
326-if test "$target" != "$host"; then
327+
328 echo "cross compiling from $host to $target"
329
330 _SAVE_CC="$CC"
331@@ -235,7 +239,7 @@
332
333 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
334 AC_TRY_COMPILE([], [return(0);],
335- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
336+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
337 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
338
339 CC="$HOST_CXX"
340@@ -243,7 +247,7 @@
341
342 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
343 AC_TRY_COMPILE([], [return(0);],
344- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
345+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
346 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
347
348 CC=$_SAVE_CC
349@@ -298,7 +302,7 @@
350 ;;
351 esac
352
353- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
354+ CC="${target_alias}-gcc"
355 unset ac_cv_prog_CC
356 AC_PROG_CC
357 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
358@@ -328,37 +332,6 @@
359 dnl able to run ppc code in a translated environment, making a cross
360 dnl compiler appear native. So we override that here.
361 cross_compiling=yes
362-else
363- AC_PROG_CC
364- AC_PROG_CXX
365- AC_PROG_RANLIB
366- MOZ_PATH_PROGS(AS, $AS as, $CC)
367- AC_CHECK_PROGS(AR, ar, :)
368- AC_CHECK_PROGS(LD, ld, :)
369- AC_CHECK_PROGS(STRIP, strip, :)
370- AC_CHECK_PROGS(WINDRES, windres, :)
371- if test -z "$HOST_CC"; then
372- HOST_CC="$CC"
373- fi
374- if test -z "$HOST_CFLAGS"; then
375- HOST_CFLAGS="$CFLAGS"
376- fi
377- if test -z "$HOST_CXX"; then
378- HOST_CXX="$CXX"
379- fi
380- if test -z "$HOST_CXXFLAGS"; then
381- HOST_CXXFLAGS="$CXXFLAGS"
382- fi
383- if test -z "$HOST_LDFLAGS"; then
384- HOST_LDFLAGS="$LDFLAGS"
385- fi
386- if test -z "$HOST_RANLIB"; then
387- HOST_RANLIB="$RANLIB"
388- fi
389- if test -z "$HOST_AR"; then
390- HOST_AR="$AR"
391- fi
392-fi
393
394 GNU_AS=
395 GNU_LD=
396@@ -1424,6 +1397,8 @@
397 fi # GNU_CC
398 fi # COMPILE_ENVIRONMENT
399
400+ac_cv_static_assertion_macros_work=yes
401+
402 dnl =================================================================
403 dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
404 dnl which is bad when cross compiling.
405@@ -2579,9 +2554,13 @@
406 AC_LANG_C
407 AC_HEADER_STDC
408 AC_C_CONST
409+ac_cv_type_mode_t=yes
410 AC_TYPE_MODE_T
411+ac_cv_type_off_t=yes
412 AC_TYPE_OFF_T
413+ac_cv_type_pid_t=yes
414 AC_TYPE_PID_T
415+ac_cv_type_size_t=yes
416 AC_TYPE_SIZE_T
417 AC_STRUCT_ST_BLKSIZE
418 AC_MSG_CHECKING(for siginfo_t)
419@@ -2606,7 +2585,8 @@
420
421 AC_CHECK_HEADER(stdint.h)
422 if test "$ac_cv_header_stdint_h" = yes; then
423- AC_DEFINE(JS_HAVE_STDINT_H)
424+ AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
425+ AC_DEFINE(HAVE_STDINT_H)
426 else
427 dnl We'll figure them out for ourselves. List more likely types
428 dnl earlier. If we ever really encounter a size for which none of
429@@ -3004,10 +2984,7 @@
430 ;;
431 *)
432 AC_CHECK_LIB(m, atan)
433- AC_CHECK_LIB(dl, dlopen,
434- AC_CHECK_HEADER(dlfcn.h,
435- LIBS="-ldl $LIBS"
436- AC_DEFINE(HAVE_LIBDL)))
437+ AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
438 ;;
439 esac
440
441@@ -3903,6 +3880,7 @@
442 [ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
443 See --with-nspr-cflags for more details.],
444 NSPR_LIBS=$withval)
445+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
446 AC_SUBST(NSPR_CFLAGS)
447 AC_SUBST(NSPR_LIBS)
448
449@@ -4512,18 +4490,11 @@
450
451 # Demangle only for debug or trace-malloc builds
452 MOZ_DEMANGLE_SYMBOLS=
453-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
454- MOZ_DEMANGLE_SYMBOLS=1
455- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
456-fi
457 AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
458
459 dnl ========================================================
460 dnl = Support for gcc stack unwinding (from gcc 3.3)
461 dnl ========================================================
462-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
463- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
464-fi
465
466 dnl ========================================================
467 dnl =
468@@ -5231,6 +5202,8 @@
469 done
470 AC_SUBST(LIBS_PATH)
471
472+
473+
474 dnl ========================================================
475 dnl JavaScript shell
476 dnl ========================================================
477@@ -5371,3 +5344,4 @@
478 # 'js-config' in Makefile.in.
479 AC_MSG_RESULT(invoking make to create js-config script)
480 $MAKE js-config
481+
482Index: offscreen/nsprpub/configure.in
483===================================================================
484--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
485+++ offscreen/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
486@@ -42,7 +42,6 @@
487 AC_PREREQ(2.12)
488 AC_INIT(config/libc_r.h)
489
490-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
491 AC_CANONICAL_SYSTEM
492
493 dnl ========================================================
494@@ -396,7 +395,7 @@
495 dnl ========================================================
496 dnl Checks for compilers.
497 dnl ========================================================
498-if test "$target" != "$host"; then
499+
500 echo "cross compiling from $host to $target"
501 cross_compiling=yes
502
503@@ -423,7 +422,7 @@
504
505 AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
506 AC_TRY_COMPILE([], [return(0);],
507- [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
508+ [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
509 AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
510
511 CC=$_SAVE_CC
512@@ -444,7 +443,7 @@
513 ;;
514 esac
515
516- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
517+ CC="${target_alias}-gcc"
518 unset ac_cv_prog_CC
519 AC_PROG_CC
520 if test -n "$USE_CPLUS"; then
521@@ -470,30 +469,6 @@
522 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
523 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
524
525-else
526- AC_PROG_CC
527- if test -n "$USE_CPLUS"; then
528- if test "$CC" = "cl" -a -z "$CXX"; then
529- CXX=$CC
530- else
531- AC_PROG_CXX
532- fi
533- fi
534- AC_PROG_CPP
535- AC_PROG_RANLIB
536- AC_PATH_PROGS(AS, as, $CC)
537- AC_PATH_PROGS(AR, ar, echo not_ar)
538- AC_PATH_PROGS(LD, ld link, echo not_ld)
539- AC_PATH_PROGS(STRIP, strip, echo not_strip)
540- AC_PATH_PROGS(WINDRES, windres, echo not_windres)
541- if test -z "$HOST_CC"; then
542- HOST_CC="$CC"
543- fi
544- if test -z "$HOST_CFLAGS"; then
545- HOST_CFLAGS="$CFLAGS"
546- fi
547-fi
548-
549 if test "$GCC" = "yes"; then
550 GNU_CC=1
551 fi
552@@ -514,11 +489,8 @@
553 ;;
554 esac
555
556-if test "$cross_compiling" = "yes"; then
557+
558 CROSS_COMPILE=1
559-else
560- CROSS_COMPILE=
561-fi
562
563 dnl ========================================================
564 dnl Check for gcc -pipe support
565@@ -2283,10 +2255,7 @@
566 *-darwin*|*-beos*)
567 ;;
568 *)
569- AC_CHECK_LIB(dl, dlopen,
570- AC_CHECK_HEADER(dlfcn.h,
571- OS_LIBS="-ldl $OS_LIBS"))
572- ;;
573+ AC_CHECK_LIB(dl, dlopen)
574 esac
575
576
577@@ -2904,6 +2873,8 @@
578 dnl pr/tests/w16gui/Makefile
579 dnl tools/Makefile
580
581+m4_pattern_allow(AS_BIN)
582+
583 if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
584 MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
585 elif test -n "$USE_PTHREADS"; then
586@@ -2919,3 +2890,5 @@
587 echo $MAKEFILES > unallmakefiles
588
589 AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
590+
591+
592Index: offscreen/js/src/Makefile.in
593===================================================================
594--- offscreen.orig/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
595+++ offscreen/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
596@@ -514,20 +514,8 @@
597
598 export:: jsautocfg.h
599
600-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
601 jsautocfg.h:
602 touch $@
603-else
604-ifeq ($(OS_ARCH),WINCE)
605-jsautocfg.h:
606- touch $@
607-else
608-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
609- @rm -f $@ jsautocfg.tmp
610- ./jscpucfg > jsautocfg.tmp
611- mv jsautocfg.tmp $@
612-endif
613-endif
614
615 # jscpucfg is a strange target
616 # Needs to be built with the host compiler but needs to include
617@@ -557,7 +545,7 @@
618 echo no need to build jscpucfg $<
619 else
620 jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
621- $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
622+ $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
623 endif
624 endif
625
626Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
627===================================================================
628--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
629+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
630@@ -47,6 +47,8 @@
631
632 #include <stdarg.h>
633
634+#include "mozilla-config.h"
635+
636 #include "prlog.h"
637
638 #include "nsCOMPtr.h"
639Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
640===================================================================
641--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
642+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
643@@ -39,6 +39,8 @@
644 *
645 * ***** END LICENSE BLOCK ***** */
646
647+#include "mozilla-config.h"
648+
649 #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
650
651 #include "mozJSSubScriptLoader.h"
652Index: offscreen/modules/lcms/include/icc34.h
653===================================================================
654--- offscreen.orig/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
655+++ offscreen/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
656@@ -144,7 +144,7 @@
657 */
658
659
660-#ifdef PACKAGE_NAME
661+#if 0
662 /*
663 June 9, 2003, Adapted for use with configure by Bob Friesenhahn
664 Added the stupid check for autoconf by Marti Maria.
665Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
666===================================================================
667--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
668+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
669@@ -60,7 +60,7 @@
670
671 LIBS += \
672 $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
673- $(BZ2_LIBS) \
674+ $(BZ2_LIBS) -lpthread \
675 $(NULL)
676
677 ifeq ($(OS_ARCH),WINNT)
678Index: offscreen/xpcom/sample/program/Makefile.in
679===================================================================
680--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
681+++ offscreen/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
682@@ -57,7 +57,7 @@
683 # that the application be linked against the XPCOM dynamic library or the NSPR
684 # dynamic libraries.
685 LIBS = \
686- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
687+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
688 $(NULL)
689
690 # Need to link with CoreFoundation on Mac
691Index: offscreen/xpcom/tools/registry/Makefile.in
692===================================================================
693--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
694+++ offscreen/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
695@@ -54,7 +54,7 @@
696 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
697
698 LIBS = \
699- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
700+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
701 $(NULL)
702
703 # Need to link with CoreFoundation on Mac
704Index: offscreen/xulrunner/app/Makefile.in
705===================================================================
706--- offscreen.orig/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
707+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
708@@ -184,7 +184,7 @@
709 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
710 endif
711
712-LIBS += $(JEMALLOC_LIBS)
713+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
714
715 include $(topsrcdir)/config/rules.mk
716
717Index: offscreen/xulrunner/stub/Makefile.in
718===================================================================
719--- offscreen.orig/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
720+++ offscreen/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
721@@ -101,7 +101,7 @@
722 endif
723 endif
724
725-LIBS += $(JEMALLOC_LIBS)
726+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
727
728 include $(topsrcdir)/config/rules.mk
729
730Index: offscreen/modules/plugin/test/testplugin/Makefile.in
731===================================================================
732--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
733+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
734@@ -63,9 +63,7 @@
735 CMMSRCS = nptest_macosx.mm
736 endif
737
738-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
739 CPPSRCS += nptest_gtk2.cpp
740-endif
741
742 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
743 CPPSRCS += nptest_os2.cpp
744Index: offscreen/js/src/aclocal.m4
745===================================================================
746--- offscreen.orig/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
747+++ offscreen/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
748@@ -9,4 +9,3 @@
749 builtin(include, build/autoconf/moznbytetype.m4)dnl
750 builtin(include, build/autoconf/mozprog.m4)dnl
751
752-MOZ_PROG_CHECKMSYS()
753Index: offscreen/toolkit/toolkit-makefiles.sh
754===================================================================
755--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-06-12 14:19:59.000000000 +0100
756+++ offscreen/toolkit/toolkit-makefiles.sh 2009-06-12 14:20:09.000000000 +0100
757@@ -342,7 +342,6 @@
758 modules/plugin/sdk/samples/Makefile
759 modules/plugin/sdk/samples/common/Makefile
760 modules/plugin/sdk/samples/basic/windows/Makefile
761- modules/plugin/sdk/samples/basic/unix/Makefile
762 modules/plugin/sdk/samples/winless/windows/Makefile
763 "
764
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
deleted file mode 100644
index 7ee1211f1a..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ /dev/null
@@ -1,774 +0,0 @@
1Index: offscreen/configure.in
2===================================================================
3--- offscreen.orig/configure.in 2009-12-09 13:10:12.000000000 +0000
4+++ offscreen/configure.in 2009-12-09 13:38:51.000000000 +0000
5@@ -64,7 +64,6 @@
6
7 AC_PREREQ(2.13)
8 AC_INIT(config/config.mk)
9-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
10 AC_CANONICAL_SYSTEM
11 TARGET_CPU="${target_cpu}"
12 TARGET_VENDOR="${target_vendor}"
13@@ -106,7 +105,6 @@
14 _SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
15 _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
16 _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
17-_SUBDIR_CONFIG_ARGS="$ac_configure_args"
18
19 dnl Set the version number of the libs included with mozilla
20 dnl ========================================================
21@@ -139,6 +137,9 @@
22
23 MSMANIFEST_TOOL=
24
25+ac_cv_have_usable_wchar_v2=no
26+ac_cv_have_usable_wchar_option_v2=no
27+
28 dnl Set various checks
29 dnl ========================================================
30 MISSING_X=
31@@ -308,7 +309,7 @@
32 ;;
33 esac
34
35-if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
36+
37 echo "cross compiling from $host to $target"
38 cross_compiling=yes
39
40@@ -346,7 +347,7 @@
41
42 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
43 AC_TRY_COMPILE([], [return(0);],
44- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
45+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
46 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
47
48 CC="$HOST_CXX"
49@@ -354,7 +355,7 @@
50
51 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
52 AC_TRY_COMPILE([], [return(0);],
53- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
54+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
55 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
56
57 CC=$_SAVE_CC
58@@ -375,7 +376,7 @@
59 ;;
60 esac
61
62- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
63+ CC="${target_alias}-gcc"
64 unset ac_cv_prog_CC
65 AC_PROG_CC
66 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
67@@ -399,37 +400,6 @@
68 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
69 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
70 AC_DEFINE(CROSS_COMPILE)
71-else
72- AC_PROG_CC
73- AC_PROG_CXX
74- AC_PROG_RANLIB
75- MOZ_PATH_PROGS(AS, $AS as, $CC)
76- AC_CHECK_PROGS(AR, ar, :)
77- AC_CHECK_PROGS(LD, ld, :)
78- AC_CHECK_PROGS(STRIP, strip, :)
79- AC_CHECK_PROGS(WINDRES, windres, :)
80- if test -z "$HOST_CC"; then
81- HOST_CC="$CC"
82- fi
83- if test -z "$HOST_CFLAGS"; then
84- HOST_CFLAGS="$CFLAGS"
85- fi
86- if test -z "$HOST_CXX"; then
87- HOST_CXX="$CXX"
88- fi
89- if test -z "$HOST_CXXFLAGS"; then
90- HOST_CXXFLAGS="$CXXFLAGS"
91- fi
92- if test -z "$HOST_LDFLAGS"; then
93- HOST_LDFLAGS="$LDFLAGS"
94- fi
95- if test -z "$HOST_RANLIB"; then
96- HOST_RANLIB="$RANLIB"
97- fi
98- if test -z "$HOST_AR"; then
99- HOST_AR="$AR"
100- fi
101-fi
102
103 GNU_AS=
104 GNU_LD=
105@@ -1586,6 +1556,7 @@
106 '
107
108 dnl test that the macros actually work:
109+ac_cv_static_assertion_macros_work="yes"
110 AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
111 AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
112 [AC_LANG_SAVE
113@@ -2770,9 +2741,13 @@
114 AC_LANG_C
115 AC_HEADER_STDC
116 AC_C_CONST
117+ac_cv_type_mode_t=yes
118 AC_TYPE_MODE_T
119+ac_cv_type_off_t=yes
120 AC_TYPE_OFF_T
121+ac_cv_type_pid_t=yes
122 AC_TYPE_PID_T
123+ac_cv_type_size_t=yes
124 AC_TYPE_SIZE_T
125 AC_STRUCT_ST_BLKSIZE
126 AC_MSG_CHECKING(for siginfo_t)
127@@ -3174,21 +3149,9 @@
128 dnl We don't want to link against libm or libpthread on Darwin since
129 dnl they both are just symlinks to libSystem and explicitly linking
130 dnl against libSystem causes issues when debugging (see bug 299601).
131-case $target in
132-*-darwin*)
133- ;;
134-*-beos*)
135- ;;
136-*-os2*)
137- ;;
138-*)
139 AC_CHECK_LIB(m, atan)
140 AC_CHECK_LIB(dl, dlopen,
141- AC_CHECK_HEADER(dlfcn.h,
142- LIBS="-ldl $LIBS"
143- AC_DEFINE(HAVE_LIBDL)))
144- ;;
145-esac
146+ AC_DEFINE(HAVE_LIBDL))
147
148 _SAVE_CFLAGS="$CFLAGS"
149 CFLAGS="$CFLAGS -D_GNU_SOURCE"
150@@ -6889,18 +6852,13 @@
151
152 # Demangle only for debug or trace-malloc builds
153 MOZ_DEMANGLE_SYMBOLS=
154-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
155- MOZ_DEMANGLE_SYMBOLS=1
156- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
157-fi
158+
159 AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
160
161 dnl ========================================================
162 dnl = Support for gcc stack unwinding (from gcc 3.3)
163 dnl ========================================================
164-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
165- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
166-fi
167+
168
169 dnl ========================================================
170 dnl =
171@@ -7420,10 +7378,7 @@
172 dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
173 dnl to either libIDL1 or libIDL2.
174 if test -z "$_LIBIDL_FOUND"; then
175- AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
176- if test -z "$_LIBIDL_FOUND"; then
177 PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
178- fi
179 fi
180 dnl
181 dnl If we don't have a libIDL config program & not cross-compiling,
182@@ -7495,13 +7450,7 @@
183 fi
184
185 if test -z "$SKIP_PATH_CHECKS"; then
186-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
187- if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
188 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
189- else
190- AM_PATH_GLIB(${GLIB_VERSION})
191- fi
192-fi
193 fi
194
195 if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
196@@ -8278,10 +8227,7 @@
197 HAVE_WCRTOMB
198 "
199
200-AC_CONFIG_HEADER(
201-netwerk/necko-config.h
202-xpcom/xpcom-config.h
203-xpcom/xpcom-private.h
204+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
205 )
206
207 # Save the defines header file before autoconf removes it.
208@@ -8340,31 +8286,11 @@
209 dnl To add new Makefiles, edit allmakefiles.sh.
210 dnl allmakefiles.sh sets the variable, MAKEFILES.
211 . ${srcdir}/allmakefiles.sh
212-dnl
213-dnl Run a perl script to quickly create the makefiles.
214-dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
215-dnl for the files it cannot handle correctly. This way, config.status
216-dnl will handle these files.
217-dnl If it fails, nothing is set and config.status will run as usual.
218-dnl
219-dnl This does not change the $MAKEFILES variable.
220-dnl
221-dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
222-dnl
223-if test -z "${AS_PERL}"; then
224-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
225-else
226-echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
227-fi
228-. ./conftest.sh
229-rm conftest.sh
230
231 echo $MAKEFILES > unallmakefiles
232
233 mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
234
235-AC_OUTPUT($MAKEFILES)
236-
237 dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
238 if test "$CAIRO_FEATURES_H"; then
239 if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
240@@ -8390,14 +8316,14 @@
241 HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
242 RC=
243
244-unset MAKEFILES
245-unset CONFIG_FILES
246+#unset MAKEFILES
247+#unset CONFIG_FILES
248
249 # No need to run subconfigures when building with LIBXUL_SDK_DIR
250 if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
251
252 if test -z "$MOZ_NATIVE_NSPR"; then
253- ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
254+ ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
255 if test -z "$MOZ_DEBUG"; then
256 ac_configure_args="$ac_configure_args --disable-debug"
257 fi
258@@ -8413,8 +8339,7 @@
259 if test -n "$USE_ARM_KUSER"; then
260 ac_configure_args="$ac_configure_args --with-arm-kuser"
261 fi
262- AC_OUTPUT_SUBDIRS(nsprpub)
263- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
264+ AC_CONFIG_SUBDIRS(nsprpub)
265 fi
266
267 if test -z "$MOZ_NATIVE_NSPR"; then
268@@ -8431,7 +8356,6 @@
269
270 # Run the SpiderMonkey 'configure' script.
271 dist=$MOZ_BUILD_ROOT/dist
272-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
273 ac_configure_args="$ac_configure_args --enable-threadsafe"
274 if test -z "$MOZ_NATIVE_NSPR"; then
275 ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
276@@ -8448,8 +8372,7 @@
277 export MOZ_MEMORY_LDFLAGS
278 fi
279 fi
280-AC_OUTPUT_SUBDIRS(js/src)
281-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
282+AC_CONFIG_SUBDIRS(js/src)
283
284 # Build jsctypes on the platforms we can.
285 if test "$BUILD_CTYPES"; then
286@@ -8465,20 +8388,14 @@
287 if test -n "$CROSS_COMPILE"; then
288 ac_configure_args="$ac_configure_args --build=$build --host=$target"
289 fi
290- if test "$SOLARIS_SUNPRO_CC"; then
291- # Always use gcc for libffi on Solaris
292- old_cache_file=$cache_file
293- cache_file=js/ctypes/libffi/config.cache
294- ac_configure_args="$ac_configure_args CC=gcc"
295- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
296- cache_file=$old_cache_file
297- else
298- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
299- fi
300- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
301+ AC_CONFIG_SUBDIRS(js/ctypes/libffi)
302 fi
303 fi
304
305+m4_pattern_allow(AS_BIN)
306+
307+AC_OUTPUT($MAKEFILES)
308+
309 fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
310
311 dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
312Index: offscreen/js/src/configure.in
313===================================================================
314--- offscreen.orig/js/src/configure.in 2009-12-09 13:10:12.000000000 +0000
315+++ offscreen/js/src/configure.in 2009-12-09 13:38:51.000000000 +0000
316@@ -62,7 +62,6 @@
317
318 AC_PREREQ(2.13)
319 AC_INIT(jsapi.h)
320-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
321 AC_CONFIG_HEADER(js-config.h)
322 AC_CANONICAL_SYSTEM
323 TARGET_CPU="${target_cpu}"
324@@ -101,6 +100,9 @@
325 _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
326 _SUBDIR_CONFIG_ARGS="$ac_configure_args"
327
328+ac_cv_have_usable_wchar_v2=no
329+ac_cv_have_usable_wchar_option_v2=no
330+
331 dnl Set the version number of the libs included with mozilla
332 dnl ========================================================
333 NSPR_VERSION=4
334@@ -113,6 +115,8 @@
335
336 MSMANIFEST_TOOL=
337
338+m4_pattern_allow(AS_BIN)
339+
340 dnl Set various checks
341 dnl ========================================================
342 MISSING_X=
343@@ -212,7 +216,7 @@
344
345 if test "$COMPILE_ENVIRONMENT"; then
346
347-if test "$target" != "$host"; then
348+
349 echo "cross compiling from $host to $target"
350
351 _SAVE_CC="$CC"
352@@ -249,7 +253,7 @@
353
354 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
355 AC_TRY_COMPILE([], [return(0);],
356- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
357+ [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
358 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
359
360 CC="$HOST_CXX"
361@@ -257,7 +261,7 @@
362
363 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
364 AC_TRY_COMPILE([], [return(0);],
365- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
366+ [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
367 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
368
369 CC=$_SAVE_CC
370@@ -312,7 +316,7 @@
371 ;;
372 esac
373
374- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
375+ CC="${target_alias}-gcc"
376 unset ac_cv_prog_CC
377 AC_PROG_CC
378 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
379@@ -342,37 +346,6 @@
380 dnl able to run ppc code in a translated environment, making a cross
381 dnl compiler appear native. So we override that here.
382 cross_compiling=yes
383-else
384- AC_PROG_CC
385- AC_PROG_CXX
386- AC_PROG_RANLIB
387- MOZ_PATH_PROGS(AS, $AS as, $CC)
388- AC_CHECK_PROGS(AR, ar, :)
389- AC_CHECK_PROGS(LD, ld, :)
390- AC_CHECK_PROGS(STRIP, strip, :)
391- AC_CHECK_PROGS(WINDRES, windres, :)
392- if test -z "$HOST_CC"; then
393- HOST_CC="$CC"
394- fi
395- if test -z "$HOST_CFLAGS"; then
396- HOST_CFLAGS="$CFLAGS"
397- fi
398- if test -z "$HOST_CXX"; then
399- HOST_CXX="$CXX"
400- fi
401- if test -z "$HOST_CXXFLAGS"; then
402- HOST_CXXFLAGS="$CXXFLAGS"
403- fi
404- if test -z "$HOST_LDFLAGS"; then
405- HOST_LDFLAGS="$LDFLAGS"
406- fi
407- if test -z "$HOST_RANLIB"; then
408- HOST_RANLIB="$RANLIB"
409- fi
410- if test -z "$HOST_AR"; then
411- HOST_AR="$AR"
412- fi
413-fi
414
415 GNU_AS=
416 GNU_LD=
417@@ -1370,6 +1343,8 @@
418 fi # GNU_CC
419 fi # COMPILE_ENVIRONMENT
420
421+ac_cv_static_assertion_macros_work=yes
422+
423 dnl =================================================================
424 dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
425 dnl which is bad when cross compiling.
426@@ -2557,9 +2532,13 @@
427 AC_LANG_C
428 AC_HEADER_STDC
429 AC_C_CONST
430+ac_cv_type_mode_t=yes
431 AC_TYPE_MODE_T
432+ac_cv_type_off_t=yes
433 AC_TYPE_OFF_T
434+ac_cv_type_pid_t=yes
435 AC_TYPE_PID_T
436+ac_cv_type_size_t=yes
437 AC_TYPE_SIZE_T
438 AC_STRUCT_ST_BLKSIZE
439 AC_MSG_CHECKING(for siginfo_t)
440@@ -2584,7 +2563,8 @@
441
442 AC_CHECK_HEADER(stdint.h)
443 if test "$ac_cv_header_stdint_h" = yes; then
444- AC_DEFINE(JS_HAVE_STDINT_H)
445+ AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
446+ AC_DEFINE(HAVE_STDINT_H)
447 else
448 dnl We'll figure them out for ourselves. List more likely types
449 dnl earlier. If we ever really encounter a size for which none of
450@@ -2938,10 +2918,7 @@
451 ;;
452 *)
453 AC_CHECK_LIB(m, atan)
454- AC_CHECK_LIB(dl, dlopen,
455- AC_CHECK_HEADER(dlfcn.h,
456- LIBS="-ldl $LIBS"
457- AC_DEFINE(HAVE_LIBDL)))
458+ AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
459 ;;
460 esac
461
462@@ -3847,6 +3824,7 @@
463 [ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
464 See --with-nspr-cflags for more details.],
465 NSPR_LIBS=$withval)
466+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
467 AC_SUBST(NSPR_CFLAGS)
468 AC_SUBST(NSPR_LIBS)
469
470@@ -4386,18 +4364,11 @@
471
472 # Demangle only for debug or trace-malloc builds
473 MOZ_DEMANGLE_SYMBOLS=
474-if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
475- MOZ_DEMANGLE_SYMBOLS=1
476- AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
477-fi
478 AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
479
480 dnl ========================================================
481 dnl = Support for gcc stack unwinding (from gcc 3.3)
482 dnl ========================================================
483-if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
484- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
485-fi
486
487 dnl ========================================================
488 dnl =
489@@ -5097,6 +5068,8 @@
490
491 AC_HAVE_FUNCS(setlocale)
492
493+
494+
495 dnl ========================================================
496 dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
497 dnl ========================================================
498@@ -5234,3 +5207,4 @@
499 # 'js-config' in Makefile.in.
500 AC_MSG_RESULT(invoking make to create js-config script)
501 $MAKE js-config
502+
503Index: offscreen/nsprpub/configure.in
504===================================================================
505--- offscreen.orig/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
506+++ offscreen/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
507@@ -42,7 +42,6 @@
508 AC_PREREQ(2.12)
509 AC_INIT(config/libc_r.h)
510
511-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
512 AC_CANONICAL_SYSTEM
513
514 dnl ========================================================
515@@ -396,7 +395,7 @@
516 dnl ========================================================
517 dnl Checks for compilers.
518 dnl ========================================================
519-if test "$target" != "$host"; then
520+
521 echo "cross compiling from $host to $target"
522 cross_compiling=yes
523
524@@ -423,7 +422,7 @@
525
526 AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
527 AC_TRY_COMPILE([], [return(0);],
528- [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
529+ [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
530 AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
531
532 CC=$_SAVE_CC
533@@ -444,7 +443,7 @@
534 ;;
535 esac
536
537- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
538+ CC="${target_alias}-gcc"
539 unset ac_cv_prog_CC
540 AC_PROG_CC
541 if test -n "$USE_CPLUS"; then
542@@ -470,30 +469,6 @@
543 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
544 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
545
546-else
547- AC_PROG_CC
548- if test -n "$USE_CPLUS"; then
549- if test "$CC" = "cl" -a -z "$CXX"; then
550- CXX=$CC
551- else
552- AC_PROG_CXX
553- fi
554- fi
555- AC_PROG_CPP
556- AC_PROG_RANLIB
557- AC_PATH_PROGS(AS, as, $CC)
558- AC_PATH_PROGS(AR, ar, echo not_ar)
559- AC_PATH_PROGS(LD, ld link, echo not_ld)
560- AC_PATH_PROGS(STRIP, strip, echo not_strip)
561- AC_PATH_PROGS(WINDRES, windres, echo not_windres)
562- if test -z "$HOST_CC"; then
563- HOST_CC="$CC"
564- fi
565- if test -z "$HOST_CFLAGS"; then
566- HOST_CFLAGS="$CFLAGS"
567- fi
568-fi
569-
570 if test "$GCC" = "yes"; then
571 GNU_CC=1
572 fi
573@@ -514,11 +489,8 @@
574 ;;
575 esac
576
577-if test "$cross_compiling" = "yes"; then
578+
579 CROSS_COMPILE=1
580-else
581- CROSS_COMPILE=
582-fi
583
584 dnl ========================================================
585 dnl Check for gcc -pipe support
586@@ -2286,10 +2258,7 @@
587 *-darwin*|*-beos*|*-os2*)
588 ;;
589 *)
590- AC_CHECK_LIB(dl, dlopen,
591- AC_CHECK_HEADER(dlfcn.h,
592- OS_LIBS="-ldl $OS_LIBS"))
593- ;;
594+ AC_CHECK_LIB(dl, dlopen)
595 esac
596
597
598@@ -2907,6 +2876,8 @@
599 dnl pr/tests/w16gui/Makefile
600 dnl tools/Makefile
601
602+m4_pattern_allow(AS_BIN)
603+
604 if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
605 MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
606 elif test -n "$USE_PTHREADS"; then
607@@ -2922,3 +2893,5 @@
608 echo $MAKEFILES > unallmakefiles
609
610 AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
611+
612+
613Index: offscreen/js/src/Makefile.in
614===================================================================
615--- offscreen.orig/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
616+++ offscreen/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
617@@ -513,20 +513,8 @@
618
619 export:: jsautocfg.h
620
621-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
622 jsautocfg.h:
623 touch $@
624-else
625-ifeq ($(OS_ARCH),WINCE)
626-jsautocfg.h:
627- touch $@
628-else
629-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
630- @rm -f $@ jsautocfg.tmp
631- ./jscpucfg > jsautocfg.tmp
632- mv jsautocfg.tmp $@
633-endif
634-endif
635
636 # jscpucfg is a strange target
637 # Needs to be built with the host compiler but needs to include
638@@ -556,7 +544,7 @@
639 echo no need to build jscpucfg $<
640 else
641 jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
642- $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
643+ $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
644 endif
645 endif
646
647Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
648===================================================================
649--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
650+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
651@@ -47,6 +47,8 @@
652
653 #include <stdarg.h>
654
655+#include "mozilla-config.h"
656+
657 #include "prlog.h"
658
659 #include "nsCOMPtr.h"
660Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
661===================================================================
662--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.000000000 +0000
663+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.000000000 +0000
664@@ -39,6 +39,8 @@
665 *
666 * ***** END LICENSE BLOCK ***** */
667
668+#include "mozilla-config.h"
669+
670 #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
671
672 #include "mozJSSubScriptLoader.h"
673Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
674===================================================================
675--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
676+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
677@@ -56,7 +56,7 @@
678
679 LIBS += \
680 $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
681- $(BZ2_LIBS) \
682+ $(BZ2_LIBS) -lpthread \
683 $(NULL)
684
685 ifeq ($(OS_ARCH),WINNT)
686Index: offscreen/xpcom/sample/program/Makefile.in
687===================================================================
688--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.000000000 +0000
689+++ offscreen/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.000000000 +0000
690@@ -57,7 +57,7 @@
691 # that the application be linked against the XPCOM dynamic library or the NSPR
692 # dynamic libraries.
693 LIBS = \
694- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
695+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
696 $(NULL)
697
698 # Need to link with CoreFoundation on Mac
699Index: offscreen/xpcom/tools/registry/Makefile.in
700===================================================================
701--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.000000000 +0000
702+++ offscreen/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.000000000 +0000
703@@ -54,7 +54,7 @@
704 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
705
706 LIBS = \
707- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
708+ $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
709 $(NULL)
710
711 # Need to link with CoreFoundation on Mac
712Index: offscreen/xulrunner/app/Makefile.in
713===================================================================
714--- offscreen.orig/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
715+++ offscreen/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
716@@ -173,7 +173,7 @@
717 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
718 endif
719
720-LIBS += $(JEMALLOC_LIBS)
721+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
722
723 include $(topsrcdir)/config/rules.mk
724
725Index: offscreen/xulrunner/stub/Makefile.in
726===================================================================
727--- offscreen.orig/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
728+++ offscreen/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
729@@ -100,7 +100,7 @@
730 endif
731 endif
732
733-LIBS += $(JEMALLOC_LIBS)
734+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
735
736 include $(topsrcdir)/config/rules.mk
737
738Index: offscreen/modules/plugin/test/testplugin/Makefile.in
739===================================================================
740--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
741+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
742@@ -60,9 +60,7 @@
743 CMMSRCS = nptest_macosx.mm
744 endif
745
746-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
747 CPPSRCS += nptest_gtk2.cpp
748-endif
749
750 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
751 CPPSRCS += nptest_os2.cpp
752Index: offscreen/js/src/aclocal.m4
753===================================================================
754--- offscreen.orig/js/src/aclocal.m4 2009-12-09 13:10:12.000000000 +0000
755+++ offscreen/js/src/aclocal.m4 2009-12-09 13:39:01.000000000 +0000
756@@ -8,6 +8,4 @@
757 builtin(include, build/autoconf/altoptions.m4)dnl
758 builtin(include, build/autoconf/moznbytetype.m4)dnl
759 builtin(include, build/autoconf/mozprog.m4)dnl
760-builtin(include, build/autoconf/acwinpaths.m4)dnl
761
762-MOZ_PROG_CHECKMSYS()
763Index: offscreen/toolkit/toolkit-makefiles.sh
764===================================================================
765--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
766+++ offscreen/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
767@@ -369,7 +369,6 @@
768 modules/plugin/sdk/samples/Makefile
769 modules/plugin/sdk/samples/common/Makefile
770 modules/plugin/sdk/samples/basic/windows/Makefile
771- modules/plugin/sdk/samples/basic/unix/Makefile
772 modules/plugin/sdk/samples/winless/windows/Makefile
773 "
774
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
1#ifndef js_cpucfg___
2#define js_cpucfg___
3
4/* AUTOMATICALLY GENERATED - DO NOT EDIT */
5
6#define IS_LITTLE_ENDIAN 1
7#undef IS_BIG_ENDIAN
8
9
10#define JS_BYTES_PER_WORD 4L
11#define JS_BYTES_PER_DOUBLE 8L
12#define JS_BITS_PER_WORD_LOG2 5L
13#define JS_ALIGN_OF_POINTER 4L
14
15#define JS_THREADSAFE 1
16
17#define JS_STACK_GROWTH_DIRECTION (-1)
18
19#define JS_HAVE_LONG_LONG
20
21#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
1#ifndef js_cpucfg___
2#define js_cpucfg___
3
4/* AUTOMATICALLY GENERATED - DO NOT EDIT */
5
6#define IS_LITTLE_ENDIAN 1
7#undef IS_BIG_ENDIAN
8
9
10#define JS_BYTES_PER_WORD 4L
11#define JS_BYTES_PER_DOUBLE 8L
12#define JS_BITS_PER_WORD_LOG2 5L
13#define JS_ALIGN_OF_POINTER 4L
14
15#define JS_THREADSAFE 1
16
17#define JS_STACK_GROWTH_DIRECTION (-1)
18
19#define JS_HAVE_LONG_LONG
20
21#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
1#ifndef js_cpucfg___
2#define js_cpucfg___
3
4/* AUTOMATICALLY GENERATED - DO NOT EDIT */
5
6#define IS_LITTLE_ENDIAN 1
7#undef IS_BIG_ENDIAN
8
9
10#define JS_BYTES_PER_WORD 4L
11#define JS_BYTES_PER_DOUBLE 8L
12#define JS_BITS_PER_WORD_LOG2 5L
13#define JS_ALIGN_OF_POINTER 4L
14
15#define JS_THREADSAFE 1
16
17#define JS_STACK_GROWTH_DIRECTION (-1)
18
19#define JS_HAVE_LONG_LONG
20
21#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
1#ifndef js_cpucfg___
2#define js_cpucfg___
3
4/* AUTOMATICALLY GENERATED - DO NOT EDIT */
5
6#define IS_LITTLE_ENDIAN 1
7#undef IS_BIG_ENDIAN
8
9
10#define JS_BYTES_PER_WORD 4L
11#define JS_BYTES_PER_DOUBLE 8L
12#define JS_BITS_PER_WORD_LOG2 5L
13#define JS_ALIGN_OF_POINTER 4L
14
15#define JS_THREADSAFE 1
16
17#define JS_STACK_GROWTH_DIRECTION (-1)
18
19#define JS_HAVE_LONG_LONG
20
21#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/mozconfig b/meta/packages/mozilla-headless/mozilla-headless/mozconfig
deleted file mode 100644
index 6123d11d27..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
1# this line sets the directory for all build output
2mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-release
3
4# comment out the previous line and uncomment these two for a debug build
5#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-debug
6#ac_add_options --disable-optimize --enable-debug
7
8# this is the line that enables the headless implementation
9ac_add_options --enable-default-toolkit=cairo-headless
10
11# comment out the previous line and uncomment these two for a GTK build
12#ac_add_options --enable-system-cairo
13#ac_add_options --enable-default-toolkit=cairo-gtk2
14
15ac_add_options --disable-tests
16ac_add_options --disable-javaxpcom
17ac_add_options --enable-application=xulrunner
18ac_add_options --enable-pango
19ac_add_options --disable-printing
20ac_add_options --disable-crashreporter
21ac_add_options --enable-plugins
22ac_add_options --disable-accessibility
23mk_add_options MOZ_CO_PROJECT=xulrunner
diff --git a/meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch b/meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch
deleted file mode 100644
index aabd6906e8..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1diff -r f1af606531f5 memory/jemalloc/jemalloc.h
2--- a/memory/jemalloc/jemalloc.h Sat Nov 22 20:22:22 2008 +0100
3+++ b/memory/jemalloc/jemalloc.h Mon Dec 01 16:53:06 2008 -0500
4@@ -45,14 +45,14 @@
5 } jemalloc_stats_t;
6
7 #ifndef MOZ_MEMORY_DARWIN
8-void *malloc(size_t size);
9-void *valloc(size_t size);
10-void *calloc(size_t num, size_t size);
11-void *realloc(void *ptr, size_t size);
12-void free(void *ptr);
13+void *malloc(size_t size) __THROW __attribute_malloc__ __wur;
14+void *valloc(size_t size) __THROW __attribute_malloc__ __wur;
15+void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur;
16+void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur;
17+void free(void *ptr) __THROW __attribute_malloc__ __wur;
18 #endif
19
20-int posix_memalign(void **memptr, size_t alignment, size_t size);
21+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur;
22 void *memalign(size_t alignment, size_t size);
23 size_t malloc_usable_size(const void *ptr);
24 void jemalloc_stats(jemalloc_stats_t *stats);
diff --git a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
deleted file mode 100644
index 9409105780..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Index: offscreen/js/src/configure.in
2===================================================================
3--- offscreen.orig/js/src/configure.in 2009-06-17 14:31:40.000000000 +0100
4+++ offscreen/js/src/configure.in 2009-06-17 14:31:40.000000000 +0100
5@@ -880,7 +880,7 @@
6 HOST_AR_FLAGS='$(AR_FLAGS)'
7
8 MOZ_JS_LIBS='-L$(libdir) -lmozjs'
9-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
10+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
11
12 MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
13 MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
14Index: offscreen/configure.in
15===================================================================
16--- offscreen.orig/configure.in 2009-06-17 15:09:44.000000000 +0100
17+++ offscreen/configure.in 2009-06-17 15:10:00.000000000 +0100
18@@ -1060,7 +1060,7 @@
19
20 MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
21 DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
22-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
23+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
24 XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
25 LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
26 XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
diff --git a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
deleted file mode 100644
index 53ae6d3251..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Index: offscreen/js/src/configure.in
2===================================================================
3--- offscreen.orig/js/src/configure.in 2009-12-09 13:38:51.000000000 +0000
4+++ offscreen/js/src/configure.in 2009-12-09 14:14:08.000000000 +0000
5@@ -858,7 +858,7 @@
6 HOST_AR_FLAGS='$(AR_FLAGS)'
7
8 MOZ_JS_LIBS='-L$(libdir) -lmozjs'
9-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
10+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
11
12 MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
13
14@@ -3824,7 +3824,7 @@
15 [ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
16 See --with-nspr-cflags for more details.],
17 NSPR_LIBS=$withval)
18-$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
19+NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
20 AC_SUBST(NSPR_CFLAGS)
21 AC_SUBST(NSPR_LIBS)
22
23Index: offscreen/configure.in
24===================================================================
25--- offscreen.orig/configure.in 2009-12-09 13:38:51.000000000 +0000
26+++ offscreen/configure.in 2009-12-09 14:31:33.000000000 +0000
27@@ -1041,7 +1041,7 @@
28
29 MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
30 DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
31-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
32+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
33 XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
34 LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
35 XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
36@@ -8378,7 +8378,7 @@
37 if test "$BUILD_CTYPES"; then
38 # Run the libffi 'configure' script on platforms that it supports.
39 if test -z "$_MSC_VER"; then
40- ac_configure_args="--disable-shared --enable-static --disable-raw-api"
41+ ac_configure_args="$ac_configure_args --disable-shared --enable-static --disable-raw-api"
42 if test "$MOZ_DEBUG"; then
43 ac_configure_args="$ac_configure_args --enable-debug"
44 fi
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
deleted file mode 100644
index 669c526163..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ /dev/null
@@ -1,99 +0,0 @@
1
2#file://0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch;patch=1 \
3SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
4 file://configurefix-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
5 file://configurefix.patch;patch=1;notrev=1a622cb7c384 \
6 file://mozilla-jemalloc.patch;patch=1 \
7 file://removebadrpath-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
8 file://removebadrpath.patch;patch=1;notrev=1a622cb7c384 \
9 file://buildfixhack.patch;patch=1;notrev=1a622cb7c384 \
10 file://autoconffix.patch;patch=1 \
11 file://jsautocfg.h \
12 file://mozconfig"
13PV = "0.2+hg-1.0+${SRCPV}"
14PR = "r10"
15
16S = "${WORKDIR}/offscreen"
17
18DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl"
19
20FILES_${PN} += "${libdir}/xulrunner-${XULVERSION} ${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/*.so"
21FILES_${PN}-dev += "${libdir}/xulrunner-devel-${XULVERSION}"
22FILES_${PN}-dbg += "${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/.debug"
23
24# Mozilla's build rules search for -L paths to find libraries. Its
25# not clever enough to know where the sysroot is and hence finds host
26# object files which is bad. We therefore tell pkg-config not to hide
27# paths. See config/rules.mk and the LIBS_DEPS and _LIBDIRS variables.
28export PKG_CONFIG_ALLOW_SYSTEM_LIBS = "1"
29
30TARGET_CC_ARCH = ""
31
32CFLAGS = "${TARGET_CFLAGS}"
33TARGET_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"
34
35LDFLAGS = "${TARGET_LDFLAGS}"
36TARGET_LDFLAGS = "-Wl,-rpath,${libdir}/xulrunner-${XULVERSION}"
37
38export target_alias=${TARGET_PREFIX}
39
40inherit autotools mozilla
41
42acpaths = "-I ${S}/build/autoconf "
43
44export topsrcdir = "${S}"
45
46do_configure () {
47 if [ "${SRCREV}" != "1a622cb7c384" ]; then
48 rm -rf ${S}/build/autoconf/acwinpaths.m4
49 rm -rf ${S}/js/src/build/autoconf/acwinpaths.m4
50 rm -rf ${S}/nsprpub/build/autoconf/acwinpaths.m4
51 mkdir -p ${S}/js/src/dist/include
52 ln -fs ../../../../nsprpub/dist/include/nspr ${S}/js/src/dist/include/nsprpub
53 fi
54 cp ${S}/build/autoconf/install-sh ${S}
55 autotools_do_configure
56 # Yes, we run this twice. The first pass sets up npsrpub-config which then
57 # sets the values correctly on the second try. Ick.
58 autotools_do_configure
59}
60
61do_compile () {
62 cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
63 #oe_runmake -f client.mk build_all
64 base_do_compile
65}
66
67XULVERSION = "1.9.3a1pre"
68
69do_install_append () {
70 install -d ${D}${sysconfdir}/ld.so.conf.d/
71 echo ${libdir}/xulrunner-${XULVERSION}/ > ${D}${sysconfdir}/ld.so.conf.d/mozilla-headless
72}
73
74EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-headless --with-pthreads \
75 --enable-pango --enable-optimize --disable-debug --disable-tests \
76 --disable-printing --disable-crashreporter --disable-accessibility \
77 --disable-javaxpcom --enable-plugins --enable-system-sqlite --disable-necko-wifi"
78
79export LIBXUL_DIST="${S}/dist"
80
81SYSROOT_PREPROCESS_FUNCS += "mozilla_sysroot_preprocess"
82
83mozilla_sysroot_preprocess () {
84 autotools_stage_dir ${D}/${libdir}/xulrunner-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/
85 autotools_stage_dir ${D}/${libdir}/xulrunner-devel-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/
86
87 ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/bin
88 ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/idl
89 ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/include
90 ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/lib
91
92 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
93 install -m 755 ${S}/dist/host/bin/host_xpidl ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/xpidl
94}
95
96__anonymous () {
97 if bb.data.getVar("SRCREV", d, True) == "1a622cb7c384":
98 bb.data.setVar("XULVERSION", "1.9.2a1pre", d)
99}
diff --git a/meta/packages/mozilla/files/eabi-fix.patch b/meta/packages/mozilla/files/eabi-fix.patch
deleted file mode 100644
index fd3bb88683..0000000000
--- a/meta/packages/mozilla/files/eabi-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1http://lists.debian.org/debian-arm/2007/05/msg00039.html
2
3From: Lennert Buytenhek <buytenh@wantstofly.org>
4
5Hi,
6
7The reason that building nss (i.e., firefox) would segfault on ARM EABI
8systems is an assumption about the layout of the jmp_buf structure in
9the nspr library (which nss depends on) that does hold on old-ABI but
10no longer holds on EABI. The attached patch fixes this assumption,
11and fixes the shlibsign segfault during the building of nss (it also
12fixes a floating point byte order assumption.)
13
14Looks sane?
15
16It's of course a stupid idea to depend on a particular layout of the
17jmp_buf structure in application programs, but oh well. People write
18ugly buggy code, film at 11.
19
20
21--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200
22+++ mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200
23@@ -59,8 +59,8 @@
24 /* FIXME: deal with freelist and p5s. */
25 }
26
27-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \
28- || defined(__arm32__)
29+#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \
30+ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__)
31 #define IEEE_ARM
32 #elif defined(IS_LITTLE_ENDIAN)
33 #define IEEE_8087
34--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200
35+++ mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200
36@@ -346,7 +346,7 @@
37 #error "Linux/MIPS pre-glibc2 not supported yet"
38 #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
39
40-#elif defined(__arm__)
41+#elif defined(__arm__) && !defined(__ARM_EABI__)
42 /* ARM/Linux */
43 #if defined(__GLIBC__) && __GLIBC__ >= 2
44 #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
45@@ -358,6 +358,18 @@
46 #error "ARM/Linux pre-glibc2 not supported yet"
47 #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
48
49+#elif defined(__arm__) && defined(__ARM_EABI__)
50+/* ARM/Linux */
51+#if defined(__GLIBC__) && __GLIBC__ >= 2
52+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
53+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
54+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
55+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
56+#define _MD_SP_TYPE __ptr_t
57+#else
58+#error "ARM/Linux pre-glibc2 not supported yet"
59+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
60+
61 #else
62
63 #error "Unknown CPU architecture"
64
65
66
diff --git a/meta/packages/mozilla/files/eabi-fix2.patch b/meta/packages/mozilla/files/eabi-fix2.patch
deleted file mode 100644
index 5f64e7f796..0000000000
--- a/meta/packages/mozilla/files/eabi-fix2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1https://bugzilla.mozilla.org/show_bug.cgi?id=369722
2
3Index: js/src/jsnum.h
4===================================================================
5RCS file: /cvsroot/mozilla/js/src/jsnum.h,v
6retrieving revision 3.27
7diff -p -u -8 -r3.27 jsnum.h
8--- mozilla/js/src/jsnum.h 21 Dec 2006 01:00:32 -0000 3.27
9+++ mozilla/js/src/jsnum.h 8 Feb 2007 12:13:01 -0000
10@@ -52,23 +52,24 @@ JS_BEGIN_EXTERN_C
11
12 /*
13 * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
14 * ARM is a little endian architecture but 64 bit double words are stored
15 * differently: the 32 bit words are in little endian byte order, the two words
16 * are stored in big endian`s way.
17 */
18
19-#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
20-#define CPU_IS_ARM
21+#if !defined(__ARM_EABI__) && \
22+ (defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__))
23+#define IEEE_ARM
24 #endif
25
26 typedef union jsdpun {
27 struct {
28-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
29+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
30 uint32 lo, hi;
31 #else
32 uint32 hi, lo;
33 #endif
34 } s;
35 jsdouble d;
36 } jsdpun;
37
38@@ -87,17 +88,17 @@ typedef union jsdpun {
39
40 #else /* not or old GNUC */
41
42 /*
43 * We don't know of any non-gcc compilers that perform alias optimization,
44 * so this code should work.
45 */
46
47-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
48+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
49 #define JSDOUBLE_HI32(x) (((uint32 *)&(x))[1])
50 #define JSDOUBLE_LO32(x) (((uint32 *)&(x))[0])
51 #else
52 #define JSDOUBLE_HI32(x) (((uint32 *)&(x))[0])
53 #define JSDOUBLE_LO32(x) (((uint32 *)&(x))[1])
54 #endif
55
56 #define JSDOUBLE_SET_HI32(x, y) (JSDOUBLE_HI32(x)=(y))
diff --git a/meta/packages/mozilla/files/eabi-fix3.patch b/meta/packages/mozilla/files/eabi-fix3.patch
deleted file mode 100644
index 8bf8c2f4da..0000000000
--- a/meta/packages/mozilla/files/eabi-fix3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
2
3Index: mozilla/extensions/transformiix/source/base/Double.cpp
4===================================================================
5--- mozilla.orig/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:21:34.000000000 +0200
6+++ mozilla/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:23:59.000000000 +0200
7@@ -71,7 +71,7 @@
8 * are stored in big endian`s way.
9 */
10
11-#if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
12+#if !defined(__ARM_EABI__) && defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
13 #define CPU_IS_ARM
14 #endif
15
diff --git a/meta/packages/mozilla/files/minimo.desktop b/meta/packages/mozilla/files/minimo.desktop
deleted file mode 100644
index 5ef0f2075a..0000000000
--- a/meta/packages/mozilla/files/minimo.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Name=Minimo
3Comment=Minimo web browser
4Exec=minimo http://www.mozilla.org/projects/minimo/home.html
5Terminal=0
6Type=Application
7Icon=minimo.png
8Categories=Application;Network;
9StartupNotify=True
diff --git a/meta/packages/mozilla/files/minimo.png b/meta/packages/mozilla/files/minimo.png
deleted file mode 100644
index f8b2e2192b..0000000000
--- a/meta/packages/mozilla/files/minimo.png
+++ /dev/null
Binary files differ
diff --git a/meta/packages/mozilla/minimo/bug-322806.diff b/meta/packages/mozilla/minimo/bug-322806.diff
deleted file mode 100644
index e001e3fc67..0000000000
--- a/meta/packages/mozilla/minimo/bug-322806.diff
+++ /dev/null
@@ -1,13 +0,0 @@
1See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
2
3--- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100
4+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100
5@@ -212,7 +212,7 @@
6 "add sp, sp, r4 \n\t" /* restore stack pointer */
7 "mov %0, r0 \n\t" /* the result... */
8 : "=r" (result)
9- : "r" (&my_params)
10+ : "r" (&my_params), "m" (my_params)
11 : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
12 );
13
diff --git a/meta/packages/mozilla/minimo/minimo b/meta/packages/mozilla/minimo/minimo
deleted file mode 100644
index d130173adf..0000000000
--- a/meta/packages/mozilla/minimo/minimo
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo
3export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}
4exec ${MOZILLA_FIVE_HOME}/minimo "$@"
diff --git a/meta/packages/mozilla/minimo/minimo.patch b/meta/packages/mozilla/minimo/minimo.patch
deleted file mode 100644
index 8894ee7f45..0000000000
--- a/meta/packages/mozilla/minimo/minimo.patch
+++ /dev/null
@@ -1,356 +0,0 @@
1Index: mozilla/content/html/content/src/nsFormSubmission.cpp
2===================================================================
3--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200
4+++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200
5@@ -1315,11 +1315,6 @@
6 nsresult rv = NS_OK;
7
8 nsCAutoString charset(aCharset);
9- // canonical name is passed so that we just have to check against
10- // *our* canonical names listed in charsetaliases.properties
11- if (charset.EqualsLiteral("ISO-8859-1")) {
12- charset.AssignLiteral("windows-1252");
13- }
14
15 // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
16 // MS IE/Opera).
17Index: mozilla/embedding/base/Makefile.in
18===================================================================
19--- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100
20+++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200
21@@ -43,6 +43,7 @@
22
23 MODULE = embed_base
24 LIBRARY_NAME = embed_base_s
25+EXPORT_LIBRARY = 1
26 XPIDL_MODULE = embed_base
27
28 include $(DEPTH)/config/autoconf.mk
29Index: mozilla/js/src/Makefile.in
30===================================================================
31--- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200
32+++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200
33@@ -46,6 +46,7 @@
34
35 MODULE = js
36 LIBRARY_NAME = mozjs
37+EXPORT_LIBRARY = 1
38 LIB_IS_C_ONLY = 1
39 GRE_MODULE = 1
40
41Index: mozilla/minimo/Makefile.in
42===================================================================
43--- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200
44+++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200
45@@ -41,6 +41,6 @@
46
47 include $(DEPTH)/config/autoconf.mk
48
49-DIRS = config components chrome locales customization base extensions
50+DIRS = config chrome locales customization base extensions
51
52 include $(topsrcdir)/config/rules.mk
53Index: mozilla/minimo/base/Makefile.in
54===================================================================
55--- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200
56+++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200
57@@ -96,7 +96,6 @@
58
59 # this should move into the toolkit!
60 LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
61-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
62
63 ifdef WINCE
64 RCINCLUDE = wince/SplashScreen.rc
65@@ -143,10 +142,6 @@
66 endif
67
68
69-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
70-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
71-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
72-
73 include $(topsrcdir)/config/static-config.mk
74
75 EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
76@@ -180,14 +175,11 @@
77 # (same as in mozilla/js/src/Makefile.in)
78 ifdef WINCE
79 LDFLAGS += -OPT:NOICF
80+else
81+# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
82+LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
83 endif
84
85-export::
86- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
87- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
88-
89-
90-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
91
92 ifdef WINCE
93 package::
94Index: mozilla/minimo/base/Minimo.cpp
95===================================================================
96--- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200
97+++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200
98@@ -813,6 +813,8 @@
99 #ifdef MOZ_WIDGET_GTK2
100 gtk_set_locale();
101 gtk_init(&argc, &argv);
102+ gtk_widget_set_default_visual(gdk_rgb_get_visual());
103+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
104 #endif
105
106 #ifdef HACKY_PRE_LOAD_LIBRARY
107Index: mozilla/minimo/base/SplashScreen.cpp
108===================================================================
109--- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200
110+++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200
111@@ -202,9 +202,24 @@
112 void KillSplashScreen() {}
113 void GetScreenSize(unsigned long* x, unsigned long* y)
114 {
115+#ifdef MOZ_WIDGET_GTK2
116+ GdkDisplay* display = gdk_display_get_default();
117+ if (display != NULL)
118+ {
119+ GdkScreen *screen;
120+ screen = gdk_display_get_default_screen(display);
121+ *x = gdk_screen_get_width(screen);
122+ *y = gdk_screen_get_height(screen);
123+ }
124+ else
125+ {
126+#endif
127 // we need to figure this out.
128 *x = 240;
129 *y = 320;
130+#ifdef MOZ_WIDGET_GTK2
131+ }
132+#endif
133 }
134
135
136Index: mozilla/minimo/config/linux_package.sh
137===================================================================
138--- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200
139+++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200
140@@ -29,9 +29,7 @@
141 cp -pRL bin/libnssckbi.so minimo
142 cp -pRL bin/libsmime3.so minimo
143 cp -pRL bin/libsoftokn3.so minimo
144-cp -pRL bin/libsoftokn3.chk minimo
145 cp -pRL bin/libfreebl3.so minimo
146-cp -pRL bin/libfreebl3.chk minimo
147 cp -pRL bin/libssl3.so minimo
148
149 mkdir -p minimo/chrome
150@@ -62,8 +60,6 @@
151 cp -pRL bin/components/nsHelperAppDlg.js minimo/components
152 cp -pRL bin/components/nsProgressDialog.js minimo/components
153
154-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
155-
156 mkdir -p minimo/greprefs
157 cp -pRL bin/greprefs/* minimo/greprefs
158
159@@ -80,7 +76,7 @@
160
161 echo Linking XPT files.
162
163-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
164+host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
165
166 echo Chewing on chrome
167
168Index: mozilla/profile/dirserviceprovider/src/Makefile.in
169===================================================================
170--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200
171+++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200
172@@ -44,6 +44,7 @@
173
174 MODULE = profdirserviceprovider
175 LIBRARY_NAME = profdirserviceprovider_s
176+EXPORT_LIBRARY = 1
177 MOZILLA_INTERNAL_API = 1
178
179 REQUIRES = xpcom \
180Index: mozilla/security/coreconf/Linux.mk
181===================================================================
182--- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100
183+++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200
184@@ -117,6 +117,10 @@
185 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
186 CPU_ARCH = mips
187 else
188+ifeq ($(OS_TEST),arm)
189+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
190+ CPU_ARCH = arm
191+else
192 OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
193 CPU_ARCH = x86
194 endif
195@@ -133,6 +137,7 @@
196 endif
197 endif
198 endif
199+endif
200
201
202 LIBC_TAG = _glibc
203Index: mozilla/security/coreconf/arch.mk
204===================================================================
205--- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100
206+++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200
207@@ -60,18 +60,14 @@
208 64BIT_TAG=
209 endif
210
211-OS_ARCH := $(subst /,_,$(shell uname -s))
212+OS_ARCH := Linux
213
214 #
215 # Attempt to differentiate between sparc and x86 Solaris
216 #
217
218-OS_TEST := $(shell uname -m)
219-ifeq ($(OS_TEST),i86pc)
220- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
221-else
222- OS_RELEASE := $(shell uname -r)
223-endif
224+OS_TEST := arm
225+OS_RELEASE := 2.6
226
227 #
228 # Force the IRIX64 machines to use IRIX.
229Index: mozilla/toolkit/components/build/Makefile.in
230===================================================================
231--- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200
232+++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
233@@ -112,7 +112,6 @@
234 $(NULL)
235
236 SHARED_LIBRARY_LIBS = \
237- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
238 $(NULL)
239
240 ifdef MOZ_XPINSTALL
241Index: mozilla/toolkit/components/startup/src/Makefile.in
242===================================================================
243--- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200
244+++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
245@@ -43,6 +43,7 @@
246
247 MODULE = toolkitcomps
248 LIBRARY_NAME = appstartup_s
249+EXPORT_LIBRARY = 1
250 FORCE_STATIC_LIB = 1
251 LIBXUL_LIBRARY = 1
252
253Index: mozilla/toolkit/xre/Makefile.in
254===================================================================
255--- mozilla.orig/toolkit/xre/Makefile.in 2007-02-06 08:13:20.000000000 +0100
256+++ mozilla/toolkit/xre/Makefile.in 2007-05-10 12:11:27.000000000 +0200
257@@ -45,7 +45,6 @@
258
259 MODULE = xulapp
260 LIBRARY_NAME = xulapp_s
261-EXPORT_LIBRARY = 1
262 LIBXUL_LIBRARY = 1
263
264 REQUIRES = \
265@@ -180,14 +179,6 @@
266
267 include $(topsrcdir)/config/rules.mk
268
269-ifdef BUILD_STATIC_LIBS
270-export::
271- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
272-# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
273-# FINAL_LINK_COMPS to keep the two lists in sync :-(
274- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
275-endif
276-
277 LOCAL_INCLUDES += \
278 -I$(srcdir) \
279 -I$(topsrcdir)/xpfe/bootstrap \
280Index: mozilla/xpcom/build/Makefile.in
281===================================================================
282--- mozilla.orig/xpcom/build/Makefile.in 2006-01-29 17:51:02.000000000 +0100
283+++ mozilla/xpcom/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
284@@ -61,7 +61,7 @@
285 endif
286
287 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
288-#EXPORT_LIBRARY = 1
289+EXPORT_LIBRARY = 1
290 GRE_MODULE = 1
291 MOZILLA_INTERNAL_API = 1
292
293Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
294===================================================================
295--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2004-04-18 16:18:18.000000000 +0200
296+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200
297@@ -45,9 +45,9 @@
298 #endif
299
300 /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
301-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
302+nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
303
304-static nsresult
305+nsresult
306 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
307 {
308 #define PARAM_BUFFER_COUNT 16
309Index: mozilla/xpfe/browser/src/Makefile.in
310===================================================================
311--- mozilla.orig/xpfe/browser/src/Makefile.in 2005-03-18 22:23:45.000000000 +0100
312+++ mozilla/xpfe/browser/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
313@@ -44,6 +44,7 @@
314
315 MODULE = browser
316 LIBRARY_NAME = mozbrwsr_s
317+EXPORT_LIBRARY = 1
318 FORCE_STATIC_LIB = 1
319 LIBXUL_LIBRARY = 1
320 MODULE_NAME = nsBrowserModule
321Index: mozilla/xpfe/components/build/Makefile.in
322===================================================================
323--- mozilla.orig/xpfe/components/build/Makefile.in 2005-09-27 02:15:25.000000000 +0200
324+++ mozilla/xpfe/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
325@@ -44,7 +44,6 @@
326
327 MODULE = appcomps
328 LIBRARY_NAME = appcomps
329-EXPORT_LIBRARY = 1
330 IS_COMPONENT = 1
331 MODULE_NAME = application
332 LIBXUL_LIBRARY = 1
333Index: mozilla/xpfe/components/filepicker/src/Makefile.in
334===================================================================
335--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in 2006-05-22 18:29:32.000000000 +0200
336+++ mozilla/xpfe/components/filepicker/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
337@@ -47,7 +47,6 @@
338 MODULE = filepicker
339 LIBRARY_NAME = fileview
340 SHORT_LIBNAME = fileview
341-EXPORT_LIBRARY = 1
342 IS_COMPONENT = 1
343 MODULE_NAME = nsFileViewModule
344 MOZILLA_INTERNAL_API = 1
345Index: mozilla/xpfe/components/find/src/Makefile.in
346===================================================================
347--- mozilla.orig/xpfe/components/find/src/Makefile.in 2005-03-18 22:23:46.000000000 +0100
348+++ mozilla/xpfe/components/find/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
349@@ -45,7 +45,6 @@
350 MODULE = appcomps
351 XPIDL_MODULE = mozfind
352 LIBRARY_NAME = mozfind
353-EXPORT_LIBRARY = 1
354 IS_COMPONENT = 1
355 MODULE_NAME = nsFindComponent
356 LIBXUL_LIBRARY = 1
diff --git a/meta/packages/mozilla/minimo/minimo.png b/meta/packages/mozilla/minimo/minimo.png
deleted file mode 100644
index f8b2e2192b..0000000000
--- a/meta/packages/mozilla/minimo/minimo.png
+++ /dev/null
Binary files differ
diff --git a/meta/packages/mozilla/minimo/mozconfig b/meta/packages/mozilla/minimo/mozconfig
deleted file mode 100644
index 393981e9fa..0000000000
--- a/meta/packages/mozilla/minimo/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
1# mozilla/configure: Features and packages:
2
3ac_add_options --enable-application=minimo
4ac_add_options --enable-default-toolkit=gtk2
5ac_add_options --disable-freetype2
6ac_add_options --enable-xft
7ac_add_options --disable-postscript
8ac_add_options --disable-xprint
9ac_add_options --disable-gnomevfs
10ac_add_options --disable-gnomeui
11ac_add_options --disable-jsd
12ac_add_options --disable-plugins
13ac_add_options --disable-view-source
14ac_add_options --disable-accessibility
15ac_add_options --disable-xpinstall
16ac_add_options --enable-single-profile
17ac_add_options --disable-jsloader
18ac_add_options --disable-printing
19ac_add_options --enable-native-uconv
20ac_add_options --enable-plaintext-editor-only
21ac_add_options --disable-xpcom-obsolete
22ac_add_options --disable-pref-extensions
23ac_add_options --disable-extensions
24ac_add_options --enable-image-decoders=png,gif,jpeg
25ac_add_options --disable-mathml
26ac_add_options --disable-installer
27ac_add_options --disable-updater
28ac_add_options --disable-tests
29ac_add_options --enable-optimize=-Os
30ac_add_options --disable-logging
31ac_add_options --enable-strip
32ac_add_options --enable-elf-dynstr-gc
33ac_add_options --disable-shared
34ac_add_options --enable-static
35ac_add_options --disable-profilesharing
36ac_add_options --disable-profilelocking
diff --git a/meta/packages/mozilla/minimo_cvs.bb b/meta/packages/mozilla/minimo_cvs.bb
deleted file mode 100644
index 5eec96d143..0000000000
--- a/meta/packages/mozilla/minimo_cvs.bb
+++ /dev/null
@@ -1,153 +0,0 @@
1DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
2SECTION = "x11/network"
3LICENSE = "MPL/GPL/LGPL"
4HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
5PRIORITY = "optional"
6
7DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
8
9CVSSVR = "cvs-mirror.mozilla.org"
10BRTAG = "MOZILLA_1_8_BRANCH"
11MOZDATE = "20070510"
12
13PV = "0.02+cvs${MOZDATE}"
14PR = "r3"
15
16SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
17 file://minimo.patch;patch=1 \
18 file://bug-322806.diff;patch=1 \
19 file://mozconfig \
20 file://minimo \
21 file://eabi-fix.patch;patch=1 \
22 file://eabi-fix2.patch;patch=1 \
23 file://eabi-fix3.patch;patch=1 \
24 file://minimo.desktop \
25 file://minimo.png"
26
27inherit autotools
28
29S = "${WORKDIR}/mozilla"
30
31export MOZCONFIG = "${WORKDIR}/mozconfig"
32
33export CROSS_COMPILE="1"
34export ac_cv_prog_HOST_CC="${BUILD_CC}"
35export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
36export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
37export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
38export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
39
40mozdir="${libdir}/mozilla-minimo"
41
42EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
43
44do_configure() {
45 cd ${S}
46 oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
47 sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
48}
49
50do_compile() {
51 cd ${S}
52 oe_runmake -f client.mk build
53}
54
55do_install() {
56 cd ${WORKDIR}
57
58 install -d ${D}${bindir}
59 install -m 0755 minimo ${D}${bindir}
60
61 install -d ${D}${datadir}/applications
62 install -m 0644 minimo.desktop ${D}${datadir}/applications
63
64 install -d ${D}/${datadir}/pixmaps
65 install -m 0644 minimo.png ${D}${datadir}/pixmaps
66
67 cd ${S}
68
69 ./minimo/config/linux_package.sh ${S} ${S}/minimo/config
70
71 cd dist/minimo
72
73 install -d ${D}${mozdir}
74 install -m 0755 minimo ${D}${mozdir}
75 install -m 0755 libfreebl3.so ${D}${mozdir}
76 install -m 0755 libnspr4.so ${D}${mozdir}
77 install -m 0755 libnss3.so ${D}${mozdir}
78 install -m 0755 libnssckbi.so ${D}${mozdir}
79 install -m 0755 libplc4.so ${D}${mozdir}
80 install -m 0755 libplds4.so ${D}${mozdir}
81 install -m 0755 libsmime3.so ${D}${mozdir}
82 install -m 0755 libsoftokn3.so ${D}${mozdir}
83 install -m 0755 libssl3.so ${D}${mozdir}
84
85 install -d ${D}${mozdir}/chrome
86 install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
87 install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
88 install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
89 install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
90 install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
91 install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
92 install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
93 install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
94 install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
95 install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
96 install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
97 install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
98 install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
99 install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
100
101 install -d ${D}${mozdir}/components
102 install -m 0644 components/all.xpt ${D}${mozdir}/components
103 install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
104 install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
105
106 install -d ${D}${mozdir}/greprefs
107 install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
108 install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
109
110 install -d ${D}${mozdir}/res
111 install -m 0644 res/forms.css ${D}${mozdir}/res
112 install -m 0644 res/html.css ${D}${mozdir}/res
113 install -m 0644 res/quirk.css ${D}${mozdir}/res
114 install -m 0644 res/ua.css ${D}${mozdir}/res
115 install -m 0644 res/arrow.gif ${D}${mozdir}/res
116 install -m 0644 res/arrowd.gif ${D}${mozdir}/res
117 install -m 0644 res/broken-image.gif ${D}${mozdir}/res
118 install -m 0644 res/loading-image.gif ${D}${mozdir}/res
119 install -m 0644 res/charsetData.properties ${D}${mozdir}/res
120 install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
121 install -m 0644 res/langGroups.properties ${D}${mozdir}/res
122 install -m 0644 res/language.properties ${D}${mozdir}/res
123 install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
124
125 install -d ${D}${mozdir}/res/dtd
126 install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
127
128 install -d ${D}${mozdir}/res/entityTables
129 install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
130 install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
131 install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
132 install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
133 install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
134
135 install -d ${D}${mozdir}/res/fonts
136 install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
137 install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
138
139 install -d ${D}${mozdir}/res/html
140 install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
141 install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
142 install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
143 install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
144 install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
145 install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
146 install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
147 install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
148 install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
149 install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
150}
151
152FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
153FILES_${PN} += "${mozdir}"
diff --git a/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg b/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
deleted file mode 100644
index 8858b3e7c2..0000000000
--- a/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2# Wait for the desktop to say its finished loading
3dbus-wait org.matchbox_project.desktop Loaded
4exec /usr/bin/nm-applet
diff --git a/meta/packages/networkmanager/files/99_networkmanager b/meta/packages/networkmanager/files/99_networkmanager
deleted file mode 100644
index 20cbcc1bca..0000000000
--- a/meta/packages/networkmanager/files/99_networkmanager
+++ /dev/null
@@ -1 +0,0 @@
1d root root 0700 /var/run/NetworkManager none
diff --git a/meta/packages/networkmanager/files/NetworkManager b/meta/packages/networkmanager/files/NetworkManager
deleted file mode 100644
index 4522e0107b..0000000000
--- a/meta/packages/networkmanager/files/NetworkManager
+++ /dev/null
@@ -1,43 +0,0 @@
1#!/bin/sh
2#
3### BEGIN INIT INFO
4# Provides: NetworkManager
5# Required-Start: $remote_fs dbus hal
6# Required-Stop: $remote_fs dbus hal
7# Should-Start: $syslog
8# Should-Stop: $syslog
9# Default-Start: 2 3 4 5
10# Default-Stop: 0 1 6
11# Short-Description: network connection manager
12# Description: Daemon for automatically switching network
13# connections to the best available connection.
14### END INIT INFO
15
16. /etc/profile
17
18case $1 in
19 'start')
20 echo -n "Starting NetworkManager daemon: NetworkManager"
21 /usr/sbin/NetworkManager
22 /usr/sbin/NetworkManagerDispatcher
23 /usr/sbin/wpa_supplicant -u &
24 echo "."
25 ;;
26
27 'stop')
28 echo -n "Stopping NetworkManager daemon: NetworkManager"
29 kill `ps |grep /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
30 kill `ps |grep /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
31 kill `ps |grep /usr/sbin/wpa_supplicant | grep -v grep | cut "-d " -f2`
32 echo "."
33 ;;
34
35 'restart')
36 $0 stop
37 $0 start
38 ;;
39
40 *)
41 echo "Usage: $0 { start | stop | restart }"
42 ;;
43esac
diff --git a/meta/packages/networkmanager/files/allow-disabling.patch b/meta/packages/networkmanager/files/allow-disabling.patch
deleted file mode 100644
index 10730e9fe5..0000000000
--- a/meta/packages/networkmanager/files/allow-disabling.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Allow interfaces to be ignored by networkmanager by creation of a
2/etc/network/nm-disabled-INTERFACENAME file.
3
4RP - 16/7/2008
5
6Index: trunk/src/backends/NetworkManagerDebian.c
7===================================================================
8--- trunk.orig/src/backends/NetworkManagerDebian.c 2008-07-15 19:23:11.000000000 +0100
9+++ trunk/src/backends/NetworkManagerDebian.c 2008-07-15 19:37:05.000000000 +0100
10@@ -29,6 +29,7 @@
11
12 #include <stdio.h>
13 #include <sys/types.h>
14+#include <sys/stat.h>
15 #include <signal.h>
16 #include <arpa/inet.h>
17 #include "NetworkManagerGeneric.h"
18@@ -374,12 +375,25 @@
19 /*
20 * nm_system_device_get_disabled
21 *
22- * Return whether the distro-specific system config tells us to use
23- * dhcp for this device.
24+ * Return whether the distro-specific system config tells us to interact
25+ * with this device.
26 *
27 */
28 gboolean nm_system_device_get_disabled (NMDevice *dev)
29 {
30+ struct stat statbuf;
31+ gchar *filepath;
32+
33+ g_return_val_if_fail (dev != NULL, FALSE);
34+
35+ filepath = g_strdup_printf (SYSCONFDIR"/network/nm-disabled-%s", nm_device_get_iface (dev));
36+
37+ if (stat(filepath, &statbuf) == 0) {
38+ g_free(filepath);
39+ return TRUE;
40+ }
41+
42+ g_free(filepath);
43 return FALSE;
44 }
45
diff --git a/meta/packages/networkmanager/files/applet-no-animation.patch b/meta/packages/networkmanager/files/applet-no-animation.patch
deleted file mode 100644
index d437fd0fc9..0000000000
--- a/meta/packages/networkmanager/files/applet-no-animation.patch
+++ /dev/null
@@ -1,234 +0,0 @@
1Index: trunk/src/applet.c
2===================================================================
3--- trunk.orig/src/applet.c 2008-02-06 20:30:04.000000000 +0000
4+++ trunk/src/applet.c 2008-02-06 20:46:59.000000000 +0000
5@@ -111,8 +111,6 @@
6
7 static void nma_init (NMApplet *applet)
8 {
9- applet->animation_id = 0;
10- applet->animation_step = 0;
11 applet->passphrase_dialog = NULL;
12 applet->icon_theme = NULL;
13 #ifdef ENABLE_NOTIFY
14@@ -1006,20 +1004,6 @@
15 }
16 }
17
18-static gboolean
19-vpn_animation_timeout (gpointer data)
20-{
21- NMApplet *applet = NM_APPLET (data);
22-
23- foo_set_icon (applet, applet->vpn_connecting_icons[applet->animation_step], ICON_LAYER_VPN);
24-
25- applet->animation_step++;
26- if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES)
27- applet->animation_step = 0;
28-
29- return TRUE;
30-}
31-
32 static void
33 vpn_connection_state_changed (NMVPNConnection *connection,
34 NMVPNConnectionState state,
35@@ -1030,10 +1014,6 @@
36
37 switch (state) {
38 case NM_VPN_CONNECTION_STATE_ACTIVATED:
39- if (applet->animation_id) {
40- g_source_remove (applet->animation_id);
41- applet->animation_id = 0;
42- }
43 foo_set_icon (applet, applet->vpn_lock_icon, ICON_LAYER_VPN);
44 // vpn_connection_info_set_last_attempt_success (info, TRUE);
45 break;
46@@ -1041,10 +1021,7 @@
47 case NM_VPN_CONNECTION_STATE_NEED_AUTH:
48 case NM_VPN_CONNECTION_STATE_CONNECT:
49 case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
50- if (applet->animation_id == 0) {
51- applet->animation_step = 0;
52- applet->animation_id = g_timeout_add (100, vpn_animation_timeout, applet);
53- }
54+ foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_VPN);
55 break;
56 case NM_VPN_CONNECTION_STATE_FAILED:
57 // vpn_connection_info_set_last_attempt_success (info, FALSE);
58@@ -1053,10 +1030,6 @@
59 g_hash_table_remove (applet->vpn_connections, nm_vpn_connection_get_name (connection));
60 /* Fall through */
61 default:
62- if (applet->animation_id) {
63- g_source_remove (applet->animation_id);
64- applet->animation_id = 0;
65- }
66 foo_set_icon (applet, NULL, ICON_LAYER_VPN);
67 break;
68 }
69@@ -2295,45 +2268,6 @@
70 } FooAnimationTimeoutInfo;
71
72 static void
73-foo_animation_timeout_info_destroy (gpointer data)
74-{
75- g_slice_free (FooAnimationTimeoutInfo, data);
76-}
77-
78-static gboolean
79-foo_animation_timeout (gpointer data)
80-{
81- FooAnimationTimeoutInfo *info = (FooAnimationTimeoutInfo *) data;
82- NMApplet *applet = info->applet;
83- int stage = -1;
84-
85- switch (info->state) {
86- case NM_DEVICE_STATE_PREPARE:
87- stage = 0;
88- break;
89- case NM_DEVICE_STATE_CONFIG:
90- stage = 1;
91- break;
92- case NM_DEVICE_STATE_IP_CONFIG:
93- stage = 2;
94- break;
95- default:
96- break;
97- }
98-
99- if (stage >= 0)
100- foo_set_icon (applet,
101- applet->network_connecting_icons[stage][applet->animation_step],
102- ICON_LAYER_LINK);
103-
104- applet->animation_step++;
105- if (applet->animation_step >= NUM_CONNECTING_FRAMES)
106- applet->animation_step = 0;
107-
108- return TRUE;
109-}
110-
111-static void
112 foo_common_state_change (NMDevice *device, NMDeviceState state, NMApplet *applet)
113 {
114 FooAnimationTimeoutInfo *info;
115@@ -2345,11 +2279,7 @@
116 info = g_slice_new (FooAnimationTimeoutInfo);
117 info->applet = applet;
118 info->state = state;
119- applet->animation_step = 0;
120- applet->animation_id = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
121- 100, foo_animation_timeout,
122- info,
123- foo_animation_timeout_info_destroy);
124+ foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_LINK);
125 break;
126 case NM_DEVICE_STATE_ACTIVATED:
127 break;
128@@ -2602,12 +2532,6 @@
129 NMApplet *applet = NM_APPLET (user_data);
130 gboolean handled = FALSE;
131
132- applet->animation_step = 0;
133- if (applet->animation_id) {
134- g_source_remove (applet->animation_id);
135- applet->animation_id = 0;
136- }
137-
138 clear_active_connections (applet);
139 applet->active_connections = nm_client_get_active_connections (applet->nm_client);
140
141@@ -3166,17 +3090,8 @@
142 if (applet->wireless_100_icon)
143 g_object_unref (applet->wireless_100_icon);
144
145- for (i = 0; i < NUM_CONNECTING_STAGES; i++) {
146- int j;
147-
148- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
149- if (applet->network_connecting_icons[i][j])
150- g_object_unref (applet->network_connecting_icons[i][j]);
151- }
152-
153- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
154- if (applet->vpn_connecting_icons[i])
155- g_object_unref (applet->vpn_connecting_icons[i]);
156+ if (applet->network_connecting_icon)
157+ g_object_unref (applet->network_connecting_icon);
158
159 nma_icons_zero (applet);
160 }
161@@ -3196,16 +3111,7 @@
162 applet->wireless_75_icon = NULL;
163 applet->wireless_100_icon = NULL;
164
165- for (i = 0; i < NUM_CONNECTING_STAGES; i++)
166- {
167- int j;
168-
169- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
170- applet->network_connecting_icons[i][j] = NULL;
171- }
172-
173- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
174- applet->vpn_connecting_icons[i] = NULL;
175+ applet->network_connecting_icon = NULL;
176
177 applet->icons_loaded = FALSE;
178 }
179@@ -3257,28 +3163,7 @@
180 ICON_LOAD(applet->wireless_75_icon, "nm-signal-75");
181 ICON_LOAD(applet->wireless_100_icon, "nm-signal-100");
182
183- for (i = 0; i < NUM_CONNECTING_STAGES; i++)
184- {
185- int j;
186-
187- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
188- {
189- char *name;
190-
191- name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1);
192- ICON_LOAD(applet->network_connecting_icons[i][j], name);
193- g_free (name);
194- }
195- }
196-
197- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
198- {
199- char *name;
200-
201- name = g_strdup_printf ("nm-vpn-connecting%02d", i+1);
202- ICON_LOAD(applet->vpn_connecting_icons[i], name);
203- g_free (name);
204- }
205+ ICON_LOAD(applet->network_connecting_icon, "nm-connecting");
206
207 success = TRUE;
208
209Index: trunk/src/applet.h
210===================================================================
211--- trunk.orig/src/applet.h 2008-02-06 20:30:06.000000000 +0000
212+++ trunk/src/applet.h 2008-02-06 20:46:05.000000000 +0000
213@@ -111,20 +111,12 @@
214 GdkPixbuf * wireless_50_icon;
215 GdkPixbuf * wireless_75_icon;
216 GdkPixbuf * wireless_100_icon;
217-#define NUM_CONNECTING_STAGES 3
218-#define NUM_CONNECTING_FRAMES 11
219- GdkPixbuf * network_connecting_icons[NUM_CONNECTING_STAGES][NUM_CONNECTING_FRAMES];
220-#define NUM_VPN_CONNECTING_FRAMES 14
221- GdkPixbuf * vpn_connecting_icons[NUM_VPN_CONNECTING_FRAMES];
222+ GdkPixbuf * network_connecting_icon;
223 GdkPixbuf * vpn_lock_icon;
224
225 /* Active status icon pixbufs */
226 GdkPixbuf * icon_layers[ICON_LAYER_MAX + 1];
227
228- /* Animation stuff */
229- int animation_step;
230- guint animation_id;
231-
232 /* Direct UI elements */
233 #ifdef HAVE_STATUS_ICON
234 GtkStatusIcon * status_icon;
diff --git a/meta/packages/networkmanager/files/applet-no-gnome.diff b/meta/packages/networkmanager/files/applet-no-gnome.diff
deleted file mode 100644
index e098e8c9ed..0000000000
--- a/meta/packages/networkmanager/files/applet-no-gnome.diff
+++ /dev/null
@@ -1,59 +0,0 @@
1---
2 configure.ac | 3 +--
3 src/main.c | 8 ++++++++
4 2 files changed, 9 insertions(+), 2 deletions(-)
5
6Index: src/main.c
7===================================================================
8--- src/main.c.orig 2007-09-26 10:39:16.000000000 +0100
9+++ src/main.c 2007-09-26 10:39:37.000000000 +0100
10@@ -27,7 +27,9 @@
11
12 #include <string.h>
13 #include <gtk/gtk.h>
14+#if 0
15 #include <libgnomeui/libgnomeui.h>
16+#endif
17 #include <glib/gi18n-lib.h>
18
19 #include "applet.h"
20@@ -36,11 +38,15 @@
21 int main (int argc, char *argv[])
22 {
23 NMApplet * applet;
24+#if 0
25 GnomeProgram * program;
26
27 program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
28 argc, argv,
29 GNOME_PARAM_NONE, GNOME_PARAM_NONE);
30+#else
31+ gtk_init (&argc, &argv);
32+#endif
33
34 bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
35 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
36@@ -53,7 +59,9 @@ int main (int argc, char *argv[])
37 gtk_main ();
38
39 g_object_unref (applet);
40+#if 0
41 g_object_unref (program);
42+#endif
43
44 exit (0);
45 }
46Index: configure.ac
47===================================================================
48--- configure.ac.orig 2007-09-26 10:39:30.000000000 +0100
49+++ configure.ac 2007-09-26 10:39:37.000000000 +0100
50@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA,
51 gtk+-2.0 >= 2.6
52 libglade-2.0
53 gconf-2.0
54- gnome-keyring-1
55- libgnomeui-2.0])
56+ gnome-keyring-1])
57
58 ##### Find out the version of DBUS we're using
59 dbus_version=`pkg-config --modversion dbus-1`
diff --git a/meta/packages/networkmanager/files/libnlfix.patch b/meta/packages/networkmanager/files/libnlfix.patch
deleted file mode 100644
index 69f4922ea0..0000000000
--- a/meta/packages/networkmanager/files/libnlfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Index: trunk/src/nm-netlink.c
2===================================================================
3--- trunk.orig/src/nm-netlink.c 2007-09-25 22:37:50.000000000 +0100
4+++ trunk/src/nm-netlink.c 2009-05-16 12:44:26.000000000 +0100
5@@ -52,16 +52,20 @@
6 struct nl_handle *
7 nm_netlink_get_default_handle (void)
8 {
9+ struct nl_cb *cb;
10+
11 if (def_nl_handle)
12 return def_nl_handle;
13
14- def_nl_handle = nl_handle_alloc_nondefault (NL_CB_VERBOSE);
15- g_assert (def_nl_handle);
16+ cb = nl_cb_alloc(NL_CB_VERBOSE);
17+ def_nl_handle = nl_handle_alloc_cb (cb);
18+ if (!def_nl_handle) {
19+ nm_warning ("couldn't allocate netlink handle.");
20+ return NULL;
21+ }
22
23- nl_handle_set_pid (def_nl_handle, (pthread_self () << 16 | getpid ()));
24 if (nl_connect (def_nl_handle, NETLINK_ROUTE) < 0) {
25 nm_error ("couldn't connect to netlink: %s", nl_geterror ());
26- nl_handle_destroy (def_nl_handle);
27 return NULL;
28 }
29
diff --git a/meta/packages/networkmanager/files/makefile-fix.patch b/meta/packages/networkmanager/files/makefile-fix.patch
deleted file mode 100644
index 5fbbf3a74a..0000000000
--- a/meta/packages/networkmanager/files/makefile-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1This line causes libtool to try and create a program which fails since there is no
2main(). This is hidden with libtool 1.5.10 but appears with 2.2.2.
3
4RP - 14/4/08
5
6Index: trunk/src/ppp-manager/Makefile.am
7===================================================================
8--- trunk.orig/src/ppp-manager/Makefile.am 2008-04-14 23:00:54.000000000 +0100
9+++ trunk/src/ppp-manager/Makefile.am 2008-04-14 23:01:24.000000000 +0100
10@@ -25,7 +25,6 @@
11 $(top_builddir)/src/marshallers/libmarshallers.la
12
13 nm_pppd_plugindir = $(libdir)
14-nm_pppd_plugin_PROGRAMS = nm-pppd-plugin.so
15
16 nm_pppd_plugin_so_SOURCES = \
17 nm-pppd-plugin.c \
diff --git a/meta/packages/networkmanager/files/nmutil-fix.patch b/meta/packages/networkmanager/files/nmutil-fix.patch
deleted file mode 100644
index d8495bac40..0000000000
--- a/meta/packages/networkmanager/files/nmutil-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: trunk/configure.ac
2===================================================================
3--- trunk.orig/configure.ac 2009-01-08 10:49:26.000000000 -0600
4+++ trunk/configure.ac 2009-01-08 12:00:34.000000000 -0600
5@@ -62,6 +62,7 @@
6 glib-2.0 >= 2.10
7 NetworkManager >= 0.7.0
8 libnm_glib
9+ libnm-util
10 gtk+-2.0 >= 2.6
11 libglade-2.0
12 gconf-2.0
diff --git a/meta/packages/networkmanager/files/no-restarts.diff b/meta/packages/networkmanager/files/no-restarts.diff
deleted file mode 100644
index 20bdf82aab..0000000000
--- a/meta/packages/networkmanager/files/no-restarts.diff
+++ /dev/null
@@ -1,21 +0,0 @@
1Index: src/backends/NetworkManagerDebian.c
2===================================================================
3--- src/backends/NetworkManagerDebian.c (revision 2881)
4+++ src/backends/NetworkManagerDebian.c (working copy)
5@@ -204,8 +204,6 @@
6 */
7 void nm_system_update_dns (void)
8 {
9- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
10-
11 }
12
13
14@@ -218,7 +216,6 @@
15 */
16 void nm_system_restart_mdns_responder (void)
17 {
18- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
19 }
20
21
diff --git a/meta/packages/networkmanager/files/no_vpn.patch b/meta/packages/networkmanager/files/no_vpn.patch
deleted file mode 100644
index 49423e879f..0000000000
--- a/meta/packages/networkmanager/files/no_vpn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: trunk/src/applet.c
2===================================================================
3--- trunk.orig/src/applet.c 2008-02-29 17:47:39.000000000 +0000
4+++ trunk/src/applet.c 2008-02-29 17:48:38.000000000 +0000
5@@ -1783,7 +1783,7 @@
6 }
7
8 nma_menu_add_devices (menu, applet);
9- nma_menu_add_vpn_submenu (menu, applet);
10+ //nma_menu_add_vpn_submenu (menu, applet);
11
12 gtk_widget_show_all (applet->menu);
13
diff --git a/meta/packages/networkmanager/networkmanager-applet_svn.bb b/meta/packages/networkmanager/networkmanager-applet_svn.bb
deleted file mode 100644
index 1f0987011f..0000000000
--- a/meta/packages/networkmanager/networkmanager-applet_svn.bb
+++ /dev/null
@@ -1,33 +0,0 @@
1DESCRIPTION = "GTK+ applet for NetworkManager"
2HOMEPAGE = "http://projects.gnome.org/NetworkManager/"
3BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=NetworkManager&content="
4LICENSE = "GPLv2+ & LGPLv2.1+"
5DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
6#TODO DEPENDS libnotify
7RDEPENDS = "networkmanager dbus-wait"
8PR = "r7"
9
10inherit gnome gtk-icon-cache
11
12SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
13 file://applet-no-gnome.diff;patch=1;pnum=0 \
14 file://applet-no-animation.patch;patch=1 \
15 file://no_vpn.patch;patch=1 \
16 file://nmutil-fix.patch;patch=1 \
17 file://70NetworkManagerApplet.shbg"
18
19PV = "0.0+svnr${SRCREV}"
20
21S = "${WORKDIR}/trunk"
22
23FILES_${PN} += "${datadir}/nm-applet/ \
24 ${datadir}/gnome-vpn-properties/ \
25 ${datadir}/gnome/autostart/"
26
27do_install_append () {
28 install -d ${D}${sysconfdir}/X11/Xsession.d/
29 install -m 755 ${WORKDIR}/70NetworkManagerApplet.shbg ${D}${sysconfdir}/X11/Xsession.d/
30}
31
32#TODO: remove if libnotify in DEPENDS
33EXTRA_OECONF += "--without-libnotify"
diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
deleted file mode 100644
index 40f04e497c..0000000000
--- a/meta/packages/networkmanager/networkmanager_svn.bb
+++ /dev/null
@@ -1,51 +0,0 @@
1DESCRIPTION = "NetworkManager"
2HOMEPAGE = "http://projects.gnome.org/NetworkManager/"
3BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=NetworkManager&content="
4SECTION = "net/misc"
5LICENSE = "GPLv2+ & LGPLv2+"
6PRIORITY = "optional"
7DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common polkit"
8RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
9
10PV = "0.7+svnr${SRCREV}"
11PR = "r10"
12
13SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
14 file://no-restarts.diff;patch=1;pnum=0 \
15 file://libnlfix.patch;patch=1 \
16 file://makefile-fix.patch;patch=1 \
17 file://allow-disabling.patch;patch=1 \
18 file://NetworkManager \
19 file://99_networkmanager"
20
21EXTRA_OECONF = "--with-distro=debian \
22 --with-ip=/sbin/ip"
23# TODO: will /bin/ip from busybox do?
24
25S = "${WORKDIR}/trunk"
26
27inherit autotools pkgconfig update-rc.d
28
29INITSCRIPT_NAME = "NetworkManager"
30INITSCRIPT_PARAMS = "defaults 22"
31
32do_install_append () {
33 install -d ${D}/etc/default/volatiles
34 install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
35 # This overwrites the provided init script
36 install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
37 rmdir ${D}/var/run/NetworkManager
38 rmdir ${D}/var/run
39}
40
41PACKAGES =+ "libnmutil libnmglib"
42
43FILES_libnmutil += "${libdir}/libnm-util.so.*"
44
45FILES_libnmglib += "${libdir}/libnm_glib.so.*"
46
47FILES_${PN}-dev = "${includedir}/* \
48 ${libdir}/*.so \
49 ${libdir}/*.a \
50 ${libdir}/pkgconfig/*.pc \
51 ${datadir}/NetworkManager/gdb-cmd"
diff --git a/meta/packages/smart/smart_1.1.bb b/meta/packages/smart/smart_1.1.bb
deleted file mode 100644
index 8f89eb3e00..0000000000
--- a/meta/packages/smart/smart_1.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1DESCRIPTION = "Next generation package handling tool."
2HOMEPAGE = "http://labix.org/smart/"
3LICENSE = "GPL v2+"
4DEPENDS = "zlib python desktop-file-utils-native python-pygtk rpm"
5
6SRC_URI = "http://labix.org/download/smart/smart-1.1.tar.bz2"
7
8S = "${WORKDIR}/smart-${PV}"
9
10inherit distutils
11
12FILES_${PN} += "/usr/share/lib/${PYTHON_DIR}/site-packages/smart/interfaces/images/*.png \
13 /usr/share/lib/${PYTHON_DIR/site-packages/smart/backends/"
14
15FILES_${PN}-doc += "/usr/share/share/man/man8/smart.8"
16
17FILES_${PN}-locale += "/usr/share/share/locale/es_ES/LC_MESSAGES/smart.mo \
18 /usr/share/share/locale/it/LC_MESSAGES/smart.mo \
19 /usr/share/share/locale/de/LC_MESSAGES/smart.mo \
20 /usr/share/share/locale/ru/LC_MESSAGES/smart.mo \
21 /usr/share/share/locale/sv/LC_MESSAGES/smart.mo \
22 /usr/share/share/locale/fr/LC_MESSAGES/smart.mo \
23 /usr/share/share/locale/hu/LC_MESSAGES/smart.mo \
24 /usr/share/share/locale/zh_TW/LC_MESSAGES/smart.mo \
25 /usr/share/share/locale/pt_BR/LC_MESSAGES/smart.mo \
26 /usr/share/share/locale/zh_CN/LC_MESSAGES/smart.mo"
27
28FILES_${PN}-dbg += "/usr/lib/${PYTHON_DIR}/site-packages/smart/backends/rpm/.debug \
29 /usr/lib/${PYTHON_DIR}/site-packages/smart/backends/deb/.debug \" \ No newline at end of file
diff --git a/meta/packages/tar/tar-1.17/m4extensions.patch b/meta/packages/tar/tar-1.17/m4extensions.patch
deleted file mode 100644
index 11b981aa92..0000000000
--- a/meta/packages/tar/tar-1.17/m4extensions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1# Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
2# This is needed to configure correctly with newer versions of autoconf.
3
4--- tar-1.17/m4/extensions.m4.orig 2010-07-22 22:21:35.000000000 -0700
5+++ tar-1.17/m4/extensions.m4 2010-07-22 22:23:41.000000000 -0700
6@@ -1,4 +1,4 @@
7-# serial 4 -*- Autoconf -*-
8+# serial 5 -*- Autoconf -*-
9 # Enable extensions on systems that normally disable them.
10
11 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
12@@ -16,6 +16,7 @@
13 # ------------------------
14 # Enable extensions on systems that normally disable them,
15 # typically due to standards-conformance issues.
16+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
17 AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
18 [
19 AC_BEFORE([$0], [AC_COMPILE_IFELSE])
20@@ -48,7 +49,7 @@
21 AC_DEFINE([__EXTENSIONS__])
22 AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
23 AC_DEFINE([_TANDEM_SOURCE])
24-])
25+])])
26
27 # gl_USE_SYSTEM_EXTENSIONS
28 # ------------------------
diff --git a/meta/packages/tar/tar.inc b/meta/packages/tar/tar.inc
deleted file mode 100644
index cf72d4893b..0000000000
--- a/meta/packages/tar/tar.inc
+++ /dev/null
@@ -1,25 +0,0 @@
1DESCRIPTION = "GNU tar saves many files together into a single tape \
2or disk archive, and can restore individual files from the archive."
3HOMEPAGE = "http://www.gnu.org/software/tar/"
4SECTION = "base"
5
6SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
7
8inherit autotools gettext
9
10do_install () {
11 autotools_do_install
12 install -d ${D}${base_bindir}
13 mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
14 mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
15}
16
17pkg_postinst_${PN} () {
18 update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
19 update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
20}
21
22pkg_prerm_${PN} () {
23 update-alternatives --remove tar tar.${PN}
24 update-alternatives --remove rmt rmt.${PN}
25}
diff --git a/meta/packages/tar/tar_1.17.bb b/meta/packages/tar/tar_1.17.bb
deleted file mode 100644
index 729aecc984..0000000000
--- a/meta/packages/tar/tar_1.17.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require tar.inc
2
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5
6PR = "r0"
7
8SRC_URI += "file://m4extensions.patch"
9
10SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
11SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492"
12
13# Required to build with gcc 4.3 and later:
14CFLAGS += "-fgnu89-inline"
diff --git a/meta/packages/tar/tar_1.23.bb b/meta/packages/tar/tar_1.23.bb
deleted file mode 100644
index 093c0b43ce..0000000000
--- a/meta/packages/tar/tar_1.23.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require tar.inc
2
3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
5
6PR = "r0"
7
8SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e"
9SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36"
diff --git a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy
index c48ee4e5d5..c48ee4e5d5 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy
diff --git a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy.conf b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf
index 751145c522..751145c522 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy.conf
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf
diff --git a/meta/packages/apmd/apmd-3.2.2-14/default b/meta/recipes-bsp/apmd/apmd-3.2.2-14/default
index 4b7965abf8..4b7965abf8 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/default
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/default
diff --git a/meta/packages/apmd/apmd-3.2.2-14/init b/meta/recipes-bsp/apmd/apmd-3.2.2-14/init
index 268d4b26b7..268d4b26b7 100755
--- a/meta/packages/apmd/apmd-3.2.2-14/init
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/init
diff --git a/meta/packages/apmd/apmd-3.2.2-14/libtool.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
index 711e777084..711e777084 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/libtool.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
diff --git a/meta/packages/apmd/apmd-3.2.2-14/unlinux.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
index c64e7df524..c64e7df524 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/unlinux.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
diff --git a/meta/packages/apmd/apmd-3.2.2-14/workaround.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/workaround.patch
index d37380397c..d37380397c 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/workaround.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/workaround.patch
diff --git a/meta/packages/apmd/apmd_3.2.2-14.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
index 2778cc69e8..2778cc69e8 100644
--- a/meta/packages/apmd/apmd_3.2.2-14.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
diff --git a/meta/packages/hostap/files/hostap-fw-load.patch b/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
index 88adee2bc9..88adee2bc9 100644
--- a/meta/packages/hostap/files/hostap-fw-load.patch
+++ b/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
diff --git a/meta/packages/hostap/files/hostap_cs.conf b/meta/recipes-bsp/hostap/files/hostap_cs.conf
index 8dda82aad3..8dda82aad3 100644
--- a/meta/packages/hostap/files/hostap_cs.conf
+++ b/meta/recipes-bsp/hostap/files/hostap_cs.conf
diff --git a/meta/packages/hostap/files/hostap_cs.conf-upstream b/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
index 5b7385a7cb..5b7385a7cb 100644
--- a/meta/packages/hostap/files/hostap_cs.conf-upstream
+++ b/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
diff --git a/meta/packages/hostap/files/hostap_cs.modalias b/meta/recipes-bsp/hostap/files/hostap_cs.modalias
index cb9efab271..cb9efab271 100644
--- a/meta/packages/hostap/files/hostap_cs.modalias
+++ b/meta/recipes-bsp/hostap/files/hostap_cs.modalias
diff --git a/meta/packages/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index ce069662c7..ce069662c7 100644
--- a/meta/packages/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
diff --git a/meta/packages/hostap/hostap-utils.inc b/meta/recipes-bsp/hostap/hostap-utils.inc
index 16880f1196..16880f1196 100644
--- a/meta/packages/hostap/hostap-utils.inc
+++ b/meta/recipes-bsp/hostap/hostap-utils.inc
diff --git a/meta/packages/hostap/hostap-utils_0.4.7.bb b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
index 9fe362b19f..9fe362b19f 100644
--- a/meta/packages/hostap/hostap-utils_0.4.7.bb
+++ b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
diff --git a/meta/packages/lrzsz/lrzsz-0.12.20/autotools.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
index 73f5a062ef..73f5a062ef 100644
--- a/meta/packages/lrzsz/lrzsz-0.12.20/autotools.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
diff --git a/meta/packages/lrzsz/lrzsz-0.12.20/gettext.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
index 241ffd90ba..241ffd90ba 100644
--- a/meta/packages/lrzsz/lrzsz-0.12.20/gettext.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
diff --git a/meta/packages/lrzsz/lrzsz-0.12.20/makefile.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
index c553c8bf34..c553c8bf34 100644
--- a/meta/packages/lrzsz/lrzsz-0.12.20/makefile.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
diff --git a/meta/packages/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index af2db23102..af2db23102 100644
--- a/meta/packages/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
diff --git a/meta/packages/pm-utils/pm-utils_1.3.0.bb b/meta/recipes-bsp/pm-utils/pm-utils_1.3.0.bb
index cb90f87acc..cb90f87acc 100644
--- a/meta/packages/pm-utils/pm-utils_1.3.0.bb
+++ b/meta/recipes-bsp/pm-utils/pm-utils_1.3.0.bb
diff --git a/meta/packages/oh/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index fc59320282..fc59320282 100644
--- a/meta/packages/oh/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
diff --git a/meta/packages/oh/qemu-config/anjuta-remote-run b/meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run
index 620e3a705b..620e3a705b 100644
--- a/meta/packages/oh/qemu-config/anjuta-remote-run
+++ b/meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run
diff --git a/meta/packages/oh/qemu-config/distcc.sh b/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh
index a2b543d6b8..a2b543d6b8 100644
--- a/meta/packages/oh/qemu-config/distcc.sh
+++ b/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh
diff --git a/meta/packages/oh/qemu-config/exports b/meta/recipes-bsp/qemu-config/qemu-config/exports
index b7257aa008..b7257aa008 100644
--- a/meta/packages/oh/qemu-config/exports
+++ b/meta/recipes-bsp/qemu-config/qemu-config/exports
diff --git a/meta/packages/oh/qemu-config/qemu-autostart b/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
index db2668eb4e..db2668eb4e 100755
--- a/meta/packages/oh/qemu-config/qemu-autostart
+++ b/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
diff --git a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop b/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
index b973d4318e..b973d4318e 100644
--- a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop
+++ b/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
diff --git a/meta/packages/oh/qemu-config/shutdown.desktop b/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop
index 272688922c..272688922c 100644
--- a/meta/packages/oh/qemu-config/shutdown.desktop
+++ b/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop
diff --git a/meta/packages/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb
index 4e0d1b66e4..4e0d1b66e4 100644
--- a/meta/packages/setserial/setserial_2.17.bb
+++ b/meta/recipes-bsp/setserial/setserial_2.17.bb
diff --git a/meta/packages/uboot/files/fix-arm920t-eabi.patch b/meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch
index 69cb75891d..69cb75891d 100644
--- a/meta/packages/uboot/files/fix-arm920t-eabi.patch
+++ b/meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch
diff --git a/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb b/meta/recipes-bsp/uboot/u-boot-mkimage-native_1.3.2.bb
index fcba0d5662..fcba0d5662 100644
--- a/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage-native_1.3.2.bb
diff --git a/meta/packages/uboot/u-boot-mkimage_2009.08.bb b/meta/recipes-bsp/uboot/u-boot-mkimage_2009.08.bb
index bf07198beb..bf07198beb 100644
--- a/meta/packages/uboot/u-boot-mkimage_2009.08.bb
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage_2009.08.bb
diff --git a/meta/packages/uboot/u-boot-omap3-git/beagleboard/name.patch b/meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
index ac03e47774..ac03e47774 100644
--- a/meta/packages/uboot/u-boot-omap3-git/beagleboard/name.patch
+++ b/meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
diff --git a/meta/packages/uboot/u-boot-omap3_git.bb b/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
index 480780ebfc..480780ebfc 100644
--- a/meta/packages/uboot/u-boot-omap3_git.bb
+++ b/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
diff --git a/meta/packages/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
index 889f6215ed..889f6215ed 100644
--- a/meta/packages/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
diff --git a/meta/packages/oh/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb
index 1d4575bddb..1d4575bddb 100644
--- a/meta/packages/oh/usbinit.bb
+++ b/meta/recipes-bsp/usbinit/usbinit.bb
diff --git a/meta/packages/oh/usbinit/usb-gether b/meta/recipes-bsp/usbinit/usbinit/usb-gether
index e80a0bb30e..e80a0bb30e 100755
--- a/meta/packages/oh/usbinit/usb-gether
+++ b/meta/recipes-bsp/usbinit/usbinit/usb-gether
diff --git a/meta/packages/usbutils/usbutils_0.86.bb b/meta/recipes-bsp/usbutils/usbutils_0.86.bb
index 8e4a3da453..8e4a3da453 100644
--- a/meta/packages/usbutils/usbutils_0.86.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_0.86.bb
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch
index 579d72f484..579d72f484 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
index f6a7be1d81..f6a7be1d81 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/fixincludes.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch
index 91d99cce22..91d99cce22 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/fixincludes.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/noattrmode.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch
index 5c766d6c06..5c766d6c06 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/noattrmode.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/site.h b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h
index 2289554ef3..2289554ef3 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/site.h
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h
diff --git a/meta/packages/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc
index 3f68f452d2..3f68f452d2 100644
--- a/meta/packages/dhcp/dhcp3.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp3.inc
diff --git a/meta/packages/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index 7652b948f0..7652b948f0 100644
--- a/meta/packages/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
diff --git a/meta/packages/dhcp/dhcp_4.1.1-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.1.1-P1.bb
index e9759de56f..e9759de56f 100644
--- a/meta/packages/dhcp/dhcp_4.1.1-P1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.1.1-P1.bb
diff --git a/meta/packages/dhcp/files/default-relay b/meta/recipes-connectivity/dhcp/files/default-relay
index 59249db283..59249db283 100644
--- a/meta/packages/dhcp/files/default-relay
+++ b/meta/recipes-connectivity/dhcp/files/default-relay
diff --git a/meta/packages/dhcp/files/default-server b/meta/recipes-connectivity/dhcp/files/default-server
index 0385d16992..0385d16992 100644
--- a/meta/packages/dhcp/files/default-server
+++ b/meta/recipes-connectivity/dhcp/files/default-server
diff --git a/meta/packages/dhcp/files/dhclient.conf b/meta/recipes-connectivity/dhcp/files/dhclient.conf
index 0e6dcf96c2..0e6dcf96c2 100644
--- a/meta/packages/dhcp/files/dhclient.conf
+++ b/meta/recipes-connectivity/dhcp/files/dhclient.conf
diff --git a/meta/packages/dhcp/files/dhcpd.conf b/meta/recipes-connectivity/dhcp/files/dhcpd.conf
index 0001c0f00e..0001c0f00e 100644
--- a/meta/packages/dhcp/files/dhcpd.conf
+++ b/meta/recipes-connectivity/dhcp/files/dhcpd.conf
diff --git a/meta/packages/dhcp/files/init-relay b/meta/recipes-connectivity/dhcp/files/init-relay
index 019a7e84cf..019a7e84cf 100644
--- a/meta/packages/dhcp/files/init-relay
+++ b/meta/recipes-connectivity/dhcp/files/init-relay
diff --git a/meta/packages/dhcp/files/init-server b/meta/recipes-connectivity/dhcp/files/init-server
index 34c20852b9..34c20852b9 100644
--- a/meta/packages/dhcp/files/init-server
+++ b/meta/recipes-connectivity/dhcp/files/init-server
diff --git a/meta/packages/farsight/farsight2_0.0.9.bb b/meta/recipes-connectivity/farsight/farsight2_0.0.9.bb
index 06c85f1cf0..06c85f1cf0 100644
--- a/meta/packages/farsight/farsight2_0.0.9.bb
+++ b/meta/recipes-connectivity/farsight/farsight2_0.0.9.bb
diff --git a/meta/packages/farsight/libnice_0.0.6.bb b/meta/recipes-connectivity/farsight/libnice_0.0.6.bb
index 809b691af7..809b691af7 100644
--- a/meta/packages/farsight/libnice_0.0.6.bb
+++ b/meta/recipes-connectivity/farsight/libnice_0.0.6.bb
diff --git a/meta/packages/gsm/files/0001-Introduce-ports.patch b/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
index b3ba3cb957..b3ba3cb957 100644
--- a/meta/packages/gsm/files/0001-Introduce-ports.patch
+++ b/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
diff --git a/meta/packages/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch b/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
index 3683596389..3683596389 100644
--- a/meta/packages/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
+++ b/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
diff --git a/meta/packages/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch b/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
index 984acc9369..984acc9369 100644
--- a/meta/packages/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
+++ b/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
diff --git a/meta/packages/gsm/files/0004-Handle-read-and-write-return-values.patch b/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
index f5e7a7902d..f5e7a7902d 100644
--- a/meta/packages/gsm/files/0004-Handle-read-and-write-return-values.patch
+++ b/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
diff --git a/meta/packages/gsm/files/0005-Add-ask-ds-option-forSMS.patch b/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
index e9f49bd7d2..e9f49bd7d2 100644
--- a/meta/packages/gsm/files/0005-Add-ask-ds-option-forSMS.patch
+++ b/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
diff --git a/meta/packages/gsm/files/024_sms-text-in-bracket.patch b/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
index 32a1ca33ff..32a1ca33ff 100644
--- a/meta/packages/gsm/files/024_sms-text-in-bracket.patch
+++ b/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
diff --git a/meta/packages/gsm/files/025_sms-status-report.patch b/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
index 560e72e380..560e72e380 100644
--- a/meta/packages/gsm/files/025_sms-status-report.patch
+++ b/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
diff --git a/meta/packages/gsm/files/027_phonebook-find-and-read-range-support.patch b/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
index ea0f12daac..ea0f12daac 100644
--- a/meta/packages/gsm/files/027_phonebook-find-and-read-range-support.patch
+++ b/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
diff --git a/meta/packages/gsm/files/028_shell-phonebook-find-and-read-range-support.patch b/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
index db07a5df35..db07a5df35 100644
--- a/meta/packages/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
+++ b/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
diff --git a/meta/packages/gsm/files/default b/meta/recipes-connectivity/gsm/files/default
index 6ef4f6db57..6ef4f6db57 100644
--- a/meta/packages/gsm/files/default
+++ b/meta/recipes-connectivity/gsm/files/default
diff --git a/meta/packages/gsm/files/fix_machine_init.patch b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
index 808bb17b42..808bb17b42 100644
--- a/meta/packages/gsm/files/fix_machine_init.patch
+++ b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
diff --git a/meta/packages/gsm/files/gsmd b/meta/recipes-connectivity/gsm/files/gsmd
index dc10e63098..dc10e63098 100644
--- a/meta/packages/gsm/files/gsmd
+++ b/meta/recipes-connectivity/gsm/files/gsmd
diff --git a/meta/packages/gsm/files/install-ts-headers.patch b/meta/recipes-connectivity/gsm/files/install-ts-headers.patch
index 88e3b6dd1f..88e3b6dd1f 100644
--- a/meta/packages/gsm/files/install-ts-headers.patch
+++ b/meta/recipes-connectivity/gsm/files/install-ts-headers.patch
diff --git a/meta/packages/gsm/files/lgsm_send_fix_return_value.patch b/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
index 00ba3a4549..00ba3a4549 100644
--- a/meta/packages/gsm/files/lgsm_send_fix_return_value.patch
+++ b/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
diff --git a/meta/packages/gsm/gsmd.inc b/meta/recipes-connectivity/gsm/gsmd.inc
index a69fdd90f1..a69fdd90f1 100644
--- a/meta/packages/gsm/gsmd.inc
+++ b/meta/recipes-connectivity/gsm/gsmd.inc
diff --git a/meta/packages/gsm/libgsmd_svn.bb b/meta/recipes-connectivity/gsm/libgsmd_svn.bb
index 9d3ca19c04..9d3ca19c04 100644
--- a/meta/packages/gsm/libgsmd_svn.bb
+++ b/meta/recipes-connectivity/gsm/libgsmd_svn.bb
diff --git a/meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch
index 67dc6f5a30..67dc6f5a30 100644
--- a/meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch
diff --git a/meta/packages/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index 7246b87e9b..7246b87e9b 100644
--- a/meta/packages/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
diff --git a/meta/packages/iproute2/iproute2_2.6.34.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb
index c5e0ef6e56..c5e0ef6e56 100644
--- a/meta/packages/iproute2/iproute2_2.6.34.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb
diff --git a/meta/packages/libetpan/files/cxx-is-here.patch b/meta/recipes-connectivity/libetpan/files/cxx-is-here.patch
index d910daab17..d910daab17 100644
--- a/meta/packages/libetpan/files/cxx-is-here.patch
+++ b/meta/recipes-connectivity/libetpan/files/cxx-is-here.patch
diff --git a/meta/packages/libetpan/libetpan_0.54.bb b/meta/recipes-connectivity/libetpan/libetpan_0.54.bb
index 5666ea0ded..5666ea0ded 100644
--- a/meta/packages/libetpan/libetpan_0.54.bb
+++ b/meta/recipes-connectivity/libetpan/libetpan_0.54.bb
diff --git a/meta/packages/libnss-mdns/files/alignment-fix.patch b/meta/recipes-connectivity/libnss-mdns/files/alignment-fix.patch
index 11d4655e1f..11d4655e1f 100644
--- a/meta/packages/libnss-mdns/files/alignment-fix.patch
+++ b/meta/recipes-connectivity/libnss-mdns/files/alignment-fix.patch
diff --git a/meta/packages/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index 69eaa33d60..69eaa33d60 100644
--- a/meta/packages/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
diff --git a/meta/packages/libpcap/libpcap-1.1.1/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
index 71fd8b989b..71fd8b989b 100644
--- a/meta/packages/libpcap/libpcap-1.1.1/aclocal.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
diff --git a/meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
index f29c7cb54c..f29c7cb54c 100644
--- a/meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
diff --git a/meta/packages/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 2025d84c0d..2025d84c0d 100644
--- a/meta/packages/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
diff --git a/meta/packages/libpcap/libpcap_1.1.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb
index 58ab5e6c95..58ab5e6c95 100644
--- a/meta/packages/libpcap/libpcap_1.1.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb
diff --git a/meta/packages/network-suspend-scripts/network-suspend-scripts.bb b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb
index dc22ed85f6..dc22ed85f6 100644
--- a/meta/packages/network-suspend-scripts/network-suspend-scripts.bb
+++ b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb
diff --git a/meta/packages/network-suspend-scripts/network-suspend-scripts/ifupdown b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown
index d458da6866..d458da6866 100644
--- a/meta/packages/network-suspend-scripts/network-suspend-scripts/ifupdown
+++ b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown
diff --git a/meta/packages/network-suspend-scripts/network-suspend-scripts/usbnet b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet
index 3731f6339f..3731f6339f 100644
--- a/meta/packages/network-suspend-scripts/network-suspend-scripts/usbnet
+++ b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet
diff --git a/meta/packages/nfs-utils/libnfsidmap_0.23.bb b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.23.bb
index c6b02fe19a..c6b02fe19a 100644
--- a/meta/packages/nfs-utils/libnfsidmap_0.23.bb
+++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.23.bb
diff --git a/meta/packages/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
index 336dc0e267..336dc0e267 100644
--- a/meta/packages/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
diff --git a/meta/packages/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index 9d02e85848..9d02e85848 100644
--- a/meta/packages/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
diff --git a/meta/packages/nfs-utils/nfs-utils_1.2.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.2.bb
index fafedd17b5..fafedd17b5 100644
--- a/meta/packages/nfs-utils/nfs-utils_1.2.2.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.2.bb
diff --git a/meta/packages/openssl/openssl-0.9.8o/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/configure-targets.patch
index b68123a233..b68123a233 100644
--- a/meta/packages/openssl/openssl-0.9.8o/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/configure-targets.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/ca.patch
index 761eebe510..761eebe510 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/ca.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/ca.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/config-hurd.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/config-hurd.patch
index 21b7935dde..21b7935dde 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/config-hurd.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/config-hurd.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/debian-targets.patch
index fed47341ea..fed47341ea 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/debian-targets.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/engines-path.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/engines-path.patch
index 49400ff6e1..49400ff6e1 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/engines-path.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/engines-path.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch
index da97186886..da97186886 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/make-targets.patch
index b1239728e7..b1239728e7 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/make-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/make-targets.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-dir.patch
index 29563ecf59..29563ecf59 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-dir.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-section.patch
index fe20ab0444..fe20ab0444 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-section.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-rpath.patch
index 3ebc9accca..3ebc9accca 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-rpath.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-symbolic.patch
index 2504fa791e..2504fa791e 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-symbolic.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/perl-path.diff b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/perl-path.diff
index a72f938d82..a72f938d82 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/perl-path.diff
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/perl-path.diff
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pic.patch
index b534afa66c..b534afa66c 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pic.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pkg-config.patch
index 38923b08bf..38923b08bf 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/pkg-config.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pkg-config.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/rc4-amd64.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rc4-amd64.patch
index 6f0421a014..6f0421a014 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/rc4-amd64.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rc4-amd64.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash-crt.patch
index a8ff28c6f3..a8ff28c6f3 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/rehash-crt.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash-crt.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/rehash_pod.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash_pod.patch
index 94792c48e5..94792c48e5 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/rehash_pod.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash_pod.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/series b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/series
index b764c0414d..b764c0414d 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/series
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/series
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch
index d27e9b2398..d27e9b2398 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/stddef.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/stddef.patch
index bb65b23319..bb65b23319 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/stddef.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/stddef.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/valgrind.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/valgrind.patch
index e9f86eabbf..e9f86eabbf 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/valgrind.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/valgrind.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/version-script.patch
index 64d8fc7fa2..64d8fc7fa2 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/version-script.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/shared-libs.patch
index 10d9146dc9..10d9146dc9 100644
--- a/meta/packages/openssl/openssl-0.9.8o/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/shared-libs.patch
diff --git a/meta/packages/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 2482585c64..2482585c64 100644
--- a/meta/packages/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
diff --git a/meta/packages/openssl/openssl_0.9.8o.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb
index 31c5568ba1..31c5568ba1 100644
--- a/meta/packages/openssl/openssl_0.9.8o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb
diff --git a/meta/packages/openswan/openswan-2.4.7/installflags.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
index e6da2eaa5f..e6da2eaa5f 100644
--- a/meta/packages/openswan/openswan-2.4.7/installflags.patch
+++ b/meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
diff --git a/meta/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
index e3cc8762cc..e3cc8762cc 100644
--- a/meta/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch
+++ b/meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
diff --git a/meta/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
index b3863a584b..b3863a584b 100644
--- a/meta/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
+++ b/meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
diff --git a/meta/packages/openswan/openswan_2.4.7.bb b/meta/recipes-connectivity/openswan/openswan_2.4.7.bb
index 4ebb9c7a45..4ebb9c7a45 100644
--- a/meta/packages/openswan/openswan_2.4.7.bb
+++ b/meta/recipes-connectivity/openswan/openswan_2.4.7.bb
diff --git a/meta/packages/opensync/libopensync-0.37/build-in-src.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
index 1810b339a6..1810b339a6 100644
--- a/meta/packages/opensync/libopensync-0.37/build-in-src.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
diff --git a/meta/packages/opensync/libopensync-0.37/cmake.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
index 7ea4613548..7ea4613548 100644
--- a/meta/packages/opensync/libopensync-0.37/cmake.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
diff --git a/meta/packages/opensync/libopensync-0.37/no-python-check.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
index 04257bc623..04257bc623 100644
--- a/meta/packages/opensync/libopensync-0.37/no-python-check.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
diff --git a/meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
index 4a1802ce17..4a1802ce17 100644
--- a/meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
diff --git a/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
index a1c4cb1887..a1c4cb1887 100644
--- a/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
diff --git a/meta/packages/opensync/libopensync-plugin-file_0.37.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
index 33a049b7d6..33a049b7d6 100644
--- a/meta/packages/opensync/libopensync-plugin-file_0.37.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
diff --git a/meta/packages/opensync/libopensync-plugin-google-calendar_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
index 33a049b7d6..33a049b7d6 100644
--- a/meta/packages/opensync/libopensync-plugin-google-calendar_0.36.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
diff --git a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
index c06de2fde8..c06de2fde8 100644
--- a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
diff --git a/meta/packages/opensync/libopensync-plugin-syncml/fixerror.patch b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
index 7dad889422..7dad889422 100644
--- a/meta/packages/opensync/libopensync-plugin-syncml/fixerror.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
diff --git a/meta/packages/opensync/libopensync-plugin-syncml_0.38.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
index d32d62de47..d32d62de47 100644
--- a/meta/packages/opensync/libopensync-plugin-syncml_0.38.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
diff --git a/meta/packages/opensync/libopensync-plugin-vformat_0.37.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
index 84a48f21fe..84a48f21fe 100644
--- a/meta/packages/opensync/libopensync-plugin-vformat_0.37.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
diff --git a/meta/packages/opensync/libopensync-plugin_0.36.inc b/meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
index db6b1fa73a..db6b1fa73a 100644
--- a/meta/packages/opensync/libopensync-plugin_0.36.inc
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
diff --git a/meta/packages/opensync/libopensync_0.37.bb b/meta/recipes-connectivity/opensync/libopensync_0.37.bb
index e9b8ce202e..e9b8ce202e 100644
--- a/meta/packages/opensync/libopensync_0.37.bb
+++ b/meta/recipes-connectivity/opensync/libopensync_0.37.bb
diff --git a/meta/packages/sync/libsync_svn.bb b/meta/recipes-connectivity/opensync/libsync_svn.bb
index 660b39aa42..660b39aa42 100644
--- a/meta/packages/sync/libsync_svn.bb
+++ b/meta/recipes-connectivity/opensync/libsync_svn.bb
diff --git a/meta/packages/opensync/libsyncml/build-in-src.patch b/meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch
index d8106bdfc7..d8106bdfc7 100644
--- a/meta/packages/opensync/libsyncml/build-in-src.patch
+++ b/meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch
diff --git a/meta/packages/opensync/libsyncml_0.5.4.bb b/meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb
index 7feb5e0f18..7feb5e0f18 100644
--- a/meta/packages/opensync/libsyncml_0.5.4.bb
+++ b/meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb
diff --git a/meta/packages/opensync/msynctool_0.37.bb b/meta/recipes-connectivity/opensync/msynctool_0.37.bb
index 773166b3be..773166b3be 100644
--- a/meta/packages/opensync/msynctool_0.37.bb
+++ b/meta/recipes-connectivity/opensync/msynctool_0.37.bb
diff --git a/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch b/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch
index a1563c7141..a1563c7141 100644
--- a/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch
+++ b/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch
diff --git a/meta/packages/portmap/portmap-6.0/tcpd-config.patch b/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch
index da55f3799d..da55f3799d 100644
--- a/meta/packages/portmap/portmap-6.0/tcpd-config.patch
+++ b/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch
diff --git a/meta/packages/portmap/portmap.inc b/meta/recipes-connectivity/portmap/portmap.inc
index d563ad5b5a..d563ad5b5a 100644
--- a/meta/packages/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
diff --git a/meta/packages/portmap/portmap/portmap.init b/meta/recipes-connectivity/portmap/portmap/portmap.init
index e46513e115..e46513e115 100755
--- a/meta/packages/portmap/portmap/portmap.init
+++ b/meta/recipes-connectivity/portmap/portmap/portmap.init
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index 49ac1d8332..49ac1d8332 100644
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
diff --git a/meta/packages/ppp-dialin/files/host-peer b/meta/recipes-connectivity/ppp-dialin/files/host-peer
index e7e2e11d49..e7e2e11d49 100644
--- a/meta/packages/ppp-dialin/files/host-peer
+++ b/meta/recipes-connectivity/ppp-dialin/files/host-peer
diff --git a/meta/packages/ppp-dialin/files/ppp-dialin b/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
index ea2771311a..ea2771311a 100644
--- a/meta/packages/ppp-dialin/files/ppp-dialin
+++ b/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
diff --git a/meta/packages/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 6861d8ad44..6861d8ad44 100644
--- a/meta/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
diff --git a/meta/packages/ppp/ppp-2.4.5/08setupdns b/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns
index 998219de97..998219de97 100644
--- a/meta/packages/ppp/ppp-2.4.5/08setupdns
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns
diff --git a/meta/packages/ppp/ppp-2.4.5/92removedns b/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns
index 2eadec6899..2eadec6899 100644
--- a/meta/packages/ppp/ppp-2.4.5/92removedns
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns
diff --git a/meta/packages/ppp/ppp-2.4.5/cifdefroute.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
index 6473a08bc7..6473a08bc7 100644
--- a/meta/packages/ppp/ppp-2.4.5/cifdefroute.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/enable-ipv6.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
index daa7f2ecc6..daa7f2ecc6 100644
--- a/meta/packages/ppp/ppp-2.4.5/enable-ipv6.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/init b/meta/recipes-connectivity/ppp/ppp-2.4.5/init
index 5b3b7abe2f..5b3b7abe2f 100755
--- a/meta/packages/ppp/ppp-2.4.5/init
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/init
diff --git a/meta/packages/ppp/ppp-2.4.5/ip-down b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down
index 06d35487a5..06d35487a5 100755
--- a/meta/packages/ppp/ppp-2.4.5/ip-down
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down
diff --git a/meta/packages/ppp/ppp-2.4.5/ip-up b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up
index fc2fae9fe0..fc2fae9fe0 100755
--- a/meta/packages/ppp/ppp-2.4.5/ip-up
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up
diff --git a/meta/packages/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
index 9ba868839e..9ba868839e 100644
--- a/meta/packages/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/makefile.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
index 94af5af6de..94af5af6de 100644
--- a/meta/packages/ppp/ppp-2.4.5/makefile.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/poff b/meta/recipes-connectivity/ppp/ppp-2.4.5/poff
index 0521a9406a..0521a9406a 100644
--- a/meta/packages/ppp/ppp-2.4.5/poff
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/poff
diff --git a/meta/packages/ppp/ppp-2.4.5/pon b/meta/recipes-connectivity/ppp/ppp-2.4.5/pon
index 91c059501a..91c059501a 100644
--- a/meta/packages/ppp/ppp-2.4.5/pon
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/pon
diff --git a/meta/packages/ppp/ppp-2.4.5/pppd-resolv-varrun.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
index c4e61fdd28..c4e61fdd28 100644
--- a/meta/packages/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
diff --git a/meta/packages/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index e9caf3d13e..e9caf3d13e 100644
--- a/meta/packages/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
diff --git a/meta/packages/resolvconf/resolvconf_1.43.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb
index f751f17e0e..f751f17e0e 100644
--- a/meta/packages/resolvconf/resolvconf_1.43.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb
diff --git a/meta/packages/wbxml/files/no-doc-install.patch b/meta/recipes-connectivity/wbxml/files/no-doc-install.patch
index 16084e60e6..16084e60e6 100644
--- a/meta/packages/wbxml/files/no-doc-install.patch
+++ b/meta/recipes-connectivity/wbxml/files/no-doc-install.patch
diff --git a/meta/packages/wbxml/wbxml2_0.9.2.bb b/meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
index b8ba8c747f..b8ba8c747f 100644
--- a/meta/packages/wbxml/wbxml2_0.9.2.bb
+++ b/meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
diff --git a/meta/packages/coreutils/coreutils-6.9/futimens.patch b/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch
index 953c2d17a9..953c2d17a9 100644
--- a/meta/packages/coreutils/coreutils-6.9/futimens.patch
+++ b/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch
diff --git a/meta/packages/coreutils/coreutils-6.9/gnulib_m4.patch b/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch
index b42f5c9faa..b42f5c9faa 100644
--- a/meta/packages/coreutils/coreutils-6.9/gnulib_m4.patch
+++ b/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch
diff --git a/meta/packages/coreutils/coreutils-6.9/man-touch.patch b/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch
index 95a9638921..95a9638921 100644
--- a/meta/packages/coreutils/coreutils-6.9/man-touch.patch
+++ b/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch
diff --git a/meta/packages/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 6a23f4f65f..6a23f4f65f 100644
--- a/meta/packages/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
diff --git a/meta/packages/coreutils/coreutils_8.5.bb b/meta/recipes-core/coreutils/coreutils_8.5.bb
index 5213fa2937..5213fa2937 100644
--- a/meta/packages/coreutils/coreutils_8.5.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.5.bb
diff --git a/meta/packages/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 259750cb46..259750cb46 100644
--- a/meta/packages/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
diff --git a/meta/packages/ncurses/ncurses/makefile_tweak.patch b/meta/recipes-core/ncurses/ncurses/makefile_tweak.patch
index 480855bcc6..480855bcc6 100644
--- a/meta/packages/ncurses/ncurses/makefile_tweak.patch
+++ b/meta/recipes-core/ncurses/ncurses/makefile_tweak.patch
diff --git a/meta/packages/ncurses/ncurses/visibility.patch b/meta/recipes-core/ncurses/ncurses/visibility.patch
index 29cac5f1b8..29cac5f1b8 100644
--- a/meta/packages/ncurses/ncurses/visibility.patch
+++ b/meta/recipes-core/ncurses/ncurses/visibility.patch
diff --git a/meta/packages/ncurses/ncurses_5.4.bb b/meta/recipes-core/ncurses/ncurses_5.4.bb
index e69c1c0673..e69c1c0673 100644
--- a/meta/packages/ncurses/ncurses_5.4.bb
+++ b/meta/recipes-core/ncurses/ncurses_5.4.bb
diff --git a/meta/packages/readline/files/acinclude.m4 b/meta/recipes-core/readline/files/acinclude.m4
index 8a45f99084..8a45f99084 100644
--- a/meta/packages/readline/files/acinclude.m4
+++ b/meta/recipes-core/readline/files/acinclude.m4
diff --git a/meta/packages/readline/files/configure-fix.patch b/meta/recipes-core/readline/files/configure-fix.patch
index 4100fe42a7..4100fe42a7 100644
--- a/meta/packages/readline/files/configure-fix.patch
+++ b/meta/recipes-core/readline/files/configure-fix.patch
diff --git a/meta/packages/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 35bc7ed946..35bc7ed946 100644
--- a/meta/packages/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
diff --git a/meta/packages/readline/readline_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb
index a62345c45e..a62345c45e 100644
--- a/meta/packages/readline/readline_5.2.bb
+++ b/meta/recipes-core/readline/readline_5.2.bb
diff --git a/meta/packages/readline/readline_6.1.bb b/meta/recipes-core/readline/readline_6.1.bb
index c32755669c..c32755669c 100644
--- a/meta/packages/readline/readline_6.1.bb
+++ b/meta/recipes-core/readline/readline_6.1.bb
diff --git a/meta/packages/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index 5b513211dc..5b513211dc 100644
--- a/meta/packages/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
diff --git a/meta/packages/util-linux/files/MCONFIG b/meta/recipes-core/util-linux/files/MCONFIG
index 3fea2c02d7..3fea2c02d7 100644
--- a/meta/packages/util-linux/files/MCONFIG
+++ b/meta/recipes-core/util-linux/files/MCONFIG
diff --git a/meta/packages/util-linux/files/debian-bug392236.patch b/meta/recipes-core/util-linux/files/debian-bug392236.patch
index fcd2046e34..fcd2046e34 100644
--- a/meta/packages/util-linux/files/debian-bug392236.patch
+++ b/meta/recipes-core/util-linux/files/debian-bug392236.patch
diff --git a/meta/packages/util-linux/files/defines.h b/meta/recipes-core/util-linux/files/defines.h
index 6ce6b86df5..6ce6b86df5 100644
--- a/meta/packages/util-linux/files/defines.h
+++ b/meta/recipes-core/util-linux/files/defines.h
diff --git a/meta/packages/util-linux/files/fdiskbsdlabel_thumb.diff b/meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff
index e6f82b5b46..e6f82b5b46 100644
--- a/meta/packages/util-linux/files/fdiskbsdlabel_thumb.diff
+++ b/meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff
diff --git a/meta/packages/util-linux/files/fix-make-c.patch b/meta/recipes-core/util-linux/files/fix-make-c.patch
index bf1082e85c..bf1082e85c 100644
--- a/meta/packages/util-linux/files/fix-make-c.patch
+++ b/meta/recipes-core/util-linux/files/fix-make-c.patch
diff --git a/meta/packages/util-linux/files/gcc34.patch b/meta/recipes-core/util-linux/files/gcc34.patch
index 8c4a20cdca..8c4a20cdca 100644
--- a/meta/packages/util-linux/files/gcc34.patch
+++ b/meta/recipes-core/util-linux/files/gcc34.patch
diff --git a/meta/packages/util-linux/files/glibc-fix.patch b/meta/recipes-core/util-linux/files/glibc-fix.patch
index 6d0c2fcefa..6d0c2fcefa 100644
--- a/meta/packages/util-linux/files/glibc-fix.patch
+++ b/meta/recipes-core/util-linux/files/glibc-fix.patch
diff --git a/meta/packages/util-linux/files/make_include b/meta/recipes-core/util-linux/files/make_include
index e6abcd91f7..e6abcd91f7 100644
--- a/meta/packages/util-linux/files/make_include
+++ b/meta/recipes-core/util-linux/files/make_include
diff --git a/meta/packages/util-linux/files/optional-uuid.patch b/meta/recipes-core/util-linux/files/optional-uuid.patch
index 2d0ea43cd2..2d0ea43cd2 100644
--- a/meta/packages/util-linux/files/optional-uuid.patch
+++ b/meta/recipes-core/util-linux/files/optional-uuid.patch
diff --git a/meta/packages/util-linux/files/swapargs.h b/meta/recipes-core/util-linux/files/swapargs.h
index e960eef05f..e960eef05f 100644
--- a/meta/packages/util-linux/files/swapargs.h
+++ b/meta/recipes-core/util-linux/files/swapargs.h
diff --git a/meta/packages/util-linux/files/umount.diff b/meta/recipes-core/util-linux/files/umount.diff
index 78330789ef..78330789ef 100644
--- a/meta/packages/util-linux/files/umount.diff
+++ b/meta/recipes-core/util-linux/files/umount.diff
diff --git a/meta/packages/util-linux/files/uuid.patch b/meta/recipes-core/util-linux/files/uuid.patch
index 3208e0a865..3208e0a865 100644
--- a/meta/packages/util-linux/files/uuid.patch
+++ b/meta/recipes-core/util-linux/files/uuid.patch
diff --git a/meta/packages/util-linux/util-linux-2.17.2/tls.patch b/meta/recipes-core/util-linux/util-linux-2.17.2/tls.patch
index bdb29cae1f..bdb29cae1f 100644
--- a/meta/packages/util-linux/util-linux-2.17.2/tls.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.17.2/tls.patch
diff --git a/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.17.2/uclibc-compile.patch
index b2e8a8b95a..b2e8a8b95a 100644
--- a/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.17.2/uclibc-compile.patch
diff --git a/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
index 4b5eb73760..4b5eb73760 100644
--- a/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 571b53c99c..571b53c99c 100644
--- a/meta/packages/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
diff --git a/meta/packages/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index 9efe64a6c6..9efe64a6c6 100644
--- a/meta/packages/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
diff --git a/meta/packages/exmap-console/exmap-console.inc b/meta/recipes-devtools/exmap-console/exmap-console.inc
index efbd79fce1..efbd79fce1 100644
--- a/meta/packages/exmap-console/exmap-console.inc
+++ b/meta/recipes-devtools/exmap-console/exmap-console.inc
diff --git a/meta/packages/exmap-console/exmap-console_0.4.1.bb b/meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb
index c76c5c3b4c..c76c5c3b4c 100644
--- a/meta/packages/exmap-console/exmap-console_0.4.1.bb
+++ b/meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb
diff --git a/meta/packages/exmap-console/exmap-console_svn.bb b/meta/recipes-devtools/exmap-console/exmap-console_svn.bb
index ce222854e2..ce222854e2 100644
--- a/meta/packages/exmap-console/exmap-console_svn.bb
+++ b/meta/recipes-devtools/exmap-console/exmap-console_svn.bb
diff --git a/meta/packages/insserv/files/40_segfault_virtprov.dpatch b/meta/recipes-devtools/insserv/files/40_segfault_virtprov.dpatch
index 9b0081307a..9b0081307a 100644
--- a/meta/packages/insserv/files/40_segfault_virtprov.dpatch
+++ b/meta/recipes-devtools/insserv/files/40_segfault_virtprov.dpatch
diff --git a/meta/packages/insserv/files/42_loopnochangemsg.dpatch b/meta/recipes-devtools/insserv/files/42_loopnochangemsg.dpatch
index 4a15f58312..4a15f58312 100644
--- a/meta/packages/insserv/files/42_loopnochangemsg.dpatch
+++ b/meta/recipes-devtools/insserv/files/42_loopnochangemsg.dpatch
diff --git a/meta/packages/insserv/files/crosscompile_fix.patch b/meta/recipes-devtools/insserv/files/crosscompile_fix.patch
index 14d8db468f..14d8db468f 100644
--- a/meta/packages/insserv/files/crosscompile_fix.patch
+++ b/meta/recipes-devtools/insserv/files/crosscompile_fix.patch
diff --git a/meta/packages/insserv/files/insserv.conf b/meta/recipes-devtools/insserv/files/insserv.conf
index 4858f85b69..4858f85b69 100644
--- a/meta/packages/insserv/files/insserv.conf
+++ b/meta/recipes-devtools/insserv/files/insserv.conf
diff --git a/meta/packages/insserv/files/make.patch b/meta/recipes-devtools/insserv/files/make.patch
index bb3b51a8ca..bb3b51a8ca 100644
--- a/meta/packages/insserv/files/make.patch
+++ b/meta/recipes-devtools/insserv/files/make.patch
diff --git a/meta/packages/insserv/insserv_1.11.0.bb b/meta/recipes-devtools/insserv/insserv_1.11.0.bb
index a45ccda48f..a45ccda48f 100644
--- a/meta/packages/insserv/insserv_1.11.0.bb
+++ b/meta/recipes-devtools/insserv/insserv_1.11.0.bb
diff --git a/meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
index 61ecba266e..61ecba266e 100644
--- a/meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
+++ b/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
diff --git a/meta/packages/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index f9bdf93b7b..f9bdf93b7b 100644
--- a/meta/packages/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
diff --git a/meta/packages/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index 1f23a41f89..1f23a41f89 100644
--- a/meta/packages/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
diff --git a/meta/packages/nasm/nasm_2.07.bb b/meta/recipes-devtools/nasm/nasm_2.07.bb
index 4e482a04d6..4e482a04d6 100644
--- a/meta/packages/nasm/nasm_2.07.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.07.bb
diff --git a/meta/packages/rsync/rsync-2.6.9/rsyncd.conf b/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf
index 845f5b33f5..845f5b33f5 100644
--- a/meta/packages/rsync/rsync-2.6.9/rsyncd.conf
+++ b/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf
diff --git a/meta/packages/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
index cc2ae1a964..cc2ae1a964 100644
--- a/meta/packages/strace/strace_4.5.20.bb
+++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
diff --git a/meta/packages/tcf-agent/tcf-agent/fix_tcf-agent.init.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
index fa9e458714..fa9e458714 100644
--- a/meta/packages/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
diff --git a/meta/packages/tcf-agent/tcf-agent/terminals_agent.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
index b88b5e70cd..b88b5e70cd 100644
--- a/meta/packages/tcf-agent/tcf-agent/terminals_agent.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
diff --git a/meta/packages/tcf-agent/tcf-agent_svn.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb
index b4c70ec8b8..b4c70ec8b8 100644
--- a/meta/packages/tcf-agent/tcf-agent_svn.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb
diff --git a/meta/packages/ubootchart/files/sysvinit.patch b/meta/recipes-devtools/ubootchart/files/sysvinit.patch
index de9fb0b17d..de9fb0b17d 100644
--- a/meta/packages/ubootchart/files/sysvinit.patch
+++ b/meta/recipes-devtools/ubootchart/files/sysvinit.patch
diff --git a/meta/packages/ubootchart/files/ubootchart-stop b/meta/recipes-devtools/ubootchart/files/ubootchart-stop
index 3444069c9a..3444069c9a 100644
--- a/meta/packages/ubootchart/files/ubootchart-stop
+++ b/meta/recipes-devtools/ubootchart/files/ubootchart-stop
diff --git a/meta/packages/ubootchart/files/ubootchart.desktop b/meta/recipes-devtools/ubootchart/files/ubootchart.desktop
index 5552b3bc6f..5552b3bc6f 100644
--- a/meta/packages/ubootchart/files/ubootchart.desktop
+++ b/meta/recipes-devtools/ubootchart/files/ubootchart.desktop
diff --git a/meta/packages/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index cd292b6943..cd292b6943 100644
--- a/meta/packages/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
diff --git a/meta/packages/yaffs2/files/mkyaffs2image.patch b/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
index 521f1ba9a0..521f1ba9a0 100644
--- a/meta/packages/yaffs2/files/mkyaffs2image.patch
+++ b/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
diff --git a/meta/packages/yaffs2/files/yaffs2-unioob.patch b/meta/recipes-devtools/yaffs2/files/yaffs2-unioob.patch
index c894528ca1..c894528ca1 100644
--- a/meta/packages/yaffs2/files/yaffs2-unioob.patch
+++ b/meta/recipes-devtools/yaffs2/files/yaffs2-unioob.patch
diff --git a/meta/packages/yaffs2/yaffs2-utils.inc b/meta/recipes-devtools/yaffs2/yaffs2-utils.inc
index b25cc3b590..b25cc3b590 100644
--- a/meta/packages/yaffs2/yaffs2-utils.inc
+++ b/meta/recipes-devtools/yaffs2/yaffs2-utils.inc
diff --git a/meta/packages/yaffs2/yaffs2-utils_cvs.bb b/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb
index 6171fe55bd..6171fe55bd 100644
--- a/meta/packages/yaffs2/yaffs2-utils_cvs.bb
+++ b/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb
diff --git a/meta/packages/blktool/blktool_4-6.bb b/meta/recipes-extended/blktool/blktool_4-6.bb
index 3313b039ce..3313b039ce 100644
--- a/meta/packages/blktool/blktool_4-6.bb
+++ b/meta/recipes-extended/blktool/blktool_4-6.bb
diff --git a/meta/packages/bzip2/bzip2-1.0.5/Makefile.am b/meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am
index 070d57b243..070d57b243 100644
--- a/meta/packages/bzip2/bzip2-1.0.5/Makefile.am
+++ b/meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am
diff --git a/meta/packages/bzip2/bzip2-1.0.5/configure.ac b/meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac
index 14b1d1809d..14b1d1809d 100644
--- a/meta/packages/bzip2/bzip2-1.0.5/configure.ac
+++ b/meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac
diff --git a/meta/packages/bzip2/bzip2_1.0.5.bb b/meta/recipes-extended/bzip2/bzip2_1.0.5.bb
index c6339c0676..c6339c0676 100644
--- a/meta/packages/bzip2/bzip2_1.0.5.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.5.bb
diff --git a/meta/packages/devicekit/devicekit-power_014.bb b/meta/recipes-extended/devicekit/devicekit-power_014.bb
index f69a060ef2..f69a060ef2 100644
--- a/meta/packages/devicekit/devicekit-power_014.bb
+++ b/meta/recipes-extended/devicekit/devicekit-power_014.bb
diff --git a/meta/packages/devicekit/devicekit/volatile b/meta/recipes-extended/devicekit/devicekit/volatile
index 1e399642e0..1e399642e0 100644
--- a/meta/packages/devicekit/devicekit/volatile
+++ b/meta/recipes-extended/devicekit/devicekit/volatile
diff --git a/meta/packages/devicekit/devicekit_003.bb b/meta/recipes-extended/devicekit/devicekit_003.bb
index af812935cd..af812935cd 100644
--- a/meta/packages/devicekit/devicekit_003.bb
+++ b/meta/recipes-extended/devicekit/devicekit_003.bb
diff --git a/meta/packages/devicekit/devicekit_git.bb b/meta/recipes-extended/devicekit/devicekit_git.bb
index 74b639f6c1..74b639f6c1 100644
--- a/meta/packages/devicekit/devicekit_git.bb
+++ b/meta/recipes-extended/devicekit/devicekit_git.bb
diff --git a/meta/packages/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
index 86b46aafec..86b46aafec 100644
--- a/meta/packages/diffutils/diffutils_2.8.1.bb
+++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
diff --git a/meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch b/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch
index 2bc54e9290..2bc54e9290 100644
--- a/meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch
+++ b/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch
diff --git a/meta/packages/findutils/findutils-4.4.2/01-27017.patch b/meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch
index b61f67b12d..b61f67b12d 100644
--- a/meta/packages/findutils/findutils-4.4.2/01-27017.patch
+++ b/meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch
diff --git a/meta/packages/findutils/findutils-4.4.2/02-28824.patch b/meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch
index 3469712d90..3469712d90 100644
--- a/meta/packages/findutils/findutils-4.4.2/02-28824.patch
+++ b/meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch
diff --git a/meta/packages/findutils/findutils-4.4.2/03-28872.patch b/meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch
index 8bede38920..8bede38920 100644
--- a/meta/packages/findutils/findutils-4.4.2/03-28872.patch
+++ b/meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch
diff --git a/meta/packages/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index 08ca2022ee..08ca2022ee 100644
--- a/meta/packages/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
diff --git a/meta/packages/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index 2804a3ba3a..2804a3ba3a 100644
--- a/meta/packages/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
diff --git a/meta/packages/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index 18514f36ea..18514f36ea 100644
--- a/meta/packages/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
diff --git a/meta/packages/gperf/gperf.inc b/meta/recipes-extended/gperf/gperf.inc
index a521e0943b..a521e0943b 100644
--- a/meta/packages/gperf/gperf.inc
+++ b/meta/recipes-extended/gperf/gperf.inc
diff --git a/meta/packages/gperf/gperf_3.0.3.bb b/meta/recipes-extended/gperf/gperf_3.0.3.bb
index 5cccdf1adb..5cccdf1adb 100644
--- a/meta/packages/gperf/gperf_3.0.3.bb
+++ b/meta/recipes-extended/gperf/gperf_3.0.3.bb
diff --git a/meta/packages/gperf/gperf_3.0.4.bb b/meta/recipes-extended/gperf/gperf_3.0.4.bb
index ee532c98d8..ee532c98d8 100644
--- a/meta/packages/gperf/gperf_3.0.4.bb
+++ b/meta/recipes-extended/gperf/gperf_3.0.4.bb
diff --git a/meta/packages/grep/grep-2.5.1a/uclibc-fix.patch b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
index 8fc7c4852f..8fc7c4852f 100644
--- a/meta/packages/grep/grep-2.5.1a/uclibc-fix.patch
+++ b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
diff --git a/meta/packages/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index d50d5a374e..d50d5a374e 100644
--- a/meta/packages/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
diff --git a/meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
index 8308865a25..8308865a25 100644
--- a/meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
diff --git a/meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
index 927377286f..927377286f 100644
--- a/meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
diff --git a/meta/packages/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 28df4d4a5d..28df4d4a5d 100644
--- a/meta/packages/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
diff --git a/meta/packages/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb
index c111e2e24d..c111e2e24d 100644
--- a/meta/packages/gzip/gzip_1.3.12.bb
+++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb
diff --git a/meta/packages/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb
index 93020ba50b..93020ba50b 100644
--- a/meta/packages/gzip/gzip_1.4.bb
+++ b/meta/recipes-extended/gzip/gzip_1.4.bb
diff --git a/meta/packages/hdparm/hdparm-6.3/bswap.patch b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
index 37fbcb7b38..37fbcb7b38 100644
--- a/meta/packages/hdparm/hdparm-6.3/bswap.patch
+++ b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
diff --git a/meta/packages/hdparm/hdparm-6.3/uclibc.patch b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
index 495d7491bb..495d7491bb 100644
--- a/meta/packages/hdparm/hdparm-6.3/uclibc.patch
+++ b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
diff --git a/meta/packages/hdparm/hdparm_6.3.bb b/meta/recipes-extended/hdparm/hdparm_6.3.bb
index 94d1e6e9bf..94d1e6e9bf 100644
--- a/meta/packages/hdparm/hdparm_6.3.bb
+++ b/meta/recipes-extended/hdparm/hdparm_6.3.bb
diff --git a/meta/packages/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb
index 17bb103d9e..17bb103d9e 100644
--- a/meta/packages/libidn/libidn_0.6.14.bb
+++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb
diff --git a/meta/packages/libidn/libidn_1.19.bb b/meta/recipes-extended/libidn/libidn_1.19.bb
index 2e29ade14c..2e29ade14c 100644
--- a/meta/packages/libidn/libidn_1.19.bb
+++ b/meta/recipes-extended/libidn/libidn_1.19.bb
diff --git a/meta/packages/lsof/lsof_4.83.bb b/meta/recipes-extended/lsof/lsof_4.83.bb
index 078da64305..078da64305 100644
--- a/meta/packages/lsof/lsof_4.83.bb
+++ b/meta/recipes-extended/lsof/lsof_4.83.bb
diff --git a/meta/packages/pam/libpam-1.1.1/99_pam b/meta/recipes-extended/pam/libpam-1.1.1/99_pam
index 97e990d10b..97e990d10b 100644
--- a/meta/packages/pam/libpam-1.1.1/99_pam
+++ b/meta/recipes-extended/pam/libpam-1.1.1/99_pam
diff --git a/meta/packages/pam/libpam-1.1.1/disable_crossbinary.patch b/meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch
index 43359b08fe..43359b08fe 100644
--- a/meta/packages/pam/libpam-1.1.1/disable_crossbinary.patch
+++ b/meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-account b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account
index 316b17337b..316b17337b 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-account
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-auth b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth
index 460b69f198..460b69f198 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-auth
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-password b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password
index 3896057328..3896057328 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-password
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-session b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session
index a594dd9d90..a594dd9d90 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-session
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-session-noninteractive b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive
index b110bb2b49..b110bb2b49 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-session-noninteractive
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/other b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/other
index 6e40cd0c02..6e40cd0c02 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/other
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/other
diff --git a/meta/packages/pam/libpam_1.1.1.bb b/meta/recipes-extended/pam/libpam_1.1.1.bb
index 536a0f5ce9..536a0f5ce9 100644
--- a/meta/packages/pam/libpam_1.1.1.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.1.bb
diff --git a/meta/packages/parted/parted-1.9.0/no_check.patch b/meta/recipes-extended/parted/parted-1.9.0/no_check.patch
index 24a328ceea..24a328ceea 100644
--- a/meta/packages/parted/parted-1.9.0/no_check.patch
+++ b/meta/recipes-extended/parted/parted-1.9.0/no_check.patch
diff --git a/meta/packages/parted/parted-1.9.0/syscalls.patch b/meta/recipes-extended/parted/parted-1.9.0/syscalls.patch
index 6be49968f3..6be49968f3 100644
--- a/meta/packages/parted/parted-1.9.0/syscalls.patch
+++ b/meta/recipes-extended/parted/parted-1.9.0/syscalls.patch
diff --git a/meta/packages/parted/parted_1.9.0.bb b/meta/recipes-extended/parted/parted_1.9.0.bb
index f2a265187f..f2a265187f 100644
--- a/meta/packages/parted/parted_1.9.0.bb
+++ b/meta/recipes-extended/parted/parted_1.9.0.bb
diff --git a/meta/packages/polkit/polkit-gnome_0.96.bb b/meta/recipes-extended/polkit/polkit-gnome_0.96.bb
index e103e631c8..e103e631c8 100644
--- a/meta/packages/polkit/polkit-gnome_0.96.bb
+++ b/meta/recipes-extended/polkit/polkit-gnome_0.96.bb
diff --git a/meta/packages/polkit/polkit_0.96.bb b/meta/recipes-extended/polkit/polkit_0.96.bb
index e6e030b19a..e6e030b19a 100644
--- a/meta/packages/polkit/polkit_0.96.bb
+++ b/meta/recipes-extended/polkit/polkit_0.96.bb
diff --git a/meta/packages/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch
index d9cdd90d71..d9cdd90d71 100644
--- a/meta/packages/psmisc/files/libintl-link.patch
+++ b/meta/recipes-extended/psmisc/files/libintl-link.patch
diff --git a/meta/packages/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index d489891d64..d489891d64 100644
--- a/meta/packages/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
diff --git a/meta/packages/psmisc/psmisc_22.2.bb b/meta/recipes-extended/psmisc/psmisc_22.2.bb
index 62327fa4d6..62327fa4d6 100644
--- a/meta/packages/psmisc/psmisc_22.2.bb
+++ b/meta/recipes-extended/psmisc/psmisc_22.2.bb
diff --git a/meta/packages/sed/sed-4.1.2/fix_return_type.patch b/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch
index d91960b3ee..d91960b3ee 100644
--- a/meta/packages/sed/sed-4.1.2/fix_return_type.patch
+++ b/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch
diff --git a/meta/packages/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 09bd3e18cc..09bd3e18cc 100644
--- a/meta/packages/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
diff --git a/meta/packages/sudo/files/autofoo.patch b/meta/recipes-extended/sudo/files/autofoo.patch
index 4f24737610..4f24737610 100644
--- a/meta/packages/sudo/files/autofoo.patch
+++ b/meta/recipes-extended/sudo/files/autofoo.patch
diff --git a/meta/packages/sudo/files/noexec-link.patch b/meta/recipes-extended/sudo/files/noexec-link.patch
index e0d35d0e25..e0d35d0e25 100644
--- a/meta/packages/sudo/files/noexec-link.patch
+++ b/meta/recipes-extended/sudo/files/noexec-link.patch
diff --git a/meta/packages/sudo/files/nostrip.patch b/meta/recipes-extended/sudo/files/nostrip.patch
index 3c71b4fd86..3c71b4fd86 100644
--- a/meta/packages/sudo/files/nostrip.patch
+++ b/meta/recipes-extended/sudo/files/nostrip.patch
diff --git a/meta/packages/sudo/site/bit-32 b/meta/recipes-extended/sudo/site/bit-32
index 9b7ca5c81b..9b7ca5c81b 100644
--- a/meta/packages/sudo/site/bit-32
+++ b/meta/recipes-extended/sudo/site/bit-32
diff --git a/meta/packages/sudo/site/bit-64 b/meta/recipes-extended/sudo/site/bit-64
index 05846ff0aa..05846ff0aa 100644
--- a/meta/packages/sudo/site/bit-64
+++ b/meta/recipes-extended/sudo/site/bit-64
diff --git a/meta/packages/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 2add94bef4..2add94bef4 100644
--- a/meta/packages/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
diff --git a/meta/packages/sudo/sudo_1.7.2p7.bb b/meta/recipes-extended/sudo/sudo_1.7.2p7.bb
index 3dd6cdf059..3dd6cdf059 100644
--- a/meta/packages/sudo/sudo_1.7.2p7.bb
+++ b/meta/recipes-extended/sudo/sudo_1.7.2p7.bb
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
index ff60a843e4..ff60a843e4 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
index 4963f82eb8..4963f82eb8 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
index a168f6d5a5..a168f6d5a5 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
index d06aaef13b..d06aaef13b 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
index 5c8be5c27c..5c8be5c27c 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
index 0238e35208..0238e35208 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
index 88a2b5e43b..88a2b5e43b 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
index 60ca594bee..60ca594bee 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
index c089b33257..c089b33257 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
index 0e1ecf5b4a..0e1ecf5b4a 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
index 913ed987d6..913ed987d6 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
index e35fc7ecd9..e35fc7ecd9 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
index 31c2b92278..31c2b92278 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
index 2e897650e0..2e897650e0 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
index afaa9c8ac3..afaa9c8ac3 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
index ece7da35fe..ece7da35fe 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
index a926d0edfd..a926d0edfd 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8 b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
index 875616b9ea..875616b9ea 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
index 5c8c9a1548..5c8c9a1548 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
index f286605bfd..f286605bfd 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
index 71be340a07..71be340a07 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/size_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
index 4db40f4c7b..4db40f4c7b 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
index 3beae39306..3beae39306 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/try-from.8 b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
index 9c8f30543e..9c8f30543e 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/try-from.8
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 308a8b63b4..308a8b63b4 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
diff --git a/meta/packages/tzcode/tzcode-native_2009r.bb b/meta/recipes-extended/tzcode/tzcode-native_2009r.bb
index c9a213b4f8..c9a213b4f8 100644
--- a/meta/packages/tzcode/tzcode-native_2009r.bb
+++ b/meta/recipes-extended/tzcode/tzcode-native_2009r.bb
diff --git a/meta/packages/tzdata/tzdata_2010j.bb b/meta/recipes-extended/tzdata/tzdata_2010j.bb
index 97eb1173c1..97eb1173c1 100644
--- a/meta/packages/tzdata/tzdata_2010j.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2010j.bb
diff --git a/meta/packages/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index 069dfb8781..069dfb8781 100644
--- a/meta/packages/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
diff --git a/meta/packages/watchdog/watchdog_5.9.bb b/meta/recipes-extended/watchdog/watchdog_5.9.bb
index c768077f1d..c768077f1d 100644
--- a/meta/packages/watchdog/watchdog_5.9.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.9.bb
diff --git a/meta/packages/zile/files/for_build.patch b/meta/recipes-extended/zile/files/for_build.patch
index 96380fa220..96380fa220 100644
--- a/meta/packages/zile/files/for_build.patch
+++ b/meta/recipes-extended/zile/files/for_build.patch
diff --git a/meta/packages/zile/zile_1.7+2.0beta6.bb b/meta/recipes-extended/zile/zile_1.7+2.0beta6.bb
index 74d832eef3..74d832eef3 100644
--- a/meta/packages/zile/zile_1.7+2.0beta6.bb
+++ b/meta/recipes-extended/zile/zile_1.7+2.0beta6.bb
diff --git a/meta/packages/zip/zip.inc b/meta/recipes-extended/zip/zip.inc
index 9550447264..9550447264 100644
--- a/meta/packages/zip/zip.inc
+++ b/meta/recipes-extended/zip/zip.inc
diff --git a/meta/packages/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index c5df637a38..c5df637a38 100644
--- a/meta/packages/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
diff --git a/meta/packages/libffi/libffi_3.0.8.bb b/meta/recipes-gnome/libffi/libffi_3.0.8.bb
index 06106279b0..06106279b0 100644
--- a/meta/packages/libffi/libffi_3.0.8.bb
+++ b/meta/recipes-gnome/libffi/libffi_3.0.8.bb
diff --git a/meta/packages/libgsf/libgsf_1.14.5.bb b/meta/recipes-gnome/libgsf/libgsf_1.14.5.bb
index 10b6390722..10b6390722 100644
--- a/meta/packages/libgsf/libgsf_1.14.5.bb
+++ b/meta/recipes-gnome/libgsf/libgsf_1.14.5.bb
diff --git a/meta/packages/libgtkstylus/files/gtkstylus.sh b/meta/recipes-gnome/libgtkstylus/files/gtkstylus.sh
index b1302ede0e..b1302ede0e 100644
--- a/meta/packages/libgtkstylus/files/gtkstylus.sh
+++ b/meta/recipes-gnome/libgtkstylus/files/gtkstylus.sh
diff --git a/meta/packages/libgtkstylus/libgtkstylus_0.5.bb b/meta/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
index f614048a16..f614048a16 100644
--- a/meta/packages/libgtkstylus/libgtkstylus_0.5.bb
+++ b/meta/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
diff --git a/meta/packages/librsvg/librsvg_2.18.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.18.2.bb
index fb68c8ba70..fb68c8ba70 100644
--- a/meta/packages/librsvg/librsvg_2.18.2.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.18.2.bb
diff --git a/meta/packages/librsvg/librsvg_2.22.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.22.3.bb
index fb68c8ba70..fb68c8ba70 100644
--- a/meta/packages/librsvg/librsvg_2.22.3.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.22.3.bb
diff --git a/meta/packages/librsvg/librsvg_2.26.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.26.3.bb
index 41e23b1d7d..41e23b1d7d 100644
--- a/meta/packages/librsvg/librsvg_2.26.3.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.26.3.bb
diff --git a/meta/packages/wv/wv-1.2.0/pkgconfig.patch b/meta/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
index 136d89341f..136d89341f 100644
--- a/meta/packages/wv/wv-1.2.0/pkgconfig.patch
+++ b/meta/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
diff --git a/meta/packages/wv/wv_1.2.0.bb b/meta/recipes-gnome/wv/wv_1.2.0.bb
index c4c115b90e..c4c115b90e 100644
--- a/meta/packages/wv/wv_1.2.0.bb
+++ b/meta/recipes-gnome/wv/wv_1.2.0.bb
diff --git a/meta/recipes-graphics/clutter/clutter-helix.inc b/meta/recipes-graphics/clutter/clutter-helix.inc
deleted file mode 100644
index 6bbbb244d7..0000000000
--- a/meta/recipes-graphics/clutter/clutter-helix.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "Clutter Helix"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "helix-libs"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-helix"
8
9COMPATIBLE_HOST = '(x86_64|i.86.*)-linux'
10
11PACKAGES =+ "${PN}-examples"
12FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"
13
14inherit autotools pkgconfig gtk-doc
15
diff --git a/meta/recipes-graphics/clutter/clutter-helix_git.bb b/meta/recipes-graphics/clutter/clutter-helix_git.bb
deleted file mode 100644
index 1c272306bf..0000000000
--- a/meta/recipes-graphics/clutter/clutter-helix_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require clutter-helix.inc
2
3PV = "0.8.0+git${SRCPV}"
4PR = "r0"
5
6SRC_URI = "git://git.clutter-project.org/clutter-helix.git;protocol=git"
7
8S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/clutter/clutter-mozembed.inc b/meta/recipes-graphics/clutter/clutter-mozembed.inc
deleted file mode 100644
index 72c9412d04..0000000000
--- a/meta/recipes-graphics/clutter/clutter-mozembed.inc
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Clutter Mozilla Embedded"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "mozilla-headless mozilla-headless-services clutter-1.0"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-mozembed"
8
9FILES_${PN} =+ "${datadir}/cluttermozembed/chrome/"
10
11EXTRA_OECONF = "--enable-plugins"
12
13inherit autotools pkgconfig gtk-doc
14
diff --git a/meta/recipes-graphics/clutter/clutter-mozembed_git.bb b/meta/recipes-graphics/clutter/clutter-mozembed_git.bb
deleted file mode 100644
index e2da2d6a7d..0000000000
--- a/meta/recipes-graphics/clutter/clutter-mozembed_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require clutter-mozembed.inc
2
3PV = "0.8.0+git${SRCPV}"
4PR = "r7"
5
6SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \
7 file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
8 file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41"
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 touch ${S}/clutter-mozembed/dummy.cpp
13 touch ${S}/clutter-mozembed/dummy2.cpp
14}
diff --git a/meta/packages/fstests/fstests_svn.bb b/meta/recipes-graphics/fstests/fstests_svn.bb
index b4075212ee..b4075212ee 100644
--- a/meta/packages/fstests/fstests_svn.bb
+++ b/meta/recipes-graphics/fstests/fstests_svn.bb
diff --git a/meta/packages/libsdl/files/acinclude.m4 b/meta/recipes-graphics/libsdl/files/acinclude.m4
index ca2df9d5e5..ca2df9d5e5 100644
--- a/meta/packages/libsdl/files/acinclude.m4
+++ b/meta/recipes-graphics/libsdl/files/acinclude.m4
diff --git a/meta/packages/libsdl/files/configure_tweak.patch b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
index 90a2888e57..90a2888e57 100644
--- a/meta/packages/libsdl/files/configure_tweak.patch
+++ b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
diff --git a/meta/packages/libsdl/files/directfb_obsolete_calls.patch b/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch
index f3f422cde3..f3f422cde3 100644
--- a/meta/packages/libsdl/files/directfb_obsolete_calls.patch
+++ b/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch
diff --git a/meta/packages/libsdl/files/extra-keys.patch b/meta/recipes-graphics/libsdl/files/extra-keys.patch
index f12f0c7efb..f12f0c7efb 100644
--- a/meta/packages/libsdl/files/extra-keys.patch
+++ b/meta/recipes-graphics/libsdl/files/extra-keys.patch
diff --git a/meta/packages/libsdl/files/kernel-asm-page.patch b/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
index 42bceadfdc..42bceadfdc 100644
--- a/meta/packages/libsdl/files/kernel-asm-page.patch
+++ b/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
diff --git a/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
index 633a4c284b..633a4c284b 100644
--- a/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb
+++ b/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
diff --git a/meta/packages/pong-clock/pong-clock/pong-clock-no-flicker.c b/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
index 41cebc58a7..41cebc58a7 100644
--- a/meta/packages/pong-clock/pong-clock/pong-clock-no-flicker.c
+++ b/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
diff --git a/meta/packages/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
index 571a90dbd3..571a90dbd3 100644
--- a/meta/packages/pong-clock/pong-clock_1.0.bb
+++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
diff --git a/meta/packages/x11vnc/x11vnc_0.9.3.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
index 5269ff3091..5269ff3091 100644
--- a/meta/packages/x11vnc/x11vnc_0.9.3.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
diff --git a/meta/packages/xrestop/xrestop_0.4.bb b/meta/recipes-graphics/xrestop/xrestop_0.4.bb
index 1fd24503a7..1fd24503a7 100644
--- a/meta/packages/xrestop/xrestop_0.4.bb
+++ b/meta/recipes-graphics/xrestop/xrestop_0.4.bb
diff --git a/meta/packages/xvideo-tests/xvideo-tests_svn.bb b/meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb
index 0aa861f688..0aa861f688 100644
--- a/meta/packages/xvideo-tests/xvideo-tests_svn.bb
+++ b/meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb
diff --git a/meta/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch b/meta/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
index 903a8baa9e..903a8baa9e 100644
--- a/meta/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
+++ b/meta/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
diff --git a/meta/packages/fuse/fuse.inc b/meta/recipes-kernel/fuse/fuse.inc
index c6755ac7c7..c6755ac7c7 100644
--- a/meta/packages/fuse/fuse.inc
+++ b/meta/recipes-kernel/fuse/fuse.inc
diff --git a/meta/packages/fuse/fuse_2.7.2.bb b/meta/recipes-kernel/fuse/fuse_2.7.2.bb
index d284a25f5f..d284a25f5f 100644
--- a/meta/packages/fuse/fuse_2.7.2.bb
+++ b/meta/recipes-kernel/fuse/fuse_2.7.2.bb
diff --git a/meta/packages/libomxil/libomxil_0.3.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
index 016aed5149..016aed5149 100644
--- a/meta/packages/libomxil/libomxil_0.3.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
diff --git a/meta/packages/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
index 6f1b133f24..6f1b133f24 100644
--- a/meta/packages/speex/speex_1.2rc1.bb
+++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
diff --git a/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch b/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch
deleted file mode 100644
index 4ebc3dea8d..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
1From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:39:58 +0200
4Subject: [PATCH] fix mkspecs
5
6---
7 mkspecs/common/g++.conf | 18 +++++++++---------
8 mkspecs/common/linux.conf | 26 +++++++++++++-------------
9 2 files changed, 22 insertions(+), 22 deletions(-)
10
11Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
12===================================================================
13--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/g++.conf
14+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
15@@ -2,12 +2,12 @@
16 # qmake configuration for common gcc
17 #
18
19-QMAKE_CC = gcc
20-QMAKE_CFLAGS += -pipe
21+QMAKE_CC = $(OE_QMAKE_CC)
22+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
23 QMAKE_CFLAGS_DEPS += -M
24 QMAKE_CFLAGS_WARN_ON += -Wall -W
25 QMAKE_CFLAGS_WARN_OFF += -w
26-QMAKE_CFLAGS_RELEASE += -O2
27+QMAKE_CFLAGS_RELEASE += -O2
28 QMAKE_CFLAGS_DEBUG += -g
29 QMAKE_CFLAGS_SHLIB += -fPIC
30 QMAKE_CFLAGS_STATIC_LIB += -fPIC
31@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=
32 QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
33 QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
34
35-QMAKE_CXX = g++
36-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
37+QMAKE_CXX = $(OE_QMAKE_CXX)
38+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
39 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
40 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
41 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
42@@ -30,11 +30,11 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAG
43 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
44 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
45
46-QMAKE_LINK = g++
47-QMAKE_LINK_SHLIB = g++
48-QMAKE_LINK_C = gcc
49-QMAKE_LINK_C_SHLIB = gcc
50-QMAKE_LFLAGS +=
51+QMAKE_LINK = $(OE_QMAKE_LINK)
52+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
53+QMAKE_LINK_C = $(OE_QMAKE_CC)
54+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_CC)
55+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
56 QMAKE_LFLAGS_RELEASE += -Wl,-O1
57 QMAKE_LFLAGS_DEBUG +=
58 QMAKE_LFLAGS_APP +=
59@@ -43,7 +43,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SH
60 QMAKE_LFLAGS_SONAME += -Wl,-soname,
61 QMAKE_LFLAGS_THREAD +=
62 QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
63-QMAKE_RPATH = -Wl,-rpath,
64+QMAKE_RPATH = -Wl,-rpath-link,
65
66 QMAKE_PCH_OUTPUT_EXT = .gch
67
68Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
69===================================================================
70--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/linux.conf
71+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
72@@ -7,27 +7,27 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_
73
74 QMAKE_INCDIR =
75 QMAKE_LIBDIR =
76-QMAKE_INCDIR_X11 = /usr/X11R6/include
77-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
78-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
79-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
80-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
81-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
82+QMAKE_INCDIR_X11 =
83+QMAKE_LIBDIR_X11 =
84+QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
85+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
86+QMAKE_INCDIR_OPENGL =
87+QMAKE_LIBDIR_OPENGL =
88
89 QMAKE_LIBS =
90 QMAKE_LIBS_DYNLOAD = -ldl
91-QMAKE_LIBS_X11 = -lXext -lX11 -lm
92-QMAKE_LIBS_X11SM = -lSM -lICE
93+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
94+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
95 QMAKE_LIBS_NIS = -lnsl
96 QMAKE_LIBS_OPENGL = -lGLU -lGL
97 QMAKE_LIBS_OPENGL_QT = -lGL
98 QMAKE_LIBS_THREAD = -lpthread
99
100-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
101-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
102+QMAKE_MOC = $(OE_QMAKE_MOC)
103+QMAKE_UIC = $(OE_QMAKE_UIC)
104
105-QMAKE_AR = ar cqs
106-QMAKE_OBJCOPY = objcopy
107+QMAKE_AR = $(OE_QMAKE_AR) cqs
108+QMAKE_OBJCOPY = $(OE_QMAKE_OBJCOPY)
109 QMAKE_RANLIB =
110
111 QMAKE_TAR = tar -cf
112@@ -39,7 +39,7 @@ QMAKE_COPY_DIR = $(COPY) -r
113 QMAKE_MOVE = mv -f
114 QMAKE_DEL_FILE = rm -f
115 QMAKE_DEL_DIR = rmdir
116-QMAKE_STRIP = strip
117+QMAKE_STRIP = $(OE_QMAKE_STRIP)
118 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
119 QMAKE_CHK_DIR_EXISTS = test -d
120 QMAKE_MKDIR = mkdir -p
diff --git a/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf b/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf
deleted file mode 100644
index f58481a693..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf
+++ /dev/null
@@ -1 +0,0 @@
1include(../linux-g++/qmake.conf)
diff --git a/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch b/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch
deleted file mode 100644
index 4197dbbf64..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp
2===================================================================
3--- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:45:26.000000000 +0200
4+++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:57:09.000000000 +0200
5@@ -416,7 +416,7 @@
6 t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t";
7 if(!project->isEmpty("QMAKE_PRE_LINK"))
8 t << var("QMAKE_PRE_LINK") << "\n\t";
9- t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
10+ t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)";
11 if(!project->isEmpty("QMAKE_POST_LINK"))
12 t << "\n\t" << var("QMAKE_POST_LINK");
13 t << endl << endl;
14@@ -430,7 +430,7 @@
15 t << mkdir_p_asstring(destdir) << "\n\t";
16 if(!project->isEmpty("QMAKE_PRE_LINK"))
17 t << var("QMAKE_PRE_LINK") << "\n\t";
18- t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)";
19+ t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)";
20 if(!project->isEmpty("QMAKE_POST_LINK"))
21 t << "\n\t" << var("QMAKE_POST_LINK");
22 t << endl << endl;
diff --git a/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb b/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb
deleted file mode 100644
index 60f738b9ce..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb
+++ /dev/null
@@ -1,74 +0,0 @@
1DESCRIPTION = "TrollTech Makefile Generator"
2PRIORITY = "optional"
3HOMEPAGE = "http://www.trolltech.com"
4SECTION = "devel"
5LICENSE = "GPL"
6PR = "r2"
7
8QTVER = "qt-embedded-linux-opensource-src-4.5.3"
9
10SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
11 file://0001-fix-mkspecs.patch;patch=1 \
12 file://use-lflags-last.patch;patch=1 \
13 file://linux-oe-qmake.conf"
14S = "${WORKDIR}/${QTVER}"
15
16# we need the real target system here
17CROSS_SYS := "${TARGET_SYS}"
18CROSS_BINDIR := "${STAGING_BINDIR_CROSS}"
19inherit autotools cross
20
21export QTDIR = "${S}"
22EXTRA_OEMAKE = "-e"
23EXTRA_OECONF = "-opensource"
24
25do_configure() {
26 # Install the OE build templates
27 for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
28 do
29 install -d ${S}/mkspecs/$template
30 install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
31 ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
32 done
33
34 QMAKESPEC=
35 PLATFORM=${HOST_OS}-oe-g++
36 export PLATFORM
37 # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
38 export OE_QMAKE_CC="${CC}"
39 export OE_QMAKE_CFLAGS="${CFLAGS}"
40 export OE_QMAKE_CXX="${CXX}"
41 export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
42 export OE_QMAKE_LDFLAGS="${LDFLAGS}"
43 export OE_QMAKE_LINK="${CCLD}"
44 export OE_QMAKE_AR="${AR}"
45 export OE_QMAKE_OBJCOPY="${OBJCOPY}"
46 export OE_QMAKE_STRIP="${STRIP}"
47 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
48 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
49 export OE_QMAKE_RCC="non-existant"
50 export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
51 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
52 echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
53}
54
55do_compile() {
56 :
57}
58
59do_install() {
60 install -d ${D}${CROSS_BINDIR}/
61 install -m 0755 bin/qmake ${D}${CROSS_BINDIR}/qmake2
62 install -m 0755 bin/qmake ${D}${CROSS_BINDIR}/qmake-qt4
63 install -d ${D}${STAGING_DIR}/${CROSS_SYS}/qt4/
64 cp -PfR mkspecs ${D}${STAGING_DIR}/${CROSS_SYS}/qt4/
65 install -d ${D}${STAGING_DIR}/${HOST_SYS}/qt4/
66 cp -PfR mkspecs ${D}${STAGING_DIR}/${HOST_SYS}/qt4/
67}
68
69sysroot_stage_all_append() {
70 sysroot_stage_dir ${D}/${STAGING_DIR_NATIVE}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/qt4
71 sysroot_stage_dir ${D}/${STAGING_DIR_TARGET}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/qt4
72}
73
74
diff --git a/meta/recipes-qt/uicmoc/uicmoc4-native.inc b/meta/recipes-qt/uicmoc/uicmoc4-native.inc
deleted file mode 100644
index b6933628d9..0000000000
--- a/meta/recipes-qt/uicmoc/uicmoc4-native.inc
+++ /dev/null
@@ -1,67 +0,0 @@
1DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-native"
3SECTION = "libs"
4HOMEPAGE = "http://www.trolltech.com"
5PRIORITY = "optional"
6LICENSE = "GPL"
7PR = "r1"
8
9SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
10S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
11
12inherit native
13
14EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
15 -qt-libjpeg -qt-gif -system-zlib \
16 -no-nis -no-cups -no-exceptions \
17 -no-accessibility -no-libjpeg \
18 -no-nas-sound -no-sm \
19 -no-xshape -no-xinerama \
20 -no-xcursor -no-xrandr \
21 -no-xrender -no-fontconfig \
22 -no-tablet -no-xkb \
23 -no-libpng \
24 -verbose -release -fast -static \
25 -L ${STAGING_LIBDIR_NATIVE} \
26 -qt3support "
27# yank default -e
28EXTRA_OEMAKE = " "
29
30do_configure() {
31 sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
32 echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
33}
34
35TOBUILD = "\
36 src/tools/moc \
37 src/corelib \
38 src/sql \
39 src/qt3support \
40 src/xml \
41 src/tools/uic \
42 src/tools/rcc \
43 src/network \
44 src/gui \
45 src/tools/uic3 \
46"
47
48do_compile() {
49 unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
50 for i in ${TOBUILD}; do
51 cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
52 done
53}
54
55do_install() {
56 install -d ${D}${bindir}/
57 install -m 0755 bin/moc ${D}${bindir}//moc4
58 install -m 0755 bin/uic ${D}${bindir}/uic4
59 install -m 0755 bin/uic3 ${D}${bindir}/uic34
60 install -m 0755 bin/rcc $${D}${bindir}/rcc4
61 install -d ${D}/qt4/
62 install -m 0644 tools/porting/src/q3porting.xml ${D}/qt4/
63}
64
65sysroot_stage_all_append() {
66 sysroot_stage_dir ${D}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/qt4
67}
diff --git a/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb b/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb
deleted file mode 100644
index 1950f63068..0000000000
--- a/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb
+++ /dev/null
@@ -1 +0,0 @@
1require uicmoc4-native.inc
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/recipes-sato/claws-mail/claws-mail.inc
index 04401df2f5..04401df2f5 100644
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/recipes-sato/claws-mail/claws-mail.inc
diff --git a/meta/packages/claws-mail/claws-mail_2.9.1.bb b/meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb
index f8a8396b95..f8a8396b95 100644
--- a/meta/packages/claws-mail/claws-mail_2.9.1.bb
+++ b/meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb
diff --git a/meta/packages/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb b/meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
index 82918173e4..82918173e4 100644
--- a/meta/packages/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
diff --git a/meta/packages/claws-mail/claws-plugin-maildir_0.24.4.bb b/meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
index 4351d1e5de..4351d1e5de 100644
--- a/meta/packages/claws-mail/claws-plugin-maildir_0.24.4.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
diff --git a/meta/packages/claws-mail/claws-plugin-mailmbox_1.13.bb b/meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
index fe7041494f..fe7041494f 100644
--- a/meta/packages/claws-mail/claws-plugin-mailmbox_1.13.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
diff --git a/meta/packages/claws-mail/claws-plugin-rssyl_0.13.bb b/meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
index de0705c7fd..de0705c7fd 100644
--- a/meta/packages/claws-mail/claws-plugin-rssyl_0.13.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
diff --git a/meta/packages/claws-mail/files/desktop.patch b/meta/recipes-sato/claws-mail/files/desktop.patch
index c5ed7a9c7d..c5ed7a9c7d 100644
--- a/meta/packages/claws-mail/files/desktop.patch
+++ b/meta/recipes-sato/claws-mail/files/desktop.patch
diff --git a/meta/packages/claws-mail/files/fix-build.patch b/meta/recipes-sato/claws-mail/files/fix-build.patch
index 2f30899fe1..2f30899fe1 100644
--- a/meta/packages/claws-mail/files/fix-build.patch
+++ b/meta/recipes-sato/claws-mail/files/fix-build.patch
diff --git a/meta/packages/claws-mail/files/owl-window-menu.patch b/meta/recipes-sato/claws-mail/files/owl-window-menu.patch
index 54c61668a9..54c61668a9 100644
--- a/meta/packages/claws-mail/files/owl-window-menu.patch
+++ b/meta/recipes-sato/claws-mail/files/owl-window-menu.patch
diff --git a/meta/packages/claws-mail/files/streamline-ui.patch b/meta/recipes-sato/claws-mail/files/streamline-ui.patch
index 29a52ff795..29a52ff795 100644
--- a/meta/packages/claws-mail/files/streamline-ui.patch
+++ b/meta/recipes-sato/claws-mail/files/streamline-ui.patch
diff --git a/meta/packages/libical/libical_0.44.bb b/meta/recipes-sato/libical/libical_0.44.bb
index 0b016a0b8f..0b016a0b8f 100644
--- a/meta/packages/libical/libical_0.44.bb
+++ b/meta/recipes-sato/libical/libical_0.44.bb
diff --git a/meta/packages/rxvt-unicode/files/makefile.patch b/meta/recipes-sato/rxvt-unicode/files/makefile.patch
index 86f82eeb4c..86f82eeb4c 100644
--- a/meta/packages/rxvt-unicode/files/makefile.patch
+++ b/meta/recipes-sato/rxvt-unicode/files/makefile.patch
diff --git a/meta/packages/rxvt-unicode/files/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop
index a419c98a13..a419c98a13 100644
--- a/meta/packages/rxvt-unicode/files/rxvt.desktop
+++ b/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop
diff --git a/meta/packages/rxvt-unicode/files/rxvt.png b/meta/recipes-sato/rxvt-unicode/files/rxvt.png
index e56fa2e9cd..e56fa2e9cd 100644
--- a/meta/packages/rxvt-unicode/files/rxvt.png
+++ b/meta/recipes-sato/rxvt-unicode/files/rxvt.png
Binary files differ
diff --git a/meta/packages/rxvt-unicode/files/signedchar.patch b/meta/recipes-sato/rxvt-unicode/files/signedchar.patch
index 6faa175143..6faa175143 100644
--- a/meta/packages/rxvt-unicode/files/signedchar.patch
+++ b/meta/recipes-sato/rxvt-unicode/files/signedchar.patch
diff --git a/meta/packages/rxvt-unicode/files/xwc.patch b/meta/recipes-sato/rxvt-unicode/files/xwc.patch
index 7cf59656ce..7cf59656ce 100644
--- a/meta/packages/rxvt-unicode/files/xwc.patch
+++ b/meta/recipes-sato/rxvt-unicode/files/xwc.patch
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
index eb87b84b25..eb87b84b25 100644
--- a/meta/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb
index d13089501f..d13089501f 100644
--- a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index 39817f1dd5..39817f1dd5 100644
--- a/meta/packages/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
diff --git a/meta/packages/webkit/files/Makefile b/meta/recipes-sato/webkit/files/Makefile
index 1e50d1d358..1e50d1d358 100644
--- a/meta/packages/webkit/files/Makefile
+++ b/meta/recipes-sato/webkit/files/Makefile
diff --git a/meta/packages/webkit/files/Makefile.shared b/meta/recipes-sato/webkit/files/Makefile.shared
index aa9fa728d6..aa9fa728d6 100644
--- a/meta/packages/webkit/files/Makefile.shared
+++ b/meta/recipes-sato/webkit/files/Makefile.shared
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/recipes-sato/webkit/files/WebKit.pri
index d12423beb2..d12423beb2 100644
--- a/meta/packages/webkit/files/WebKit.pri
+++ b/meta/recipes-sato/webkit/files/WebKit.pri
diff --git a/meta/packages/webkit/files/WebKit.pro b/meta/recipes-sato/webkit/files/WebKit.pro
index bc14feb5f6..bc14feb5f6 100644
--- a/meta/packages/webkit/files/WebKit.pro
+++ b/meta/recipes-sato/webkit/files/WebKit.pro
diff --git a/meta/packages/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh
index 97beb209d2..97beb209d2 100755
--- a/meta/packages/webkit/files/autogen.sh
+++ b/meta/recipes-sato/webkit/files/autogen.sh
diff --git a/meta/packages/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac
index d4f3e749fc..d4f3e749fc 100644
--- a/meta/packages/webkit/files/configure.ac
+++ b/meta/recipes-sato/webkit/files/configure.ac
diff --git a/meta/packages/webkit/files/fix_im.patch b/meta/recipes-sato/webkit/files/fix_im.patch
index e69de29bb2..e69de29bb2 100644
--- a/meta/packages/webkit/files/fix_im.patch
+++ b/meta/recipes-sato/webkit/files/fix_im.patch
diff --git a/meta/packages/webkit/files/gtk-doc.make b/meta/recipes-sato/webkit/files/gtk-doc.make
index 354ffb7c66..354ffb7c66 100644
--- a/meta/packages/webkit/files/gtk-doc.make
+++ b/meta/recipes-sato/webkit/files/gtk-doc.make
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index fe31b9c24c..fe31b9c24c 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
diff --git a/meta/packages/apr/apr-util/configfix.patch b/meta/recipes-support/apr/apr-util/configfix.patch
index a8953e5244..a8953e5244 100644
--- a/meta/packages/apr/apr-util/configfix.patch
+++ b/meta/recipes-support/apr/apr-util/configfix.patch
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch
index 0b2a0903e1..0b2a0903e1 100644
--- a/meta/packages/apr/apr-util/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch.old b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
index 16f88b3bba..16f88b3bba 100644
--- a/meta/packages/apr/apr-util/configure_fixes.patch.old
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/recipes-support/apr/apr-util_1.3.4.bb
index 2e608e8a5c..2e608e8a5c 100644
--- a/meta/packages/apr/apr-util_1.3.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.4.bb
diff --git a/meta/packages/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch
index fd74826480..fd74826480 100644
--- a/meta/packages/apr/apr/cleanup.patch
+++ b/meta/recipes-support/apr/apr/cleanup.patch
diff --git a/meta/packages/apr/apr/configfix.patch b/meta/recipes-support/apr/apr/configfix.patch
index 995555e8ba..995555e8ba 100644
--- a/meta/packages/apr/apr/configfix.patch
+++ b/meta/recipes-support/apr/apr/configfix.patch
diff --git a/meta/packages/apr/apr/configure_fixes.patch b/meta/recipes-support/apr/apr/configure_fixes.patch
index 86ceb8cf08..86ceb8cf08 100644
--- a/meta/packages/apr/apr/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr/configure_fixes.patch
diff --git a/meta/packages/apr/apr_1.3.3.bb b/meta/recipes-support/apr/apr_1.3.3.bb
index a193a18a2e..a193a18a2e 100644
--- a/meta/packages/apr/apr_1.3.3.bb
+++ b/meta/recipes-support/apr/apr_1.3.3.bb
diff --git a/meta/packages/aspell/aspell_0.60.6.bb b/meta/recipes-support/aspell/aspell_0.60.6.bb
index 8d43a707d2..8d43a707d2 100644
--- a/meta/packages/aspell/aspell_0.60.6.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.bb
diff --git a/meta/packages/atk/atk.inc b/meta/recipes-support/atk/atk.inc
index 899d360e1a..899d360e1a 100644
--- a/meta/packages/atk/atk.inc
+++ b/meta/recipes-support/atk/atk.inc
diff --git a/meta/packages/atk/atk_1.30.0.bb b/meta/recipes-support/atk/atk_1.30.0.bb
index e85ef9040c..e85ef9040c 100644
--- a/meta/packages/atk/atk_1.30.0.bb
+++ b/meta/recipes-support/atk/atk_1.30.0.bb
diff --git a/meta/packages/attr/acl.inc b/meta/recipes-support/attr/acl.inc
index 68745dd728..68745dd728 100644
--- a/meta/packages/attr/acl.inc
+++ b/meta/recipes-support/attr/acl.inc
diff --git a/meta/packages/attr/acl_2.2.49.bb b/meta/recipes-support/attr/acl_2.2.49.bb
index e5d5509de1..e5d5509de1 100644
--- a/meta/packages/attr/acl_2.2.49.bb
+++ b/meta/recipes-support/attr/acl_2.2.49.bb
diff --git a/meta/packages/attr/attr-2.4.44/double-free.patch b/meta/recipes-support/attr/attr-2.4.44/double-free.patch
index 6fc684f6c2..6fc684f6c2 100644
--- a/meta/packages/attr/attr-2.4.44/double-free.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/double-free.patch
diff --git a/meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch
index 966632d87e..966632d87e 100644
--- a/meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch
diff --git a/meta/packages/attr/attr-2.4.44/memory-leak2.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch
index 03395423da..03395423da 100644
--- a/meta/packages/attr/attr-2.4.44/memory-leak2.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch
diff --git a/meta/packages/attr/attr-2.4.44/pull-in-string.h.patch b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch
index ccbc236284..ccbc236284 100644
--- a/meta/packages/attr/attr-2.4.44/pull-in-string.h.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch
diff --git a/meta/packages/attr/attr-2.4.44/thinko-in-restore.patch b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch
index a84de94ed0..a84de94ed0 100644
--- a/meta/packages/attr/attr-2.4.44/thinko-in-restore.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch
diff --git a/meta/packages/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index da7924631e..da7924631e 100644
--- a/meta/packages/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
diff --git a/meta/packages/attr/attr_2.4.44.bb b/meta/recipes-support/attr/attr_2.4.44.bb
index 0b21b33dcf..0b21b33dcf 100644
--- a/meta/packages/attr/attr_2.4.44.bb
+++ b/meta/recipes-support/attr/attr_2.4.44.bb
diff --git a/meta/packages/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 77fa2b4fd6..77fa2b4fd6 100644
--- a/meta/packages/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
diff --git a/meta/packages/attr/files/relative-libdir.patch b/meta/recipes-support/attr/files/relative-libdir.patch
index f989dd0ccc..f989dd0ccc 100644
--- a/meta/packages/attr/files/relative-libdir.patch
+++ b/meta/recipes-support/attr/files/relative-libdir.patch
diff --git a/meta/packages/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
index 3e18a87c3f..3e18a87c3f 100644
--- a/meta/packages/beecrypt/beecrypt/disable-icu-check.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
diff --git a/meta/packages/beecrypt/beecrypt/fix-security.patch b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
index 6103562e0a..6103562e0a 100644
--- a/meta/packages/beecrypt/beecrypt/fix-security.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
diff --git a/meta/packages/beecrypt/beecrypt/x64fix.patch b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
index ac02425d51..ac02425d51 100644
--- a/meta/packages/beecrypt/beecrypt/x64fix.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
diff --git a/meta/packages/beecrypt/beecrypt_4.1.2.bb b/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
index 6eb40e5d5d..6eb40e5d5d 100644
--- a/meta/packages/beecrypt/beecrypt_4.1.2.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
diff --git a/meta/packages/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc
index 5d2d1280be..5d2d1280be 100644
--- a/meta/packages/boost/boost-36.inc
+++ b/meta/recipes-support/boost/boost-36.inc
diff --git a/meta/packages/boost/boost-jam-native.inc b/meta/recipes-support/boost/boost-jam-native.inc
index fe181ad00f..fe181ad00f 100644
--- a/meta/packages/boost/boost-jam-native.inc
+++ b/meta/recipes-support/boost/boost-jam-native.inc
diff --git a/meta/packages/boost/boost-jam-native_3.1.18.bb b/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
index 2e92146a83..2e92146a83 100644
--- a/meta/packages/boost/boost-jam-native_3.1.18.bb
+++ b/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
diff --git a/meta/packages/boost/boost_1.44.0.bb b/meta/recipes-support/boost/boost_1.44.0.bb
index 81a2e53ba3..81a2e53ba3 100644
--- a/meta/packages/boost/boost_1.44.0.bb
+++ b/meta/recipes-support/boost/boost_1.44.0.bb
diff --git a/meta/packages/boost/files/1.34.1-gcc43.patch b/meta/recipes-support/boost/files/1.34.1-gcc43.patch
index 4670ac4295..4670ac4295 100644
--- a/meta/packages/boost/files/1.34.1-gcc43.patch
+++ b/meta/recipes-support/boost/files/1.34.1-gcc43.patch
diff --git a/meta/packages/boost/files/arm-intrinsics.patch b/meta/recipes-support/boost/files/arm-intrinsics.patch
index 3f9c620ebe..3f9c620ebe 100644
--- a/meta/packages/boost/files/arm-intrinsics.patch
+++ b/meta/recipes-support/boost/files/arm-intrinsics.patch
diff --git a/meta/packages/boost/files/atomic_count_gcc_atomicity.patch b/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
index 7d08e73550..7d08e73550 100644
--- a/meta/packages/boost/files/atomic_count_gcc_atomicity.patch
+++ b/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
diff --git a/meta/packages/boost/files/gcc41.patch b/meta/recipes-support/boost/files/gcc41.patch
index f91d1adf2b..f91d1adf2b 100644
--- a/meta/packages/boost/files/gcc41.patch
+++ b/meta/recipes-support/boost/files/gcc41.patch
diff --git a/meta/packages/boost/files/gcc43.patch b/meta/recipes-support/boost/files/gcc43.patch
index aefe0800c3..aefe0800c3 100644
--- a/meta/packages/boost/files/gcc43.patch
+++ b/meta/recipes-support/boost/files/gcc43.patch
diff --git a/meta/packages/boost/files/linux-uclibc.patch b/meta/recipes-support/boost/files/linux-uclibc.patch
index 79f14dea88..79f14dea88 100644
--- a/meta/packages/boost/files/linux-uclibc.patch
+++ b/meta/recipes-support/boost/files/linux-uclibc.patch
diff --git a/meta/packages/boost/files/unit_test_log10f.patch b/meta/recipes-support/boost/files/unit_test_log10f.patch
index b235e12446..b235e12446 100644
--- a/meta/packages/boost/files/unit_test_log10f.patch
+++ b/meta/recipes-support/boost/files/unit_test_log10f.patch
diff --git a/meta/packages/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch
index a3319a23e3..a3319a23e3 100644
--- a/meta/packages/curl/curl/noldlibpath.patch
+++ b/meta/recipes-support/curl/curl/noldlibpath.patch
diff --git a/meta/packages/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch
index a59d39b8b1..a59d39b8b1 100644
--- a/meta/packages/curl/curl/pkgconfig_fix.patch
+++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch
diff --git a/meta/packages/curl/curl_7.21.0.bb b/meta/recipes-support/curl/curl_7.21.0.bb
index 1e11222897..1e11222897 100644
--- a/meta/packages/curl/curl_7.21.0.bb
+++ b/meta/recipes-support/curl/curl_7.21.0.bb
diff --git a/meta/packages/db/db/arm-thumb-mutex.patch b/meta/recipes-support/db/db/arm-thumb-mutex.patch
index acd446fcd8..acd446fcd8 100644
--- a/meta/packages/db/db/arm-thumb-mutex.patch
+++ b/meta/recipes-support/db/db/arm-thumb-mutex.patch
diff --git a/meta/packages/db/db/configure_fixes.patch b/meta/recipes-support/db/db/configure_fixes.patch
index 80aa0e7c1c..80aa0e7c1c 100644
--- a/meta/packages/db/db/configure_fixes.patch
+++ b/meta/recipes-support/db/db/configure_fixes.patch
diff --git a/meta/packages/db/db_4.2.52.bb b/meta/recipes-support/db/db_4.2.52.bb
index b3ca493a01..b3ca493a01 100644
--- a/meta/packages/db/db_4.2.52.bb
+++ b/meta/recipes-support/db/db_4.2.52.bb
diff --git a/meta/packages/db/db_4.3.29.bb b/meta/recipes-support/db/db_4.3.29.bb
index 04a6680f07..04a6680f07 100644
--- a/meta/packages/db/db_4.3.29.bb
+++ b/meta/recipes-support/db/db_4.3.29.bb
diff --git a/meta/packages/enchant/enchant_1.6.0.bb b/meta/recipes-support/enchant/enchant_1.6.0.bb
index 92b4686545..92b4686545 100644
--- a/meta/packages/enchant/enchant_1.6.0.bb
+++ b/meta/recipes-support/enchant/enchant_1.6.0.bb
diff --git a/meta/packages/gdbm/gdbm-1.8.3/libtool-mode.patch b/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch
index c56bac2ca9..c56bac2ca9 100644
--- a/meta/packages/gdbm/gdbm-1.8.3/libtool-mode.patch
+++ b/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch
diff --git a/meta/packages/gdbm/gdbm-1.8.3/makefile.patch b/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch
index 5350c53729..5350c53729 100644
--- a/meta/packages/gdbm/gdbm-1.8.3/makefile.patch
+++ b/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch
diff --git a/meta/packages/gdbm/gdbm_1.8.3.bb b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
index e8369fd725..e8369fd725 100644
--- a/meta/packages/gdbm/gdbm_1.8.3.bb
+++ b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
diff --git a/meta/recipes-devtools/gmp/gmp-4.2.1/disable-stdc.patch b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
index 83c9eae36a..83c9eae36a 100644
--- a/meta/recipes-devtools/gmp/gmp-4.2.1/disable-stdc.patch
+++ b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
diff --git a/meta/recipes-devtools/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
index 6b56f7e7c8..6b56f7e7c8 100644
--- a/meta/recipes-devtools/gmp/gmp.inc
+++ b/meta/recipes-support/gmp/gmp.inc
diff --git a/meta/recipes-devtools/gmp/gmp/amd64.patch b/meta/recipes-support/gmp/gmp/amd64.patch
index 67be9dd350..67be9dd350 100644
--- a/meta/recipes-devtools/gmp/gmp/amd64.patch
+++ b/meta/recipes-support/gmp/gmp/amd64.patch
diff --git a/meta/recipes-devtools/gmp/gmp/configure.patch b/meta/recipes-support/gmp/gmp/configure.patch
index ed0c02d86c..ed0c02d86c 100644
--- a/meta/recipes-devtools/gmp/gmp/configure.patch
+++ b/meta/recipes-support/gmp/gmp/configure.patch
diff --git a/meta/recipes-devtools/gmp/gmp/sh4-asmfix.patch b/meta/recipes-support/gmp/gmp/sh4-asmfix.patch
index 1a01f61533..1a01f61533 100644
--- a/meta/recipes-devtools/gmp/gmp/sh4-asmfix.patch
+++ b/meta/recipes-support/gmp/gmp/sh4-asmfix.patch
diff --git a/meta/recipes-devtools/gmp/gmp/use-includedir.patch b/meta/recipes-support/gmp/gmp/use-includedir.patch
index ee3891f807..ee3891f807 100644
--- a/meta/recipes-devtools/gmp/gmp/use-includedir.patch
+++ b/meta/recipes-support/gmp/gmp/use-includedir.patch
diff --git a/meta/recipes-devtools/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
index d70dcf2665..d70dcf2665 100644
--- a/meta/recipes-devtools/gmp/gmp_4.2.1.bb
+++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
diff --git a/meta/recipes-devtools/gmp/gmp_5.0.1.bb b/meta/recipes-support/gmp/gmp_5.0.1.bb
index dd908bd7ca..dd908bd7ca 100644
--- a/meta/recipes-devtools/gmp/gmp_5.0.1.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.1.bb
diff --git a/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch
index 247e324564..247e324564 100644
--- a/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch
diff --git a/meta/packages/gnutls/gnutls-2.8.6/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch
index 413de06472..413de06472 100644
--- a/meta/packages/gnutls/gnutls-2.8.6/gnutls-openssl.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch
diff --git a/meta/packages/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch
index a2d2f03870..a2d2f03870 100644
--- a/meta/packages/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 76f4ca63fd..76f4ca63fd 100644
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
diff --git a/meta/packages/gnutls/gnutls_2.8.6.bb b/meta/recipes-support/gnutls/gnutls_2.8.6.bb
index d8adc6ba17..d8adc6ba17 100644
--- a/meta/packages/gnutls/gnutls_2.8.6.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.8.6.bb
diff --git a/meta/packages/gnutls/libtasn1_2.7.bb b/meta/recipes-support/gnutls/libtasn1_2.7.bb
index 11a7dc5055..11a7dc5055 100644
--- a/meta/packages/gnutls/libtasn1_2.7.bb
+++ b/meta/recipes-support/gnutls/libtasn1_2.7.bb
diff --git a/meta/packages/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
index f56f35b9ed..f56f35b9ed 100644
--- a/meta/packages/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
+++ b/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
diff --git a/meta/packages/gpgme/gpgme_1.3.0.bb b/meta/recipes-support/gpgme/gpgme_1.3.0.bb
index 1c665b5ea4..1c665b5ea4 100644
--- a/meta/packages/gpgme/gpgme_1.3.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.0.bb
diff --git a/meta/packages/hal/files/20hal b/meta/recipes-support/hal/files/20hal
index 5b97c4f9e6..5b97c4f9e6 100755
--- a/meta/packages/hal/files/20hal
+++ b/meta/recipes-support/hal/files/20hal
diff --git a/meta/packages/hal/files/autoconf.diff b/meta/recipes-support/hal/files/autoconf.diff
index eb30cccdbe..eb30cccdbe 100644
--- a/meta/packages/hal/files/autoconf.diff
+++ b/meta/recipes-support/hal/files/autoconf.diff
diff --git a/meta/packages/hal/files/hal-right-input-h.patch b/meta/recipes-support/hal/files/hal-right-input-h.patch
index f820b7790a..f820b7790a 100644
--- a/meta/packages/hal/files/hal-right-input-h.patch
+++ b/meta/recipes-support/hal/files/hal-right-input-h.patch
diff --git a/meta/packages/hal/files/sg-inhibit.patch b/meta/recipes-support/hal/files/sg-inhibit.patch
index f0cc41448a..f0cc41448a 100644
--- a/meta/packages/hal/files/sg-inhibit.patch
+++ b/meta/recipes-support/hal/files/sg-inhibit.patch
diff --git a/meta/packages/hal/hal-info.inc b/meta/recipes-support/hal/hal-info.inc
index adba83fb28..adba83fb28 100644
--- a/meta/packages/hal/hal-info.inc
+++ b/meta/recipes-support/hal/hal-info.inc
diff --git a/meta/packages/hal/hal-info_20091130.bb b/meta/recipes-support/hal/hal-info_20091130.bb
index e6d50e3981..e6d50e3981 100644
--- a/meta/packages/hal/hal-info_20091130.bb
+++ b/meta/recipes-support/hal/hal-info_20091130.bb
diff --git a/meta/packages/hal/hal-info_git.bb b/meta/recipes-support/hal/hal-info_git.bb
index 3fff5e0a7d..3fff5e0a7d 100644
--- a/meta/packages/hal/hal-info_git.bb
+++ b/meta/recipes-support/hal/hal-info_git.bb
diff --git a/meta/packages/hal/hal.inc b/meta/recipes-support/hal/hal.inc
index 839dfd0652..839dfd0652 100644
--- a/meta/packages/hal/hal.inc
+++ b/meta/recipes-support/hal/hal.inc
diff --git a/meta/packages/hal/hal/configure_fix.patch b/meta/recipes-support/hal/hal/configure_fix.patch
index e8417040de..e8417040de 100644
--- a/meta/packages/hal/hal/configure_fix.patch
+++ b/meta/recipes-support/hal/hal/configure_fix.patch
diff --git a/meta/packages/hal/hal_0.5.14.bb b/meta/recipes-support/hal/hal_0.5.14.bb
index a12be729cb..a12be729cb 100644
--- a/meta/packages/hal/hal_0.5.14.bb
+++ b/meta/recipes-support/hal/hal_0.5.14.bb
diff --git a/meta/packages/hal/hal_git.bb b/meta/recipes-support/hal/hal_git.bb
index baed472375..baed472375 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/recipes-support/hal/hal_git.bb
diff --git a/meta/packages/icu/files/gccfix.patch b/meta/recipes-support/icu/files/gccfix.patch
index 9291e921d3..9291e921d3 100644
--- a/meta/packages/icu/files/gccfix.patch
+++ b/meta/recipes-support/icu/files/gccfix.patch
diff --git a/meta/packages/icu/files/noldlibpath.patch b/meta/recipes-support/icu/files/noldlibpath.patch
index eba3d805d4..eba3d805d4 100644
--- a/meta/packages/icu/files/noldlibpath.patch
+++ b/meta/recipes-support/icu/files/noldlibpath.patch
diff --git a/meta/packages/icu/files/use-g++-for-linking.patch b/meta/recipes-support/icu/files/use-g++-for-linking.patch
index 4702abc065..4702abc065 100644
--- a/meta/packages/icu/files/use-g++-for-linking.patch
+++ b/meta/recipes-support/icu/files/use-g++-for-linking.patch
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index 1c611bdf36..1c611bdf36 100644
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/recipes-support/icu/icu_3.6.bb
index 5042116009..5042116009 100644
--- a/meta/packages/icu/icu_3.6.bb
+++ b/meta/recipes-support/icu/icu_3.6.bb
diff --git a/meta/packages/iso-codes/iso-codes_3.3.bb b/meta/recipes-support/iso-codes/iso-codes_3.3.bb
index 23d025f4d2..23d025f4d2 100644
--- a/meta/packages/iso-codes/iso-codes_3.3.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.3.bb
diff --git a/meta/packages/js/files/buildcc.patch b/meta/recipes-support/js/files/buildcc.patch
index 26eef218d6..26eef218d6 100644
--- a/meta/packages/js/files/buildcc.patch
+++ b/meta/recipes-support/js/files/buildcc.patch
diff --git a/meta/packages/js/files/configure.ac b/meta/recipes-support/js/files/configure.ac
index 41af298455..41af298455 100644
--- a/meta/packages/js/files/configure.ac
+++ b/meta/recipes-support/js/files/configure.ac
diff --git a/meta/packages/js/files/jsautocfg.h b/meta/recipes-support/js/files/jsautocfg.h
index 16e38bf8d6..16e38bf8d6 100644
--- a/meta/packages/js/files/jsautocfg.h
+++ b/meta/recipes-support/js/files/jsautocfg.h
diff --git a/meta/packages/js/files/link_with_gcc.patch b/meta/recipes-support/js/files/link_with_gcc.patch
index d74b94f378..d74b94f378 100644
--- a/meta/packages/js/files/link_with_gcc.patch
+++ b/meta/recipes-support/js/files/link_with_gcc.patch
diff --git a/meta/packages/js/files/usepic.patch b/meta/recipes-support/js/files/usepic.patch
index ddd31be9cb..ddd31be9cb 100644
--- a/meta/packages/js/files/usepic.patch
+++ b/meta/recipes-support/js/files/usepic.patch
diff --git a/meta/packages/js/js_1.7.0+1.8.0rc1.bb b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
index 97cba90d03..97cba90d03 100644
--- a/meta/packages/js/js_1.7.0+1.8.0rc1.bb
+++ b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
diff --git a/meta/packages/libassuan/libassuan_2.0.0.bb b/meta/recipes-support/libassuan/libassuan_2.0.0.bb
index 11934013ce..11934013ce 100644
--- a/meta/packages/libassuan/libassuan_2.0.0.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.0.0.bb
diff --git a/meta/packages/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 16eaae690c..16eaae690c 100644
--- a/meta/packages/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
diff --git a/meta/packages/libcap/libcap_2.19.bb b/meta/recipes-support/libcap/libcap_2.19.bb
index eb861535e9..eb861535e9 100644
--- a/meta/packages/libcap/libcap_2.19.bb
+++ b/meta/recipes-support/libcap/libcap_2.19.bb
diff --git a/meta/packages/libcheck/libcheck_0.9.8.bb b/meta/recipes-support/libcheck/libcheck_0.9.8.bb
index 048b8ce622..048b8ce622 100644
--- a/meta/packages/libcheck/libcheck_0.9.8.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.9.8.bb
diff --git a/meta/packages/libcroco/files/croco.patch b/meta/recipes-support/libcroco/files/croco.patch
index 572f9de59f..572f9de59f 100644
--- a/meta/packages/libcroco/files/croco.patch
+++ b/meta/recipes-support/libcroco/files/croco.patch
diff --git a/meta/packages/libcroco/libcroco_0.6.2.bb b/meta/recipes-support/libcroco/libcroco_0.6.2.bb
index 2ea33b155b..2ea33b155b 100644
--- a/meta/packages/libcroco/libcroco_0.6.2.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.2.bb
diff --git a/meta/packages/libdaemon/libdaemon_0.14.bb b/meta/recipes-support/libdaemon/libdaemon_0.14.bb
index b4092fdbb9..b4092fdbb9 100644
--- a/meta/packages/libdaemon/libdaemon_0.14.bb
+++ b/meta/recipes-support/libdaemon/libdaemon_0.14.bb
diff --git a/meta/packages/libevent/libevent_1.4.14b.bb b/meta/recipes-support/libevent/libevent_1.4.14b.bb
index 4209305512..4209305512 100644
--- a/meta/packages/libevent/libevent_1.4.14b.bb
+++ b/meta/recipes-support/libevent/libevent_1.4.14b.bb
diff --git a/meta/packages/libfm/libfm_0.1.12.bb b/meta/recipes-support/libfm/libfm_0.1.12.bb
index 83e6af8523..83e6af8523 100644
--- a/meta/packages/libfm/libfm_0.1.12.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.12.bb
diff --git a/meta/packages/libfribidi/files/libtool-update.patch b/meta/recipes-support/libfribidi/files/libtool-update.patch
index c7031008fd..c7031008fd 100644
--- a/meta/packages/libfribidi/files/libtool-update.patch
+++ b/meta/recipes-support/libfribidi/files/libtool-update.patch
diff --git a/meta/packages/libfribidi/libfribidi_0.10.4.bb b/meta/recipes-support/libfribidi/libfribidi_0.10.4.bb
index a9850fe52d..a9850fe52d 100644
--- a/meta/packages/libfribidi/libfribidi_0.10.4.bb
+++ b/meta/recipes-support/libfribidi/libfribidi_0.10.4.bb
diff --git a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch b/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
index 24a59787a2..24a59787a2 100644
--- a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch
+++ b/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
diff --git a/meta/packages/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 08fe7992fa..08fe7992fa 100644
--- a/meta/packages/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
diff --git a/meta/packages/libgcrypt/libgcrypt_1.4.6.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
index a592437913..a592437913 100644
--- a/meta/packages/libgcrypt/libgcrypt_1.4.6.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
diff --git a/meta/packages/libgdbus/libgdbus_git.bb b/meta/recipes-support/libgdbus/libgdbus_git.bb
index f0101f9925..f0101f9925 100644
--- a/meta/packages/libgdbus/libgdbus_git.bb
+++ b/meta/recipes-support/libgdbus/libgdbus_git.bb
diff --git a/meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
index 49e47d874e..49e47d874e 100644
--- a/meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
diff --git a/meta/packages/libgpg-error/libgpg-error_1.8.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.8.bb
index 120feecafa..120feecafa 100644
--- a/meta/packages/libgpg-error/libgpg-error_1.8.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.8.bb
diff --git a/meta/packages/libiconv/libiconv_1.9.2.bb b/meta/recipes-support/libiconv/libiconv_1.9.2.bb
index d427dcef83..d427dcef83 100644
--- a/meta/packages/libiconv/libiconv_1.9.2.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.9.2.bb
diff --git a/meta/packages/libmpc/libmpc.inc b/meta/recipes-support/libmpc/libmpc.inc
index 6e18e588be..6e18e588be 100644
--- a/meta/packages/libmpc/libmpc.inc
+++ b/meta/recipes-support/libmpc/libmpc.inc
diff --git a/meta/packages/libmpc/libmpc_0.8.2.bb b/meta/recipes-support/libmpc/libmpc_0.8.2.bb
index 1792066e77..1792066e77 100644
--- a/meta/packages/libmpc/libmpc_0.8.2.bb
+++ b/meta/recipes-support/libmpc/libmpc_0.8.2.bb
diff --git a/meta/packages/libnl/libnl/compilefix.patch b/meta/recipes-support/libnl/libnl/compilefix.patch
index f75ff282af..f75ff282af 100644
--- a/meta/packages/libnl/libnl/compilefix.patch
+++ b/meta/recipes-support/libnl/libnl/compilefix.patch
diff --git a/meta/packages/libnl/libnl/local-includes.patch b/meta/recipes-support/libnl/libnl/local-includes.patch
index 5af463004b..5af463004b 100644
--- a/meta/packages/libnl/libnl/local-includes.patch
+++ b/meta/recipes-support/libnl/libnl/local-includes.patch
diff --git a/meta/packages/libnl/libnl_1.1.bb b/meta/recipes-support/libnl/libnl_1.1.bb
index 683df9159f..683df9159f 100644
--- a/meta/packages/libnl/libnl_1.1.bb
+++ b/meta/recipes-support/libnl/libnl_1.1.bb
diff --git a/meta/packages/liboil/liboil-0.3.17/no-tests.patch b/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
index 00cf5d7431..00cf5d7431 100644
--- a/meta/packages/liboil/liboil-0.3.17/no-tests.patch
+++ b/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
diff --git a/meta/packages/liboil/liboil_0.3.17.bb b/meta/recipes-support/liboil/liboil_0.3.17.bb
index 8ba303069d..8ba303069d 100644
--- a/meta/packages/liboil/liboil_0.3.17.bb
+++ b/meta/recipes-support/liboil/liboil_0.3.17.bb
diff --git a/meta/packages/libpcre/files/pcre-cross.patch b/meta/recipes-support/libpcre/files/pcre-cross.patch
index 0626fb347a..0626fb347a 100644
--- a/meta/packages/libpcre/files/pcre-cross.patch
+++ b/meta/recipes-support/libpcre/files/pcre-cross.patch
diff --git a/meta/packages/libpcre/libpcre_8.10.bb b/meta/recipes-support/libpcre/libpcre_8.10.bb
index 840d74a658..840d74a658 100644
--- a/meta/packages/libpcre/libpcre_8.10.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.10.bb
diff --git a/meta/packages/libproxy/libproxy_0.4.3.bb b/meta/recipes-support/libproxy/libproxy_0.4.3.bb
index 6c0b7a50c6..6c0b7a50c6 100644
--- a/meta/packages/libproxy/libproxy_0.4.3.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.3.bb
diff --git a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.31.2.bb
index 9a00e07da0..9a00e07da0 100644
--- a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.31.2.bb
diff --git a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.4.1.bb
index f48ac3d6c9..f48ac3d6c9 100644
--- a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.4.1.bb
diff --git a/meta/packages/libsoup/libsoup_2.2.100.bb b/meta/recipes-support/libsoup/libsoup_2.2.100.bb
index 94efb7f676..94efb7f676 100644
--- a/meta/packages/libsoup/libsoup_2.2.100.bb
+++ b/meta/recipes-support/libsoup/libsoup_2.2.100.bb
diff --git a/meta/packages/liburcu/liburcu_0.4.6.bb b/meta/recipes-support/liburcu/liburcu_0.4.6.bb
index 503b561d37..503b561d37 100644
--- a/meta/packages/liburcu/liburcu_0.4.6.bb
+++ b/meta/recipes-support/liburcu/liburcu_0.4.6.bb
diff --git a/meta/packages/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch b/meta/recipes-support/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch
index 501ba3fb29..501ba3fb29 100644
--- a/meta/packages/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch
+++ b/meta/recipes-support/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch
diff --git a/meta/packages/libusb/libusb-compat_0.1.3.bb b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
index e8d6338e57..e8d6338e57 100644
--- a/meta/packages/libusb/libusb-compat_0.1.3.bb
+++ b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
diff --git a/meta/packages/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb
index 26a535ab4e..26a535ab4e 100644
--- a/meta/packages/libusb/libusb1_1.0.8.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb
diff --git a/meta/packages/libxslt/libxslt/pkgconfig_fix.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
index d21663896f..d21663896f 100644
--- a/meta/packages/libxslt/libxslt/pkgconfig_fix.patch
+++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
diff --git a/meta/packages/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index b5726974f1..b5726974f1 100644
--- a/meta/packages/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
diff --git a/meta/packages/lzo/lzo-2.03/acinclude.m4 b/meta/recipes-support/lzo/lzo-2.03/acinclude.m4
index c4d2ccd5b5..c4d2ccd5b5 100644
--- a/meta/packages/lzo/lzo-2.03/acinclude.m4
+++ b/meta/recipes-support/lzo/lzo-2.03/acinclude.m4
diff --git a/meta/packages/lzo/lzo-2.03/autofoo.patch b/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
index 5762f4c6e2..5762f4c6e2 100644
--- a/meta/packages/lzo/lzo-2.03/autofoo.patch
+++ b/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
diff --git a/meta/packages/lzo/lzo_2.03.bb b/meta/recipes-support/lzo/lzo_2.03.bb
index 9657d97e59..9657d97e59 100644
--- a/meta/packages/lzo/lzo_2.03.bb
+++ b/meta/recipes-support/lzo/lzo_2.03.bb
diff --git a/meta/recipes-devtools/mpfr/mpfr.inc b/meta/recipes-support/mpfr/mpfr.inc
index dbb859fe3e..dbb859fe3e 100644
--- a/meta/recipes-devtools/mpfr/mpfr.inc
+++ b/meta/recipes-support/mpfr/mpfr.inc
diff --git a/meta/recipes-devtools/mpfr/mpfr_3.0.0.bb b/meta/recipes-support/mpfr/mpfr_3.0.0.bb
index 188a5d95cd..188a5d95cd 100644
--- a/meta/recipes-devtools/mpfr/mpfr_3.0.0.bb
+++ b/meta/recipes-support/mpfr/mpfr_3.0.0.bb
diff --git a/meta/packages/neon/neon-0.29.3/pkgconfig.patch b/meta/recipes-support/neon/neon-0.29.3/pkgconfig.patch
index 6256d9ab2b..6256d9ab2b 100644
--- a/meta/packages/neon/neon-0.29.3/pkgconfig.patch
+++ b/meta/recipes-support/neon/neon-0.29.3/pkgconfig.patch
diff --git a/meta/packages/neon/neon_0.29.3.bb b/meta/recipes-support/neon/neon_0.29.3.bb
index bb18893f9e..bb18893f9e 100644
--- a/meta/packages/neon/neon_0.29.3.bb
+++ b/meta/recipes-support/neon/neon_0.29.3.bb
diff --git a/meta/packages/ohm/ohm/fix_configure.patch b/meta/recipes-support/ohm/ohm/fix_configure.patch
index e4b774e785..e4b774e785 100644
--- a/meta/packages/ohm/ohm/fix_configure.patch
+++ b/meta/recipes-support/ohm/ohm/fix_configure.patch
diff --git a/meta/packages/ohm/ohm_git.bb b/meta/recipes-support/ohm/ohm_git.bb
index 2ba78b35ab..2ba78b35ab 100644
--- a/meta/packages/ohm/ohm_git.bb
+++ b/meta/recipes-support/ohm/ohm_git.bb
diff --git a/meta/packages/openobex/files/disable-cable-test.patch b/meta/recipes-support/openobex/files/disable-cable-test.patch
index 95b636dd8f..95b636dd8f 100644
--- a/meta/packages/openobex/files/disable-cable-test.patch
+++ b/meta/recipes-support/openobex/files/disable-cable-test.patch
diff --git a/meta/packages/openobex/files/libusb_crosscompile_check.patch b/meta/recipes-support/openobex/files/libusb_crosscompile_check.patch
index 20ac70bd1e..20ac70bd1e 100644
--- a/meta/packages/openobex/files/libusb_crosscompile_check.patch
+++ b/meta/recipes-support/openobex/files/libusb_crosscompile_check.patch
diff --git a/meta/packages/openobex/openobex_1.5.bb b/meta/recipes-support/openobex/openobex_1.5.bb
index dc07ae1353..dc07ae1353 100644
--- a/meta/packages/openobex/openobex_1.5.bb
+++ b/meta/recipes-support/openobex/openobex_1.5.bb
diff --git a/meta/packages/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index 347c0fc4a4..347c0fc4a4 100644
--- a/meta/packages/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
diff --git a/meta/packages/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb
index 8ee3cd4cd1..8ee3cd4cd1 100644
--- a/meta/packages/pth/pth_2.0.7.bb
+++ b/meta/recipes-support/pth/pth_2.0.7.bb
diff --git a/meta/packages/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index c2e5487019..c2e5487019 100644
--- a/meta/packages/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
diff --git a/meta/packages/shared-mime-info/shared-mime-info_0.71.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.71.bb
index fc64c2b0e0..fc64c2b0e0 100644
--- a/meta/packages/shared-mime-info/shared-mime-info_0.71.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.71.bb
diff --git a/meta/packages/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 709e3016b8..709e3016b8 100644
--- a/meta/packages/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
diff --git a/meta/packages/sqlite/sqlite3/libtool.patch b/meta/recipes-support/sqlite/sqlite3/libtool.patch
index ccf9993ed2..ccf9993ed2 100644
--- a/meta/packages/sqlite/sqlite3/libtool.patch
+++ b/meta/recipes-support/sqlite/sqlite3/libtool.patch
diff --git a/meta/packages/sqlite/sqlite3_3.6.23.1.bb b/meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
index 5075dd35b7..5075dd35b7 100644
--- a/meta/packages/sqlite/sqlite3_3.6.23.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
diff --git a/meta/packages/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 6138f8ca01..6138f8ca01 100644
--- a/meta/packages/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
diff --git a/meta/packages/vte/vte_0.24.3.bb b/meta/recipes-support/vte/vte_0.24.3.bb
index 1953101f82..1953101f82 100644
--- a/meta/packages/vte/vte_0.24.3.bb
+++ b/meta/recipes-support/vte/vte_0.24.3.bb
diff --git a/meta/packages/poppler/poppler-data_0.1.bb b/meta/recipes-tbd/poppler/poppler-data_0.1.bb
index ca22e4dba0..ca22e4dba0 100644
--- a/meta/packages/poppler/poppler-data_0.1.bb
+++ b/meta/recipes-tbd/poppler/poppler-data_0.1.bb
diff --git a/meta/packages/poppler/poppler-fpu.inc b/meta/recipes-tbd/poppler/poppler-fpu.inc
index a26273020a..a26273020a 100644
--- a/meta/packages/poppler/poppler-fpu.inc
+++ b/meta/recipes-tbd/poppler/poppler-fpu.inc
diff --git a/meta/packages/poppler/poppler.inc b/meta/recipes-tbd/poppler/poppler.inc
index 645e734e8b..645e734e8b 100644
--- a/meta/packages/poppler/poppler.inc
+++ b/meta/recipes-tbd/poppler/poppler.inc
diff --git a/meta/packages/poppler/poppler_0.9.2.bb b/meta/recipes-tbd/poppler/poppler_0.9.2.bb
index 92c25bc0ac..92c25bc0ac 100644
--- a/meta/packages/poppler/poppler_0.9.2.bb
+++ b/meta/recipes-tbd/poppler/poppler_0.9.2.bb
diff --git a/meta/packages/xournal/files/ldflags.patch b/meta/recipes-tbd/xournal/files/ldflags.patch
index 7f6585befb..7f6585befb 100644
--- a/meta/packages/xournal/files/ldflags.patch
+++ b/meta/recipes-tbd/xournal/files/ldflags.patch
diff --git a/meta/packages/xournal/files/no-printing.diff b/meta/recipes-tbd/xournal/files/no-printing.diff
index 7a4724e696..7a4724e696 100644
--- a/meta/packages/xournal/files/no-printing.diff
+++ b/meta/recipes-tbd/xournal/files/no-printing.diff
diff --git a/meta/packages/xournal/xournal_0.2.bb b/meta/recipes-tbd/xournal/xournal_0.2.bb
index 1ca6e1ed7c..1ca6e1ed7c 100644
--- a/meta/packages/xournal/xournal_0.2.bb
+++ b/meta/recipes-tbd/xournal/xournal_0.2.bb