merge of '3c0e078ee39da24a256067ec5c50395619259524'

     and 'ddf801e292cf0442dbd1fe0e9ec66ac87b15dc77'

11 files changed, 90 insertions, 19 deletions

diff --git a/packages/anthy/anthy_7811.bb b/packages/anthy/anthy_7811.bb
index 5ac651223b..9f5bf8d1e6 100644
--- a/packages/anthy/anthy_7811.bb
+++ b/packages/anthy/anthy_7811.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://anthy.sourceforge.jp"
 LICENSE = "GPL"
 DEPENDS = "anthy-native"
 SECTION = "inputmethods"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
 	   file://not_build_elc.patch;patch=1 \
@@ -14,8 +14,6 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
 
 inherit autotools pkgconfig
 
-PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev"
-
 DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
 DESCRIPTION_libanthy0 = "Anthy runtime library"
 DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
@@ -27,6 +25,12 @@ SECTION_libanthy-dev = "devel/libs"
 LEAD_SONAME = "libanthy.so.0"
 RDEPENDS_anthy = "libanthy0"
 
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES += "${PN}-el libanthy0 libanthy-dev"
+FILES_${PN}-dbg += "${libdir}/.debug"
 FILES_libanthy0 = "${libdir}/libanthy.so.*	\
            		   ${libdir}/libanthydic.so.*	\
 		           ${libdir}/libanthyinput.so.*"
@@ -39,8 +43,3 @@ FILES_${PN}-el = "${datadir}/emacs/*"
 FILES_${PN} = "${datadir}/* \
                ${bindir}/* \
                ${sysconfdir}/anthy-conf"
