From e9bc8e10b211ae802b20049bac307c194324e738 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Wed, 27 Aug 2008 11:31:41 +0000
Subject: pidgin: Update to version 2.5.0 and set as default preference: *
 older versions have known security issues * ICQ works only in versions >=
 2.4.3

---
 packages/pidgin/pidgin/purple-OE-branding-25.patch | 16 ++++++++++++++++
 packages/pidgin/pidgin_2.4.3.bb                    | 18 ------------------
 packages/pidgin/pidgin_2.5.0.bb                    | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 packages/pidgin/pidgin/purple-OE-branding-25.patch
 delete mode 100644 packages/pidgin/pidgin_2.4.3.bb
 create mode 100644 packages/pidgin/pidgin_2.5.0.bb

diff --git a/packages/pidgin/pidgin/purple-OE-branding-25.patch b/packages/pidgin/pidgin/purple-OE-branding-25.patch
new file mode 100644
index 0000000000..293ef709d1
--- /dev/null
+++ b/packages/pidgin/pidgin/purple-OE-branding-25.patch
@@ -0,0 +1,16 @@
+Index: pidgin-2.5.0/libpurple/protocols/irc/irc.h
+===================================================================
+--- pidgin-2.5.0.orig/libpurple/protocols/irc/irc.h	2008-08-19 01:53:38.000000000 +0000
++++ pidgin-2.5.0/libpurple/protocols/irc/irc.h	2008-08-27 11:15:58.000000000 +0000
+@@ -36,9 +36,9 @@
+ 
+ #define IRC_DEFAULT_CHARSET "UTF-8"
+ #define IRC_DEFAULT_AUTODETECT FALSE
+-#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/packages/pidgin/pidgin_2.4.3.bb b/packages/pidgin/pidgin_2.4.3.bb
deleted file mode 100644
index 37ecbd5873..0000000000
--- a/packages/pidgin/pidgin_2.4.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require pidgin.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-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.patch;patch=1 \
-	   file://pidgin-cross-python.patch;patch=1 \
-	  " 
-
-EXTRA_OECONF += " --disable-gtkspell \
-                  --disable-meanwhile \
-                  --disable-nm \ 
-                "
-
-PR = "r0"
diff --git a/packages/pidgin/pidgin_2.5.0.bb b/packages/pidgin/pidgin_2.5.0.bb
new file mode 100644
index 0000000000..80d15f677f
--- /dev/null
+++ b/packages/pidgin/pidgin_2.5.0.bb
@@ -0,0 +1,16 @@
+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 \ 
+                "
+
+PR = "r0"
-- 
cgit v1.2.3


From d7a0e9f753ce162fcaf16779487d6307753106bb Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 27 Aug 2008 12:43:46 +0000
Subject: site common-glibc: add ac_cv_fread_reads_directories

---
 site/common-glibc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/common-glibc b/site/common-glibc
index 6b7bf80c73..ce45dd250b 100644
--- a/site/common-glibc
+++ b/site/common-glibc
@@ -46,5 +46,7 @@ ac_cv_func_va_copy=${ac_cv_func_va_copy=yes}
 ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
 ac_cv_epoll_works=${ac_cv_epoll_works=yes}
 
+#git
+ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes}
 # pth
 ac_cv_check_sjlj=ssjlj
-- 
cgit v1.2.3