From: g2@giantshoulder.com <g2@giantshoulder.com>
Date: Mon, 21 Mar 2005 16:38:57 +0000 (+0000)
Subject: Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
X-Git-Tag: Release-2010-05/1~14638
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bd321a6be3c38e6d0de401d61b156d28c4eec99;p=openembedded.git

Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/21 07:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/21 15:05:42+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/03/21 15:05:27+00:00 nexus.co.uk!pb
apply patch from Michael Kropfberger to fix timezone problem

BKrev: 423ef8a1L3ee1bkalLyayRs2YXzWiw
---

diff --git a/packages/gtk+/gtk+-1.2-1.2.10/timezone-fix.patch b/packages/gtk+/gtk+-1.2-1.2.10/timezone-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index a3a527c7c1..75b5c6e19b 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -5,9 +5,10 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
 DEPENDS = "glib-1.2 jpeg libpng xext"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
+           file://timezone-fix.patch;patch=1 \
            file://gtk+1.2-reconf-fix;patch=1 \
            file://no-xwc;patch=1"
 S = "${WORKDIR}/gtk+-${PV}"