From 1598a110f47633c846d7f2fc2b0188e5d924a137 Mon Sep 17 00:00:00 2001
From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Thu, 28 Sep 2006 20:40:29 +0000
Subject: ixp4xx-kernel: One last revbump, cleaning up the patch directory

---
 packages/linux/ixp4xx-kernel_2.6.18.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index bfa1059825..d191cbfbfc 100644
--- a/packages/linux/ixp4xx-kernel_2.6.18.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "438"
+IXP4XX_KERNEL_SVN_REV = "439"
 #
 # Increment the number below (i.e. the digits after PR) when
 # the changes in SVN between revisions include changes in the
-- 
cgit v1.2.3


From 6e7162ef3b75528537da5dab0afedb755b5e5497 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 28 Sep 2006 20:47:55 +0000
Subject: gnu-config: Add missing install -d (from packaged-staging)

---
 packages/gnu-config/gnu-config-native_20050701.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/gnu-config/gnu-config-native_20050701.bb b/packages/gnu-config/gnu-config-native_20050701.bb
index e729520d60..43df124f7f 100644
--- a/packages/gnu-config/gnu-config-native_20050701.bb
+++ b/packages/gnu-config/gnu-config-native_20050701.bb
@@ -6,7 +6,8 @@ inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gnu-config"
 
 do_stage () {
-	install -d ${STAGING_DATADIR}/gnu-config
+	install -d ${STAGING_DATADIR}/gnu-config/
+	install -d ${STAGING_BINDIR}/
 	cat ${WORKDIR}/gnu-configize.in | \
 		sed -e 's,@gnu-configdir@,${STAGING_DATADIR}/gnu-config,' \
 		    -e 's,@autom4te_perllibdir@,${STAGING_DATADIR}/autoconf,' > ${STAGING_BINDIR}/gnu-configize
-- 
cgit v1.2.3


From a65ba920e8f634f3d7130291431c86880ace71d5 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 28 Sep 2006 21:21:31 +0000
Subject: perl: Update cpan.bbclass to set CCFLAGS to CFLAGS so that the
 compiler settings for the current OE build are used instead of the made up
 values in the perl config (which were manually generated since we are cross
 compiling). Remove this from each of the perl modules that was manually
 setting this.

---
 packages/perl/libcompress-zlib-perl_1.42.bb   | 3 ---
 packages/perl/libdigest-sha1-perl_2.11.bb     | 5 +----
 packages/perl/libipc-sharelite-perl_0.09.bb   | 5 +----
 packages/perl/libparams-validate-perl_0.86.bb | 5 +----
 4 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'packages')

diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb
index 1dce1bf325..c26678a9b9 100644
--- a/packages/perl/libcompress-zlib-perl_1.42.bb
+++ b/packages/perl/libcompress-zlib-perl_1.42.bb
@@ -9,6 +9,3 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.t
 S = "${WORKDIR}/Compress-Zlib-${PV}"
 
 inherit cpan
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"
diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb
index 912fdb1843..712c0e6737 100644
--- a/packages/perl/libdigest-sha1-perl_2.11.bb
+++ b/packages/perl/libdigest-sha1-perl_2.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz"
 
@@ -14,6 +14,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/Digest/SHA1/* \
                 ${libdir}/perl5/*/*/auto/Digest/SHA1/.packlist \
                 ${libdir}/perl5/*/*/Digest"
 FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Digest/SHA1/.debug"
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"
diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb
index 5598eed93e..6e2c7f16e3 100644
--- a/packages/perl/libipc-sharelite-perl_0.09.bb
+++ b/packages/perl/libipc-sharelite-perl_0.09.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz"
 
@@ -14,6 +14,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/IPC/ShareLite/* \
                 ${libdir}/perl5/*/*/auto/IPC/ShareLite/.packlist \
                 ${libdir}/perl5/*/*/IPC"
 FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/IPC/ShareLite/.debug"
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"
diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb
index 75894af662..cd628f4809 100644
--- a/packages/perl/libparams-validate-perl_0.86.bb
+++ b/packages/perl/libparams-validate-perl_0.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-0.86.tar.gz"
 
@@ -15,6 +15,3 @@ FILES_${PN} = "${libdir}/perl5/*/*/auto/Params/Validate/* \
                 ${libdir}/perl5/*/*/Params \
                 ${libdir}/perl5/*/*/Attribute"
 FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Params/Validate/.debug"
