From 2e23feebced982ef9a22d30ae2a4cfe453103c70 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Fri, 3 Jul 2009 20:41:19 +0000
Subject: pidgin: Updated to version 2.5.8.

---
 conf/checksums.ini                                 |  4 ++++
 conf/distro/include/preferred-om-2008-versions.inc |  2 +-
 recipes/pidgin/pidgin/purple-OE-branding.patch     | 14 --------------
 recipes/pidgin/pidgin_2.5.3.bb                     | 17 -----------------
 recipes/pidgin/pidgin_2.5.8.bb                     | 17 +++++++++++++++++
 5 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100644 recipes/pidgin/pidgin/purple-OE-branding.patch
 delete mode 100644 recipes/pidgin/pidgin_2.5.3.bb
 create mode 100644 recipes/pidgin/pidgin_2.5.8.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b2027d48e9..0677d6c63d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -19254,6 +19254,10 @@ sha256=13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
 md5=4abc4ce9e1ad62bbf098f05f305147d7
 sha256=912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82
 
+[http://downloads.sourceforge.net/pidgin/pidgin-2.5.8.tar.bz2]
+md5=c207407dca71c6357c82135875e472f0
+sha256=2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21
+
 [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
 md5=75af127948cc0c701d424d22d621f792
 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 65676ec969..b81f0b17e1 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1429,7 +1429,7 @@ PREFERRED_VERSION_phoneserver ?= "1.0"
 PREFERRED_VERSION_php ?= "5.2.0"
 PREFERRED_VERSION_php-native ?= "5.2.0"
 PREFERRED_VERSION_picocom ?= "1.4"
-PREFERRED_VERSION_pidgin ?= "2.5.3"
+PREFERRED_VERSION_pidgin ?= "2.5.8"
 PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"
diff --git a/recipes/pidgin/pidgin/purple-OE-branding.patch b/recipes/pidgin/pidgin/purple-OE-branding.patch
deleted file mode 100644
index 99c61375ce..0000000000
--- a/recipes/pidgin/pidgin/purple-OE-branding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- /tmp/irc.h	2007-08-04 20:27:10.000000000 +0200
-+++ pidgin-2.1.0/libpurple/protocols/irc/irc.h	2007-08-04 20:28:15.318400000 +0200
-@@ -35,9 +35,9 @@
- #define IRC_DEFAULT_SSL_PORT 994
- 
- #define IRC_DEFAULT_CHARSET "UTF-8"
--#define IRC_DEFAULT_ALIAS "purple"
-+#define IRC_DEFAULT_ALIAS "OE-user"
- 
--#define IRC_DEFAULT_QUIT "Leaving."
-+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
- 
- #define IRC_INITIAL_BUFSIZE 1024
- 
diff --git a/recipes/pidgin/pidgin_2.5.3.bb b/recipes/pidgin/pidgin_2.5.3.bb
deleted file mode 100644
index 17d0270456..0000000000
--- a/recipes/pidgin/pidgin_2.5.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require pidgin.inc
-
-SRC_URI = "\
-  ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-  file://sanitize-configure.ac.patch;patch=1 \
-  file://gconf-no-errors.patch;patch=1 \
-  file://pidgin.desktop-set-icon.patch;patch=1 \
-  file://purple-OE-branding-25.patch;patch=1 \
-  file://pidgin-cross-python.patch;patch=1 \
-" 
-
-EXTRA_OECONF += "\
-  --disable-gtkspell \
-  --disable-meanwhile \
-  --disable-nm \ 
-  --disable-screensaver \
-"
diff --git a/recipes/pidgin/pidgin_2.5.8.bb b/recipes/pidgin/pidgin_2.5.8.bb
new file mode 100644
index 0000000000..17d0270456
--- /dev/null
+++ b/recipes/pidgin/pidgin_2.5.8.bb
@@ -0,0 +1,17 @@
+require pidgin.inc
+
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+  file://sanitize-configure.ac.patch;patch=1 \
+  file://gconf-no-errors.patch;patch=1 \
+  file://pidgin.desktop-set-icon.patch;patch=1 \
+  file://purple-OE-branding-25.patch;patch=1 \
+  file://pidgin-cross-python.patch;patch=1 \
+" 
+
+EXTRA_OECONF += "\
+  --disable-gtkspell \
+  --disable-meanwhile \
+  --disable-nm \ 
+  --disable-screensaver \
+"
-- 
cgit v1.2.3