diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-08-27 13:19:23 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-08-27 13:19:23 +0000 |
| commit | f05854e89327463f009e47cad7ed61bd228fb7e9 (patch) | |
| tree | fd3845884e99c60f5edfcb26a285140ed8ecdb7f | |
| parent | c2fc7eb12afe4faf1da04594bc81fe9e06cbc09c (diff) | |
| parent | d7a0e9f753ce162fcaf16779487d6307753106bb (diff) | |
merge of '045e00ff4301aa05fddab174a3ac5bf9c260343b'
and '90204f8950d2ea5d6cc182ba36902a2e41bdfc7e'
| -rw-r--r-- | packages/pidgin/pidgin/purple-OE-branding-25.patch | 16 | ||||
| -rw-r--r-- | packages/pidgin/pidgin_2.5.0.bb (renamed from packages/pidgin/pidgin_2.4.3.bb) | 4 | ||||
| -rw-r--r-- | site/common-glibc | 2 |
3 files changed, 19 insertions, 3 deletions
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.5.0.bb index 37ecbd5873..80d15f677f 100644 --- a/packages/pidgin/pidgin_2.4.3.bb +++ b/packages/pidgin/pidgin_2.5.0.bb @@ -1,12 +1,10 @@ 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://purple-OE-branding-25.patch;patch=1 \ file://pidgin-cross-python.patch;patch=1 \ " 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 |