-
-# Stop from searching /include - should put this in cpan class?
-export CCFLAGS = "${CFLAGS}"
-- 
cgit v1.2.3


From 9640459cd8419e4305cf7792ed23233628de0f97 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 28 Sep 2006 21:23:33 +0000
Subject: perl: Add the perl Locale::gettext module, which is used for gettext
 style message handling.

---
 packages/perl/liblocale-gettext-perl_1.05.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/perl/liblocale-gettext-perl_1.05.bb

(limited to 'packages')

diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb
new file mode 100644
index 0000000000..54e85c751f
--- /dev/null
+++ b/packages/perl/liblocale-gettext-perl_1.05.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Locale::gettext - message handling functions"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+DEPENDS = "virtual/libintl"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz"
+
+S = "${WORKDIR}/gettext-${PV}"
+
+inherit cpan
-- 
cgit v1.2.3


From d8c34c96401935a2ca35ee7e7f5e417e3cc686d4 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 28 Sep 2006 21:29:17 +0000
Subject: perl: Add the native version of the Local::gettext module.

---
 packages/perl/liblocale-gettext-perl-native_1.05.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 packages/perl/liblocale-gettext-perl-native_1.05.bb

(limited to 'packages')

diff --git a/packages/perl/liblocale-gettext-perl-native_1.05.bb b/packages/perl/liblocale-gettext-perl-native_1.05.bb
new file mode 100644
index 0000000000..14561664d3
--- /dev/null
+++ b/packages/perl/liblocale-gettext-perl-native_1.05.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require liblocale-gettext-perl_${PV}.bb
-- 
cgit v1.2.3


From 2bcdf40d8415d833a6392199f7dd4506f3d599ab Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 28 Sep 2006 21:33:32 +0000
Subject: perl: Add the 1.1.6 version of libintl-perl. The 1.11 versions which
 are currently in OE are no longer available on cpan.

---
 packages/perl/libintl-perl-native_1.16.bb |  5 +++++
 packages/perl/libintl-perl_1.16.bb        | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 packages/perl/libintl-perl-native_1.16.bb
 create mode 100644 packages/perl/libintl-perl_1.16.bb

(limited to 'packages')

diff --git a/packages/perl/libintl-perl-native_1.16.bb b/packages/perl/libintl-perl-native_1.16.bb
new file mode 100644
index 0000000000..17b6789bda
--- /dev/null
+++ b/packages/perl/libintl-perl-native_1.16.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+include libintl-perl_${PV}.bb
diff --git a/packages/perl/libintl-perl_1.16.bb b/packages/perl/libintl-perl_1.16.bb
new file mode 100644
index 0000000000..5a8fde1ea6
--- /dev/null
+++ b/packages/perl/libintl-perl_1.16.bb
@@ -0,0 +1,11 @@
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+RDEPENDS = "perl-module-vars perl-module-locale perl-module-io-handle \
+            perl-module-symbol perl-module-selectsaver perl-module-io \
+            perl-module-integer perl-module-exporter-heavy"
+
+SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz"
+
+S = "${WORKDIR}/libintl-perl-${PV}"
+
+inherit cpan
-- 
cgit v1.2.3


From 43466984142b559813c7270c6d2d988ec57b0d9e Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 28 Sep 2006 22:01:19 +0000
Subject: perl: Update the LICENSE on the modules to indicate that they are
 available under either the Artistic license or the GPL, and not just under
 the Artistic license.

