17 files changed, 141 insertions, 24 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a44f20b55d..5696dbfbaa 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7358,14 +7358,26 @@ sha256=8e46a48d581f8b835f305bb17ffbb7776d53b9214113524819e96be842f9db98
 md5=44009c42e98943fbb868638032d5c8d6
 sha256=6b9c73f34f498b12851ac32e1225b72228e4ea629d321b0426d505ad18309e54
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-docs-1.4.3.tar.gz]
+md5=6305083c37a86f2353a8be40bcf70b99
+sha256=26e0d0aa9a24e75af57c27c5710521ed9005dcf4242d912ac0c497653b9a1959
+
 [http://geda.seul.org/release/v1.4/1.4.1/geda-examples-1.4.1.tar.gz]
 md5=9d3daac1be22186784929b56ea181738
 sha256=29e3a1b65212b30847ac5c9f3d51a3add492a1597237085279b6ff82d1a1479f
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-examples-1.4.3.tar.gz]
+md5=923fe9d9cc843b5eb7b26c91ad0ef2d4
+sha256=38a7c6d39a8b298aa1baeadaf7a174ed2ae6397ef227f19cb0bee22757b6e553
+
 [http://geda.seul.org/release/v1.4/1.4.1/geda-gattrib-1.4.1.tar.gz]
 md5=0b8bc020cacda9c3fc21bb7f49332c85
 sha256=e6ab108a7ec3b4431ffa1831a6c23937baf8a7815243d4c145e68f5ee8b11105
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gattrib-1.4.3.tar.gz]
+md5=e1f68401e7ca5fff16292358f0dfd553
+sha256=5eb48772d374dad446bfcd69990231fa6c6b52ba9b30048991632557512a7565
+
 [http://www.geda.seul.org/devel/20050820/geda-gattrib-20050820.tar.gz]
 md5=6ff8e6343b621199dde7fcd9a7ff264a
 sha256=c3b2751303d18c5d685b2d2c380065a93dab17a233657a6d1a09d9f2da64800f
@@ -7374,6 +7386,10 @@ sha256=c3b2751303d18c5d685b2d2c380065a93dab17a233657a6d1a09d9f2da64800f
 md5=b9b8dcb2818eb1fcc51002921f32b203
 sha256=66cff8c99bd0cd4d594b50c3d2cf7af35cc48adce23e6471f1926f3cc9b50d20
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gnetlist-1.4.3.tar.gz]
+md5=ef31d47010108518c6d214516f3d0cad
+sha256=0793ec9d173dbe600c14a0a8cf8b89f418271176d75b5a02e0a840a55910c119
+
 [http://www.geda.seul.org/devel/20050820/geda-gnetlist-20050820.tar.gz]
 md5=94f2a666701e06438fda0a9ce00e5ae3
 sha256=3df3a23c73df7a9c2cc553836e6df797d01da094f6a947049f9fcc182110ef43
@@ -7382,6 +7398,10 @@ sha256=3df3a23c73df7a9c2cc553836e6df797d01da094f6a947049f9fcc182110ef43
 md5=065c22125b75269188321d315ccb64bc
 sha256=6929dd56d14cfcc9fcbdd4dfc056ef8f0bab5ef72a01055fe6cda7280e59748e
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gschem-1.4.3.tar.gz]
+md5=76eef656ba4e27c6083fa29b3a5dfb08
+sha256=6952601966e0f28b9436286178a488849a78da1581c282944d2be34e9a09eec7
+
 [http://www.geda.seul.org/devel/20050820/geda-gschem-20050820.tar.gz]
 md5=8ac2387999ec98016c3b004c95fab424
 sha256=166abaa8b0c98e6c826a7c7273b7ddfb57f82be9929e4afbf00e0e3de5d45ef9
@@ -7390,6 +7410,10 @@ sha256=166abaa8b0c98e6c826a7c7273b7ddfb57f82be9929e4afbf00e0e3de5d45ef9
 md5=1dc7c628acc946731b1e67fb2b910e52
 sha256=15f99bb807dcf6116844847c72bcdde98c8c2232a0e0961cc2ff072a022ccfc6
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-gsymcheck-1.4.3.tar.gz]
+md5=764613c24a752281a4f5d5432e53d0d2
+sha256=e6d9517eaea4383e724502c607d720a3cd4bf560459f5f2196e19d0c5bb3da2c
+
 [http://www.geda.seul.org/devel/20050820/geda-gsymcheck-20050820.tar.gz]
 md5=c339abc4956987852b948c44118b2e2f
 sha256=3526fd4c30f351c3d548cb2632eda150eb632846b1273349aa2061d0400f9816
@@ -7398,6 +7422,10 @@ sha256=3526fd4c30f351c3d548cb2632eda150eb632846b1273349aa2061d0400f9816
 md5=a9dda9a87edefaac2a99b70a85d0fd1c
 sha256=188d398c8e7a19bf4492419bbb44754451ebfa9f1810b0eb8b6eb84f708bf0f4
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-symbols-1.4.3.tar.gz]
+md5=e93f0c9747a66ce229702418b49e128f
+sha256=97c2dec953e21bfa2633077d084fc0b9aff0c79030f96680ebdef9f97e294cc7
+
 [http://www.geda.seul.org/devel/20050820/geda-symbols-20050820.tar.gz]
 md5=a05c9bb11a31c246be3c9a799685bb0e
 sha256=0534ccda5d9136a120abd18ebe3bccd3dbcc6414ec321ad2fd5f9258389ae13d
@@ -7406,6 +7434,10 @@ sha256=0534ccda5d9136a120abd18ebe3bccd3dbcc6414ec321ad2fd5f9258389ae13d
 md5=50d39c9af0577a42f3d769794930a74f
 sha256=dfe4d3d3033e92254aa5e00fa7ab6921589747604269bc7b01e59ba9b630e82c
 
+[http://geda.seul.org/release/v1.4/1.4.3/geda-utils-1.4.3.tar.gz]
+md5=55ab23cad7aee2e65fcc742c424e68d4
+sha256=d4814c6c11b38a3cce88b193f7a6d18cba46c44f8226716fdde53f0ccc58de49
+
 [http://www.geda.seul.org/devel/20050820/geda-utils-20050820.tar.gz]
 md5=6555466492f3273dbefb772bd4ffd486
 sha256=8140ff430e89c8564efabbc24da0d9b2858d5ac5e982dab9923eaf3b46a8aacb
@@ -13130,6 +13162,10 @@ sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844
 md5=16f2e3176eb489838bad57c8728c7388
 sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d
 
+[http://geda.seul.org/release/v1.4/1.4.3/libgeda-1.4.3.tar.gz]
+md5=f4254f345b5d1a1f3ae4e2e27ae38b0a
+sha256=f3687c7308231634619de278b5880cccd6b9b3fc04a4c1b1cf8b2e3131f6f158
+
 [http://www.geda.seul.org/devel/20050820/libgeda-20050820.tar.gz]
 md5=356182f379af726045a70de3024c7e6d
 sha256=c2fdec2c186c11aac2f941dc238ee89f51412707bd7c952e02faefa70e38d700
@@ -16490,6 +16526,10 @@ sha256=cea3848006631801709588b8ae6808dbc768f62b6da4085073075f276309fd0d
 md5=afed64074b2ed195aae171b2178650e1
 sha256=e6cc1b6da8a7af99ba9298e0cb4aac790595f04e04497ea8c2bb4b48c44feb5f
 
+[http://goodies.xfce.org/releases/midori/midori-0.1.7.tar.bz2]
+md5=c6299ecf93417526f37bc0154c18b126
+sha256=9b74a776831c3680c10ad5c3d04985a1368c4fdf2f383a0e8efcc3cda925baaf
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
 md5=d50f0a9683dee60685bcd48e04970949
 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
@@ -22674,6 +22714,10 @@ sha256=b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db
 md5=4e6e4c1a5c1ee2e6026454083de3d5d5
 sha256=d2a107e3a5ceaeeb15ab2e3d7cd308653b4ded8aaf8d3c0e0be3b64ba4e17cfc
 
+[http://www.tangogps.org/downloads/tangogps-0.9.6.tar.gz]
+md5=85755b15099f6071776d6feb67bdbca8
+sha256=e56a77325cdea8c274a39fcb79bd47919cbafa15d8009176538ec9a94f5e6e13
+
 [http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz]
 md5=e88c400394c092c2688bb2d490c80ccb
 sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1
diff --git a/conf/machine/tx27.conf b/conf/machine/tx27.conf
index ef7742ef01..a3e784c110 100644
--- a/conf/machine/tx27.conf
+++ b/conf/machine/tx27.conf
@@ -10,6 +10,8 @@ GUI_MACHINE_CLASS = "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.28"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
 
 require conf/machine/include/tune-arm926ejs.inc
 
@@ -20,8 +22,8 @@ ROOT_FLASH_SIZE = "128"
 
 IMAGE_FSTYPES ?= "jffs2"
 
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \
-    --pad ; sumtool --eraseblock=0x20000 \
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \
+    --pad ; sumtool --eraseblock=0x20000 -n \
     --littleendian --pad \
     -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
     -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
diff --git a/recipes/geda/geda-docs_1.4.1.bb b/recipes/geda/geda-docs_1.4.3.bb
index a35d41514b..a35d41514b 100644
--- a/recipes/geda/geda-docs_1.4.1.bb
+++ b/recipes/geda/geda-docs_1.4.3.bb
diff --git a/recipes/geda/geda-examples_1.4.1.bb b/recipes/geda/geda-examples_1.4.3.bb
index a35d41514b..a35d41514b 100644
--- a/recipes/geda/geda-examples_1.4.1.bb
+++ b/recipes/geda/geda-examples_1.4.3.bb
diff --git a/recipes/geda/geda-gattrib_1.4.1.bb b/recipes/geda/geda-gattrib_1.4.3.bb
index af4ea94153..af4ea94153 100644
--- a/recipes/geda/geda-gattrib_1.4.1.bb
+++ b/recipes/geda/geda-gattrib_1.4.3.bb
diff --git a/recipes/geda/geda-gnetlist_1.4.1.bb b/recipes/geda/geda-gnetlist_1.4.3.bb
index 4f560d3d37..4f560d3d37 100644
--- a/recipes/geda/geda-gnetlist_1.4.1.bb
+++ b/recipes/geda/geda-gnetlist_1.4.3.bb
diff --git a/recipes/geda/geda-gschem_1.4.1.bb b/recipes/geda/geda-gschem_1.4.3.bb
index 7613f3c6a5..7613f3c6a5 100644
--- a/recipes/geda/geda-gschem_1.4.1.bb
+++ b/recipes/geda/geda-gschem_1.4.3.bb
diff --git a/recipes/geda/geda-gsymcheck_1.4.1.bb b/recipes/geda/geda-gsymcheck_1.4.3.bb
index 463da2de99..463da2de99 100644
--- a/recipes/geda/geda-gsymcheck_1.4.1.bb
+++ b/recipes/geda/geda-gsymcheck_1.4.3.bb
diff --git a/recipes/geda/geda-symbols_1.4.1.bb b/recipes/geda/geda-symbols_1.4.3.bb
index 4f560d3d37..4f560d3d37 100644
--- a/recipes/geda/geda-symbols_1.4.1.bb
+++ b/recipes/geda/geda-symbols_1.4.3.bb
diff --git a/recipes/geda/geda-utils_1.4.1.bb b/recipes/geda/geda-utils_1.4.3.bb
index ea61665d9d..ea61665d9d 100644
--- a/recipes/geda/geda-utils_1.4.1.bb
+++ b/recipes/geda/geda-utils_1.4.3.bb
diff --git a/recipes/geda/geda_1.4.1.bb b/recipes/geda/geda_1.4.3.bb
index ee9394d9f2..ee9394d9f2 100644
--- a/recipes/geda/geda_1.4.1.bb
+++ b/recipes/geda/geda_1.4.3.bb
diff --git a/recipes/geda/libgeda_1.4.1.bb b/recipes/geda/libgeda_1.4.3.bb
index a00a1d5cde..a00a1d5cde 100644
--- a/recipes/geda/libgeda_1.4.1.bb
+++ b/recipes/geda/libgeda_1.4.3.bb
diff --git a/recipes/gtk-webcore/midori_0.1.7.bb b/recipes/gtk-webcore/midori_0.1.7.bb
new file mode 100644
index 0000000000..c1d1f66fe7
--- /dev/null
+++ b/recipes/gtk-webcore/midori_0.1.7.bb
@@ -0,0 +1,31 @@
+require midori.inc
+
+DEPENDS += "python-native python-docutils-native"
+
+SRC_URI = "http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2 \
+           file://waf"
+
+
+do_configure() {
+	cp -f ${WORKDIR}/waf ${S}/
+	./configure \
+            --prefix=${prefix} \
+            --bindir=${bindir} \
+            --sbindir=${sbindir} \
+            --libexecdir=${libexecdir} \
+            --datadir=${datadir} \
+            --sysconfdir=${sysconfdir} \
+            --sharedstatedir=${sharedstatedir} \
+            --localstatedir=${localstatedir} \
+            --libdir=${libdir} \
+            --includedir=${includedir} \
+            --infodir=${infodir} \
+            --mandir=${mandir} \
+            ${EXTRA_OECONF} 
+ 
+	sed -i /LINK_CC/d ./_build_/c4che/default.cache.py 
+	echo "LINK_CC = '${CXX}'" >>  ./_build_/c4che/default.cache.py
+}
+
+
+
diff --git a/recipes/linux/linux-2.6.28/tx27/defconfig b/recipes/linux/linux-2.6.28/tx27/defconfig
index 44ed75ae06..d46f4401f0 100644
--- a/recipes/linux/linux-2.6.28/tx27/defconfig
+++ b/recipes/linux/linux-2.6.28/tx27/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28
-# Fri May 29 22:49:00 2009
+# Sun Jun  7 01:39:35 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -32,7 +32,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -233,7 +232,7 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
@@ -260,7 +259,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttymxc0,115200"
+CONFIG_CMDLINE=" debug "
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -366,8 +365,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_PHONET is not set
 # CONFIG_WIRELESS is not set
 CONFIG_WIRELESS_EXT=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -653,7 +650,13 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_KEYBOARD_GPIO=m
-# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -775,8 +778,8 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Master Controller Drivers
 #
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_MXC=m
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_MXC=y
 # CONFIG_SPI_MXC_TEST_LOOPBACK is not set
 CONFIG_SPI_MXC_SELECT1=y
 # CONFIG_SPI_MXC_SELECT2 is not set
@@ -1030,9 +1033,6 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_UPD64083 is not set
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_MXC_CAMERA is not set
-# CONFIG_MXC_CAMERA_MICRON111 is not set
-# CONFIG_MXC_CAMERA_MC521DA is not set
-# CONFIG_MXC_CAMERA_OV2640 is not set
 CONFIG_VIDEO_MXC_OUTPUT=y
 # CONFIG_VIDEO_MXC_OUTPUT_DEBUG is not set
 CONFIG_VIDEO_MXC_EMMA_OUTPUT=y
@@ -1101,11 +1101,50 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_SOUND is not set
+# CONFIG_LOGO is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_SPI=y
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_ALL_CODECS=y
+CONFIG_SND_SOC_AD73311=y
+CONFIG_SND_SOC_AK4535=y
+CONFIG_SND_SOC_CS4270=y
+CONFIG_SND_SOC_SSM2602=y
+CONFIG_SND_SOC_TLV320AIC23=y
+CONFIG_SND_SOC_TLV320AIC26=y
+CONFIG_SND_SOC_TLV320AIC3X=y
+CONFIG_SND_SOC_UDA1380=y
+CONFIG_SND_SOC_WM8510=y
+CONFIG_SND_SOC_WM8580=y
+CONFIG_SND_SOC_WM8731=y
+CONFIG_SND_SOC_WM8750=y
+CONFIG_SND_SOC_WM8753=y
+CONFIG_SND_SOC_WM8900=y
+CONFIG_SND_SOC_WM8903=y
+CONFIG_SND_SOC_WM8971=y
+CONFIG_SND_SOC_WM8990=y
+# CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
@@ -1121,7 +1160,7 @@ CONFIG_USB_HID=y
 #
 # Special HID drivers
 #
-# CONFIG_HID_COMPAT is not set
+CONFIG_HID_COMPAT=y
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
@@ -1586,7 +1625,6 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -1620,7 +1658,6 @@ CONFIG_HAVE_FUNCTION_TRACER=y
 #
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_BOOT_TRACER is not set
diff --git a/recipes/linux/linux_2.6.28.bb b/recipes/linux/linux_2.6.28.bb
index bded7ed03e..415f81a1cb 100644
--- a/recipes/linux/linux_2.6.28.bb
+++ b/recipes/linux/linux_2.6.28.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r9"
+PR = "r10"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/tangogps/tangogps_0.9.3.bb b/recipes/tangogps/tangogps_0.9.6.bb
index 59020fd6bd..727179e5af 100644
--- a/recipes/tangogps/tangogps_0.9.3.bb
+++ b/recipes/tangogps/tangogps_0.9.6.bb
@@ -1,3 +1,3 @@
 require tangogps.inc
-PR = "r3"
+PR = "r0"
 
diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
index ba7d26f7cd..6dfe7baeb5 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
@@ -1,4 +1,7 @@
 upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133
+status: Rejected
+comment: It's a bit unclear if this patch was ever needed, but recent versions seem
+ to work fine without it.
 
 --- xorg-server-1.3.0.0/render/glyphstr.h~	2006-09-18 03:04:18.000000000 -0300
 +++ xorg-server-1.3.0.0/render/glyphstr.h	2008-02-03 22:14:23.187159732 -0200