From 61c97701838acde5a7e6e2b25a0cd92b8dda8908 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 14 Jul 2008 15:57:53 +0000 Subject: pidgin updated to version 2.4.3: * ICQ works again * pidgin-cross-python.patch: worked-around python cross include clash --- packages/pidgin/pidgin/pidgin-cross-python.patch | 16 ++++++++++++++++ packages/pidgin/pidgin_2.4.2.bb | 17 ----------------- packages/pidgin/pidgin_2.4.3.bb | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 packages/pidgin/pidgin/pidgin-cross-python.patch delete mode 100644 packages/pidgin/pidgin_2.4.2.bb create mode 100644 packages/pidgin/pidgin_2.4.3.bb (limited to 'packages') diff --git a/packages/pidgin/pidgin/pidgin-cross-python.patch b/packages/pidgin/pidgin/pidgin-cross-python.patch new file mode 100644 index 0000000000..ca88502b67 --- /dev/null +++ b/packages/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/packages/pidgin/pidgin_2.4.2.bb b/packages/pidgin/pidgin_2.4.2.bb deleted file mode 100644 index 99b4563523..0000000000 --- a/packages/pidgin/pidgin_2.4.2.bb +++ /dev/null @@ -1,17 +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 \ - " - -EXTRA_OECONF += " --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - " - -PR = "r0" diff --git a/packages/pidgin/pidgin_2.4.3.bb b/packages/pidgin/pidgin_2.4.3.bb new file mode 100644 index 0000000000..37ecbd5873 --- /dev/null +++ b/packages/pidgin/pidgin_2.4.3.bb @@ -0,0 +1,18 @@ +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" -- cgit v1.2.3