---
 packages/perl/libarchive-tar-perl_1.30.bb            | 4 ++--
 packages/perl/libcache-cache-perl_1.05.bb            | 4 ++--
 packages/perl/libclass-container-perl_0.12.bb        | 4 ++--
 packages/perl/libclass-data-inheritable-perl_0.06.bb | 4 ++--
 packages/perl/libcompress-zlib-perl_1.42.bb          | 4 ++--
 packages/perl/libdevel-stacktrace-perl_1.13.bb       | 4 ++--
 packages/perl/libdigest-sha1-perl_2.11.bb            | 4 ++--
 packages/perl/liberror-perl_0.17004.bb               | 4 ++--
 packages/perl/libexception-class-perl_1.23.bb        | 4 ++--
 packages/perl/libextutils-cbuilder-perl_0.18.bb      | 4 ++--
 packages/perl/libextutils-parsexs-perl_2.16.bb       | 4 ++--
 packages/perl/libio-zlib-perl_1.04.bb                | 4 ++--
 packages/perl/libipc-sharelite-perl_0.09.bb          | 4 ++--
 packages/perl/liblocale-gettext-perl_1.05.bb         | 4 ++--
 packages/perl/liblog-dispatch-perl_2.13.bb           | 4 ++--
 packages/perl/liblog-log4perl-perl_1.06.bb           | 4 ++--
 packages/perl/libmodule-build-perl_0.2805.bb         | 4 ++--
 packages/perl/libnet-ip-perl_1.25.bb                 | 4 ++--
 packages/perl/libparams-validate-perl_0.86.bb        | 4 ++--
 packages/perl/libversion-perl_0.6701.bb              | 4 ++--
 packages/perl/libyaml-perl_0.62.bb                   | 4 ++--
 21 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'packages')

diff --git a/packages/perl/libarchive-tar-perl_1.30.bb b/packages/perl/libarchive-tar-perl_1.30.bb
index 258cf1cb67..21b961242a 100644
--- a/packages/perl/libarchive-tar-perl_1.30.bb
+++ b/packages/perl/libarchive-tar-perl_1.30.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Archive::Tar - module for manipulations of tar archives"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS += "libio-zlib-perl-native"
 RDEPENDS += "libio-zlib-perl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-1.30.tar.gz"
 
diff --git a/packages/perl/libcache-cache-perl_1.05.bb b/packages/perl/libcache-cache-perl_1.05.bb
index 1869659aa8..d0e7ec46d5 100644
--- a/packages/perl/libcache-cache-perl_1.05.bb
+++ b/packages/perl/libcache-cache-perl_1.05.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Cache::Cache -- the Cache interface."
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \
            libipc-sharelite-perl-native"
 RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-1.05.tar.gz"
 
diff --git a/packages/perl/libclass-container-perl_0.12.bb b/packages/perl/libclass-container-perl_0.12.bb
index e3643575e2..38fbebbe01 100644
--- a/packages/perl/libclass-container-perl_0.12.bb
+++ b/packages/perl/libclass-container-perl_0.12.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Class::Container - Glues object frameworks together transparently"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS = "libparams-validate-perl-native"
 RDEPENDS = "libparams-validate-perl"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Class-Container-0.12.tar.gz"
 
diff --git a/packages/perl/libclass-data-inheritable-perl_0.06.bb b/packages/perl/libclass-data-inheritable-perl_0.06.bb
index c4e28ba434..56f099669b 100644
--- a/packages/perl/libclass-data-inheritable-perl_0.06.bb
+++ b/packages/perl/libclass-data-inheritable-perl_0.06.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Class::Data::Inheritable - Inheritable, overridable class data"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r2"
+LICENSE = "Artistic|GPL"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.06.tar.gz"
 
diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb
index c26678a9b9..dfbfdb5633 100644
--- a/packages/perl/libcompress-zlib-perl_1.42.bb
+++ b/packages/perl/libcompress-zlib-perl_1.42.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Compress::Zlib - Interface to zlib compression library"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r0"
+LICENSE = "Artistic|GPL"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.tar.gz"
 
diff --git a/packages/perl/libdevel-stacktrace-perl_1.13.bb b/packages/perl/libdevel-stacktrace-perl_1.13.bb
index 254d82afa1..b4d9b9febd 100644
--- a/packages/perl/libdevel-stacktrace-perl_1.13.bb
+++ b/packages/perl/libdevel-stacktrace-perl_1.13.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Devel::StackTrace - Stack trace and stack trace frame objects"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r2"
+LICENSE = "Artistic|GPL"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.13.tar.gz"
 
diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb
index 712c0e6737..9d40110653 100644
--- a/packages/perl/libdigest-sha1-perl_2.11.bb
+++ b/packages/perl/libdigest-sha1-perl_2.11.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r5"
+LICENSE = "Artistic|GPL"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz"
 
diff --git a/packages/perl/liberror-perl_0.17004.bb b/packages/perl/liberror-perl_0.17004.bb
index f7f86db907..b2411adecf 100644
--- a/packages/perl/liberror-perl_0.17004.bb
+++ b/packages/perl/liberror-perl_0.17004.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Error - Error/exception handling in an OO-ish way"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r2"
+LICENSE = "Artistic|GPL"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-0.17004.tar.gz"
 