-
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/gtkterm/.mtn2git_empty b/packages/gtkterm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtkterm/.mtn2git_empty
diff --git a/packages/gtkterm/gtkterm2_0.2.3.bb b/packages/gtkterm/gtkterm2_0.2.3.bb
new file mode 100644
index 0000000000..c86c0c4a47
--- /dev/null
+++ b/packages/gtkterm/gtkterm2_0.2.3.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "A lightweight terminal emulator based on VTE and Gtk+"
+HOMEPAGE = "http://gtkterm.feige.net/"
+AUTHOR = "Oliver Feige"
+SECTION = "x11/terminals"
+DEPENDS = "gtk+ vte"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gtkterm/gtkterm2-${PV}.tar.gz"
+
+inherit autotools
+
diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
new file mode 100644
index 0000000000..a5e8b847c5
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
@@ -0,0 +1,45 @@
+diff --git a/devscripts/acinclude.m4.in.qt2 b/devscripts/acinclude.m4.in.qt2
+index 500e75f..e8d9758 100644
+--- a/devscripts/acinclude.m4.in.qt2
++++ b/devscripts/acinclude.m4.in.qt2
+@@ -4937,31 +4937,11 @@ AC_DEFUN([KDE_SET_PREFIX],
+   AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+ 
+   KDE_SET_DEFAULT_BINDIRS
+-  if test "x$prefix" = "xNONE"; then
+-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
+-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+-  else
+-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+-    kde_save_PATH="$PATH"
+-    PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+-    PATH="$kde_save_PATH"
+-  fi
+-
+-  kde_libs_prefix=`$KDECONFIG --prefix`
+-  if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
+-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+-                    This means it has been moved since you installed it.
+-                    This won't work. Please recompile kdelibs for the new prefix.
+-                    ])
+-  fi
+-  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+-  kde_libs_suffix=`$KDECONFIG --libsuffix`
+ 
+   AC_MSG_CHECKING([where to install])
+   if test "x$prefix" = "xNONE"; then
+     prefix=$kde_libs_prefix
+-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
++    AC_MSG_RESULT([$prefix (as NOT returned by kde-config)])
+   else
+     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
+     given_prefix=$prefix
+@@ -4973,7 +4953,6 @@ AC_DEFUN([KDE_SET_PREFIX],
+   exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+   given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+ 
+-  AC_SUBST(KDECONFIG)
+   AC_SUBST(kde_libs_prefix)
+   AC_SUBST(kde_libs_htmldir)
+ 
diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb
index 31eebaa860..0c2107bf79 100644
--- a/packages/konqueror/konqueror-embedded_20070212.bb
+++ b/packages/konqueror/konqueror-embedded_20070212.bb
@@ -11,6 +11,7 @@ PR = "r4"
 inherit autotools
 
 SRC_URI = "http://www.basyskom.de/uploads/175/35/kdenox_snapshot_Qt2_2007.02.12.tar.bz2 \
+	   file://dont-use-kde-config.patch;patch=1 \
            file://konqe_new_opie.patch;patch=1 \
 	   file://konqe-kapplication.patch;patch=1"
 S = "${WORKDIR}/kdenox"
diff --git a/packages/qemu/qemu-qop-nogfx-native_svn.bb b/packages/qemu/qemu-qop-nogfx-native_svn.bb
index 4936761339..1a041c8536 100644
--- a/packages/qemu/qemu-qop-nogfx-native_svn.bb
+++ b/packages/qemu/qemu-qop-nogfx-native_svn.bb
@@ -4,6 +4,7 @@ PROVIDES = "qemu-native"
 
 SRC_URI = "svn://nowt.dyndns.org/svn/qemu;module=trunk;proto=https \
            file://configure.patch;patch=1 \
+           http://www.busybox.net/downloads/qemu/qemu-gcc-4-all.patch;patch=1 \
            "
 
 S = "${WORKDIR}/trunk"
diff --git a/packages/qemu/qemu_cvs.bb b/packages/qemu/qemu_cvs.bb
index 8d22a6f1f8..23589fec9e 100644
--- a/packages/qemu/qemu_cvs.bb
+++ b/packages/qemu/qemu_cvs.bb
@@ -14,8 +14,11 @@ SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;r
            file://compiler.patch;patch=1 \
            file://qemu-usb-wacom-0.8.2.patch;patch=1 \
            file://qemu-usb-wacom-pressure.patch;patch=1 \
-           file://qemu-usb-wacom-buttons.patch;patch=1"
+           file://qemu-usb-wacom-buttons.patch;patch=1 \
+           http://www.busybox.net/downloads/qemu/qemu-gcc-4-all.patch;patch=1"
 S = "${WORKDIR}/qemu"
 
+EXTRA_OECONF="--disable-gcc-check"
+
 inherit autotools
 
diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb
index 5249ac6394..653056e193 100644
--- a/packages/uim/uim-native_1.3.1.bb
+++ b/packages/uim/uim-native_1.3.1.bb
@@ -1,3 +1,5 @@
 require uim.inc
 DEPENDS = "gtk+ anthy intltool-native"
 inherit native autotools pkgconfig
+
+S = "${WORKDIR}/uim-${PV}"
diff --git a/packages/vte/vte_0.11.15.bb b/packages/vte/vte_0.11.15.bb
index 274cd81070..71ca0a04bd 100644
--- a/packages/vte/vte_0.11.15.bb
+++ b/packages/vte/vte_0.11.15.bb
@@ -1,10 +1,14 @@
+DESCRIPTION = "vte is a virtual terminal emulator"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_stage() {
-autotools_stage_all
+	autotools_stage_all
 }
+
+PACKAGES =+ "libvte"
+FILES_libvte = "${libdir}/*.so*"
diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb
index 9cdc72f797..cb2edffd01 100644
--- a/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb
@@ -11,7 +11,7 @@ DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
 
-PR = "r2"
+PR = "r3"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive"
 
diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch
index 2f7f5ca020..f2db7acb4b 100644
--- a/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kdrive-imageon.patch
@@ -902,7 +902,7 @@
 +#endif
 --- /dev/null
 +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon_cursor.c
-@@ -0,0 +1,565 @@
+@@ -0,0 +1,569 @@
 +/*
 + * Copyright © 2007 Manuel Teira
 + *
@@ -1253,8 +1253,12 @@
 +        W100_HOST2CARD(pCurPriv->area->vidmem->base
 +                       + pCurPriv->area->offset);
 +    DBG_IMAGEON(("W100MoveCursor dst(x:%d,y:%d),"
++                 "hwpos(hpos.start:%d,hpos.end:%d,vpos.start:%d,vpos.end:%d),"
 +                 "mapped(x:%d,y:%d,xoffs:%d,yoffs:%d)\n",
-+                 x, y, deviceBox.x1, deviceBox.y1, xoffs, yoffs));
++                 x, y, 
++                 hpos.f.cur_h_start, hpos.f.cur_h_end,
++                 vpos.f.cur_v_start, vpos.f.cur_v_end,
++                 deviceBox.x1, deviceBox.y1, xoffs, yoffs));
 +
 +    W100DisableDisplayUpdate(w100c);
 +    MMIO_OUT32(mmCURSOR1_OFFSET, cursor_offset.val);
@@ -7009,7 +7013,7 @@
 +        dst->x1 = src->y1;
 +        dst->y1 = w100c->hw_window.width - src->x2 - 1;
 +        dst->x2 = src->y2;
-+        dst->y2 = w100c->hw_window.height - src->x1 - 1;
++        dst->y2 = w100c->hw_window.width - src->x1 - 1;
 +        break;
 +    }
 +    DBG_IMAGEON(("MapToDevice (x1:%d,y1:%d,x2:%d,y2:%d)->(x1:%d,y1:%d,x2:%d,y2:%d)\n",
@@ -7731,7 +7735,7 @@
 +        
 --- /dev/null
 +++ xorg-server-X11R7.1-1.1.0.work/hw/kdrive/imageon/imageon_video.c
-@@ -0,0 +1,1170 @@
+@@ -0,0 +1,1172 @@
 +/*
 + * Copyright © 2007 Manuel Teira
 + *
@@ -8625,12 +8629,14 @@
 +    for (i = 0; i < NUM_OVL_RESIZERS; i++) {
 +        w = (ovlBox.x2 - x + 1) >> ovlResizers[i].xfactor;
 +        h = (ovlBox.y2 - y + 1) >> ovlResizers[i].yfactor;
-+        DBG_IMAGEON(("Before aligning w=%d, h=%d\n", w, h));
 +        w = W100_ALIGN(w, OVL_W_ALIGN);
 +        h = W100_ALIGN(h, OVL_H_ALIGN);
-+        DBG_IMAGEON(("Trying overlay surface (%d,%d,%d,%d)\n",
-+                     x, y, w, h));
 +        port->ovl.size = W100SurfaceSize(port, w, h);
++        DBG_IMAGEON(("Trying overlay surface (x:%d,y:%d,w:%d,h:%d). Size %d."
++                     " xfactor:%d, yfactor:%d\n",
++                     x, y, w, h, port->ovl.size,
++                     ovlResizers[i].xfactor,
++                     ovlResizers[i].yfactor));
 +        if (port->ovl.size <= port->ovl.maxSize) {
 +            ErrorF("Using (x=%d,y=%d,w=%d,h=%d) overlay surface (%d bytes). "
 +                   "Resizer(xfactor:%d,yfactor:%d)\n",