diff options
25 files changed, 9 insertions, 143 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index f6330981c5..c7415a7d8b 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -76,8 +76,11 @@ ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" +TARGET_FPU_ppc405 ?= "soft" -TARGET_FPU_dht-walnut ?= "soft" +TARGET_FPU_armv6 ?= "hard" +TARGET_FPU_armv7a ?= "hard" +TARGET_FPU_ppc603e ?= "hard" #Set the right arch for the feeds #Alphabetically sorted diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 637126b1e3..824ab2b7b3 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -13,7 +13,6 @@ GUI_MACHINE_CLASS = "bigscreen" #Ship all kernel modules till the board support has matured enough MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc # requires gcc 4.3.0: #include conf/machine/include/tune-cortexa8.inc diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf index ad17bb82bf..f5f6cb5c66 100644 --- a/conf/machine/htckaiser.conf +++ b/conf/machine/htckaiser.conf @@ -11,7 +11,6 @@ GUI_MACHINE_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -TARGET_FPU = "soft" TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" FEED_ARCH = "armv6" PACKAGE_ARCH = "armv6" diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf index 2df6ce0802..4760d64e30 100644 --- a/conf/machine/lsarm.conf +++ b/conf/machine/lsarm.conf @@ -8,7 +8,6 @@ INHERIT += "lsarm-image" MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd" MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" -TARGET_FPU = "soft" PREFERRED_PROVIDER_virtual/bootloader = "" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index fcd15ad2ef..78c9b8a462 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB TARGET_ARCH = "powerpc" -TARGET_FPU ?= "soft" PACKAGE_EXTRA_ARCHS = "ppce300c2" PREFERRED_PROVIDER_virtual/kernel ?= "linux" diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index e600af8bf2..6a5c09796b 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for Freescale MX31ADS TARGET_ARCH = "arm" -TARGET_FPU_arm = "hard" MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf index c918404d6c..6884d6e3d6 100644 --- a/conf/machine/mx31moboard.conf +++ b/conf/machine/mx31moboard.conf @@ -4,7 +4,6 @@ #@Website: http://mobots.epfl.ch/mx31MoBoard.html TARGET_ARCH = "arm" -TARGET_FPU_arm = "hard" MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 89f79fa185..026339ded6 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -1,6 +1,5 @@ TARGET_ARCH = "arm" TARGET_OS = "linux" -TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" INHERIT += "n2100-image" diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index aa35383410..afdf0ac621 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -11,7 +11,6 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc ROOT_FLASH_SIZE = "174" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 5b69bbdc9a..336c4e4900 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,5 +1,4 @@ TARGET_ARCH = "powerpc" -TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc603e" # terminal specs - console, but no other ports diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 6d9362958b..bb923dc19c 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -1,6 +1,5 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" -TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc603e" INHERIT += "turbostation-image" diff --git a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch b/packages/gtk+/files/gtklabel-resize-patch index df29656343..df29656343 100644 --- a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch +++ b/packages/gtk+/files/gtklabel-resize-patch diff --git a/packages/gtk+/gtk+-2.10.14/xsettings.patch b/packages/gtk+/files/xsettings.patch index b63e262d34..b63e262d34 100644 --- a/packages/gtk+/gtk+-2.10.14/xsettings.patch +++ b/packages/gtk+/files/xsettings.patch diff --git a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.12.0/xsettings.patch b/packages/gtk+/gtk+-2.12.0/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.12.0/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.12.3/xsettings.patch b/packages/gtk+/gtk+-2.12.3/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.12.3/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch b/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.6.10/xsettings.patch b/packages/gtk+/gtk+-2.6.10/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.6.10/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.8.16/xsettings.patch b/packages/gtk+/gtk+-2.8.16/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.8.16/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.8.9/xsettings.patch b/packages/gtk+/gtk+-2.8.9/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.8.9/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb index e77d24d819..f23f6bd945 100644 --- a/packages/uim/uim-native_1.3.1.bb +++ b/packages/uim/uim-native_1.3.1.bb @@ -1,6 +1,8 @@ require uim.inc DEPENDS = "gtk+ anthy intltool-native" inherit native autotools pkgconfig -PR = "r1" +PR = "r2" S = "${WORKDIR}/uim-${PV}" + +EXTRA_OECONF += "--disable-xim" diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc index dc8ba50b6f..b78d4019ac 100644 --- a/packages/uim/uim.inc +++ b/packages/uim/uim.inc @@ -15,4 +15,5 @@ EXTRA_OECONF += "--disable-applet \ SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2" -FILES_${PN}-dbg += "${libdir}/*/*/immodules/.debug ${libdir}/uim/plugin" +FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" +FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" |