From 94d8b289d930fe384b53e5cbc4384e94864bccbd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 17 Mar 2009 00:08:55 -0700
Subject: checksums.ini: Update checksum for phoneserver, soundserver, and
 voicecall.

---
 conf/checksums.ini | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f91f259f2f..5705ad8a90 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -18103,8 +18103,8 @@ md5=e4e6155530a23ea0ea4ca59f8c5fda8c
 sha256=e86a0a81ce1b989a4d06e0c07d64e1fcbba2456fa8e22ae24f333f186f3fc663
 
 [http://gpephone.linuxtogo.org/download/gpephone/phoneserver-1.0/phoneserver-1.0.tar.bz2]
-md5=195b684e025ff5c15617d6f757cf631f
-sha256=e14546d11e899e7e9f06ca58979fee14b273d53c637eb268d7c6fe3bf78d564d
+md5=6f6450c4e762059e790216b15b5930e6
+sha256=a1f05eba12369fb8bafb53559ae5ab2855ab1e83746049a100ce5a6d69bec2a6
 
 [http://de3.php.net/distributions/php-4.4.4.tar.bz2]
 md5=bc6fa8908e2ac36e93bab9f7d42cda3a
@@ -20983,8 +20983,8 @@ md5=a362dc3f5f23d785990917103c76a43d
 sha256=084f8286eb945455f3f1567c0a7e7df3a759f2a4e1aab3b881b8ef1bda5bdb21
 
 [http://gpephone.linuxtogo.org/download/gpephone/soundserver-1.0/soundserver-1.0.tar.bz2]
-md5=95a2346791fb461d570808369ac5a2bb
-sha256=0b1009cd6bb5a345be3fe69048b23c8f3248a86340832861f0ffda9e368a6015
+md5=14cbf40e5c6ba1ac05a9309d392326fc
+sha256=2cd45d30fcf862f65d3d9a096e69df1e6520920b01cc35fe66e1f21799645614
 
 [http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2]
 md5=e10563187f49d9f39d360d4c59de6c6c
@@ -23043,8 +23043,8 @@ md5=511ffbc8ed8d9df82e7c67852164728c
 sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a
 
 [http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz]
-md5=c775c0663a5c499d3f2ac23602e98426
-sha256=52f8a7087960aa8845941d08d4fe58c29670c374fbeccd722dd5fbfe995fb89c
+md5=7fa731310c2f5e334ca4eba9c5482965
+sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e
 
 [http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2]
 md5=1c5b3e3e70916de74c2932c7f3e46d9e
-- 
cgit 1.2.3-korg


From 18e898f91445bca0c1817146d10e0ae57ca11ba9 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Tue, 17 Mar 2009 12:45:22 +0100
Subject: minimal: ship debug apps, if requested

---
 conf/distro/minimal.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 196018b431..f7c33d4ed6 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -99,8 +99,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 #############################################################################
 
 # Ship extra debug utils in the rootfs when doing a debug build 
-DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
+DISTRO_EXTRA_APPS ?= ""
+DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
 
 # Additional content I (only valid if you include task-base)
 # distro-feed-configs: configuration files for the online feeds
@@ -110,6 +110,7 @@ DISTRO_EXTRA_RDEPENDS += "\
   distro-feed-configs \
   util-linux-ng-mount util-linux-ng-umount \
   angstrom-libc-fixup-hack \
+  ${DISTRO_EXTRA_APPS} \
 "
 
 # Additional content II (can be masked with BAD_RECOMMENDS)
-- 
cgit 1.2.3-korg


From 1f445f44f3e95a0aeff0e3f15b620012bbf9dd1a Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Tue, 17 Mar 2009 12:45:46 +0100
Subject: fso-autorev.inc: add libfsoframework and fsodeviced

---
 conf/distro/include/fso-autorev.inc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'conf')

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 6de3c82a38..a95a0da4ef 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -3,6 +3,7 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
 SRCREV_pn-fsod = "${AUTOREV}"
+SRCREV_pn-fsodeviced = "${AUTOREV}"
 SRCREV_pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
@@ -11,6 +12,7 @@ SRCREV_pn-fso-monitord = "${AUTOREV}"
 SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libfsoframework = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
 SRCREV_pn-libgsm0710mux = "${AUTOREV}"
-- 
cgit 1.2.3-korg


From c3906c2aa5fefb263ee5782d3dfcf564e1a965cd Mon Sep 17 00:00:00 2001
From: woglinde <heinold@inf.fu-berlin.de>
Date: Tue, 17 Mar 2009 14:21:25 +0100
Subject: checksums.ini: fix entry of busybox-1.13.2-modprobe.patch

---
 conf/checksums.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5705ad8a90..ac27d0d3ab 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3019,8 +3019,8 @@ md5=a72d169e9545e26257032e0e367feb95
 sha256=fd4a64c6a83e07586de0360258162c5bf431f164b3980301185743e4029940df
 
 [http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-modprobe.patch]
-md5=6eeb6efcd71e57082d6654a9a6a368eb
-sha256=a02007661cf2f318a66468456f8fc8ae1177e12c3c66c59ff2de4d98863a388e
+md5=b2b9d0992b055816077ec9e0e4ee7775
+sha256=ba540cad8a029ff2eec7b078e31a308f408c074a13160aa7eba80f5ca18ee703
 
 [http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-tar.patch]
 md5=90d093817855bc63ad16fbb8524f80df
-- 
cgit 1.2.3-korg


From 560f9bb446a8049d7be3b0c77bbad9f1de4cb5ba Mon Sep 17 00:00:00 2001
From: woglinde <heinold@inf.fu-berlin.de>
Date: Tue, 17 Mar 2009 14:22:14 +0100
Subject: wrap.conf: no extra kernel-recpie needed use the plain ones

---
 conf/machine/wrap.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index 92720043f2..1fc75ebe94 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "i486"
 PACKAGE_EXTRA_ARCHS = "i386 x86"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrap-geode"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 # Serial console settings for sysvinit
-- 
cgit 1.2.3-korg


From 6041d2d7eb0d9a4885bff1aa38ddffd75388ca64 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Tue, 17 Mar 2009 15:30:02 +0100
Subject: webkit-qt(opia): drop obsolete test packages

* remove webkit-qt and webkit-qtopia, webkit support
  is now provided as part of Qt itself

Acked-By: Holger Hans Peter Freyther <zecke@selfish.org>
---
 conf/distro/include/sane-srcrevs.inc               |   2 -
 packages/webkit/files/qt-api-changes.diff          |  27 --
 .../webkit/files/qtwebkit-use-image-decoders.patch | 280 ---------------------
 packages/webkit/webkit-qt.inc                      |  32 ---
 packages/webkit/webkit-qt_svn.bb                   |   2 -
 packages/webkit/webkit-qtopia_svn.bb               |   5 -
 6 files changed, 348 deletions(-)
 delete mode 100644 packages/webkit/files/qt-api-changes.diff
 delete mode 100644 packages/webkit/files/qtwebkit-use-image-decoders.patch
 delete mode 100644 packages/webkit/webkit-qt.inc
 delete mode 100644 packages/webkit/webkit-qt_svn.bb
 delete mode 100644 packages/webkit/webkit-qtopia_svn.bb

(limited to 'conf')

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e0b8dba733..4e8d4fa9dc 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -233,8 +233,6 @@ SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-webkit-gtk ?= "40814"
-SRCREV_pn-webkit-qt ?= "28656"
-SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
diff --git a/packages/webkit/files/qt-api-changes.diff b/packages/webkit/files/qt-api-changes.diff
deleted file mode 100644
index 16f448b017..0000000000
--- a/packages/webkit/files/qt-api-changes.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: WebKit/qt/Api/qwebkitglobal.h
-===================================================================
---- WebKit/qt/Api/qwebkitglobal.h	(revision 26079)
-+++ WebKit/qt/Api/qwebkitglobal.h	(working copy)
-@@ -25,15 +25,13 @@
- #include <qglobal.h>
- 
- #if defined(Q_OS_WIN)
--#    if defined(BUILD_WEBKIT)
--#        define QWEBKIT_EXPORT Q_DECL_EXPORT
--#    else
--#        define QWEBKIT_EXPORT Q_DECL_IMPORT
--#    endif
-+    #ifdef BUILD_WEBKIT
-+        #define QWEBKIT_EXPORT __declspec(dllexport)
-+    #else
-+        #define QWEBKIT_EXPORT __declspec(dllimport)
-+    #endif
-+#else
-+    #define QWEBKIT_EXPORT __attribute__((visibility("default")))
- #endif
- 
--#if !defined(QWEBKIT_EXPORT)
--#define QWEBKIT_EXPORT Q_DECL_EXPORT
--#endif
--
- #endif // QWEBKITGLOBAL_H
diff --git a/packages/webkit/files/qtwebkit-use-image-decoders.patch b/packages/webkit/files/qtwebkit-use-image-decoders.patch
deleted file mode 100644
index 85d3f84a0d..0000000000
--- a/packages/webkit/files/qtwebkit-use-image-decoders.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
-index bb34e44..23a1cd0 100644
---- a/WebCore/WebCore.pro
-+++ b/WebCore/WebCore.pro
-@@ -6,6 +6,7 @@ CONFIG += building-libs
- CONFIG += no_batch
- include($$PWD/../WebKit.pri)
- gtk-port:LIBS -= -lWebKitGtk
-+qt-port:LIBS += -lpng -ljpeg
- 
- TEMPLATE = lib
- qt-port:TARGET = QtWebKit
-@@ -74,6 +75,12 @@ qt-port {
- INCLUDEPATH += \
-                 $$PWD/platform/qt \
-                 $$PWD/platform/network/qt \
-+                $$PWD/platform/image-decoders/bmp \
-+                $$PWD/platform/image-decoders/gif \
-+                $$PWD/platform/image-decoders/ico \
-+                $$PWD/platform/image-decoders/jpeg \
-+                $$PWD/platform/image-decoders/png \
-+                $$PWD/platform/image-decoders/xbm \
-                 $$PWD/platform/graphics/qt \
-                 $$PWD/platform/graphics/svg/qt \
-                 $$PWD/loader/qt \
-@@ -777,6 +784,13 @@ qt-port {
-     page/qt/EventHandlerQt.cpp \
-     page/qt/FrameQt.cpp \
-     loader/qt/DocumentLoaderQt.cpp \
-+    platform/image-decoders/gif/GIFImageDecoder.cpp \
-+    platform/image-decoders/gif/GIFImageReader.cpp  \
-+    platform/image-decoders/png/PNGImageDecoder.cpp \
-+    platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
-+    platform/image-decoders/bmp/BMPImageDecoder.cpp \
-+    platform/image-decoders/ico/ICOImageDecoder.cpp \
-+    platform/image-decoders/xbm/XBMImageDecoder.cpp \
-     platform/graphics/qt/AffineTransformQt.cpp \
-     platform/graphics/qt/ColorQt.cpp \
-     platform/graphics/qt/FloatPointQt.cpp \
-diff --git a/WebCore/platform/graphics/ImageSource.h b/WebCore/platform/graphics/ImageSource.h
-index a75f1d6..2af8c1e 100644
---- a/WebCore/platform/graphics/ImageSource.h
-+++ b/WebCore/platform/graphics/ImageSource.h
-@@ -49,8 +49,8 @@ class SharedBuffer;
- typedef CGImageSourceRef NativeImageSourcePtr;
- typedef CGImageRef NativeImagePtr;
- #elif PLATFORM(QT)
--class ImageDecoderQt;
--typedef ImageDecoderQt* NativeImageSourcePtr;
-+class ImageDecoder;
-+typedef ImageDecoder* NativeImageSourcePtr;
- typedef QPixmap* NativeImagePtr;
- #else
- class ImageDecoder;
-diff --git a/WebCore/platform/graphics/qt/ImageSourceQt.cpp b/WebCore/platform/graphics/qt/ImageSourceQt.cpp
-index 264f90f..d1fd340 100644
---- a/WebCore/platform/graphics/qt/ImageSourceQt.cpp
-+++ b/WebCore/platform/graphics/qt/ImageSourceQt.cpp
-@@ -1,6 +1,7 @@
- /*
-  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved. 
-  * Copyright (C) 2006 Trolltech ASA
-+ * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk>
-  *
-  * All rights reserved.
-  *
-@@ -28,76 +29,78 @@
- 
- #include "config.h"
- #include "ImageSource.h"
--#include "ImageDecoderQt.h"
- #include "SharedBuffer.h"
- 
--#include <QImage>
--#include <qdebug.h>
-+#include "GIFImageDecoder.h"
-+#include "JPEGImageDecoder.h"
-+#include "PNGImageDecoder.h"
-+#include "BMPImageDecoder.h"
-+#include "ICOImageDecoder.h"
-+#include "XBMImageDecoder.h"
- 
-+#include <QImage>
-+#include <QPixmap>
- 
- namespace WebCore {
--    enum ImageFormat { ImageFormat_None, ImageFormat_GIF, ImageFormat_PNG, ImageFormat_JPEG,
--                       ImageFormat_BMP,  ImageFormat_ICO,  ImageFormat_XBM };
- 
--ImageFormat detectImageFormat(const SharedBuffer& data)
-+ImageDecoder* createDecoder(const Vector<char>& data)
- {
-     // We need at least 4 bytes to figure out what kind of image we're dealing with.
-     int length = data.size();
-     if (length < 4)
--        return ImageFormat_None;
-+        return 0;
- 
--    const unsigned char* uContents = (const unsigned char*) data.data();
-+    const unsigned char* uContents = (const unsigned char*)data.data();
-     const char* contents = data.data();
- 
-     // GIFs begin with GIF8(7 or 9).
-     if (strncmp(contents, "GIF8", 4) == 0)
--        return ImageFormat_GIF;
-+        return new GIFImageDecoder();
- 
-     // Test for PNG.
--    if (uContents[0] == 0x89 &&
--        uContents[1] == 0x50 &&
--        uContents[2] == 0x4E &&
--        uContents[3] == 0x47)
--        return ImageFormat_PNG;
-+    if (uContents[0]==0x89 &&
-+        uContents[1]==0x50 &&
-+        uContents[2]==0x4E &&
-+        uContents[3]==0x47)
-+        return new PNGImageDecoder();
- 
-     // JPEG
--    if (uContents[0] == 0xFF &&
--        uContents[1] == 0xD8 &&
--        uContents[2] == 0xFF)
--        return ImageFormat_JPEG;
-+    if (uContents[0]==0xFF &&
-+        uContents[1]==0xD8 &&
-+        uContents[2]==0xFF)
-+        return new JPEGImageDecoder();
- 
-     // BMP
-     if (strncmp(contents, "BM", 2) == 0)
--        return ImageFormat_BMP;
-+        return new BMPImageDecoder();
- 
-     // ICOs always begin with a 2-byte 0 followed by a 2-byte 1.
-     // CURs begin with 2-byte 0 followed by 2-byte 2.
-     if (!memcmp(contents, "\000\000\001\000", 4) ||
-         !memcmp(contents, "\000\000\002\000", 4))
--        return ImageFormat_ICO;
--
-+        return new ICOImageDecoder();
-+   
-     // XBMs require 8 bytes of info.
-     if (length >= 8 && strncmp(contents, "#define ", 8) == 0)
--        return ImageFormat_XBM;
-+        return new XBMImageDecoder();
- 
-     // Give up. We don't know what the heck this is.
--    return ImageFormat_None;
--}
--    
--ImageDecoderQt* createDecoder(const SharedBuffer& data) {
--    if (detectImageFormat(data) != ImageFormat_None) 
--        return new ImageDecoderQt();
-     return 0;
- }
- 
- ImageSource::ImageSource()
--    : m_decoder(0)
-+  : m_decoder(0)
-+{}
-+
-+ImageSource::~ImageSource()
- {
-+    clear();
- }
- 
--ImageSource::~ImageSource()
-+void ImageSource::clear()
- {
-     delete m_decoder;
-+    m_decoder = 0;
- }
- 
- bool ImageSource::initialized() const
-@@ -111,13 +114,11 @@ void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
-     // This method will examine the data and instantiate an instance of the appropriate decoder plugin.
-     // If insufficient bytes are available to determine the image type, no decoder plugin will be
-     // made.
--    if (!m_decoder)
--        m_decoder = createDecoder(*data);
--
-+    delete m_decoder;
-+    m_decoder = createDecoder(data->buffer());
-     if (!m_decoder)
-         return;
--
--    m_decoder->setData(data->buffer(), allDataReceived);
-+    m_decoder->setData(data, allDataReceived);
- }
- 
- bool ImageSource::isSizeAvailable()
-@@ -146,10 +147,7 @@ int ImageSource::repetitionCount()
- 
- size_t ImageSource::frameCount() const
- {
--    if (!m_decoder)
--        return 0;
--
--    return m_decoder->frameCount();
-+    return m_decoder ? m_decoder->frameCount() : 0;
- }
- 
- NativeImagePtr ImageSource::createFrameAtIndex(size_t index)
-@@ -157,25 +155,38 @@ NativeImagePtr ImageSource::createFrameAtIndex(size_t index)
-     if (!m_decoder)
-         return 0;
- 
--    
--    const QPixmap* source = m_decoder->imageAtIndex(index);
--    if (!source)
-+    RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
-+    if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty)
-         return 0;
- 
--    return new QPixmap(*source);
-+    return new QPixmap(QPixmap::fromImage(QImage(reinterpret_cast<unsigned char*>(buffer->bytes().data()),
-+						 size().width(), size().height(), size().width()*4, QImage::Format_ARGB32)));
-+}
-+
-+bool ImageSource::frameIsCompleteAtIndex(size_t index)
-+{
-+    if (!m_decoder)
-+        return false;
-+
-+    RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
-+    return buffer && buffer->status() == RGBA32Buffer::FrameComplete;
- }
- 
- float ImageSource::frameDurationAtIndex(size_t index)
- {
-     if (!m_decoder)
-         return 0;
--    
-+
-+    RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
-+    if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty)
-+        return 0;
-+
-     // Many annoying ads specify a 0 duration to make an image flash as quickly
-     // as possible.  We follow WinIE's behavior and use a duration of 100 ms
-     // for any frames that specify a duration of <= 50 ms.  See
-     // <http://bugs.webkit.org/show_bug.cgi?id=14413> or Radar 4051389 for
-     // more.
--    const float duration = m_decoder->duration(index) / 1000.0f;
-+    const float duration = buffer->duration() / 1000.0f;
-     return (duration < 0.051f) ? 0.100f : duration;
- }
- 
-@@ -183,26 +194,13 @@ bool ImageSource::frameHasAlphaAtIndex(size_t index)
- {
-     if (!m_decoder || !m_decoder->supportsAlpha())
-         return false;
--    
--    const QPixmap* source = m_decoder->imageAtIndex( index);
--    if (!source)
--        return false;
--    
--    return source->hasAlphaChannel();
--}
- 
--bool ImageSource::frameIsCompleteAtIndex(size_t index)
--{
--    return (m_decoder && m_decoder->imageAtIndex(index) != 0);
--}
-+    RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);
-+    if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty)
-+        return false;
- 
--void ImageSource::clear()
--{
--    delete  m_decoder;
--    m_decoder = 0;
-+    return buffer->hasAlpha();
- }
--
--
- }
- 
- // vim: ts=4 sw=4 et
diff --git a/packages/webkit/webkit-qt.inc b/packages/webkit/webkit-qt.inc
deleted file mode 100644
index 5522a7cf53..0000000000
--- a/packages/webkit/webkit-qt.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-WEBKIT_PORT = "qt"
-WEBKIT_EXTRA_OPTIONS = ""
-
-FILES_${PN}launcher = "${bindir}/QtLauncher"
-FILES_${PN}launcher-dbg += "${bindir}/.debug/*"
-
-RDEPENDS += "openssl"
-
-require webkit.inc
-
-PR = "r6"
-SRC_URI += " file://qt-api-changes.diff;patch=0;pnum=0 \
-             file://qtwebkit-use-image-decoders.patch;patch=0 "
-
-do_install() {
-	install -d ${D}${bindir}
-	install -d ${D}${libdir}
-	install -d ${D}${libdir}/pkgconfig
-
-	install -m 0755 ${S}/WebKitBuilds/Debug/bin/QtLauncher ${D}${bindir}
-	cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
-	oe_runmake install
-
-    oe_libinstall -C ${S}/WebKitBuilds/Debug/lib libQtWebKit ${D}${libdir}
-}
-
-# disabled as Qt and Qtopia will not like each other...
-#do_stage_prepend() {
-#    oe_libinstall -C ${S}/WebKitBuilds/Debug/lib libQtWebKit ${D}${libdir}
-#}
-
diff --git a/packages/webkit/webkit-qt_svn.bb b/packages/webkit/webkit-qt_svn.bb
deleted file mode 100644
index 75b36a4a58..0000000000
--- a/packages/webkit/webkit-qt_svn.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require webkit-qt.inc
-inherit qt4x11
diff --git a/packages/webkit/webkit-qtopia_svn.bb b/packages/webkit/webkit-qtopia_svn.bb
deleted file mode 100644
index ce32404b83..0000000000
--- a/packages/webkit/webkit-qtopia_svn.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require webkit-qt.inc
-inherit qt4e
-
-WEBKIT_EXTRA_OPTIONS += "QT+=xml QT+=network"
-
-- 
cgit 1.2.3-korg


From 3b1c82c59e3d1a2cbc5510d2572385493f0af711 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 17 Mar 2009 15:37:53 +0100
Subject: ffmpeg: add 0.5 release

---
 conf/checksums.ini            |  4 +++
 packages/ffmpeg/ffmpeg_0.5.bb | 59 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 packages/ffmpeg/ffmpeg_0.5.bb

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5705ad8a90..022e81b186 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5766,6 +5766,10 @@ sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 md5=ea5587e3c66d50b1503b82ac4179c303
 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 
+[http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2]
+md5=be8503f15c3b81ba00eb8379ca8dcf33
+sha256=16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
+
 [http://folks.o-hand.com/dodji/0xdeadbabe/ffmpeg_xine.tar.bz2]
 md5=e67e1c2eb134d2fba50a524188b6a3b4
 sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c
diff --git a/packages/ffmpeg/ffmpeg_0.5.bb b/packages/ffmpeg/ffmpeg_0.5.bb
new file mode 100644
index 0000000000..e49478a215
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg_0.5.bb
@@ -0,0 +1,59 @@
+require ffmpeg.inc
+
+DEPENDS += "schroedinger libgsm"
+
+PE = "1"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "1"
+
+SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
+SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2"
+
+#S = "${WORKDIR}/git"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+
+EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
+EXTRA_FFCONF ?= ""
+
+EXTRA_OECONF = " \
+        --enable-shared \
+        --enable-pthreads \
+        --disable-stripping \
+        --enable-gpl \
+        --enable-nonfree \
+        --enable-postproc \
+        \
+        --cross-prefix=${TARGET_PREFIX} \
+        --prefix=${prefix} \
+        \
+        --enable-x11grab \
+        --enable-libfaac \
+        --enable-libfaad \
+        --enable-libfaadbin \
+        --enable-libgsm \
+        --enable-libmp3lame \
+        --enable-libschroedinger \
+        --enable-libtheora  \
+        --enable-libvorbis \
+        --enable-swscale \
+        --arch=${TARGET_ARCH} \
+        --enable-cross-compile \
+        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+        --extra-ldflags="${TARGET_LDFLAGS}" \
+        --enable-hardcoded-tables \
+        ${EXTRA_FFCONF} \
+"
+
+do_configure() {
+        sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
+        cd ${S}
+        mkdir -p ${B}
+        cd ${B}
+        ${S}/configure ${EXTRA_OECONF}
+		sed -i -e s:Os:O4:g ${B}/config.h
+}
+
-- 
cgit 1.2.3-korg


From fa6cd5a3b993f16c27de4ff82b42684516d433ba Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 17 Mar 2009 17:37:26 +0100
Subject: checksums.ini: added fakeroot 1.12.1

---
 conf/checksums.ini | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 88cc732056..1358d11583 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5570,6 +5570,10 @@ sha256=7796adabf4514ba535ccd518bb377c839c098cd2a28ba46984a627b2e9382e26
 md5=87970d6784f536cde84f9bcbaaa52720
 sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.12.1.tar.gz]
+md5=87970d6784f536cde84f9bcbaaa52720
+sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
+
 [ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.1.tar.gz]
 md5=87970d6784f536cde84f9bcbaaa52720
 sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
-- 
cgit 1.2.3-korg


From 67cd8abfcb09096a84a20d5af216f867aa4326fd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 17 Mar 2009 21:31:01 +0100
Subject: dm355-leopard: add more machine features

---
 conf/machine/dm355-leopard.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf
index a9699499b7..5131488577 100644
--- a/conf/machine/dm355-leopard.conf
+++ b/conf/machine/dm355-leopard.conf
@@ -13,7 +13,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 
-MACHINE_FEATURES = "kernel26 alsa"
+MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc"
 
 require conf/machine/include/tune-arm926ejs.inc
 
-- 
cgit 1.2.3-korg


From 27cebb88719e395a9f282fe480942c5ab401f542 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Wed, 18 Mar 2009 00:44:10 +0100
Subject: openezx-kernel: update to sane version; we're now at 2.6.29-rc8. Fix
 branch and remove command line args for good.

---
 conf/distro/include/sane-srcrevs.inc |  2 +-
 recipes/linux/openezx-kernel_git.bb  | 26 ++++++--------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 4e8d4fa9dc..7e3ba96c2a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -141,7 +141,7 @@ SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openezx-kernel ?= "cd10215486503506f53667d69958cc547a510cce"
+SRCREV_pn-openezx-kernel ?= "87c2ff2531fd4a5f6799a80b339859dd3ebf4191"
 SRCREV_pn-openmoko-agpsui ?= "7"
 SRCREV_pn-openmoko-alsa-scenarios ?= "4732"
 SRCREV_pn-openmoko-appearance ?= "3262"
diff --git a/recipes/linux/openezx-kernel_git.bb b/recipes/linux/openezx-kernel_git.bb
index f6ff30790b..04044131b2 100644
--- a/recipes/linux/openezx-kernel_git.bb
+++ b/recipes/linux/openezx-kernel_git.bb
@@ -1,16 +1,18 @@
 DESCRIPTION = "OpenEZX 2.6 Linux Development Kernel for the Motorola EZX GSM phones"
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
-KV = "2.6.27"
+KV = "2.6.28+2.6.29rc8"
 PV = "${KV}+gitr${SRCREV}"
 PR = "r0"
 
 require linux.inc
 
-DEFAULT_PREFERENCE = "-1"
+# Make sure not to use thumb[-interworking]
+ARM_INSTRUCTION_SET = "arm"
+THUMB_INTERWORKING = "no"
 
 SRC_URI = "\
-  git://git.openezx.org/openezx.git;protocol=git \
+  git://git.openezx.org/openezx.git;protocol=git;branch=ezx/current \
 "
 S = "${WORKDIR}/git"
 
@@ -22,23 +24,7 @@ S = "${WORKDIR}/git"
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = '(a780|e680|a910|a1200|rorkre2|rokre6)'
 
-# For now the code for serial console is disabled in compress.c
-#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
-CMDLINE_CON = "console=tty1 "
-
-CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootwait=1"
-CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=1 "
-# Uncomment to enable dyntick
-#CMDLINE_OTHER = "dyntick=enable"
-CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
-CMDLINE_IP = "ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0"
-CMDLINE_MEM = "mem=32M@0xA0000000 mem=16M@0xAC000000"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
-# Uncomment to use root-over-nfs-over-usb
-#CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
-
-# 1024x1024 once was the maximum kernel size for boot-over-usb -- is it still?
-#KERNEL_IMAGE_MAXSIZE = "1294336"
+# Kernel command line parameters are given over boot_usb or gen-blob's menu
 
 ###############################################################
 # module configs specific to this kernel
-- 
cgit 1.2.3-korg


From 51b6d90f1d72ecf183ec0d78fcc103f2d8a7213e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 19 Mar 2009 09:39:02 +0100
Subject: glib-2.0: add 2.20

---
 conf/checksums.ini                                 | 12 +++++++
 .../glib-2.0/glib-2.0-2.20.0/atomic-thumb.patch    | 42 ++++++++++++++++++++++
 .../glib-2.0-2.20.0/configure-libtool.patch        | 34 ++++++++++++++++++
 recipes/glib-2.0/glib-2.0_2.20.0.bb                | 10 ++++++
 4 files changed, 98 insertions(+)
 create mode 100644 recipes/glib-2.0/glib-2.0-2.20.0/atomic-thumb.patch
 create mode 100644 recipes/glib-2.0/glib-2.0-2.20.0/configure-libtool.patch
 create mode 100644 recipes/glib-2.0/glib-2.0_2.20.0.bb

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1358d11583..af7d67a058 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1198,6 +1198,10 @@ sha256=e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec
 md5=16748b2d6e318e0e2a25581005e1943a
 sha256=4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
 
+[http://www.abiword.org/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz]
+md5=fab04d8ef999c303f720197adf261310
+sha256=b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
+
 [http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-plugins-2.5.1.tar.gz]
 md5=b1ce7ca49a0ee4e04f828e10eaebe6a9
 sha256=37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b
@@ -7406,6 +7410,10 @@ sha256=9f769e8449c8cc1d8789ba987e446bdac3ed22671d71f946c973c7aadccc0b36
 md5=aa214a10d873b68ddd67cd9de2ccae55
 sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-2.20.0.tar.bz2]
+md5=05188e560dbd8bddd568e24ce10dd003
+sha256=6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
 md5=a45db7d82480da431f6cd00ea041a534
 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
@@ -9438,6 +9446,10 @@ sha256=516d981d1d696bb00a8c451fe928efd64ce0bd674ccc3024a0aefb292343231b
 md5=b693a2c1c2dd95457b87d0d042aa5bba
 sha256=efc277e87e3b7e0315eb3c2837fad6a06aab92b38e08fec6f30beb53e7e56e09
 
+[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.0.tar.bz2]
+md5=139528802794287427fd4d18875b5cf5
+sha256=ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
diff --git a/recipes/glib-2.0/glib-2.0-2.20.0/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.20.0/atomic-thumb.patch
new file mode 100644
index 0000000000..d7aa08821f
--- /dev/null
+++ b/recipes/glib-2.0/glib-2.0-2.20.0/atomic-thumb.patch
@@ -0,0 +1,42 @@
+# gatomic.c uses SWP, which doesn't work in Thumb mode.
+# Put that source file into a separate convenience library which is always built as ARM.
+
+Index: glib-2.18.1/glib/Makefile.am
+===================================================================
+--- glib-2.18.1/glib/Makefile.am	2008-09-18 00:33:57.000000000 +0200
++++ glib-2.18.1/glib/Makefile.am	2008-11-08 10:13:27.000000000 +0100
+@@ -80,6 +80,7 @@
+ 	galiasdef.c
+ 
+ lib_LTLIBRARIES = libglib-2.0.la
++noinst_LTLIBRARIES = libgatomic.la
+ 
+ if OS_WIN32_AND_DLL_COMPILATION
+ if MS_LIB_AVAILABLE
+@@ -96,10 +97,14 @@
+ uninstall-ms-lib:
+ 	$(uninstall_ms_lib_cmd)
+ 
++libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb
++
++libgatomic_la_SOURCES =                \
++       gatomic.c
++ 
+ libglib_2_0_la_SOURCES = 	\
+ 	garray.c		\
+ 	gasyncqueue.c		\
+-	gatomic.c		\
+ 	gbacktrace.c		\
+ 	gbase64.c		\
+ 	gbookmarkfile.c 	\
+@@ -286,8 +291,8 @@
+ pcre_inc =
+ endif
+ 
+-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
+-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
++libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la
++libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la
+ 
+ libglib_2_0_la_LDFLAGS = \
+ 	 $(glib_win32_res_ldflag) \
diff --git a/recipes/glib-2.0/glib-2.0-2.20.0/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.20.0/configure-libtool.patch
new file mode 100644
index 0000000000..3ba79b8986
--- /dev/null
+++ b/recipes/glib-2.0/glib-2.0-2.20.0/configure-libtool.patch
@@ -0,0 +1,34 @@
+# Poky renames libtool to $host_alias-libtool.
+# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
+# so we can't call # it at this point. We can safely assume a version is available 
+# from PATH though
+
+--- glib-2.12.10/configure.in.orig	2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in	2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+ 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ 	echo "void glib_plugin_test(void) { }" > plugin.c
+-	${SHELL} ./libtool --mode=compile ${CC} -shared \
++	${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \
+ 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+ 
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
diff --git a/recipes/glib-2.0/glib-2.0_2.20.0.bb b/recipes/glib-2.0/glib-2.0_2.20.0.bb
new file mode 100644
index 0000000000..e0afd218f7
--- /dev/null
+++ b/recipes/glib-2.0/glib-2.0_2.20.0.bb
@@ -0,0 +1,10 @@
+require glib.inc
+
+PR = "r0"
+
+SRC_URI = "\
+  http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2 \
+  file://glibconfig-sysdefs.h \
+  file://configure-libtool.patch;patch=1 \
+"
+SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
-- 
cgit 1.2.3-korg


From 2612236bf6abf8ebd98fac5359f3b1b830404ed5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 19 Mar 2009 11:31:00 +0100
Subject: abiword: update to 2.6.8

---
 conf/checksums.ini                        |  4 ++
 recipes/abiword/abiword-embedded_2.6.8.bb |  8 ++++
 recipes/abiword/abiword-plugins_2.6.8.bb  | 61 +++++++++++++++++++++++++++++++
 recipes/abiword/abiword_2.6.8.bb          |  8 ++++
 4 files changed, 81 insertions(+)
 create mode 100644 recipes/abiword/abiword-embedded_2.6.8.bb
 create mode 100644 recipes/abiword/abiword-plugins_2.6.8.bb
 create mode 100644 recipes/abiword/abiword_2.6.8.bb

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index af7d67a058..5afb025312 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1222,6 +1222,10 @@ sha256=d3ddfd3dbd20ed9bb35dceb06a55ec13d66acb1c3fce28976a8d10929c39a194
 md5=3bf973c5a1446ef3eaf980724821d6e9
 sha256=ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb
 
+[http://www.abiword.org/downloads/abiword/2.6.8/source/abiword-plugins-2.6.8.tar.gz]
+md5=421c49723e209c971ddb0798c1b313a9
+sha256=151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448
+
 [http://www.labyrinth.net.au/~trandor/abuse/files/abuse_sdl-0.7.0.tar.bz2]
 md5=59ea4498886642aa975f04233cc92558
 sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931
diff --git a/recipes/abiword/abiword-embedded_2.6.8.bb b/recipes/abiword/abiword-embedded_2.6.8.bb
new file mode 100644
index 0000000000..98e69515fa
--- /dev/null
+++ b/recipes/abiword/abiword-embedded_2.6.8.bb
@@ -0,0 +1,8 @@
+require abiword-2.5.inc
+
+EXTRA_OECONF += "--enable-embedded"
+
+S = "${WORKDIR}/abiword-${PV}"
+
+RCONFLICTS = "abiword"
+RPROVIDES += "abiword"
diff --git a/recipes/abiword/abiword-plugins_2.6.8.bb b/recipes/abiword/abiword-plugins_2.6.8.bb
new file mode 100644
index 0000000000..01778ae10f
--- /dev/null
+++ b/recipes/abiword/abiword-plugins_2.6.8.bb
@@ -0,0 +1,61 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "asio boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+#           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+	   "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+#export LDFLAGS += " -lstdc++ "
+
+EXTRA_OECONF = " --enable-shared=yes \
+                 --enable-static \
+		 --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGING_DIR_HOST} \ 
+		 --with-boost-thread=boost_thread-mt \
+               "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+        do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+
+	metapkg = "abiword-plugins"
+	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
+	bb.data.setVar('FILES_' + metapkg, "", d)
+	blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
+	metapkg_rdepends = []
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	for pkg in packages[1:]:
+		if not pkg in blacklist and not pkg in metapkg_rdepends:
+			print "Modifying ", pkg
+			metapkg_rdepends.append(pkg)
+	bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+	bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d)
+	packages.append(metapkg)
+	bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
diff --git a/recipes/abiword/abiword_2.6.8.bb b/recipes/abiword/abiword_2.6.8.bb
new file mode 100644
index 0000000000..d05fc77f70
--- /dev/null
+++ b/recipes/abiword/abiword_2.6.8.bb
@@ -0,0 +1,8 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
+
+FILES_${PN} 			+= "${datadir}/mime-info"
+FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
+FILES_abiword-systemprofiles    += "${datadir}/abiword-${SHRT_VER}/system.profile*"
+
-- 
cgit 1.2.3-korg


From b7423a748d38227810bfad44cc3c9f7f27bfe379 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 19 Mar 2009 13:00:08 +0100
Subject: libproxy: add 0.2.3

---
 conf/checksums.ini              | 12 ++++++++++++
 recipes/gnome/libproxy_0.2.3.bb | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 recipes/gnome/libproxy_0.2.3.bb

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5afb025312..18e4279d9c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13598,6 +13598,10 @@ sha256=cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
 md5=00cea4539bea4bd34cbf8b82ff9589cd
 sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
 
+[http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz]
+md5=86b635e1eb2d665cfbef4c6134fe6604
+sha256=59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
+
 [http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2]
 md5=774eabaf33440d534efe108ef9130a7d
 sha256=004dae11e11598584939d66d26a5ab9b48d08a00ca2d00ae8d38ee3ac7a15d65
@@ -13802,6 +13806,10 @@ sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a
 md5=118967f097a7e1e9d5023f1f06e0b65a
 sha256=30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.26/libsoup-2.26.0.tar.bz2]
+md5=9df9d2b3304213641d3214a774d75ee1
+sha256=47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
@@ -15790,6 +15798,10 @@ sha256=7861535eef2c0804dbdc6993db76574b4a812164bed7545a3697a3b97e36d2dd
 md5=5169ead6783f374cedf3f89bf399bd75
 sha256=a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
 
+[http://goodies.xfce.org/releases/midori/midori-0.1.4.tar.bz2]
+md5=a9b21027ba894fed3055d7074c5f073d
+sha256=4a84422c270625162f6e9e1e4e8151d9546457d64c61c2b3c896cbf43fb54ce5
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-f30dff433056e239ca775d16f343bdb249f1a338.tar.bz2]
 md5=24f6c176246300b66c036de65fed0565
 sha256=6151809d337ea8d07769618acd4ac470c5ccd310790e40805b93cf8781904048
diff --git a/recipes/gnome/libproxy_0.2.3.bb b/recipes/gnome/libproxy_0.2.3.bb
new file mode 100644
index 0000000000..2a2ee51cd7
--- /dev/null
+++ b/recipes/gnome/libproxy_0.2.3.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "A library handling all the details of proxy configuration"
+LICENSE = "LGPL"
+DEPENDS = "gconf virtual/libx11"
+
+SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
+
+inherit autotools_stage
+
+# Disable plugins that are *up* in the depchain, they need libproxy to build
+# Don't we just love circular deps?
+EXTRA_OECONF = " --with-file \
+                 --with-gnome \
+                 --without-kde \
+                 --without-webkit \
+                 --without-mozjs \
+                 --without-networkmanager \
+                "
+
+FILES_${PN}-dbg += "${libdir}/libproxy/*/plugins/.debug"
+
-- 
cgit 1.2.3-korg


From 432c38351a0e98f897b0c029598de75895961f87 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 19 Mar 2009 13:38:44 +0100
Subject: webkit-gtk: bump SRCREV

---
 conf/distro/include/sane-srcrevs.inc      |   2 +-
 recipes/webkit/webkit-gtk/GNUmakefile.am  |  58 +++++++++--------
 recipes/webkit/webkit-gtk/Makefile        |  16 -----
 recipes/webkit/webkit-gtk/Makefile.shared |  12 ----
 recipes/webkit/webkit-gtk/configure.ac    | 103 +++++++++++++++---------------
 5 files changed, 87 insertions(+), 104 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7e3ba96c2a..87e9204e45 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -232,7 +232,7 @@ SRCREV_pn-uclibc-initial ?= "24279"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-webkit-gtk ?= "40814"
+SRCREV_pn-webkit-gtk ?= "41827"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index c74e1fa428..9e97e67387 100644
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -174,7 +174,6 @@ libWebCore_la_CFLAGS = \
 	$(PANGO_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(XT_CFLAGS) \
-	$(LIBCURL_CFLAGS) \
 	$(LIBSOUP_CFLAGS) \
 	$(FREETYPE_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
@@ -201,7 +200,6 @@ libWebCore_la_LIBADD = \
 	$(PANGO_LIBS) \
 	$(GTK_LIBS) \
 	$(XT_LIBS) \
-	$(LIBCURL_LIBS) \
 	$(LIBSOUP_LIBS) \
 	$(FREETYPE_LIBS) \
 	$(UNICODE_LIBS) \
@@ -237,7 +235,8 @@ libwebkit_1_0_la_CXXFLAGS = \
 	$(libWebCore_la_CXXFLAGS)
 
 libwebkit_1_0_la_CFLAGS = \
-	$(libWebCore_la_CFLAGS)
+	$(libWebCore_la_CFLAGS) \
+	$(GNOMEKEYRING_CFLAGS)
 
 libwebkit_1_0_la_CPPFLAGS = \
 	$(libWebCore_la_CPPFLAGS) \
@@ -250,7 +249,8 @@ libwebkit_1_0_la_LDFLAGS = \
 	$(no_undefined)
 
 libwebkit_1_0_la_LIBADD = \
-	libWebCore.la
+	libWebCore.la \
+	$(GNOMEKEYRING_LIBS)
 
 #
 # Extra checks and flags
@@ -304,7 +304,9 @@ endif
 webkitgtk_h_api += \
 	WebKit/gtk/webkit/webkit.h \
 	WebKit/gtk/webkit/webkitdefines.h \
+	WebKit/gtk/webkit/webkitdownload.h \
 	WebKit/gtk/webkit/webkitnetworkrequest.h \
+	WebKit/gtk/webkit/webkitsoupauthdialog.h \
 	WebKit/gtk/webkit/webkitversion.h \
 	WebKit/gtk/webkit/webkitwebbackforwardlist.h \
 	WebKit/gtk/webkit/webkitwebframe.h \
@@ -340,6 +342,7 @@ webkitgtk_sources += \
 	WebKit/gtk/webkit/webkitnetworkrequest.cpp \
 	WebKit/gtk/webkit/webkitprivate.cpp \
 	WebKit/gtk/webkit/webkitprivate.h \
+	WebKit/gtk/webkit/webkitsoupauthdialog.c \
 	WebKit/gtk/webkit/webkitversion.cpp \
 	WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
 	WebKit/gtk/webkit/webkitwebframe.cpp \
@@ -348,6 +351,7 @@ webkitgtk_sources += \
 	WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
 	WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
 	WebKit/gtk/webkit/webkitwebsettings.cpp \
+	WebKit/gtk/webkit/webkitdownload.cpp \
 	WebKit/gtk/webkit/webkitwebview.cpp \
 	WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
 
@@ -373,18 +377,7 @@ stamp_files := \
 	stamp-webkitenumtypes.h
 
 WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
-WEBKIT_MARSHAL_LIST = $(WEBKIT_MARSHAL).list
-
-$(WEBKIT_MARSHAL_LIST): $(webkitgtk_sources) GNUmakefile.am
-	( cd $(top_srcdir) && \
-	sed -n -e 's/.*webkit_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(webkitgtk_sources) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
+WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
 
 $(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
 	@true
@@ -455,10 +448,13 @@ EXTRA_DIST = \
 	WebKit/LICENSE \
 	$(javascriptcore_dist) \
 	$(webcore_dist) \
-	symbols.filter
+	$(srcdir)/autotools/symbols.filter \
+	$(srcdir)/WebKit/gtk/ChangeLog \
+	$(srcdir)/WebKit/gtk/NEWS \
+	$(srcdir)/WebKit/gtk/webkitmarshal.list
 
 # Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
 DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
 CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
 
@@ -483,11 +479,13 @@ Programs_UnitTests_CFLAGS = \
 	-O2 \
 	$(global_cflags) \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(LIBSOUP_CFLAGS)
 
 Programs_UnitTests_LDADD = \
 	libwebkit-1.0.la \
-	$(GTK_LIBS)
+	$(GTK_LIBS)	\
+	$(GLIB_LIBS)
 
 # Autogenerated sources
 BUILT_SOURCES := \
@@ -504,11 +502,16 @@ CLEANFILES += \
 
 MAINTAINERCLEANFILES += \
 	$(srcdir)/aconfig.h.in \
-	configure \
-	config.* \
-	GNUmakefile.in \
-	INSTALL \
-	README
+	$(srcdir)/autotools/config.* \
+	$(srcdir)/autotools/compile \
+	$(srcdir)/autotools/depcomp \
+	$(srcdir)/autotools/install-sh \
+	$(srcdir)/autotools/missing \
+	$(srcdir)/configure \
+	$(srcdir)/GNUmakefile.in \
+	$(srcdir)/INSTALL \
+	$(srcdir)/README \
+	$(top_builddir)/config.*
 
 # Older automake versions (1.7) place Plo files in a different place so we need
 # to create the output directory manually.
@@ -517,4 +520,9 @@ all-local:
 
 # remove built sources and program directories
 clean-local:
+	-rm -rf $(GENPROGRAMS)
+
+maintainer-clean-local: distclean-local
+
+distclean-local:
 	-rm -rf $(GENSOURCES) $(GENPROGRAMS)
diff --git a/recipes/webkit/webkit-gtk/Makefile b/recipes/webkit/webkit-gtk/Makefile
index 217a035483..24a6f0d945 100644
--- a/recipes/webkit/webkit-gtk/Makefile
+++ b/recipes/webkit/webkit-gtk/Makefile
@@ -12,22 +12,6 @@ release r deployment dep deploy:
 	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
 	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-universal u:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-x86_64:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64u:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
 clean:
 	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
 	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
diff --git a/recipes/webkit/webkit-gtk/Makefile.shared b/recipes/webkit/webkit-gtk/Makefile.shared
index dfad6fb54c..aa9fa728d6 100644
--- a/recipes/webkit/webkit-gtk/Makefile.shared
+++ b/recipes/webkit/webkit-gtk/Makefile.shared
@@ -12,18 +12,6 @@ release r deployment dep deploy: force
 	$(SCRIPTS_PATH)/set-webkit-configuration --release
 	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
-universal u: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-x86_64: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64u: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
 clean:
 	( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac
index c7ed988329..2535c3181f 100644
--- a/recipes/webkit/webkit-gtk/configure.ac
+++ b/recipes/webkit/webkit-gtk/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
 m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [0])
+m4_define([webkit_micro_version], [3])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
@@ -23,13 +23,10 @@ AC_SUBST(WEBKIT_MICRO_VERSION)
 AC_CONFIG_SRCDIR([WebCore/config.h])
 
 dnl # Libtool library version, not to confuse with API version
-dnl # see http://www.gnu.org/software/libtool/manual.html#Versioning
-LIBWEBKITGTK_VERSION=1:0:0
+dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
+LIBWEBKITGTK_VERSION=3:0:1
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
-# Recent libtool+automake don't assume you want C++, explicitly enable it
-AC_PROG_CXX
-
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
 
 # host checking - inspired by the GTK+ configure.in
@@ -178,20 +175,6 @@ if test "$with_hildon" = "yes"; then
     AC_SUBST([HILDON_LIBS])
 fi
 
-# determine the http backend
-AC_MSG_CHECKING([the HTTP backend to use])
-AC_ARG_WITH(http_backend,
-            AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@],
-                           [Select HTTP backend [default=curl]]),
-            [],[with_http_backend="curl"])
-
-case "$with_http_backend" in
-     curl|soup) ;;
-     *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;;
-esac
-
-AC_MSG_RESULT([$with_http_backend])
-
 # minimum base dependencies
 CAIRO_REQUIRED_VERSION=1.2
 FONTCONFIG_REQUIRED_VERSION=2.4
@@ -203,8 +186,7 @@ PANGO_REQUIRED_VERSION=1.0
 GTK_REQUIRED_VERSION=2.8
 
 # optional modules
-LIBCURL_REQUIRED_VERSION=7.15
-LIBSOUP_REQUIRED_VERSION=2.23
+LIBSOUP_REQUIRED_VERSION=2.25.91
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
@@ -221,7 +203,9 @@ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
-PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED_VERSION)
+PKG_CHECK_MODULES(PANGO, 
+                  [pango >= $PANGO_REQUIRED_VERSION
+                   pangoft2])
 AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(PANGO_LIBS)
 
@@ -286,6 +270,22 @@ AC_ARG_ENABLE(dashboard_support,
               [],[enable_dashboard_support="yes"])
 AC_MSG_RESULT([$enable_dashboard_support])
 
+# check whether to enable 3D transforms support
+AC_MSG_CHECKING([whether to enable support for 3D Transforms])
+AC_ARG_ENABLE(3D_transforms,
+              AC_HELP_STRING([--enable-3D-transforms],
+                             [enable support for 3D transforms [default=no]]),
+              [],[enable_3D_transforms="no"])
+AC_MSG_RESULT([$enable_3D_transforms])
+
+# check whether to enable channel messaging support
+AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
+AC_ARG_ENABLE(channel_messaging,
+              AC_HELP_STRING([--enable-channel-messaging],
+                             [enable HTML5 channel messaging support [default=no]]),
+              [],[enable_channel_messaging="no"])
+AC_MSG_RESULT([$enable_channel_messaging])
+
 # check whether to enable HTML5 Offline Web Applications support
 AC_MSG_CHECKING([whether to enable HTML5 offline web applications support])
 AC_ARG_ENABLE(offline_web_applications,
@@ -322,8 +322,8 @@ AC_MSG_RESULT([$enable_icon_database])
 AC_MSG_CHECKING([whether to enable HTML5 video support])
 AC_ARG_ENABLE(video,
               AC_HELP_STRING([--enable-video],
-                             [enable HTML5 video support [default=no]]),
-              [],[enable_video="no"])
+                             [enable HTML5 video support [default=yes]]),
+              [],[enable_video="yes"])
 AC_MSG_RESULT([$enable_video])
 
 # check whether to enable XPath support
@@ -350,6 +350,14 @@ AC_ARG_ENABLE(geolocation,
               [],[enable_geolocation="no"])
 AC_MSG_RESULT([$enable_geolocation])
 
+# check whether to enable gnomekeyring support
+AC_MSG_CHECKING([whether to enable gnomekeyring support])
+AC_ARG_ENABLE(gnomekeyring,
+              AC_HELP_STRING([--enable-gnomekeyring],
+                             [enable support for gnomekeyring [default=no]]),
+              [],[enable_gnomekeyring="no"])
+AC_MSG_RESULT([$enable_gnomekeyring])
+
 # check whether to enable SVG support
 AC_MSG_CHECKING([whether to enable SVG support])
 AC_ARG_ENABLE(svg,
@@ -369,7 +377,7 @@ AC_MSG_RESULT([$enable_wml])
 # check whether to enable Web Workers support
 AC_MSG_CHECKING([whether to enable Web Workers support])
 AC_ARG_ENABLE(web_workers,
-              AC_HELP_STRING([--enable-workers],
+              AC_HELP_STRING([--enable-web-workers],
                              [enable support for Web Workers [default=yes]]),
               [],[enable_web_workers="yes"])
 AC_MSG_RESULT([$enable_web_workers])
@@ -514,22 +522,16 @@ else
    CFLAGS="$CFLAGS -O0"
 fi
 
-# check if curl is available
-if test "$with_http_backend" = "curl"; then
-   PKG_CHECK_MODULES([LIBCURL],
-                     [libcurl >= $LIBCURL_REQUIRED_VERSION])
-   if test "$os_win32" = "yes"; then
-      LIBCURL_LIBS="$LIBCURL_LIBS -lws2_32"
-   fi
-   AC_SUBST([LIBCURL_CFLAGS])
-   AC_SUBST([LIBCURL_LIBS])
-fi
+PKG_CHECK_MODULES([LIBSOUP],
+                  [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
+AC_SUBST([LIBSOUP_CFLAGS])
+AC_SUBST([LIBSOUP_LIBS])
 
-if test "$with_http_backend" = "soup"; then
-   PKG_CHECK_MODULES([LIBSOUP],
-                     [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
-   AC_SUBST([LIBSOUP_CFLAGS])
-   AC_SUBST([LIBSOUP_LIBS])
+if test "$enable_gnomekeyring" = "yes"; then
+   PKG_CHECK_MODULES([GNOMEKEYRING],
+                     [gnome-keyring-1])
+   AC_SUBST([GNOMEKEYRING_CFLAGS])
+   AC_SUBST([GNOMEKEYRING_LIBS])
 fi
 
 # check if FreeType/FontConfig are available
@@ -541,7 +543,6 @@ if test "$with_font_backend" = "freetype"; then
    else
    PKG_CHECK_MODULES([FREETYPE],
                      [cairo-ft
-                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION])
    fi
@@ -573,7 +574,6 @@ if test "$enable_geolocation" = "yes"; then
     AC_SUBST([GEOCLUE_LIBS])
 fi
 
-
 # check if gstreamer is available
 if test "$enable_video" = "yes"; then
    PKG_CHECK_MODULES([GSTREAMER],
@@ -610,9 +610,8 @@ AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
 AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
 AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
 
-# HTTP backend conditionals
-AM_CONDITIONAL([USE_CURL], [test "$with_http_backend" = "curl"])
-AM_CONDITIONAL([USE_SOUP], [test "$with_http_backend" = "soup"])
+# Auth backend conditionals
+AM_CONDITIONAL([USE_GNOMEKEYRING], [test "$enable_gnomekeyring" = "yes"])
 
 # Font backend conditionals
 AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
@@ -621,6 +620,8 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
 AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"])
+AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
+AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
 AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
 AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
 AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
@@ -660,13 +661,16 @@ Build configuration:
  Enable GCC build optimization                            : $enable_optimizations
  Code coverage support                                    : $enable_coverage
  Unicode backend                                          : $unicode_backend
- HTTP backend                                             : $with_http_backend
  Font backend                                             : $with_font_backend
  Optimized memory allocator                               : $enable_fast_malloc
 Features:
+ 3D Transforms                                            : $enable_3D_transforms
  JIT compilation                                          : $enable_jit
  Dashboard support                                        : $enable_dashboard_support
+ Geolocation support                                      : $enable_geolocation
+ GNOME Keyring support                                    : $enable_gnomekeyring
  HTML5 offline web applications support                   : $enable_offline_web_applications
+ HTML5 channel messaging support                          : $enable_channel_messaging
  HTML5 client-side session and persistent storage support : $enable_dom_storage
  HTML5 client-side database storage support               : $enable_database
  HTML5 video element support                              : $enable_video
@@ -678,11 +682,10 @@ Features:
  SVG foreign object support                               : $enable_svg_foreign_object
  SVG as image support                                     : $enable_svg_as_image
  SVG use element support                                  : $enable_svg_use_element
- XPATH support                                            : $enable_xpath
- XSLT support                                             : $enable_xslt
  WML support                                              : $enable_wml
  Web Workers support                                      : $enable_web_workers
- Geolocation support                                      : $enable_geolocation
+ XPATH support                                            : $enable_xpath
+ XSLT support                                             : $enable_xslt
 GTK+ configuration:
  GDK target                                               : $with_target
  Hildon UI extensions                                     : $with_hildon
-- 
cgit 1.2.3-korg


From d2b236841539692a3bd12574f7961855d19767fb Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Thu, 19 Mar 2009 13:52:32 +0100
Subject: bitbake.conf: weak assignment for DEPLOY_DIR

---
 conf/bitbake.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a4483bcaeb..68301bc478 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -284,7 +284,9 @@ STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
 
 STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}"
 
-DEPLOY_DIR = "${TMPDIR}/deploy"
+# Setting DEPLOY_DIR outside of TMPDIR is helpful, when you are using
+# packaged staging and/or multimachine.
+DEPLOY_DIR ?= "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
-- 
cgit 1.2.3-korg


From a0169ba0655e09c373f599c310e415c147c8c665 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Thu, 19 Mar 2009 13:53:52 +0100
Subject: fso-autorev: add libeflvala

---
 conf/distro/include/fso-autorev.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index a95a0da4ef..d0b3a77d08 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -12,6 +12,7 @@ SRCREV_pn-fso-monitord = "${AUTOREV}"
 SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libeflvala = "${AUTOREV}"
 SRCREV_pn-libfsoframework = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
-- 
cgit 1.2.3-korg


From b884b02725367ec1ba3281b157d085ba70d81bbf Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Thu, 19 Mar 2009 14:08:04 +0100
Subject: sane-toolchain.inc: move non-weak assignments for CACHE and
 DEPLOY_DIR to minimal.conf; make them weak You can override DEPLOY_DIR now in
 your local.conf.

---
 conf/distro/include/sane-toolchain.inc | 3 ---
 conf/distro/minimal.conf               | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index b261d635af..f70e98ee17 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -117,9 +117,6 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
 # Can be "glibc", "eglibc" or "uclibc"
 PREFERRED_LIBC ?= "glibc"
 PSTAGE_EXTRAPATH = "${PREFERRED_LIBC}"
-
-CACHE = "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
-DEPLOY_DIR = "${TMPDIR}/deploy/${PREFERRED_LIBC}"
 require conf/distro/include/sane-toolchain-${PREFERRED_LIBC}.inc
 
 # Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index f7c33d4ed6..56724446cf 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -57,6 +57,8 @@ IPKG_VARIANT = "opkg-nogpg"
 #############################################################################
 # Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 #############################################################################
-- 
cgit 1.2.3-korg


From 7c62ab83589ad2ba141ee283a1c09308e0254230 Mon Sep 17 00:00:00 2001
From: "Theodore A. Roth" <taroth@gmail.com>
Date: Thu, 19 Mar 2009 10:57:01 -0700
Subject: local.conf.sample: Replace packages/ with recipes/.

---
 conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 36407b015d..022d65d4c2 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -23,7 +23,7 @@
 DL_DIR = "${HOME}/sources"
 
 # Delete the line below. Then specify which .bb files to consider for
-# your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb"
+# your build. Typically this will be something like BBFILES = "/path/to/openembedded/recipes/*/*.bb"
 BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
 
 # Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files
-- 
cgit 1.2.3-korg


From 7732204f1e737b5874629ea1469e69ee5db8b0a3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 25 Aug 2008 20:46:02 +0000
Subject: Add yum and createrepo (from Poky)

Squashed set of changes from Poky:

svn r5098 - Add yum-native and createrepo
svn r5108 - createrepo-native: Add fix for empty data fields when creating repositories
svn r5109 - yum-native: Add patch to fix install paths
svn r5110 - yum-native: Add some hacks to make yum work better in the cross build case
svn r5118 - yum-native: add depends on libxml2-native
svn r5130 - yum-native: Add NOPOST and NOTRIGGERS flags when installing packages
svn r5133 - yum-native: Add extract-postinst.awk script for use during rootfs generation
svn r5142 - createrepo-native: added dependency on Python
svn r5157 - yum: Add yum-install-recommends.py script to handle installing Recommends
svn r5379 - yum: added 3.2.18
svn r5385 - yum-metadata-parser: fixed dependencies
svn r5392 - yum: do not hardcode arm architecture - rootfs_rpm provide arch info
svn r5395 - yum: Don't apply hacks.patch, its only needed for the native version
svn r5396 - yum-native: Fix hacks.patch to handle architecture detection issues
svn r5426 - yum: fixed packaging
svn r5427 - yum: added all required Python modules to dependencies

OE changes:

yum: do not hardcode /usr
yum-native: added intltool-native to dependencies - spotted by Tom Rini
---
 conf/checksums.ini                          |  2 +-
 recipes/yum/createrepo-native/fix.patch     | 17 +++++
 recipes/yum/createrepo-native/pathfix.patch | 81 ++++++++++++++++++++++++
 recipes/yum/createrepo-native_0.9.bb        | 17 +++++
 recipes/yum/files/extract-postinst.awk      | 11 ++++
 recipes/yum/files/hacks.patch               | 81 ++++++++++++++++++++++++
 recipes/yum/files/paths.patch               | 96 +++++++++++++++++++++++++++++
 recipes/yum/files/paths2.patch              | 33 ++++++++++
 recipes/yum/files/yum-install-recommends.py | 39 ++++++++++++
 recipes/yum/yum-native_3.2.18.bb            | 26 ++++++++
 recipes/yum/yum_3.2.18.bb                   | 32 ++++++++++
 11 files changed, 434 insertions(+), 1 deletion(-)
 create mode 100644 recipes/yum/createrepo-native/fix.patch
 create mode 100644 recipes/yum/createrepo-native/pathfix.patch
 create mode 100644 recipes/yum/createrepo-native_0.9.bb
 create mode 100644 recipes/yum/files/extract-postinst.awk
 create mode 100644 recipes/yum/files/hacks.patch
 create mode 100644 recipes/yum/files/paths.patch
 create mode 100644 recipes/yum/files/paths2.patch
 create mode 100755 recipes/yum/files/yum-install-recommends.py
 create mode 100644 recipes/yum/yum-native_3.2.18.bb
 create mode 100644 recipes/yum/yum_3.2.18.bb

(limited to 'conf')

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 18e4279d9c..0ffa03d076 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3938,7 +3938,7 @@ sha256=133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368
 md5=d3912b9f7bf745fbfea68f6a9b9de30f
 sha256=133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368
 
-[http://linux.duke.edu/projects/metadata/generate/createrepo-0.9.tar.gz]
+[http://createrepo.baseurl.org/download/createrepo-0.9.tar.gz]
 md5=0a1b1e67e3c61cda41b41a8886a90e78
 sha256=21786abe80f2c06eb9bef107d8c79f50a088a894cddf793112ce0417e83be531
 
diff --git a/recipes/yum/createrepo-native/fix.patch b/recipes/yum/createrepo-native/fix.patch
new file mode 100644
index 0000000000..4fe58e379d
--- /dev/null
+++ b/recipes/yum/createrepo-native/fix.patch
@@ -0,0 +1,17 @@
+---
+ createrepo/yumbased.py |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: createrepo-0.9/createrepo/yumbased.py
+===================================================================
+--- createrepo-0.9.orig/createrepo/yumbased.py	2008-08-26 11:41:13.000000000 +0100
++++ createrepo-0.9/createrepo/yumbased.py	2008-08-26 11:37:01.000000000 +0100
+@@ -37,6 +37,8 @@ class CreateRepoPackage(YumLocalPackage)
+         self._hdrend = None
+         
+     def _xml(self, item):
++        if item == []:
++                return []	
+         return xml.sax.saxutils.escape(item)
+         
+     def _do_checksum(self):
diff --git a/recipes/yum/createrepo-native/pathfix.patch b/recipes/yum/createrepo-native/pathfix.patch
new file mode 100644
index 0000000000..a09a51ccc9
--- /dev/null
+++ b/recipes/yum/createrepo-native/pathfix.patch
@@ -0,0 +1,81 @@
+Index: createrepo-0.9/Makefile
+===================================================================
+--- createrepo-0.9.orig/Makefile	2008-08-23 17:49:24.000000000 +0100
++++ createrepo-0.9/Makefile	2008-08-23 17:52:01.000000000 +0100
+@@ -10,22 +10,6 @@
+ SHELL = /bin/sh
+ top_srcdir = .
+ srcdir = .
+-prefix = /usr
+-exec_prefix = ${prefix}
+-
+-bindir = ${exec_prefix}/bin
+-sbindir = ${exec_prefix}/sbin
+-libexecdir = ${exec_prefix}/libexec
+-datadir = ${prefix}/share
+-sysconfdir = ${prefix}/etc
+-sharedstatedir = ${prefix}/com
+-localstatedir = ${prefix}/var
+-libdir = ${exec_prefix}/lib
+-infodir = ${prefix}/info
+-docdir = 
+-includedir = ${prefix}/include
+-oldincludedir = /usr/include
+-mandir = ${prefix}/share/man
+ 
+ pkgdatadir = $(datadir)/$(PKGNAME)
+ pkglibdir = $(libdir)/$(PKGNAME)
+Index: createrepo-0.9/bin/Makefile
+===================================================================
+--- createrepo-0.9.orig/bin/Makefile	2008-08-23 17:50:13.000000000 +0100
++++ createrepo-0.9/bin/Makefile	2008-08-23 17:50:23.000000000 +0100
+@@ -1,22 +1,6 @@
+ SHELL = /bin/sh
+ top_srcdir = ..
+ srcdir = ../bin
+-prefix = /usr
+-exec_prefix = ${prefix}
+-
+-bindir = ${exec_prefix}/bin
+-sbindir = ${exec_prefix}/sbin
+-libexecdir = ${exec_prefix}/libexec
+-datadir = ${prefix}/share
+-sysconfdir = ${prefix}/etc
+-sharedstatedir = ${prefix}/com
+-localstatedir = ${prefix}/var
+-libdir = ${exec_prefix}/lib
+-infodir = ${prefix}/info
+-docdir = 
+-includedir = ${prefix}/include
+-oldincludedir = /usr/include
+-mandir = ${prefix}/man
+ 
+ pkgdatadir = $(datadir)/$(PKGNAME)
+ pkglibdir = $(libdir)/$(PKGNAME)
+Index: createrepo-0.9/docs/Makefile
+===================================================================
+--- createrepo-0.9.orig/docs/Makefile	2008-08-23 17:52:42.000000000 +0100
++++ createrepo-0.9/docs/Makefile	2008-08-23 17:52:50.000000000 +0100
+@@ -1,22 +1,6 @@
+ SHELL = /bin/sh
+ top_srcdir = ..
+ srcdir = ../docs
+-prefix = /usr
+-exec_prefix = ${prefix}
+-
+-bindir = ${exec_prefix}/bin
+-sbindir = ${exec_prefix}/sbin
+-libexecdir = ${exec_prefix}/libexec
+-datadir = ${prefix}/share
+-sysconfdir = ${prefix}/etc
+-sharedstatedir = ${prefix}/com
+-localstatedir = ${prefix}/var
+-libdir = ${exec_prefix}/lib
+-infodir = ${prefix}/info
+-docdir = 
+-includedir = ${prefix}/include
+-oldincludedir = /usr/include
+-mandir = ${datadir}/man
+ 
+ pkgdatadir = $(datadir)/$(PKGNAME)
+ pkglibdir = $(libdir)/$(PKGNAME)
diff --git a/recipes/yum/createrepo-native_0.9.bb b/recipes/yum/createrepo-native_0.9.bb
new file mode 100644
index 0000000000..c634ecb746
--- /dev/null
+++ b/recipes/yum/createrepo-native_0.9.bb
@@ -0,0 +1,17 @@
+DEPENDS = "python-native"
+
+SRC_URI = "http://createrepo.baseurl.org/download/createrepo-${PV}.tar.gz \
+           file://fix.patch;patch=1 \
+           file://pathfix.patch;patch=1 "
+PR = "r1"
+
+inherit autotools native
+
+S = "${WORKDIR}/createrepo-${PV}"
+
+do_compile_append () {
+	sed -e 's#exec /usr/share#exec ${datadir}#' -i ${S}/bin/createrepo
+	sed -e 's#exec /usr/share#exec ${datadir}#' -i ${S}/bin/modifyrepo
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -i ${S}/genpkgmetadata.py
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -i ${S}/modifyrepo.py
+}
diff --git a/recipes/yum/files/extract-postinst.awk b/recipes/yum/files/extract-postinst.awk
new file mode 100644
index 0000000000..8f2836b32c
--- /dev/null
+++ b/recipes/yum/files/extract-postinst.awk
@@ -0,0 +1,11 @@
+/Name:.*/ {
+  package = substr($0, 7)
+  next
+}
+/postinstall.*scriptlet .*/ {
+  next
+}
+{
+  print $0 >> ENVIRON["D"] "/etc/rpm-postinsts/" package ".sh"
+}
+    
diff --git a/recipes/yum/files/hacks.patch b/recipes/yum/files/hacks.patch
new file mode 100644
index 0000000000..61f477172c
--- /dev/null
+++ b/recipes/yum/files/hacks.patch
@@ -0,0 +1,81 @@
+---
+ rpmUtils/arch.py        |    3 +++
+ rpmUtils/transaction.py |    1 +
+ yum/constants.py        |    2 +-
+ yum/depsolve.py         |    2 ++
+ 4 files changed, 7 insertions(+), 1 deletion(-)
+
+Index: yum-3.2.18/rpmUtils/arch.py
+===================================================================
+--- yum-3.2.18.orig/rpmUtils/arch.py	2008-06-17 14:05:42.000000000 +0100
++++ yum-3.2.18/rpmUtils/arch.py	2008-10-02 22:09:19.000000000 +0100
+@@ -275,6 +275,12 @@
+     return arch
+         
+ def getCanonArch(skipRpmPlatform = 0):
++    import os
++    if 'YUM_ARCH_FORCE' in os.environ:
++        return os.environ['YUM_ARCH_FORCE']
++
++    sys.exit(1)
++
+     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
+         try:
+             f = open("/etc/rpm/platform", "r")
+@@ -331,6 +338,12 @@
+        base arch is the arch before noarch in the arches dict if myarch is not
+        a key in the multilibArches."""
+ 
++    import os
++    if 'YUM_ARCH_FORCE' in os.environ:
++        return os.environ['YUM_ARCH_FORCE']
++
++    sys.exit(1)
++
+     if not myarch:
+         myarch = canonArch
+ 
+Index: yum-3.2.18/rpmUtils/transaction.py
+===================================================================
+--- yum-3.2.18.orig/rpmUtils/transaction.py	2008-06-17 14:05:42.000000000 +0100
++++ yum-3.2.18/rpmUtils/transaction.py	2008-10-02 17:09:57.000000000 +0100
+@@ -43,6 +43,7 @@
+                          'clean']
+         self.tsflags = []
+         self.open = True
++        self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS | rpm.RPMPROB_FILTER_IGNOREARCH)
+ 
+     def __del__(self):
+         # Automatically close the rpm transaction when the reference is lost
+Index: yum-3.2.18/yum/constants.py
+===================================================================
+--- yum-3.2.18.orig/yum/constants.py	2008-07-21 16:56:54.000000000 +0100
++++ yum-3.2.18/yum/constants.py	2008-10-02 17:09:57.000000000 +0100
+@@ -17,7 +17,7 @@
+ """
+ 
+ #Constants
+-YUM_PID_FILE = '/var/run/yum.pid'
++YUM_PID_FILE = '/var/run2/yum.pid'
+ 
+ #transaction set states
+ TS_UPDATE = 10
+Index: yum-3.2.18/yum/depsolve.py
+===================================================================
+--- yum-3.2.18.orig/yum/depsolve.py	2008-08-06 17:05:16.000000000 +0100
++++ yum-3.2.18/yum/depsolve.py	2008-10-02 17:09:57.000000000 +0100
+@@ -141,9 +141,14 @@
+             else:
+                 self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
+ 
++        self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOPOST)
++        self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOTRIGGERS)
++
+         probfilter = 0
+         for flag in self.tsInfo.probFilterFlags:
+             probfilter |= flag
++        probfilter |= rpm.RPMPROB_FILTER_IGNOREOS
++        probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
+         self._ts.setProbFilter(probfilter)
+ 
+     def whatProvides(self, name, flags, version):
diff --git a/recipes/yum/files/paths.patch b/recipes/yum/files/paths.patch
new file mode 100644
index 0000000000..55e6a0a2ee
--- /dev/null
+++ b/recipes/yum/files/paths.patch
@@ -0,0 +1,96 @@
+---
+ Makefile      |   18 +++++++++---------
+ docs/Makefile |   12 ++++++------
+ etc/Makefile  |   20 ++++++++++----------
+ 3 files changed, 25 insertions(+), 25 deletions(-)
+
+--- yum-3.2.18.orig/Makefile
++++ yum-3.2.18/Makefile
+@@ -16,23 +16,23 @@ clean:
+ 
+ subdirs:
+ 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
+ 
+ install:
+-	mkdir -p $(DESTDIR)/usr/share/yum-cli
++	mkdir -p $(DESTDIR)$(datadir)/yum-cli
+ 	for p in $(PYFILES) ; do \
+-		install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \
++		install -m 644 $$p $(DESTDIR)$(datadir)/yum-cli/$$p; \
+ 	done
+-	mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py $(DESTDIR)/usr/share/yum-cli/yumupd.py
+-	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
++	mv $(DESTDIR)$(datadir)/yum-cli/yum-updatesd.py $(DESTDIR)$(datadir)/yum-cli/yumupd.py
++	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)$(datadir)/yum-cli', 1, '$(PYDIR)', 1)"
+ 
+-	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
+-	install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
+-	install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
++	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
++	install -m 755 bin/yum.py $(DESTDIR)$(bindir)/yum
++	install -m 755 bin/yum-updatesd.py $(DESTDIR)$(sbindir)/yum-updatesd
+ 
+-	mkdir -p $(DESTDIR)/var/cache/yum
+-	mkdir -p $(DESTDIR)/var/lib/yum	
++	mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
++	mkdir -p $(DESTDIR)$(localstatedir)/lib/yum
+ 
+ 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
+ 
+ .PHONY: docs test
+ 
+--- yum-3.2.18.orig/docs/Makefile
++++ yum-3.2.18/docs/Makefile
+@@ -4,11 +4,11 @@ all:
+ clean:
+ 	rm -f *.pyc *.pyo *~
+ 	rm -fr epydoc
+ 
+ install:
+-	mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
+-	install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
+-	install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
+-	install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
+-	install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
+-	install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
++	mkdir -p $(DESTDIR)$(mandir)/man{5,8}
++	install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8
++	install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8
++	install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
++	install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
++	install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5
+--- yum-3.2.18.orig/etc/Makefile
++++ yum-3.2.18/etc/Makefile
+@@ -3,22 +3,22 @@ all:
+ 
+ clean:
+ 	rm -f *.pyc *.pyo *~
+ 
+ install:
+-	mkdir -p $(DESTDIR)/etc/yum/
+-	mkdir -p $(DESTDIR)/etc/yum/repos.d
++	mkdir -p $(DESTDIR)$(sysconfdir)/yum/
++	mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d
+ 
+-	install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
++	install -m 644 yum.conf $(DESTDIR)$(sysconfdir)/yum/yum.conf
+ 
+-	mkdir -p $(DESTDIR)/etc/logrotate.d
+-	install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
++	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
++	install -m 644 yum.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/yum
+ 
+-	mkdir -p $(DESTDIR)/etc/rc.d/init.d
+-	install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd
++	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
++	install -m 755 yum-updatesd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/yum-updatesd
+ 
+-	mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
+-	install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf
++	mkdir -p $(DESTDIR)$(sysconfdir)/dbus-1/system.d/
++	install -m 755 yum-updatesd-dbus.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/yum-updatesd.conf
+ 
+-	install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
++	install -m 755 yum-updatesd.conf $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf
+ 
+ 
diff --git a/recipes/yum/files/paths2.patch b/recipes/yum/files/paths2.patch
new file mode 100644
index 0000000000..db614dfbbd
--- /dev/null
+++ b/recipes/yum/files/paths2.patch
@@ -0,0 +1,33 @@
+---
+ rpmUtils/Makefile |    2 +-
+ yum/Makefile      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- yum-3.2.18.orig/rpmUtils/Makefile
++++ yum-3.2.18/rpmUtils/Makefile
+@@ -1,10 +1,10 @@
+ PYTHON=python
+ PACKAGE = $(shell basename `pwd`)
+ PYFILES = $(wildcard *.py)
+ PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
+-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
++PYSYSDIR = $(prefix)
+ PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
+ PKGDIR = $(PYLIBDIR)/site-recipes/$(PACKAGE)
+ 
+ all: 
+ 	echo "Nothing to do"
+--- yum-3.2.18.orig/yum/Makefile
++++ yum-3.2.18/yum/Makefile
+@@ -1,10 +1,10 @@
+ PYTHON=python
+ PACKAGE = $(shell basename `pwd`)
+ PYFILES = $(wildcard *.py)
+ PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
+-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
++PYSYSDIR = $(prefix)
+ PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
+ PKGDIR = $(PYLIBDIR)/site-recipes/$(PACKAGE)
+ 
+ all: 
+ 	echo "Nothing to do"
diff --git a/recipes/yum/files/yum-install-recommends.py b/recipes/yum/files/yum-install-recommends.py
new file mode 100755
index 0000000000..64716f2c3e
--- /dev/null
+++ b/recipes/yum/files/yum-install-recommends.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+import os, sys
+
+root = sys.argv[1]
+installcmd = sys.argv[2]
+
+#
+# Take an rpm image and look through for Recommends:. For each recommends 
+# found, try and install any matching packages including any Recommends for
+# packages installed by us.
+#
+
+
+def get_recommends():
+    deps = []
+    output = os.popen("rpm --root %s -aq --recommends" % (root))
+    lines = output.readlines()
+    for line in lines:
+        line = line.replace("(none)","")
+        if line:
+            deps.append(line.split()[0])
+    return deps
+
+processed = []
+
+while True:
+    toinstall = []
+    recommends = set(get_recommends())
+    for item in recommends:
+        if item not in processed:
+            toinstall.append(item)
+    if len(toinstall) != 0:
+        print "Installing %s" % " ".join(toinstall)
+        os.system("%s %s" % (installcmd, " ".join(toinstall)))
+    else:
+        break
+    processed.extend(toinstall)
+
+    
diff --git a/recipes/yum/yum-native_3.2.18.bb b/recipes/yum/yum-native_3.2.18.bb
new file mode 100644
index 0000000000..afe9b02adb
--- /dev/null
+++ b/recipes/yum/yum-native_3.2.18.bb
@@ -0,0 +1,26 @@
+HOMEPAGE = "http://linux.duke.edu/projects/yum/"
+
+SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
+           file://hacks.patch;patch=1 \
+           file://paths.patch;patch=1 \
+	   file://yum-install-recommends.py \
+	   file://extract-postinst.awk"
+PR = "r7"
+
+DEPENDS = "rpm-native python-native python-iniparse-native intltool-native \
+	   python-urlgrabber-native yum-metadata-parser-native libxml2-native"
+
+S = "${WORKDIR}/yum-${PV}"
+
+inherit autotools native
+
+do_compile_append () {
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum.py
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum-updatesd.py
+}
+
+do_install_append () {
+	install -d ${STAGING_BINDIR}/
+	install ${WORKDIR}/extract-postinst.awk ${STAGING_BINDIR}/
+	install ${WORKDIR}/yum-install-recommends.py ${STAGING_BINDIR}/
+}
diff --git a/recipes/yum/yum_3.2.18.bb b/recipes/yum/yum_3.2.18.bb
new file mode 100644
index 0000000000..b147c52b7b
--- /dev/null
+++ b/recipes/yum/yum_3.2.18.bb
@@ -0,0 +1,32 @@
+HOMEPAGE = "http://linux.duke.edu/projects/yum/"
+PR = "r5"
+
+SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
+           file://paths.patch;patch=1 \
+           file://paths2.patch;patch=1 \
+	   file://yum-install-recommends.py \
+	   file://extract-postinst.awk"
+
+RDEPENDS = "python-rpm python-core python-iniparse python-urlgrabber \
+            python-shell python-re python-logging python-pickle \
+	    python-netserver python-compression \
+	    python-bzip2 python-unixadmin python-xml python-sqlite3 \
+	    python-textutils python-fcntl python-email \
+	    yum-metadata-parser"
+
+S = "${WORKDIR}/yum-${PV}"
+
+inherit autotools
+
+do_compile_append () {
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum.py
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum-updatesd.py
+}
+
+do_install_append () {
+	install -d ${D}${bindir}/
+	install ${WORKDIR}/extract-postinst.awk ${D}${bindir}/
+	install ${WORKDIR}/yum-install-recommends.py ${D}${bindir}/
+}
+
+FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli"
-- 
cgit 1.2.3-korg