From 6bcf20d71bb7d0659734cf8fd15079e4d24e8a81 Mon Sep 17 00:00:00 2001 From: Herrie Date: Thu, 5 May 2016 15:14:49 +0200 Subject: pidgin: Update to 2.10.12 Which is compatible with GnuTLS that's included in Krogoth. Signed-off-by: Herman van Hazendonk Signed-off-by: Armin Kuster --- .../pidgin/pidgin/pidgin-cross-python-265.patch | 35 ++++--- .../pidgin/pidgin/pidgin.desktop-set-icon.patch | 11 --- meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb | 105 ++++++++++++++++++++ meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb | 109 --------------------- 4 files changed, 128 insertions(+), 132 deletions(-) delete mode 100644 meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch create mode 100644 meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb delete mode 100644 meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb (limited to 'meta-oe/recipes-support') 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 57c4c46814..cfc681cd81 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,16 +1,27 @@ -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" +From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001 +From: Herrie +Date: Thu, 5 May 2016 13:33:29 +0200 +Subject: [PATCH] Updated python patch + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 94ea8cf..2285adb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1587,9 +1587,9 @@ dnl (Thanks to XChat) + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then + AC_MSG_CHECKING(for Python compile flags) + if test -f ${PYTHON}-config; then +- PY_CFLAGS=`${PYTHON}-config --includes` +- PY_LIBS=`${PYTHON}-config --libs` +- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) + 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.]) ++ 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 + AC_MSG_RESULT([Cannot find ${PYTHON}-config]) + diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted file mode 100644 index 05f76895ba..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb new file mode 100644 index 0000000000..9133c1ce29 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb @@ -0,0 +1,105 @@ +DESCRIPTION = "multi-protocol instant messaging client" +SECTION = "x11/network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus intltool-native farsight2 libidn libxml2 gconf dbus-glib" + +inherit autotools gettext pkgconfig gconf perlnative + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch \ + file://purple-OE-branding-25.patch \ + file://pidgin-cross-python-265.patch \ +" + +SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76" +SRC_URI[sha256sum] = "2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd" + +EXTRA_OECONF = " \ + --enable-vv \ + --disable-perl \ + --disable-tcl \ + --disable-gevolution \ + --disable-schemas-install \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-gnutls=yes \ + --with-ncurses-headers=${STAGING_INCDIR} \ + --with-gnutls-includes=${STAGING_INCDIR} \ + --with-gnutls-libs=${STAGING_LIBDIR} \ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + --disable-screensaver \ + --enable-nss=no \ +" + +do_configure_prepend() { + touch ${S}/po/Makefile + sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac +} + +OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" +OE_LT_RPATH_ALLOW[export]="1" + +PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data" + +LEAD_SONAME = "libpurple.so.0" +FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" +FILES_libpurple-dev = "${libdir}/libpurple*.la \ + ${libdir}/libpurple*.so \ + ${libdir}/purple-2/*.la \ + ${libdir}/purple-2/libjabber.so \ + ${libdir}/purple-2/liboscar.so \ + ${libdir}/purple-2/libymsg.so \ + ${datadir}/aclocal" +FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ + ${libdir}/purple-2/.debug" +FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" +FILES_libgnt-dev = "${libdir}/gnt/*.la" +FILES_libgnt-dbg = "${libdir}/gnt/.debug" +FILES_finch = "${bindir}/finch" +FILES_finch-dev = "${libdir}/finch/*.la" +FILES_finch-dbg = "${bindir}/.debug/finch \ + ${libdir}/finch/.debug" + +FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ + ${datadir}/applications" +RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" + +FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" +FILES_${PN}-dev += "${libdir}/${PN}/*.la" + +PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" + +python populate_packages_prepend () { + pidgroot = d.expand('${libdir}/pidgin') + purple = d.expand('${libdir}/purple-2') + finch = d.expand('${libdir}/finch') + + do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', + output_pattern='pidgin-plugin-%s', + description='Pidgin plugin %s', + prepend=True, extra_depends='') + + do_split_packages(d, purple, '^lib(.*)\.so$', + output_pattern='libpurple-protocol-%s', + description='Libpurple protocol plugin for %s', + prepend=True, extra_depends='') + + do_split_packages(d, purple, '^(ssl-.*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='libpurple-plugin-ssl') + + do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='') + + do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + output_pattern='finch-plugin-%s', + description='Finch plugin %s', + prepend=True, extra_depends='') +} diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb b/meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb deleted file mode 100644 index 83521100db..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +++ /dev/null @@ -1,109 +0,0 @@ -DESCRIPTION = "multi-protocol instant messaging client" -SECTION = "x11/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus intltool-native farsight2 libidn" - -inherit autotools gettext pkgconfig gconf perlnative - -# http://errors.yoctoproject.org/Errors/Details/25824/ -PNBLACKLIST[pidgin] ?= "Not compatible with gnutls version 3.4 currently in oe-core and also depends on broken libnice through farsight2" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch \ - file://pidgin.desktop-set-icon.patch \ - file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ -" - -SRC_URI[md5sum] = "10a4a69d077893f6dd3438cd8af94e81" -SRC_URI[sha256sum] = "dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319" - -EXTRA_OECONF = " \ - --enable-vv \ - --disable-perl \ - --disable-tcl \ - --disable-gevolution \ - --disable-schemas-install \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-gnutls=yes \ - --with-ncurses-headers=${STAGING_INCDIR} \ - --with-gnutls-includes=${STAGING_INCDIR} \ - --with-gnutls-libs=${STAGING_LIBDIR} \ - --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - --disable-screensaver \ - --enable-nss=no \ -" - -do_configure_prepend() { - touch ${S}/po/Makefile - sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac -} - -OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data" - -LEAD_SONAME = "libpurple.so.0" -FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" -FILES_libpurple-dev = "${libdir}/libpurple*.la \ - ${libdir}/libpurple*.so \ - ${libdir}/purple-2/*.la \ - ${libdir}/purple-2/libjabber.so \ - ${libdir}/purple-2/liboscar.so \ - ${libdir}/purple-2/libymsg.so \ - ${datadir}/aclocal" -FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ - ${libdir}/purple-2/.debug" -FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" -FILES_libgnt-dev = "${libdir}/gnt/*.la" -FILES_libgnt-dbg = "${libdir}/gnt/.debug" -FILES_finch = "${bindir}/finch" -FILES_finch-dev = "${libdir}/finch/*.la" -FILES_finch-dbg = "${bindir}/.debug/finch \ - ${libdir}/finch/.debug" - -FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ - ${datadir}/applications" -RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" - -FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" -FILES_${PN}-dev += "${libdir}/${PN}/*.la" - -PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" - -python populate_packages_prepend () { - pidgroot = d.expand('${libdir}/pidgin') - purple = d.expand('${libdir}/purple-2') - finch = d.expand('${libdir}/finch') - - do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', - output_pattern='pidgin-plugin-%s', - description='Pidgin plugin %s', - prepend=True, extra_depends='') - - do_split_packages(d, purple, '^lib(.*)\.so$', - output_pattern='libpurple-protocol-%s', - description='Libpurple protocol plugin for %s', - prepend=True, extra_depends='') - - do_split_packages(d, purple, '^(ssl-.*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='libpurple-plugin-ssl') - - do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='') - - do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', - output_pattern='finch-plugin-%s', - description='Finch plugin %s', - prepend=True, extra_depends='') -} -- cgit 1.2.3-korg