diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/pidgin/pidgin | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
download | openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/pidgin/pidgin')
-rw-r--r-- | recipes/pidgin/pidgin/gconf-no-errors.patch | 12 | ||||
-rw-r--r-- | recipes/pidgin/pidgin/pidgin-cross-python.patch | 16 | ||||
-rw-r--r-- | recipes/pidgin/pidgin/pidgin.desktop-set-icon.patch | 11 | ||||
-rw-r--r-- | recipes/pidgin/pidgin/purple-OE-branding-25.patch | 16 | ||||
-rw-r--r-- | recipes/pidgin/pidgin/purple-OE-branding.patch | 14 | ||||
-rw-r--r-- | recipes/pidgin/pidgin/sanitize-configure.ac.patch | 33 |
6 files changed, 102 insertions, 0 deletions
diff --git a/recipes/pidgin/pidgin/gconf-no-errors.patch b/recipes/pidgin/pidgin/gconf-no-errors.patch new file mode 100644 index 0000000000..9a95175ac9 --- /dev/null +++ b/recipes/pidgin/pidgin/gconf-no-errors.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2007-05-08 18:39:49.000000000 +0200 ++++ pidgin-2.0.0/libpurple/gconf/Makefile.am 2007-05-08 18:40:13.755251000 +0200 +@@ -8,8 +8,7 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ +- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 + else + install-data-local: + endif diff --git a/recipes/pidgin/pidgin/pidgin-cross-python.patch b/recipes/pidgin/pidgin/pidgin-cross-python.patch new file mode 100644 index 0000000000..ca88502b67 --- /dev/null +++ b/recipes/pidgin/pidgin/pidgin-cross-python.patch @@ -0,0 +1,16 @@ +Index: pidgin-2.4.3/configure.ac +=================================================================== +--- pidgin-2.4.3.orig/configure.ac 2008-07-14 13:13:16.000000000 +0000 ++++ pidgin-2.4.3/configure.ac 2008-07-14 13:34:12.000000000 +0000 +@@ -1350,8 +1350,9 @@ + AC_CHECK_LIB(pthread, pthread_create, ) + AC_CHECK_LIB(util, openpty, ) + AC_CHECK_LIB(db, dbopen, ) +- PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" +- PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" ++ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) ++ PY_LIBS="-lpython$PY_VERSION -L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config" ++ PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION" + AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) + AC_MSG_RESULT(ok) + else diff --git a/recipes/pidgin/pidgin/pidgin.desktop-set-icon.patch b/recipes/pidgin/pidgin/pidgin.desktop-set-icon.patch new file mode 100644 index 0000000000..05f76895ba --- /dev/null +++ b/recipes/pidgin/pidgin/pidgin.desktop-set-icon.patch @@ -0,0 +1,11 @@ +--- pidgin-2.0.1/pidgin.desktop.in.orig 2007-06-20 23:50:44.000000000 +0000 ++++ pidgin-2.0.1/pidgin.desktop.in 2007-06-20 23:51:05.000000000 +0000 +@@ -4,7 +4,7 @@ + _GenericName=Internet Messenger + _Comment=Send instant messages over multiple protocols + Exec=pidgin +-Icon=pidgin ++Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png + StartupNotify=true + Terminal=false + Type=Application diff --git a/recipes/pidgin/pidgin/purple-OE-branding-25.patch b/recipes/pidgin/pidgin/purple-OE-branding-25.patch new file mode 100644 index 0000000000..293ef709d1 --- /dev/null +++ b/recipes/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/recipes/pidgin/pidgin/purple-OE-branding.patch b/recipes/pidgin/pidgin/purple-OE-branding.patch new file mode 100644 index 0000000000..99c61375ce --- /dev/null +++ b/recipes/pidgin/pidgin/purple-OE-branding.patch @@ -0,0 +1,14 @@ +--- /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/sanitize-configure.ac.patch b/recipes/pidgin/pidgin/sanitize-configure.ac.patch new file mode 100644 index 0000000000..a77d64f40b --- /dev/null +++ b/recipes/pidgin/pidgin/sanitize-configure.ac.patch @@ -0,0 +1,33 @@ +--- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200 ++++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200 +@@ -472,7 +472,7 @@ + if test "x$enable_consoleui" = "xyes"; then + dnl # Some distros put the headers in ncursesw/, some don't + found_ncurses_h=no +- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include ++ for location in $ac_ncurses_includes $NCURSES_HEADERS + do + f="$location/ncurses.h" + AC_CHECK_HEADER($f,[ +@@ -1860,10 +1860,6 @@ + KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" + fi + KRB4_LDFLAGS="-L${kerberos}/lib" +- elif test -d /usr/local/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/local/include/kerberosIV" +- elif test -d /usr/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/include/kerberosIV" + fi + AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) + +@@ -1896,10 +1892,6 @@ + ZEPHYR_LDFLAGS="-L${zephyr}/lib" + elif test -d /usr/athena/include/zephyr ; then + ZEPHYR_CFLAGS="-I/usr/athena/include" +- elif test -d /usr/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/include" +- elif test -d /usr/local/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/local/include" + fi + AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) + AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") |