From 453ecdacaa60ae46fdfc88cad601bfc411fd1471 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 19 Mar 2007 00:59:57 +0000
Subject: gst-plugins.inc: PR makes no sense for an include file

---
 packages/gstreamer/gst-plugins.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index f0531dc570..020dfc2ec7 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Plugins for GStreamer"
 SECTION = "multimedia"
 PRIORITY = "optional"
 DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound"
-PR = "r1"
 
 PACKAGES_DYNAMIC = "gst-plugin-*"
 
-- 
cgit v1.2.3


From a0c00ff8342e3b41f3feb60b3710665ea7879546 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 19 Mar 2007 01:38:00 +0000
Subject: gstreamer: Bump all PR to prevent it from going backwards as a result
 of removing PR from the include file.

---
 packages/gstreamer/gst-plugins-bad_0.10.1.bb   | 2 ++
 packages/gstreamer/gst-plugins-bad_0.10.3.bb   | 2 ++
 packages/gstreamer/gst-plugins-base_0.10.11.bb | 2 ++
 packages/gstreamer/gst-plugins-base_0.10.5.bb  | 2 ++
 packages/gstreamer/gst-plugins-base_0.10.6.bb  | 2 ++
 packages/gstreamer/gst-plugins-base_0.10.7.bb  | 2 ++
 packages/gstreamer/gst-plugins-good_0.10.2.bb  | 2 ++
 packages/gstreamer/gst-plugins-good_0.10.4.bb  | 2 ++
 packages/gstreamer/gst-plugins-ugly_0.10.2.bb  | 2 ++
 packages/gstreamer/gst-plugins-ugly_0.10.4.bb  | 2 ++
 packages/gstreamer/gstreamer_0.10.11.bb        | 1 -
 packages/gstreamer/gstreamer_0.10.4.bb         | 2 ++
 packages/gstreamer/gstreamer_0.10.5.bb         | 2 ++
 packages/gstreamer/gstreamer_0.10.6.bb         | 2 ++
 packages/gstreamer/gstreamer_0.10.8.bb         | 2 ++
 15 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/gstreamer/gst-plugins-bad_0.10.1.bb b/packages/gstreamer/gst-plugins-bad_0.10.1.bb
index 7c548acf7d..42f6df4d9d 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.1.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.1.bb
@@ -1,2 +1,4 @@
 require gst-plugins.inc
+
 DEPENDS += "gst-plugins-base"
+PR = "r2"
diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
index 7c548acf7d..42f6df4d9d 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.3.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
@@ -1,2 +1,4 @@
 require gst-plugins.inc
+
 DEPENDS += "gst-plugins-base"
+PR = "r2"
diff --git a/packages/gstreamer/gst-plugins-base_0.10.11.bb b/packages/gstreamer/gst-plugins-base_0.10.11.bb
index 4286a50c61..c2f022f283 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.11.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.11.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
+
 PROVIDES += "gst-plugins"