diff --git a/packages/perl/libexception-class-perl_1.23.bb b/packages/perl/libexception-class-perl_1.23.bb
index bcd7f1fbfd..b62e4d0ab1 100644
--- a/packages/perl/libexception-class-perl_1.23.bb
+++ b/packages/perl/libexception-class-perl_1.23.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Exception::Class - A module that allows you to declare real exception classes in Perl"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS = "libclass-data-inheritable-perl-native libdevel-stacktrace-perl-native"
 RDEPENDS = "libclass-data-inheritable-perl libdevel-stacktrace-perl"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-1.23.tar.gz"
 
diff --git a/packages/perl/libextutils-cbuilder-perl_0.18.bb b/packages/perl/libextutils-cbuilder-perl_0.18.bb
index 8bf18e9f88..4b2b874972 100644
--- a/packages/perl/libextutils-cbuilder-perl_0.18.bb
+++ b/packages/perl/libextutils-cbuilder-perl_0.18.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "ExtUtils::CBuilder - Compile and link C code for Perl modules"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r0"
+LICENSE = "Artistic|GPL"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.18.tar.gz"
 
diff --git a/packages/perl/libextutils-parsexs-perl_2.16.bb b/packages/perl/libextutils-parsexs-perl_2.16.bb
index 313a743713..57f57edc06 100644
--- a/packages/perl/libextutils-parsexs-perl_2.16.bb
+++ b/packages/perl/libextutils-parsexs-perl_2.16.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "ExtUtils::ParseXS - converts Perl XS code into C code"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r0"
+LICENSE = "Artistic|GPL"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.16.tar.gz"
 
diff --git a/packages/perl/libio-zlib-perl_1.04.bb b/packages/perl/libio-zlib-perl_1.04.bb
index b25aeeee83..0cdbd93bdd 100644
--- a/packages/perl/libio-zlib-perl_1.04.bb
+++ b/packages/perl/libio-zlib-perl_1.04.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "IO::Zlib - IO:: style interface to Compress::Zlib"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS = "libcompress-zlib-perl-native"
 RDEPENDS += "libcompress-zlib-perl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.04.tar.gz"
 
diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb
index 6e2c7f16e3..39808423a4 100644
--- a/packages/perl/libipc-sharelite-perl_0.09.bb
+++ b/packages/perl/libipc-sharelite-perl_0.09.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r5"
+LICENSE = "Artistic|GPL"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz"
 
diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb
index 54e85c751f..0f98e9bde0 100644
--- a/packages/perl/liblocale-gettext-perl_1.05.bb
+++ b/packages/perl/liblocale-gettext-perl_1.05.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Locale::gettext - message handling functions"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/libintl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz"
 
diff --git a/packages/perl/liblog-dispatch-perl_2.13.bb b/packages/perl/liblog-dispatch-perl_2.13.bb
index b421dafa03..9b136a5bad 100644
--- a/packages/perl/liblog-dispatch-perl_2.13.bb
+++ b/packages/perl/liblog-dispatch-perl_2.13.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Log::Dispatch - Dispatches messages to one or more outputs"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS = "libmodule-build-perl-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-2.13.tar.gz"
 
diff --git a/packages/perl/liblog-log4perl-perl_1.06.bb b/packages/perl/liblog-log4perl-perl_1.06.bb
index 31495374e8..b12b6c411a 100644
--- a/packages/perl/liblog-log4perl-perl_1.06.bb
+++ b/packages/perl/liblog-log4perl-perl_1.06.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Log::Log4perl - Log4j implementation for Perl"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r0"
+LICENSE = "Artistic|GPL"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.06.tar.gz"
 
diff --git a/packages/perl/libmodule-build-perl_0.2805.bb b/packages/perl/libmodule-build-perl_0.2805.bb
index ef646a5c1c..f8910f406d 100644
--- a/packages/perl/libmodule-build-perl_0.2805.bb
+++ b/packages/perl/libmodule-build-perl_0.2805.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Module::Build - Build and install Perl modules"
 SECTION = "libs"
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 DEPENDS = "libyaml-perl-native libversion-perl-native \
            libextutils-cbuilder-perl-native \
@@ -9,7 +9,7 @@ DEPENDS = "libyaml-perl-native libversion-perl-native \
            libarchive-tar-perl-native"
 RDEPENDS = "libyaml-perl libversion-perl libextutils-cbuilder-perl \
             libextutils-parsexs-perl libarchive-tar-perl"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/Module-Build-${PV}"
 
