7 files changed, 7 insertions, 50 deletions
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 92fd42f4f8..3fbe79e354 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 
 PREFERRED_VERSION_glibc = "2.2.5"
diff --git a/packages/opie-irc/files/.mtn2git_empty b/packages/opie-irc/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-irc/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/opie-irc/files/utf8-topic.patch b/packages/opie-irc/files/utf8-topic.patch
deleted file mode 100644
index d8d9a52ca9..0000000000
--- a/packages/opie-irc/files/utf8-topic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/ircmessageparser.cpp b/ircmessageparser.cpp
-index c449a65..ae47f69 100644
---- a/ircmessageparser.cpp
-+++ b/ircmessageparser.cpp
-@@ -667,11 +667,11 @@ void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) {
- void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
-     IRCChannel *channel = m_session->getChannel(message->param(1).lower());
-     if (channel) {
--        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\""));
-+        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel ") + channel->channelname() + tr(" is \"") + message->param(2) + "\"");
-         output.addParam(channel);
-         emit outputReady(output);
-     } else {
--        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\""));
-+        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel ") + message->param(1) + tr(" is \"") + message->param(2) + "\"");
-         output.addParam(0);
-         emit outputReady(output);
-     }
diff --git a/packages/opie-irc/files/utf8.patch b/packages/opie-irc/files/utf8.patch
deleted file mode 100644
index cc562838a2..0000000000
--- a/packages/opie-irc/files/utf8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/ircconnection.cpp b/ircconnection.cpp
-index 88e63f7..fb7e168 100644
---- a/ircconnection.cpp
-+++ b/ircconnection.cpp
-@@ -29,7 +29,8 @@ void IRCConnection::sendLine(QString line) {
-     while((line.right(1) == "\n") || (line.right(1) == "\r"))
-         line = line.left(line.length() - 1);
-     line.append("\r\n");
--    m_socket->writeBlock(line, line.length());
-+    QCString uline = line.utf8();
-+    m_socket->writeBlock(uline, uline.length());
- }
- 
- void IRCConnection::sendCTCPReply(const QString &nickname, const QString &type, const QString &args) {
-@@ -77,7 +78,7 @@ void IRCConnection::login() {
- /* Called when data arrives on the socket */
- void IRCConnection::dataReady() {
-     while(m_socket->canReadLine()) {
--        IRCMessage message(m_socket->readLine());
-+        IRCMessage message(QString::fromUtf8(m_socket->readLine()));
-         if (!m_loggedIn && message.isNumerical() && message.commandNumber() == 1) {
-             /* Now autojoin all channels specified inside the server profile */
-             QStringList channels = QStringList::split(QChar(','), m_server->channels());
diff --git a/packages/opie-irc/opie-irc_1.2.3.bb b/packages/opie-irc/opie-irc_1.2.3.bb
index 2f333d6a41..1166c07eef 100644
--- a/packages/opie-irc/opie-irc_1.2.3.bb
+++ b/packages/opie-irc/opie-irc_1.2.3.bb
@@ -1,10 +1,8 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-	   file://utf8.patch;patch=1 \
-	   file://utf8-topic.patch;patch=1 "
+	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb
index 63e70179a4..ecf7f645a5 100644
--- a/packages/opie-irc/opie-irc_cvs.bb
+++ b/packages/opie-irc/opie-irc_cvs.bb
@@ -1,11 +1,9 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};module=opie/help \
            ${HANDHELDS_CVS};module=opie/apps \
-	   ${HANDHELDS_CVS};module=opie/pics \
-	   file://utf8.patch;patch=1 \
-	   file://utf8-topic.patch;patch=1 "
+	   ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index 270cd0fbf8..051279e33f 100644
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "Precompiled SharpROM toolchain glue package"
 LICENSE = "GPL"
 SECTION = "base"
+# see bug 2199 for the reason the following line is in here
+DEPENDS = "virtual/linux-libc-headers"
 PROVIDES_sharprom-compatible = "\
   virtual/arm-linux-gcc-2.95 \
   virtual/arm-linux-libc-for-gcc \