+PR = "r2"
 
 do_stage() {
        autotools_stage_all
diff --git a/packages/gstreamer/gst-plugins-base_0.10.5.bb b/packages/gstreamer/gst-plugins-base_0.10.5.bb
index 34b5504551..afb0657964 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.5.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.5.bb
@@ -1 +1,3 @@
 require gst-plugins.inc
+
+PR = "r2"
diff --git a/packages/gstreamer/gst-plugins-base_0.10.6.bb b/packages/gstreamer/gst-plugins-base_0.10.6.bb
index 48e24bf756..84bd2a9fe6 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.6.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.6.bb
@@ -1,2 +1,4 @@
 require gst-plugins.inc
+
 PROVIDES_${PN} += "gst-plugins"
+PR = "r2"
diff --git a/packages/gstreamer/gst-plugins-base_0.10.7.bb b/packages/gstreamer/gst-plugins-base_0.10.7.bb
index 4286a50c61..c2f022f283 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.7.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
+
 PROVIDES += "gst-plugins"
+PR = "r2"
 
 do_stage() {
        autotools_stage_all
diff --git a/packages/gstreamer/gst-plugins-good_0.10.2.bb b/packages/gstreamer/gst-plugins-good_0.10.2.bb
index 7c548acf7d..42f6df4d9d 100644
--- a/packages/gstreamer/gst-plugins-good_0.10.2.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.2.bb
@@ -1,2 +1,4 @@
 require gst-plugins.inc
+
 DEPENDS += "gst-plugins-base"
+PR = "r2"
diff --git a/packages/gstreamer/gst-plugins-good_0.10.4.bb b/packages/gstreamer/gst-plugins-good_0.10.4.bb
index 7c548acf7d..42f6df4d9d 100644
--- a/packages/gstreamer/gst-plugins-good_0.10.4.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.4.bb
@@ -1,2 +1,4 @@
 require gst-plugins.inc
+
 DEPENDS += "gst-plugins-base"
+PR = "r2"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb
index 7c548acf7d..42f6df4d9d 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb
@@ -1,2 +1,4 @@
 require gst-plugins.inc
+
 DEPENDS += "gst-plugins-base"
+PR = "r2"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
index 7c548acf7d..42f6df4d9d 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
@@ -1,2 +1,4 @@
 require gst-plugins.inc
+
 DEPENDS += "gst-plugins-base"
+PR = "r2"
diff --git a/packages/gstreamer/gstreamer_0.10.11.bb b/packages/gstreamer/gstreamer_0.10.11.bb
index 59e224eab5..b56db69cd6 100644
--- a/packages/gstreamer/gstreamer_0.10.11.bb
+++ b/packages/gstreamer/gstreamer_0.10.11.bb
@@ -6,7 +6,6 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "libxml2 glib-2.0 gettext-native popt"
 
-PR = "r0"
 # until we have decided a final naming scheme,
 # don't use this package as a replacement for
 # version 0.8
diff --git a/packages/gstreamer/gstreamer_0.10.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb
index fcb5ad79ba..69e7637cc6 100644
--- a/packages/gstreamer/gstreamer_0.10.4.bb
+++ b/packages/gstreamer/gstreamer_0.10.4.bb
@@ -1 +1,3 @@
 require gstreamer.inc
+
+PR = "r2"
diff --git a/packages/gstreamer/gstreamer_0.10.5.bb b/packages/gstreamer/gstreamer_0.10.5.bb
index fcb5ad79ba..69e7637cc6 100644
--- a/packages/gstreamer/gstreamer_0.10.5.bb
+++ b/packages/gstreamer/gstreamer_0.10.5.bb
@@ -1 +1,3 @@
 require gstreamer.inc
+
+PR = "r2"
diff --git a/packages/gstreamer/gstreamer_0.10.6.bb b/packages/gstreamer/gstreamer_0.10.6.bb
index fcb5ad79ba..69e7637cc6 100644
--- a/packages/gstreamer/gstreamer_0.10.6.bb
+++ b/packages/gstreamer/gstreamer_0.10.6.bb
@@ -1 +1,3 @@
 require gstreamer.inc
+
+PR = "r2"
diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb
index fcb5ad79ba..69e7637cc6 100644
--- a/packages/gstreamer/gstreamer_0.10.8.bb
+++ b/packages/gstreamer/gstreamer_0.10.8.bb
@@ -1 +1,3 @@
 require gstreamer.inc
+
+PR = "r2"
-- 
cgit v1.2.3


From 36c8a5a94672b5710166d07bc5fcbdd2eaa80162 Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Wed, 21 Mar 2007 09:13:46 +0000
Subject: packages/ipkg/ipkg-collateral.bb: Add dest definitions for oplinux
 and oplinux-uclibc

---
 packages/ipkg/ipkg-collateral.bb                            | 2 +-
 packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty | 0
 packages/ipkg/ipkg-collateral/oplinux-uclibc/dest           | 3 +++
 packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty        | 0
 packages/ipkg/ipkg-collateral/oplinux/dest                  | 3 +++
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux-uclibc/dest
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux/dest

diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index ec45a10e2d..cfe7d71c2d 100644
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ipkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 PACKAGE_ARCH = "all"
 
 SRC_URI = " \
diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest
new file mode 100644
index 0000000000..b786746b63
--- /dev/null
+++ b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest
@@ -0,0 +1,3 @@
+dest root /
+dest ram /tmp
+dest smbfs /tmp/smbfs
diff --git a/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ipkg/ipkg-collateral/oplinux/dest b/packages/ipkg/ipkg-collateral/oplinux/dest
new file mode 100644
index 0000000000..b786746b63
--- /dev/null
+++ b/packages/ipkg/ipkg-collateral/oplinux/dest
@@ -0,0 +1,3 @@
+dest root /
+dest ram /tmp
+dest smbfs /tmp/smbfs
-- 
cgit v1.2.3


From 58171c20855a04126b223d981326a9772032ccce Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Wed, 21 Mar 2007 09:19:25 +0000
Subject: packages/base-files/base-files_3.0.14.bb: Add semi-custom profile for
 oplinux and oplinux-uclibc

---
 .../base-files/base-files/oplinux-uclibc/profile   | 32 ++++++++++++++++++++++
 packages/base-files/base-files/oplinux/profile     | 32 ++++++++++++++++++++++
 packages/base-files/base-files_3.0.14.bb           |  2 +-
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 packages/base-files/base-files/oplinux-uclibc/profile
 create mode 100644 packages/base-files/base-files/oplinux/profile

diff --git a/packages/base-files/base-files/oplinux-uclibc/profile b/packages/base-files/base-files/oplinux-uclibc/profile
new file mode 100644
index 0000000000..f6ae329b57
--- /dev/null
+++ b/packages/base-files/base-files/oplinux-uclibc/profile
@@ -0,0 +1,32 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/usr/bin/nano"	# needed for packages like cron
+TERM="linux"		# Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$i
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
diff --git a/packages/base-files/base-files/oplinux/profile b/packages/base-files/base-files/oplinux/profile
new file mode 100644
index 0000000000..f6ae329b57
--- /dev/null
+++ b/packages/base-files/base-files/oplinux/profile
@@ -0,0 +1,32 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/usr/bin/nano"	# needed for packages like cron
+TERM="linux"		# Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$i
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 1cf58d7ebb..393e0e3ec2 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r63"
+PR = "r64"
 LICENSE = "GPL"
 
 SRC_URI = " \
-- 
cgit v1.2.3


From 7d5283c53da68ede4d5ae2e99f2c27fd50253203 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 09:32:42 +0000
Subject: openmoko-session: start dialer so people can receive phonecalls by
 default :)

---
 packages/openmoko-base/files/session           | 1 +
 packages/openmoko-base/openmoko-session_svn.bb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session
index b2e7fd0a69..1fc2f4d17a 100644
--- a/packages/openmoko-base/files/session
+++ b/packages/openmoko-base/files/session
@@ -14,5 +14,6 @@ matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=
 mbinputmgr &
 
 openmoko-footer &
+openmoko-dialer &
 exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
 
diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index 5f0a88cfbf..c085606a7d 100644
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko"
 SECTION = "openmoko/base"
 RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks"
 PV = "0.0+svn${SRCDATE}"
-PR = "r6"
+PR = "r7"
 
 inherit openmoko-base
 
-- 
cgit v1.2.3


From 895a9b4cabafc642d676732ac26ca6cdabc6b448 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 10:15:15 +0000
Subject: openmoko-image: install a terminal, virtual keyboard and other stuff
 to make it useable

---
 packages/images/openmoko-image.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 0ebddcb276..632963076c 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -14,7 +14,9 @@ export PACKAGE_INSTALL = "\
   task-openmoko-phone \
   task-openmoko-finger \
   task-openmoko-pim \
-"
+  task-openmoko-demo \
+  "
+
 DEPENDS = "\
   ${MACHINE_TASK_PROVIDER} \
   task-openmoko \
-- 
cgit v1.2.3


From 9eb4349e80b325143f58c98c929f63497f57b44a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 10:17:49 +0000
Subject: openmoko-icon-theme-standard: merge from openmoko svn

---
 packages/openmoko-base/openmoko-icon-theme-standard_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 packages/openmoko-base/openmoko-icon-theme-standard_svn.bb

diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
new file mode 100644
index 0000000000..8be6211d68
--- /dev/null
+++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+PACKAGE_ARCH = "all"
-- 
cgit v1.2.3


From 7263517b3939ba055d443a0ecbaf5ef9a3e91c38 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 21 Mar 2007 10:36:45 +0000
Subject: storcenter: Add storcenter-image.bbclass

---
 classes/storcenter-image.bbclass | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 classes/storcenter-image.bbclass

diff --git a/classes/storcenter-image.bbclass b/classes/storcenter-image.bbclass
new file mode 100644
index 0000000000..de77f1b417
--- /dev/null
+++ b/classes/storcenter-image.bbclass
@@ -0,0 +1,30 @@
+storcenter_pack_image() {
+        # find latest kernel
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
+        if [ -z "$KERNEL" ]; then
+                oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-storcenter to create one."
+                exit 1
+        fi
+        ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+        OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
+        PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
+        HEX_MAX_KERN_SIZE=170000
+        DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
+        HEX_MAX_ROOT_SIZE=590000
+        DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
+        KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
+        if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
+                oefatal "Kernel too large at $KERNEL_SIZE bytes.  Max is $DEC_MAX_KERN_SIZE."
+                exit 1
+        fi
+        ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
+        if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then
+                oefatal "Rootfs is too large at $ROOT_SIZE bytes.  Max is $DEC_MAX_ROOT_SIZE."
+                exit 1
+        fi
+        PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc `
+        dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
+        cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
+        rm -f $PADFILE
+        ls -l $OUTPUT
+}
-- 
cgit v1.2.3


From 44965620ed77fd5079b9e57719130bb70d38341e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 21 Mar 2007 11:08:47 +0000
Subject: contacts: added 0.4, unified recipes, fixed PV in svn version,
 disabled gnome-vfs (from Poky)

---
 packages/pimlico/contacts.inc    | 16 ++++++++++++++++
 packages/pimlico/contacts_0.3.bb | 25 -------------------------
 packages/pimlico/contacts_0.4.bb |  5 +++++
 packages/pimlico/contacts_svn.bb | 30 +++++++++---------------------
 4 files changed, 30 insertions(+), 46 deletions(-)
 create mode 100644 packages/pimlico/contacts.inc
 delete mode 100644 packages/pimlico/contacts_0.3.bb
 create mode 100644 packages/pimlico/contacts_0.4.bb

diff --git a/packages/pimlico/contacts.inc b/packages/pimlico/contacts.inc
new file mode 100644
index 0000000000..5fa493fab3
--- /dev/null
+++ b/packages/pimlico/contacts.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Address-book application."
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ eds-dbus"
+RDEPENDS = "libedata-book"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
+}
+
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+		${datadir}/pixmaps/stock_person.png"
diff --git a/packages/pimlico/contacts_0.3.bb b/packages/pimlico/contacts_0.3.bb
deleted file mode 100644
index 799698b7a0..0000000000
--- a/packages/pimlico/contacts_0.3.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus"
-RDEPENDS = "libedata-book"
-DESCRIPTION = "Contacts is an address-book application."
-
-PR = "r1"
-
-SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \
-	   file://stock_contact.png \
-	   file://stock_person.png"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-do_install_append () {
-	install -d ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
-}
-
-FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
-		${datadir}/pixmaps/stock_person.png"
-
diff --git a/packages/pimlico/contacts_0.4.bb b/packages/pimlico/contacts_0.4.bb
new file mode 100644
index 0000000000..28e4cc29ce
--- /dev/null
+++ b/packages/pimlico/contacts_0.4.bb
@@ -0,0 +1,5 @@
+require contacts.inc
+
+SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \
+	   file://stock_contact.png \
+	   file://stock_person.png"
diff --git a/packages/pimlico/contacts_svn.bb b/packages/pimlico/contacts_svn.bb
index bffa1832fd..7687210b52 100644
--- a/packages/pimlico/contacts_svn.bb
+++ b/packages/pimlico/contacts_svn.bb
@@ -1,29 +1,17 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus gnome-vfs"
-RDEPENDS = "gnome-vfs-plugin-file"
-RRECOMMENDS = "gnome-vfs-plugin-http"
-DESCRIPTION = "Contacts is an address-book application."
-PR = "r5"
+require contacts.inc
 
-PV = "0.1+svn${SRCDATE}"
+#DEPENDS += "gnome-vfs"
+#RDEPENDS += "gnome-vfs-plugin-file"
+#RRECOMMENDS += "gnome-vfs-plugin-http"
+
+PV = "0.4+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
 	   file://stock_contact.png \
 	   file://stock_person.png"
 
-inherit autotools pkgconfig
-
 S = "${WORKDIR}/trunk"
 
-EXTRA_OECONF = "--enable-gnome-vfs"
-
-do_install_append () {
-	install -d ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
-}
-
-FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
-		${datadir}/pixmaps/stock_person.png"
-
+#EXTRA_OECONF = "--enable-gnome-vfs"
-- 
cgit v1.2.3


From baab7d5c3a254cc67ffb71102d94612b21b3051f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 21 Mar 2007 11:09:02 +0000
Subject: tasks: added 0.4, unified recipes, fixed PV in svn version (from
 Poky)

---
 packages/pimlico/tasks.inc    |  6 ++++++
 packages/pimlico/tasks_0.2.bb | 12 ------------
 packages/pimlico/tasks_0.4.bb |  3 +++
 packages/pimlico/tasks_svn.bb |  8 ++++++++
 4 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 packages/pimlico/tasks.inc
 delete mode 100644 packages/pimlico/tasks_0.2.bb
 create mode 100644 packages/pimlico/tasks_0.4.bb
 create mode 100644 packages/pimlico/tasks_svn.bb

diff --git a/packages/pimlico/tasks.inc b/packages/pimlico/tasks.inc
new file mode 100644
index 0000000000..9b7c245ad3
--- /dev/null
+++ b/packages/pimlico/tasks.inc
@@ -0,0 +1,6 @@
+DESCRIPTION = "Task list application"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ eds-dbus"
+
+inherit autotools pkgconfig gtk-icon-cache
diff --git a/packages/pimlico/tasks_0.2.bb b/packages/pimlico/tasks_0.2.bb
deleted file mode 100644
index ea9c1b0703..0000000000
--- a/packages/pimlico/tasks_0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Tasks is a simple TODO application."
-SECTION = "x11"
-LICENSE = "LGPL"
-PR = "r0"
-
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-
-SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-
diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb
new file mode 100644
index 0000000000..679dedf9da
--- /dev/null
+++ b/packages/pimlico/tasks_0.4.bb
@@ -0,0 +1,3 @@
+require tasks.inc
+
+SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz"
diff --git a/packages/pimlico/tasks_svn.bb b/packages/pimlico/tasks_svn.bb
new file mode 100644
index 0000000000..9d9786cbdd
--- /dev/null
+++ b/packages/pimlico/tasks_svn.bb
@@ -0,0 +1,8 @@
+require tasks.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.4+svn${SRCDATE}"
+S = "${WORKDIR}/trunk"
+
+SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
-- 
cgit v1.2.3


From 2e7cbdc4beada61a4b8a190312d29b221aa9f688 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 21 Mar 2007 11:09:17 +0000
Subject: dates: unify recipes, fix PV in svn version (from Poky)

---
 packages/pimlico/dates.inc      | 17 +++++++++++++++++
 packages/pimlico/dates_0.3.1.bb | 14 +++-----------
 packages/pimlico/dates_svn.bb   | 18 ++++--------------
 3 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 packages/pimlico/dates.inc

diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
new file mode 100644
index 0000000000..fd640844ba
--- /dev/null
+++ b/packages/pimlico/dates.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Dates is a calendar application."
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+RDEPENDS = "libedata-cal"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+# EXTRA_OECONF = "--disable-debug"
+
+FILES_${PN} += "${datadir}/pixmaps/dates.png"
+
+do_install_append () {
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
+}
+
diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb
index 8dab1db54b..51d3acc9ed 100644
--- a/packages/pimlico/dates_0.3.1.bb
+++ b/packages/pimlico/dates_0.3.1.bb
@@ -1,13 +1,5 @@
-DESCRIPTION = "Dates is a calendar application."
-SECTION = "x11"
-LICENSE = "LGPL"
-PR = "r1"
-
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-
-SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz"
+require dates.inc
 
-inherit autotools pkgconfig gtk-icon-cache
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
+PR = "r1"
 
+SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index 162e6f61a1..474fdde27a 100644
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -1,18 +1,8 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-DESCRIPTION = "Dates is a calendar application."
+require dates.inc
 
-PV = "0.1+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.3.1+svn${SRCDATE}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
-
-do_install_append () {
-	install -d ${D}/${datadir}/pixmaps
-	install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
-}
-- 
cgit v1.2.3


From 33c2929e38f8a4271be33ab99f41ef861f7e6d22 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 11:37:59 +0000
Subject: angstrom: bump some versions apparently "NOTE: consider defining a
 PREFERRED_PROVIDER to match runtime gdk-pixbuf-loader-png" is not clear
 enough, any suggestions for a better message?

---
 conf/distro/angstrom-2007.1.conf | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 4f603f4534..e4951dbf2b 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "36"
+DISTRO_REVISION = "37"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -107,16 +107,14 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
 
 
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.3.1"
 PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.0"
-
-#work around a segfault in gcc for armv4t
-PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3"
-PREFERRED_VERSION_glib-2.0_h6300  = "2.12.3"
+PREFERRED_VERSION_cairo = "1.4.2"
+PREFERRED_VERSION_glib-2.0 = "2.12.10"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-- 
cgit v1.2.3


From bc6a2cecfe312c651ec8c643ccc3e730cb8ff18d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 11:45:28 +0000
Subject: gtk: remove 2.10.x cruft

---
 packages/gtk+/gtk+-2.10.3/.mtn2git_empty          |    0
 packages/gtk+/gtk+-2.10.3/automake-lossage.patch  |   24 -
 packages/gtk+/gtk+-2.10.3/disable-print.patch     |   50 -
 packages/gtk+/gtk+-2.10.3/disable-tooltips.patch  |   11 -
 packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch    |  236 --
 packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch   |   10 -
 packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch |   29 -
 packages/gtk+/gtk+-2.10.3/menu-deactivate.patch   |   51 -
 packages/gtk+/gtk+-2.10.3/migration.patch         |  615 ------
 packages/gtk+/gtk+-2.10.3/no-demos.patch          |   10 -
 packages/gtk+/gtk+-2.10.3/no-xwc.patch            |  151 --
 packages/gtk+/gtk+-2.10.3/run-iconcache.patch     |   19 -
 packages/gtk+/gtk+-2.10.3/scroll-timings.patch    |   11 -
 packages/gtk+/gtk+-2.10.3/single-click.patch      |   54 -
 packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch  |  267 ---
 packages/gtk+/gtk+-2.10.3/spinbutton.patch        |  128 --
 packages/gtk+/gtk+-2.10.3/xsettings.patch         |   16 -
 packages/gtk+/gtk+-2.10.6/.mtn2git_empty          |    0
 packages/gtk+/gtk+-2.10.6/automake-lossage.patch  |   24 -
 packages/gtk+/gtk+-2.10.6/disable-print.patch     |   50 -
 packages/gtk+/gtk+-2.10.6/disable-tooltips.patch  |   11 -
 packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch    |  149 --
 packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch   |   10 -
 packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch |   29 -
 packages/gtk+/gtk+-2.10.6/menu-deactivate.patch   |   51 -
 packages/gtk+/gtk+-2.10.6/migration.patch         |  611 -----
 packages/gtk+/gtk+-2.10.6/no-demos.patch          |   10 -
 packages/gtk+/gtk+-2.10.6/no-xwc.patch            |  151 --
 packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff     | 2456 ---------------------
 packages/gtk+/gtk+-2.10.6/run-iconcache.patch     |   21 -
 packages/gtk+/gtk+-2.10.6/scroll-timings.patch    |   11 -
 packages/gtk+/gtk+-2.10.6/single-click.patch      |   56 -
 packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch  |  267 ---
 packages/gtk+/gtk+-2.10.6/spinbutton.patch        |  130 --
 packages/gtk+/gtk+-2.10.6/xsettings.patch         |   16 -
 packages/gtk+/gtk+-2.10.7/.mtn2git_empty          |    0
 packages/gtk+/gtk+-2.10.7/automake-lossage.patch  |   24 -
 packages/gtk+/gtk+-2.10.7/disable-print.patch     |   50 -
 packages/gtk+/gtk+-2.10.7/disable-tooltips.patch  |   11 -
 packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch  |  217 --
 packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch    |  149 --
 packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch   |   10 -
 packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch |   29 -
 packages/gtk+/gtk+-2.10.7/integer-pixops.patch    |  348 ---
 packages/gtk+/gtk+-2.10.7/menu-deactivate.patch   |   51 -
 packages/gtk+/gtk+-2.10.7/migration.patch         |  611 -----
 packages/gtk+/gtk+-2.10.7/no-demos.patch          |   10 -
 packages/gtk+/gtk+-2.10.7/no-xwc.patch            |  151 --
 packages/gtk+/gtk+-2.10.7/run-iconcache.patch     |   19 -
 packages/gtk+/gtk+-2.10.7/scroll-timings.patch    |   11 -
 packages/gtk+/gtk+-2.10.7/single-click.patch      |   56 -
 packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch  |  267 ---
 packages/gtk+/gtk+-2.10.7/spinbutton.patch        |  130 --
 packages/gtk+/gtk+-2.10.7/xsettings.patch         |   16 -
 packages/gtk+/gtk+_2.10.3.bb                      |  103 -
 packages/gtk+/gtk+_2.10.6.bb                      |  103 -
 packages/gtk+/gtk+_2.10.7.bb                      |   24 -
 57 files changed, 8125 deletions(-)
 delete mode 100644 packages/gtk+/gtk+-2.10.3/.mtn2git_empty
 delete mode 100644 packages/gtk+/gtk+-2.10.3/automake-lossage.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/disable-print.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/menu-deactivate.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/migration.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/no-demos.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/no-xwc.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/run-iconcache.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/scroll-timings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/single-click.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/spinbutton.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/xsettings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/.mtn2git_empty
 delete mode 100644 packages/gtk+/gtk+-2.10.6/automake-lossage.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/disable-print.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/disable-tooltips.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/menu-deactivate.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/migration.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/no-demos.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/no-xwc.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
 delete mode 100644 packages/gtk+/gtk+-2.10.6/run-iconcache.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/scroll-timings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/single-click.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/spinbutton.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/xsettings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/.mtn2git_empty
 delete mode 100644 packages/gtk+/gtk+-2.10.7/automake-lossage.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/disable-print.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/disable-tooltips.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/integer-pixops.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/menu-deactivate.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/migration.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/no-demos.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/no-xwc.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/run-iconcache.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/scroll-timings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/single-click.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/spinbutton.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/xsettings.patch
 delete mode 100644 packages/gtk+/gtk+_2.10.3.bb
 delete mode 100644 packages/gtk+/gtk+_2.10.6.bb
 delete mode 100644 packages/gtk+/gtk+_2.10.7.bb

diff --git a/packages/gtk+/gtk+-2.10.3/.mtn2git_empty b/packages/gtk+/gtk+-2.10.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~	2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am	2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
- 
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
--else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--dist-hook:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "*** DISTRIBUTION IS INCOMPLETE"
--	echo "***"
- endif
- 
diff --git a/packages/gtk+/gtk+-2.10.3/disable-print.patch b/packages/gtk+/gtk+-2.10.3/disable-print.patch
deleted file mode 100644
index 1067773f12..0000000000
--- a/packages/gtk+/gtk+-2.10.3/disable-print.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.10.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.10.0/configure.in	2006-07-05 18:11:44.000000000 +0200
-@@ -1539,26 +1539,27 @@
- # Printing system checks
- ################################################################
- 
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" != "xno"; then
--  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
--  CUPS_LIBS=`cups-config --libs`
--
--  CUPS_API_VERSION=`cups-config --api-version`
--  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
--
--  if test $CUPS_API_MAJOR -gt 1 -o \
--          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
--    AC_DEFINE(HAVE_CUPS_API_1_2)
--  fi
--
--  AC_SUBST(CUPS_API_MAJOR)
--  AC_SUBST(CUPS_API_MINOR)
--  AC_SUBST(CUPS_CFLAGS)
--  AC_SUBST(CUPS_LIBS)
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-+#if test "x$CUPS_CONFIG" != "xno"; then
-+#  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-+#  CUPS_LIBS=`cups-config --libs`
-+#
-+#  CUPS_API_VERSION=`cups-config --api-version`
-+#  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-+#  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
-+#
-+#  if test $CUPS_API_MAJOR -gt 1 -o \
-+#          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-+#   AC_DEFINE(HAVE_CUPS_API_1_2)
-+# fi
-+#
-+#  AC_SUBST(CUPS_API_MAJOR)
-+#  AC_SUBST(CUPS_API_MINOR)
-+#  AC_SUBST(CUPS_CFLAGS)
-+#  AC_SUBST(CUPS_LIBS)
-+#fi
-+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS,false)
- 
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
diff --git a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old	2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c	2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
-   tooltips->tips_data_list = NULL;
-   
-   tooltips->delay = DEFAULT_DELAY;
--  tooltips->enabled = TRUE;
-+  tooltips->enabled = FALSE;
-   tooltips->timer_tag = 0;
-   tooltips->use_sticky_delay = FALSE;
-   tooltips->last_popdown.tv_sec = -1;
diff --git a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
deleted file mode 100644
index 20481f059b..0000000000
--- a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- gtk+-2.4.1/gtk/gtkarrow.c	2004-03-13 09:51:13.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkarrow.c	2004-05-26 14:52:17.000000000 +1000
-@@ -29,7 +29,7 @@
- #include "gtkarrow.h"
- #include "gtkintl.h"
- 
--#define MIN_ARROW_SIZE  15
-+#define MIN_ARROW_SIZE  7
- 
- enum {
-   PROP_0,
-@@ -53,6 +53,8 @@
- 				    guint            prop_id,
- 				    GValue          *value,
- 				    GParamSpec      *pspec);
-+static void gtk_arrow_size_request (GtkWidget *arrow, 
-+				    GtkRequisition *requisition);
- 
- GType
- gtk_arrow_get_type (void)
-@@ -111,6 +113,7 @@
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-   widget_class->expose_event = gtk_arrow_expose;
-+  widget_class->size_request = gtk_arrow_size_request;
- }
- 
- static void
-@@ -166,13 +169,18 @@
- }
- 
- static void
-+gtk_arrow_size_request (GtkWidget *arrow, 
-+			GtkRequisition *requisition)
-+{
-+  requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-+  requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
-+}
-+
-+static void
- gtk_arrow_init (GtkArrow *arrow)
- {
-   GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
- 
--  GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
--  GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
--
-   arrow->arrow_type = GTK_ARROW_RIGHT;
-   arrow->shadow_type = GTK_SHADOW_OUT;
- }
---- gtk+-2.4.1/gtk/gtkcalendar.c	2004-03-06 14:37:26.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkcalendar.c	2004-05-26 14:58:57.000000000 +1000
-@@ -340,6 +340,9 @@
- static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
- 					       guint        day);
- 
-+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
-+					guint	      day);
-+
- static void gtk_calendar_paint_arrow	(GtkWidget    *widget,
- 					 guint	       arrow);
- static void gtk_calendar_paint_day_num	(GtkWidget    *widget,
-@@ -861,13 +864,13 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
-     {
-       if (calendar->selected_day < 0)
- 	calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
--      gtk_calendar_select_day (calendar, calendar->selected_day);
-+      gtk_calendar_do_select_day (calendar, calendar->selected_day);
-     }
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-@@ -908,10 +911,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -939,10 +942,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -974,10 +977,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -2480,9 +2483,9 @@
-   return TRUE;
- }
- 
--void
--gtk_calendar_select_day (GtkCalendar *calendar,
--			 guint	      day)
-+static void
-+gtk_calendar_do_select_day (GtkCalendar *calendar,
-+			    guint	      day)
- {
-   g_return_if_fail (GTK_IS_CALENDAR (calendar));
-   g_return_if_fail (day <= 31);
-@@ -2499,6 +2502,13 @@
-       if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
- 	gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
-     }
-+}
-+
-+void
-+gtk_calendar_select_day (GtkCalendar *calendar,
-+			 guint	      day)
-+{
-+  gtk_calendar_do_select_day (calendar, day);
-   
-   calendar->selected_day = day;
-   
---- gtk+-2.4.1/gtk/gtkentry.c	2004-04-22 08:08:08.000000000 +1000
-+++ gtk+-2.4.1/gtk/gtkentry.c	2004-05-26 14:52:17.000000000 +1000
-@@ -557,6 +557,15 @@
- 						       0.0,
- 						       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("min_width",
-+                                                             _("Minimum width"),
-+                                                             _("Minimum width of the entry field"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             MIN_ENTRY_WIDTH,
-+                                                             G_PARAM_READABLE));
-+
-   signals[POPULATE_POPUP] =
-     g_signal_new ("populate_popup",
- 		  G_OBJECT_CLASS_TYPE (gobject_class),
-@@ -1124,7 +1133,7 @@
- {
-   GtkEntry *entry = GTK_ENTRY (widget);
-   PangoFontMetrics *metrics;
--  gint xborder, yborder;
-+  gint xborder, yborder, min_width;
-   PangoContext *context;
-   
-   gtk_widget_ensure_style (widget);
-@@ -1140,9 +1149,11 @@
-   
-   xborder += INNER_BORDER;
-   yborder += INNER_BORDER;
--  
-+
-+  gtk_widget_style_get (widget, "min_width", &min_width, NULL);
-+
-   if (entry->width_chars < 0)
--    requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
-+    requisition->width = min_width + xborder * 2;
-   else
-     {
-       gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
---- gtk+-2.4.1/gtk/gtkrange.c	2004-03-06 14:38:08.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkrange.c	2004-05-26 14:52:17.000000000 +1000
-@@ -180,6 +180,7 @@
- static GtkWidgetClass *parent_class = NULL;
- static guint signals[LAST_SIGNAL];
- 
-+static GdkAtom recognize_protocols_atom, atom_atom;
- 
- GType
- gtk_range_get_type (void)
-@@ -220,6 +221,9 @@
-   object_class = (GtkObjectClass*) class;
-   widget_class = (GtkWidgetClass*) class;
- 
-+  recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
-+  atom_atom = gdk_atom_intern ("ATOM", FALSE);
-+
-   parent_class = g_type_class_peek_parent (class);
- 
-   gobject_class->set_property = gtk_range_set_property;
-@@ -815,6 +819,12 @@
- 					&attributes, attributes_mask);
-   gdk_window_set_user_data (range->event_window, range);
- 
-+  gdk_property_change (range->event_window,
-+		       recognize_protocols_atom,
-+		       atom_atom,
-+		       32, GDK_PROP_MODE_REPLACE,
-+		       NULL, 0);
-+
-   widget->style = gtk_style_attach (widget->style, widget->window);
- }
- 
-@@ -1186,7 +1196,7 @@
- 
-   /* ignore presses when we're already doing something else. */
-   if (range->layout->grab_location != MOUSE_OUTSIDE)
--    return FALSE;
-+    return TRUE;
- 
-   range->layout->mouse_x = event->x;
-   range->layout->mouse_y = event->y;
-@@ -1364,7 +1374,7 @@
-       return TRUE;
-     }
- 
--  return FALSE;
-+  return TRUE;
- }
- 
- /**
diff --git a/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch
deleted file mode 100644
index df29656343..0000000000
--- a/packages/gtk+/gtk+-2.10.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.10.3/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch
deleted file mode 100644
index bdbdb32f97..0000000000
--- a/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gtk+-2.10.0/configure.in.orig	2006-07-07 09:31:34.000000000 +0100
-+++ gtk+-2.10.0/configure.in	2006-07-07 09:32:49.000000000 +0100
-@@ -370,7 +370,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
- case $enable_explicit_deps in
-   auto)
--    deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-+    deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -768,7 +768,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1600,7 +1600,7 @@
- #
- # We are using gmodule-no-export now, but I'm leaving the stripping
- # code in place for now, since pango and atk still require gmodule.
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch
deleted file mode 100644
index cfb8849e9f..0000000000
--- a/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- gtk+-2.10.0/gtk/gtkmenushell.c.orig	2006-07-05 17:17:34.000000000 +0200
-+++ gtk+-2.10.0/gtk/gtkmenushell.c	2006-07-05 17:19:01.000000000 +0200
-@@ -42,7 +42,7 @@
- #include "gtkintl.h"
- #include "gtkalias.h"
- 
--#define MENU_SHELL_TIMEOUT   500
-+#define MENU_SHELL_TIMEOUT   2000
- 
- #define PACK_DIRECTION(m)                                 \
-    (GTK_IS_MENU_BAR (m)                                   \
-@@ -203,6 +203,8 @@
- 
- G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
- 
-+static int last_crossing_time;
-+
- static void
- gtk_menu_shell_class_init (GtkMenuShellClass *klass)
- {
-@@ -517,6 +519,7 @@
-       gtk_grab_add (GTK_WIDGET (menu_shell));
-       menu_shell->have_grab = TRUE;
-       menu_shell->active = TRUE;
-+      last_crossing_time = 0;
-     }
- }
- 
-@@ -669,6 +672,13 @@
- 	  menu_shell->activate_time = 0;
- 	  deactivate = FALSE;
- 	}
-+
-+      if (last_crossing_time != 0
-+	  && ((event->time - last_crossing_time) < 500))
-+	{
-+	  last_crossing_time = 0;
-+	  deactivate = FALSE;
-+	}
-       
-       if (deactivate)
- 	{
-@@ -716,6 +726,8 @@
-     {
-       menu_item = gtk_get_event_widget ((GdkEvent*) event);
- 
-+      last_crossing_time = event->time;
-+
-       if (!menu_item ||
- 	  (GTK_IS_MENU_ITEM (menu_item) && 
- 	   !_gtk_menu_item_is_selectable (menu_item)))
diff --git a/packages/gtk+/gtk+-2.10.3/migration.patch b/packages/gtk+/gtk+-2.10.3/migration.patch
deleted file mode 100644
index 4850f85e4f..0000000000
--- a/packages/gtk+/gtk+-2.10.3/migration.patch
+++ /dev/null
@@ -1,615 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gtk+/configure.in,v
-retrieving revision 1.419.2.4
-diff -u -r1.419.2.4 configure.in
---- configure.in	8 Feb 2005 21:39:42 -0000	1.419.2.4
-+++ configure.in	27 Feb 2005 13:10:16 -0000
-@@ -1495,6 +1495,16 @@
- GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
- GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
- 
-+AC_ARG_ENABLE(display-migration,
-+	[AC_HELP_STRING([--enable-display-migration],
-+			[include support for GPE_CHANGE_DISPLAY protocol])],
-+	enable_migration=yes, enable_migration=no)
-+if test "$enable_migration" = "yes"; then
-+	AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled])
-+	GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt"
-+fi
-+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes")
-+
- AC_SUBST(GTK_PACKAGES)
- AC_SUBST(GTK_EXTRA_LIBS)
- AC_SUBST(GTK_EXTRA_CFLAGS)
-Index: gtk/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
-retrieving revision 1.266.2.1
-diff -u -r1.266.2.1 Makefile.am
---- gtk/Makefile.am	13 Jan 2005 15:18:21 -0000	1.266.2.1
-+++ gtk/Makefile.am	27 Feb 2005 13:10:17 -0000
-@@ -520,6 +520,10 @@
- 	gtkwindow.c		\
- 	xembed.h
- 
-+if ENABLE_MIGRATION
-+gtk_c_sources += gtkmigration.c
-+endif
-+
- if OS_UNIX
- gtk_private_h_sources += gtkfilesystemunix.h
- gtk_c_sources +=         gtkfilesystemunix.c
-Index: gtk/gtkmain.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v
-retrieving revision 1.255
-diff -u -r1.255 gtkmain.c
---- gtk/gtkmain.c	27 Dec 2004 05:25:15 -0000	1.255
-+++ gtk/gtkmain.c	27 Feb 2005 13:10:19 -0000
-@@ -491,6 +491,10 @@
-   _gtk_accel_map_init ();  
-   _gtk_rc_init ();
- 
-+#ifdef ENABLE_MIGRATION
-+  gtk_migration_init ();
-+#endif
-+
-   /* Set the 'initialized' flag.
-    */
-   gtk_initialized = TRUE;
---- /dev/null	2005-02-20 01:07:50.714416160 +0000
-+++ gtk/gtkmigration.c	2005-02-27 15:05:04.052757352 +0000
-@@ -0,0 +1,529 @@
-+/*
-+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <stdlib.h>
-+#include <ctype.h>
-+#include <libintl.h>
-+#include <string.h>
-+#include <assert.h>
-+
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+
-+#include <gcrypt.h>
-+
-+#include "gtk.h"
-+#include "gdk.h"
-+#include "x11/gdkx.h"
-+
-+#define _(x) gettext(x)
-+
-+static GdkAtom string_gdkatom, display_change_gdkatom;
-+static GdkAtom rsa_challenge_gdkatom;
-+
-+#define DISPLAY_CHANGE_SUCCESS			0
-+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT	1
-+#define DISPLAY_CHANGE_NO_SUCH_SCREEN		2
-+#define DISPLAY_CHANGE_AUTHENTICATION_BAD	3
-+#define DISPLAY_CHANGE_INDETERMINATE_ERROR	4
-+
-+static gboolean no_auth;
-+
-+static GSList *all_widgets;
-+
-+static gboolean gtk_migration_initialised;
-+
-+#define CHALLENGE_LEN 64
-+
-+gchar *gtk_migration_auth_challenge_string;
-+
-+static unsigned char challenge_bytes[CHALLENGE_LEN];
-+static unsigned long challenge_seq;
-+
-+#define hexbyte(x)  ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0')
-+
-+struct rsa_key
-+{
-+  gcry_mpi_t n, e, d, p, q, u;
-+};
-+
-+static gcry_mpi_t
-+mpi_from_sexp (gcry_sexp_t r, char *tag)
-+{
-+  gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0);
-+  return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG);
-+}
-+
-+static char *
-+hex_from_mpi (gcry_mpi_t m)
-+{
-+  char *buf;
-+  gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m);
-+  return buf;
-+}
-+
-+static void
-+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result)
-+{
-+  size_t dlen = strlen (display);
-+  gchar *buf = g_malloc (dlen + 1 + len);
-+  strcpy (buf, display);
-+  memcpy (buf + dlen + 1, challenge, len);
-+  gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1);
-+  g_free (buf);
-+}
-+
-+static int
-+do_encode_md (const unsigned char *digest, size_t digestlen, int algo,
-+              unsigned int nbits, gcry_mpi_t *r_val)
-+{
-+  int nframe = (nbits+7) / 8;
-+  unsigned char *frame;
-+  int i, n;
-+  unsigned char asn[100];
-+  size_t asnlen;
-+
-+  asnlen = sizeof(asn);
-+  if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen))
-+    return -1;
-+
-+  if (digestlen + asnlen + 4  > nframe )
-+    return -1;
-+  
-+  /* We encode the MD in this way:
-+   *
-+   *	   0  1 PAD(n bytes)   0  ASN(asnlen bytes)  MD(len bytes)
-+   *
-+   * PAD consists of FF bytes.
-+   */
-+  frame = g_malloc (nframe);
-+  n = 0;
-+  frame[n++] = 0;
-+  frame[n++] = 1; /* block type */
-+  i = nframe - digestlen - asnlen -3 ;
-+  assert ( i > 1 );
-+  memset ( frame+n, 0xff, i ); n += i;
-+  frame[n++] = 0;
-+  memcpy ( frame+n, asn, asnlen ); n += asnlen;
-+  memcpy ( frame+n, digest, digestlen ); n += digestlen;
-+  assert ( n == nframe );
-+      
-+  gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe);
-+  g_free (frame);
-+  return 0;
-+}
-+
-+static gboolean
-+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf)
-+{
-+  gcry_mpi_t mpi, mpi2;
-+  gcry_sexp_t data, sig, key;
-+  int rc;
-+
-+  do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi);
-+
-+  gcry_sexp_build (&data, NULL, "(data (value %m))", mpi);
-+  
-+  gcry_mpi_release (mpi);
-+
-+  gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e);
-+
-+  if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL))
-+    {
-+      gcry_sexp_release (data);
-+      return FALSE;
-+    }
-+
-+  gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2);
-+
-+  rc = gcry_pk_verify (sig, data, key);
-+
-+  gcry_sexp_release (data);
-+  gcry_sexp_release (key);
-+  gcry_sexp_release (sig);
-+  gcry_mpi_release (mpi2);
-+
-+  if (rc)
-+    return FALSE;
-+
-+  return TRUE;
-+}
-+
-+static void 
-+gtk_migration_auth_update_challenge (void)
-+{
-+  int i;
-+  unsigned char *p;
-+
-+  if (gtk_migration_auth_challenge_string == NULL)
-+    gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9);
-+
-+  p = gtk_migration_auth_challenge_string;
-+
-+  for (i = 0; i < CHALLENGE_LEN; i++)
-+    {
-+      *p++ = hexbyte (challenge_bytes[i] >> 4);
-+      *p++ = hexbyte (challenge_bytes[i] & 15);
-+    }
-+  
-+  sprintf (p, "%08lx", challenge_seq++);
-+}
-+
-+static void
-+gtk_migration_auth_generate_challenge (void)
-+{
-+  gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM);
-+  gtk_migration_auth_update_challenge ();
-+}
-+
-+static struct rsa_key *
-+parse_pubkey (char *s)
-+{
-+  struct rsa_key *r;
-+  gcry_mpi_t n, e;
-+  gchar *sp;
-+
-+  sp = strtok (s, " \n");
-+  gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL);
-+  sp = strtok (NULL, " \n");
-+  gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL);
-+
-+  r = g_malloc0 (sizeof (struct rsa_key));
-+  r->e = e;
-+  r->n = n;
-+  return r;
-+}
-+
-+static struct rsa_key *
-+lookup_pubkey (u_int32_t id)
-+{
-+  const gchar *home_dir = g_get_home_dir ();
-+  gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir);
-+  FILE *fp = fopen (filename, "r");
-+  struct rsa_key *r = NULL;
-+
-+  if (fp)
-+    {
-+      while (!feof (fp))
-+	{
-+	  char buffer[4096];
-+	  if (fgets (buffer, 4096, fp))
-+	    {
-+	      char *p;
-+	      u_int32_t this_id = strtoul (buffer, &p, 16);
-+	      if (p != buffer && *p == ' ')
-+		{
-+#ifdef DEBUG
-+		  fprintf (stderr, "found id %x\n", this_id);
-+#endif
-+		  if (this_id == id)
-+		    {
-+		      r = parse_pubkey (++p);
-+		      break;
-+		    }
-+		}
-+	    }
-+	}
-+      fclose (fp);
-+    }
-+
-+  g_free (filename);
-+  return r;
-+}
-+
-+static void
-+free_pubkey (struct rsa_key *k)
-+{
-+  gcry_mpi_release (k->n);
-+  gcry_mpi_release (k->e);
-+
-+  g_free (k);
-+}
-+
-+static gboolean
-+gtk_migration_auth_validate_request (char *display, char *data)
-+{
-+  u_int32_t key_id;
-+  char *ep;
-+  char *p;
-+  struct rsa_key *k;
-+  char hash[20];
-+  gboolean rc;
-+
-+  p = strchr (data, ' ');
-+  if (p == NULL)
-+    return FALSE;
-+  *p++ = 0;
-+
-+  key_id = strtoul (data, &ep, 16);
-+  if (*ep)
-+    return FALSE;
-+
-+  k = lookup_pubkey (key_id);
-+  if (k == NULL)
-+    return FALSE;
-+
-+  gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, 
-+			   strlen (gtk_migration_auth_challenge_string), hash);
-+
-+  rc = gtk_migration_crypt_check_signature (k, hash, p);
-+
-+  free_pubkey (k);
-+
-+  return rc;
-+}
-+
-+static int
-+do_change_display (GtkWidget *w, char *display_name)
-+{
-+  GdkDisplay *newdisplay;
-+  guint screen_nr = 1;
-+  guint i;
-+
-+  if (display_name[0] == 0)
-+    return DISPLAY_CHANGE_INDETERMINATE_ERROR;
-+
-+  i = strlen (display_name) - 1;
-+  while (i > 0 && isdigit (display_name[i]))
-+    i--;
-+
-+  if (display_name[i] == '.')
-+    {
-+      screen_nr = atoi (display_name + i + 1);
-+      display_name[i] = 0;
-+    }
-+
-+  newdisplay = gdk_display_open (display_name);
-+  if (newdisplay)
-+    {
-+      GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr);
-+      if (screen)
-+	{
-+	  gtk_window_set_screen (GTK_WINDOW (w), screen);
-+	  gdk_display_manager_set_default_display (gdk_display_manager_get (),
-+						   newdisplay);
-+	  return DISPLAY_CHANGE_SUCCESS;
-+	}
-+      else
-+	return DISPLAY_CHANGE_NO_SUCH_SCREEN;
-+    }
-+
-+  return DISPLAY_CHANGE_UNABLE_TO_CONNECT;
-+}
-+
-+static void
-+set_challenge_on_window (GdkWindow *window)
-+{
-+  gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom,
-+		       8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, 
-+		       strlen (gtk_migration_auth_challenge_string));
-+}
-+
-+static void
-+update_challenge_on_windows (void)
-+{
-+  GSList *i;
-+
-+  gtk_migration_auth_update_challenge ();
-+
-+  for (i = all_widgets; i; i = i->next)
-+    {
-+      GtkWidget *w = GTK_WIDGET (i->data);
-+      if (w->window)
-+	set_challenge_on_window (w->window);
-+    }
-+}
-+
-+static void
-+reset_state (GdkWindow *window)
-+{
-+  gdk_property_change (window, display_change_gdkatom, string_gdkatom,
-+		       8, GDK_PROP_MODE_REPLACE, NULL, 0);
-+}
-+
-+static void
-+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code)
-+{
-+  XClientMessageEvent ev;
-+  Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, 
-+						 display_change_gdkatom);
-+  
-+  memset (&ev, 0, sizeof (ev));
-+  
-+  ev.type = ClientMessage;
-+  ev.window = window;
-+  ev.message_type = atom;
-+  ev.format = 32;
-+  
-+  ev.data.l[0] = window;
-+  ev.data.l[1] = code;
-+  
-+  XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev);
-+}
-+
-+static int
-+handle_request (GdkWindow *gwindow, char *prop)
-+{
-+  GtkWidget *widget;
-+  char *target, *auth_method, *auth_data;
-+  char *p;
-+
-+  target = prop;
-+  auth_method = "NULL";
-+  auth_data = NULL;
-+
-+  p = strchr (prop, ' ');
-+  if (p)
-+    {
-+      *p = 0;
-+      auth_method = ++p;
-+      
-+      p = strchr (p, ' ');
-+      if (p)
-+	{
-+	  *p = 0;
-+	  auth_data = ++p;
-+	}
-+    }
-+
-+  if (no_auth == FALSE)
-+    {
-+      if (!strcasecmp (auth_method, "null"))
-+	return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+      else if (!strcasecmp (auth_method, "rsa-sig"))
-+	{
-+	  if (gtk_migration_auth_validate_request (target, auth_data) == FALSE)
-+	    return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+	}
-+      else
-+	return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+    }
-+
-+  gdk_window_get_user_data (gwindow, (gpointer*) &widget);
-+
-+  if (widget)
-+    return do_change_display (widget, target);
-+
-+  return DISPLAY_CHANGE_INDETERMINATE_ERROR;
-+}
-+
-+static GdkFilterReturn 
-+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p)
-+{
-+  XPropertyEvent *xev = (XPropertyEvent *)xevp;
-+
-+  if (xev->type == PropertyNotify)
-+    {
-+      GdkDisplay *gdisplay;
-+      Atom atom;
-+
-+      gdisplay = gdk_x11_lookup_xdisplay (xev->display);
-+      if (gdisplay)
-+	{
-+	  atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom);
-+
-+	  if (xev->atom == atom)
-+	    {
-+	      GdkWindow *gwindow;
-+	      
-+	      gwindow = gdk_window_lookup_for_display (gdisplay, xev->window);
-+	      
-+	      if (gwindow)
-+		{
-+		  GdkAtom actual_type;
-+		  gint actual_format;
-+		  gint actual_length;
-+		  unsigned char *prop = NULL;
-+		  
-+		  if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom,
-+					0, G_MAXLONG, FALSE, &actual_type, &actual_format,
-+					&actual_length, &prop))
-+		    {
-+		      if (actual_length != 0)
-+			{
-+			  if (actual_type == string_gdkatom && actual_length > 8)
-+			    {
-+			      gchar *buf = g_malloc (actual_length + 1);
-+			      int rc;
-+			      
-+			      memcpy (buf, prop, actual_length);
-+			      buf[actual_length] = 0;
-+			      
-+			      rc = handle_request (gwindow, buf);
-+			      
-+			      g_free (buf);
-+			      generate_response (gdisplay, xev->display, xev->window, rc);
-+			      
-+			      if (rc == DISPLAY_CHANGE_SUCCESS)
-+				update_challenge_on_windows ();
-+			    }
-+			  
-+			  reset_state (gwindow);
-+			}
-+		    }
-+		  
-+		  if (prop)
-+		    g_free (prop);
-+		}
-+	    }
-+	  
-+	  return GDK_FILTER_REMOVE;
-+	}
-+    }
-+
-+  return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+unrealize_window (GtkWidget *w)
-+{
-+  all_widgets = g_slist_remove (all_widgets, w);
-+}
-+
-+void
-+gtk_migration_mark_window (GtkWidget *w)
-+{
-+  if (! gtk_migration_initialised)
-+    {
-+      g_warning ("gtk_migration not initialised yet");
-+      return;
-+    }
-+
-+