diff --git a/packages/perl/libnet-ip-perl_1.25.bb b/packages/perl/libnet-ip-perl_1.25.bb
index 1bce440731..e8de918a5e 100644
--- a/packages/perl/libnet-ip-perl_1.25.bb
+++ b/packages/perl/libnet-ip-perl_1.25.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Net::IP - Perl extension for manipulating IPv4/IPv6 addresses"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS += "libio-zlib-perl-native"
 RDEPENDS += "libio-zlib-perl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz"
 
diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb
index cd628f4809..55bbe54d0e 100644
--- a/packages/perl/libparams-validate-perl_0.86.bb
+++ b/packages/perl/libparams-validate-perl_0.86.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Params::Validate - Validate method/function parameters"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r5"
+LICENSE = "Artistic|GPL"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-0.86.tar.gz"
 
diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb
index 19b0631a04..cbbe2fda40 100644
--- a/packages/perl/libversion-perl_0.6701.bb
+++ b/packages/perl/libversion-perl_0.6701.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "version - Perl extension for Version Objects"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
-PR = "r0"
+LICENSE = "Artistic|GPL"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-0.6701.tar.gz"
 
diff --git a/packages/perl/libyaml-perl_0.62.bb b/packages/perl/libyaml-perl_0.62.bb
index 2874fa9266..290f28c294 100644
--- a/packages/perl/libyaml-perl_0.62.bb
+++ b/packages/perl/libyaml-perl_0.62.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "YAML - YAML Ain't Markup Language (tm)"
 SECTION = "libs"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
-LICENSE = "Artistic"
+LICENSE = "Artistic|GPL"
 DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \
            libipc-sharelite-perl-native"
 RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.62.tar.gz"
 
-- 
cgit v1.2.3


From 3becc4e6d4863f316776c048358a5a73273fb948 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 28 Sep 2006 22:06:36 +0000
Subject: gtk+_2.10.3.bb : new version

---
 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.3.bb                      |  92 ++++
 18 files changed, 1774 insertions(+)
 create mode 100644 packages/gtk+/gtk+-2.10.3/.mtn2git_empty
 create mode 100644 packages/gtk+/gtk+-2.10.3/automake-lossage.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/disable-print.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/menu-deactivate.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/migration.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/no-demos.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/no-xwc.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/run-iconcache.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/scroll-timings.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/single-click.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/spinbutton.patch
 create mode 100644 packages/gtk+/gtk+-2.10.3/xsettings.patch
 create mode 100644 packages/gtk+/gtk+_2.10.3.bb

(limited to 'packages')

