diff options
Diffstat (limited to 'meta-oe')
3 files changed, 42 insertions, 16 deletions
diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch index 72bf4ed41b..312fc8593f 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch @@ -1,9 +1,17 @@ -Use pkg-config instead of ${PYTHON}-config to find python +From 855cc20bafa30597ae7a62f7672d42654b25cde0 Mon Sep 17 00:00:00 2001 +From: Herrie <github.com@herrie.org> +Date: Mon, 24 Jul 2017 21:30:16 +0200 +Subject: [PATCH] Use pkg-config instead of ${PYTHON}-config to find python -diff -uNr pidgin-2.10.12.orig/configure.ac pidgin-2.10.12/configure.ac ---- pidgin-2.10.12.orig/configure.ac 2016-01-01 00:19:40.000000000 +0100 -+++ pidgin-2.10.12/configure.ac 2016-05-05 16:55:13.258945925 +0200 -@@ -1585,20 +1585,15 @@ +--- + configure.ac | 21 ++++++++------------- + 1 file changed, 8 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d20a18e..c741829 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1567,20 +1567,15 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") dnl Check for Python headers (currently useful only for libgnt) dnl (Thanks to XChat) if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch index 293ef709d1..9a24fbbc5f 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch @@ -1,8 +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 @@ +From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001 +From: Herrie <github.com@herrie.org> +Date: Mon, 24 Jul 2017 21:30:16 +0200 + +--- + libpurple/protocols/irc/irc.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h +index fde35c4..66e52dd 100644 +--- a/libpurple/protocols/irc/irc.h ++++ b/libpurple/protocols/irc/irc.h +@@ -40,9 +40,9 @@ #define IRC_DEFAULT_CHARSET "UTF-8" #define IRC_DEFAULT_AUTODETECT FALSE diff --git a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch index a77d64f40b..84dbcdc276 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch @@ -1,6 +1,16 @@ ---- /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 @@ +From c3058f9eadaf5ff28ba776cfed54b609a93a1249 Mon Sep 17 00:00:00 2001 +From: Herrie <github.com@herrie.org> +Date: Mon, 24 Jul 2017 21:30:16 +0200 + +--- + configure.ac | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b8acd2a..d20a18e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -642,7 +642,7 @@ if test "x$enable_consoleui" = "xyes"; then if test "x$enable_consoleui" = "xyes"; then dnl # Some distros put the headers in ncursesw/, some don't found_ncurses_h=no @@ -8,8 +18,8 @@ + for location in $ac_ncurses_includes $NCURSES_HEADERS do f="$location/ncurses.h" - AC_CHECK_HEADER($f,[ -@@ -1860,10 +1860,6 @@ + orig_CFLAGS="$CFLAGS" +@@ -2397,10 +2397,6 @@ if test "$kerberos" != "no" ; then KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" fi KRB4_LDFLAGS="-L${kerberos}/lib" @@ -20,7 +30,7 @@ fi AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) -@@ -1896,10 +1892,6 @@ +@@ -2433,10 +2429,6 @@ if test "$zephyr" != "no" ; then ZEPHYR_LDFLAGS="-L${zephyr}/lib" elif test -d /usr/athena/include/zephyr ; then ZEPHYR_CFLAGS="-I/usr/athena/include" |