diff options
-rw-r--r-- | conf/checksums.ini | 4 | ||||
-rw-r--r-- | recipes/pidgin/pidgin/pidgin-cross-python-265.patch | 16 | ||||
-rw-r--r-- | recipes/pidgin/pidgin_2.6.2.bb | 20 | ||||
-rw-r--r-- | recipes/pidgin/pidgin_2.6.5.bb (renamed from recipes/pidgin/pidgin_2.6.4.bb) | 2 |
4 files changed, 21 insertions, 21 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 5a36d4d0b0..3b7275cabc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21998,6 +21998,10 @@ sha256=acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6 md5=6e1dc8b9dd6983a54ff3a6de33efa778 sha256=fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11 +[http://downloads.sourceforge.net/pidgin/pidgin-2.6.5.tar.bz2] +md5=90847ed22ec830db5d9768748812b661 +sha256=3c459e4093fca679591e35ea34da4a0e45b15f2bb7ca00314a1486dc022f3d0e + [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z] md5=75af127948cc0c701d424d22d621f792 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4 diff --git a/recipes/pidgin/pidgin/pidgin-cross-python-265.patch b/recipes/pidgin/pidgin/pidgin-cross-python-265.patch new file mode 100644 index 0000000000..57c4c46814 --- /dev/null +++ b/recipes/pidgin/pidgin/pidgin-cross-python-265.patch @@ -0,0 +1,16 @@ +Index: pidgin-2.6.5/configure.ac +=================================================================== +--- pidgin-2.6.5.orig/configure.ac ++++ pidgin-2.6.5/configure.ac +@@ -1470,8 +1470,9 @@ if test "_$pythonpath" != _ ; then + AC_CHECK_LIB(pthread, pthread_create, ) + AC_CHECK_LIB(util, openpty, ) + AC_CHECK_LIB(db, dbopen, ) +- PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION" +- PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" ++ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) ++ PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION" ++ 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_2.6.2.bb b/recipes/pidgin/pidgin_2.6.2.bb deleted file mode 100644 index d3b27a771b..0000000000 --- a/recipes/pidgin/pidgin_2.6.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -require pidgin.inc -PR = "${INC_PR}.1" - -DEPENDS += "farsight2 libidn" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.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 \ - file://status-icon-theme-crash.patch;patch=1 \ -" - -EXTRA_OECONF += "\ - --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - --disable-screensaver \ -" diff --git a/recipes/pidgin/pidgin_2.6.4.bb b/recipes/pidgin/pidgin_2.6.5.bb index 7ced40d9c3..67b573fa3e 100644 --- a/recipes/pidgin/pidgin_2.6.4.bb +++ b/recipes/pidgin/pidgin_2.6.5.bb @@ -8,7 +8,7 @@ SRC_URI = "\ file://sanitize-configure.ac.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 \ + file://pidgin-cross-python-265.patch;patch=1 \ " EXTRA_OECONF += "\ |