diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2008-07-14 16:28:32 +0000 |
|---|---|---|
| committer | Stanislav Brabec <utx@penguin.cz> | 2008-07-14 16:28:32 +0000 |
| commit | 71505e393bea9e322d5b8863ec2d93b735dbd461 (patch) | |
| tree | 75e04c469ed72ab7406202e139fa92ff828f34c5 /packages | |
| parent | 8708d361c3c725f7eedd04e730c68528e4390751 (diff) | |
| parent | 61c97701838acde5a7e6e2b25a0cd92b8dda8908 (diff) | |
merge of 'a2e94fc6726520d64a4b0a9aa3e4609de4ec7bd2'
and 'fd7e5dadc748e094b6f43b6a5f9ba54db3d3c695'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/pidgin/pidgin/pidgin-cross-python.patch | 16 | ||||
| -rw-r--r-- | packages/pidgin/pidgin_2.4.3.bb (renamed from packages/pidgin/pidgin_2.4.2.bb) | 1 |
2 files changed, 17 insertions, 0 deletions
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.3.bb index 99b4563523..37ecbd5873 100644 --- a/packages/pidgin/pidgin_2.4.2.bb +++ b/packages/pidgin/pidgin_2.4.3.bb @@ -7,6 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ 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 \ |