diff --git a/packages/gtk+/gtk+-2.10.3/.mtn2git_empty b/packages/gtk+/gtk+-2.10.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch
new file mode 100644
index 0000000000..0d423ddbb9
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch
@@ -0,0 +1,24 @@
+--- 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
new file mode 100644
index 0000000000..1067773f12
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/disable-print.patch
@@ -0,0 +1,50 @@
+--- 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
new file mode 100644
index 0000000000..d71d839c3c
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000000..20481f059b
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
@@ -0,0 +1,236 @@
+--- 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
new file mode 100644
index 0000000000..df29656343
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 0000000000..bdbdb32f97
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch
@@ -0,0 +1,29 @@
+--- 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
new file mode 100644
index 0000000000..cfb8849e9f
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/menu-deactivate.patch
@@ -0,0 +1,51 @@
+--- 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
new file mode 100644
index 0000000000..4850f85e4f
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/migration.patch
@@ -0,0 +1,615 @@
+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;
++    }
++
++  if (GTK_WIDGET_REALIZED (w))
++    {
++      GdkWindow *window = w->window;
++      
++      gdk_window_add_filter (window, filter_func, NULL);
++
++      reset_state (window);
++      set_challenge_on_window (window);
++
++      all_widgets = g_slist_append (all_widgets, w);
++
++      g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL);
++    }
++  else
++    g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL);
++}
++
++void
++gtk_migration_init (void)
++{
++  if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL)
++    no_auth = TRUE;
++
++  string_gdkatom = gdk_atom_intern ("STRING", FALSE);
++  display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE);
++  rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE);
++
++  gtk_migration_auth_generate_challenge ();
++
++  gtk_migration_initialised = TRUE;
++}
+--- gtk/gtkwindow.c~	2006-07-05 13:07:08.000000000 +0200
++++ gtk/gtkwindow.c	2006-07-05 13:07:08.000000000 +0200
+@@ -50,6 +50,9 @@
+ #include "x11/gdkx.h"
+ #endif
+ 
++extern void gtk_migration_mark_window (GtkWidget *w);
++                                                               
++
+ enum {
+   SET_FOCUS,
+   FRAME_EVENT,
+@@ -823,6 +826,10 @@
+ 
+   g_signal_connect (window->screen, "composited_changed",
+ 		    G_CALLBACK (gtk_window_on_composited_changed), window);
++		    
++#ifdef ENABLE_MIGRATION
++  gtk_migration_mark_window (window);
++#endif
+ }
+ 
+ static void
diff --git a/packages/gtk+/gtk+-2.10.3/no-demos.patch b/packages/gtk+/gtk+-2.10.3/no-demos.patch
new file mode 100644
index 0000000000..0fc4c48d1a
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/no-demos.patch
@@ -0,0 +1,10 @@
+--- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
++++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Makefile.am for GTK+
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
diff --git a/packages/gtk+/gtk+-2.10.3/no-xwc.patch b/packages/gtk+/gtk+-2.10.3/no-xwc.patch
new file mode 100644
index 0000000000..affb4a303e
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/no-xwc.patch
@@ -0,0 +1,151 @@
+diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
+--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c	2004-11-30 14:57:14 +00:00
++++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c	2005-01-02 15:38:06 +00:00
+@@ -576,12 +576,14 @@
+ 			 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
+ 	}
+     }
++#ifdef HAVE_XWC
+   else if (font->type == GDK_FONT_FONTSET)
+     {
+       XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
+       XmbDrawString (xdisplay, impl->xid,
+ 		     fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
+     }
++#endif
+   else
+     g_error("undefined font type\n");
+ }
+@@ -613,6 +615,7 @@
+                    GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
+       g_free (text_8bit);
+     }
++#ifdef HAVE_XWC
+   else if (font->type == GDK_FONT_FONTSET)
+     {
+       if (sizeof(GdkWChar) == sizeof(wchar_t))
+@@ -633,6 +636,7 @@
+ 	  g_free (text_wchar);
+ 	}
+     }
++#endif
+   else
+     g_error("undefined font type\n");
+ }
+diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
+--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c	2004-08-26 01:23:46 +01:00
++++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c	2005-01-02 15:45:39 +00:00
+@@ -525,10 +525,12 @@
+ 	  width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
+ 	}
+       break;
++#ifdef HAVE_XWC
+     case GDK_FONT_FONTSET:
+       fontset = (XFontSet) private->xfont;
+       width = XmbTextEscapement (fontset, text, text_length);
+       break;
++#endif
+     default:
+       width = 0;
+     }
+@@ -578,6 +580,7 @@
+           width = 0;
+         }
+       break;
++#ifdef HAVE_XWC
+     case GDK_FONT_FONTSET:
+       if (sizeof(GdkWChar) == sizeof(wchar_t))
+ 	{
+@@ -595,6 +598,7 @@
+ 	  g_free (text_wchar);
+ 	}
+       break;
++#endif
+     default:
+       width = 0;
+     }
+@@ -667,6 +671,7 @@
+       if (descent)
+ 	*descent = overall.descent;
+       break;
++#ifdef HAVE_XWC
+     case GDK_FONT_FONTSET:
+       fontset = (XFontSet) private->xfont;
+       XmbTextExtents (fontset, text, text_length, &ink, &logical);
+@@ -681,6 +686,7 @@
+       if (descent)
+ 	*descent = ink.y + ink.height;
+       break;
++#endif
+     }
+ 
+ }
+@@ -753,6 +759,7 @@
+ 	  *descent = overall.descent;
+ 	break;
+       }
++#ifdef HAVE_XWC
+     case GDK_FONT_FONTSET:
+       fontset = (XFontSet) private->xfont;
+ 
+@@ -780,6 +787,7 @@
+       if (descent)
+ 	*descent = ink.y + ink.height;
+       break;
++#endif
+     }
+ 
+ }
+diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
+--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c	2004-11-17 00:55:10 +00:00
++++ gtk+-2.6.0/gdk/x11/gdkim-x11.c	2005-01-02 15:42:04 +00:00
+@@ -48,6 +48,7 @@
+ void
+ _gdk_x11_initialize_locale (void)
+ {
++#ifdef HAVE_XWC
+   wchar_t result;
+   gchar *current_locale;
+   static char *last_locale = NULL;
+@@ -93,7 +94,8 @@
+   GDK_NOTE (XIM,
+ 	    g_message ("%s multi-byte string functions.", 
+ 		       gdk_use_mb ? "Using" : "Not using"));
+-  
++#endif
++    
+   return;
+ }
+ 
+@@ -136,6 +138,7 @@
+ {
+   gchar *mbstr;
+ 
++#ifdef HAVE_XWC
+   if (gdk_use_mb)
+     {
+       GdkDisplay *display = find_a_display ();
+@@ -178,6 +181,7 @@
+       XFree (tpr.value);
+     }
+   else
++#endif
+     {
+       gint length = 0;
+       gint i;
+@@ -210,6 +214,7 @@
+ gint
+ gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
+ {
++#ifdef HAVE_XWC
+   if (gdk_use_mb)
+     {
+       GdkDisplay *display = find_a_display ();
+@@ -242,6 +247,7 @@
+       return len_cpy;
+     }
+   else
++#endif
+     {
+       gint i;
+ 
diff --git a/packages/gtk+/gtk+-2.10.3/run-iconcache.patch b/packages/gtk+/gtk+-2.10.3/run-iconcache.patch
new file mode 100644
index 0000000000..f0bb6ba842
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/run-iconcache.patch
@@ -0,0 +1,19 @@
+--- gtk+-2.10.0/gtk/Makefile.am~	2006-07-05 16:49:16.000000000 +0200
++++ gtk+-2.10.0/gtk/Makefile.am	2006-07-05 16:49:16.000000000 +0200
+@@ -1088,11 +1088,11 @@
+ 	done									\
+ 	&& touch stamp-icons
+ 
+-gtkbuiltincache.h: @REBUILD@ stamp-icons
+-	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
+-	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
+-	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
+-	   --source builtin_icons stock-icons > gtkbuiltincache.h
++#gtkbuiltincache.h: @REBUILD@ stamp-icons
++#	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
++#	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
++#	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
++#	   --source builtin_icons stock-icons > gtkbuiltincache.h
+ 
+ EXTRA_DIST +=                   \
+ 	$(STOCK_ICONS)		\
diff --git a/packages/gtk+/gtk+-2.10.3/scroll-timings.patch b/packages/gtk+/gtk+-2.10.3/scroll-timings.patch
new file mode 100644
index 0000000000..3f823a7880
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/scroll-timings.patch
@@ -0,0 +1,11 @@
+--- gtk+-2.10.0/gtk/gtkrange.c.orig	2006-07-05 12:41:39.000000000 +0200
++++ gtk+-2.10.0/gtk/gtkrange.c	2006-07-05 12:41:58.000000000 +0200
+@@ -39,7 +39,7 @@
+ #include "gtkalias.h"
+ 
+ #define SCROLL_DELAY_FACTOR 5    /* Scroll repeat multiplier */
+-#define UPDATE_DELAY        300  /* Delay for queued update */
++#define UPDATE_DELAY        1000  /* Delay for queued update */
+ 
+ enum {
+   PROP_0,
diff --git a/packages/gtk+/gtk+-2.10.3/single-click.patch b/packages/gtk+/gtk+-2.10.3/single-click.patch
new file mode 100644
index 0000000000..3bb208d4d6
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.3/single-click.patch
@@ -0,0 +1,54 @@
+diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
+--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 16:57:04 +01:00
++++ gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 20:05:18 +01:00
+@@ -1023,9 +1023,11 @@
+ 	}
+ 
+       gtk_calendar_select_and_focus_day (calendar, day);
+-    }
++      
++      // This change causes the calendar to disappear after choosing a day
++/*    }
+   else if (event->type == GDK_2BUTTON_PRESS)
+-    {
++    {*/
+       private_data->in_drag = 0;
+       if (day_month == MONTH_CURRENT)
+ 	g_signal_emit (calendar,
+diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2