pidgin: Update to 2.10.12
PATCH 1/4 pidgin: Update to 2.10.12
From: Herrie <[email protected]>
Which is compatible with GnuTLS that's included in Krogoth.
---
.../pidgin/pidgin/pidgin-cross-python-265.patch | 35 ++++++++++++++--------
.../pidgin/pidgin/pidgin.desktop-set-icon.patch | 11 -------
.../pidgin/{pidgin_2.10.9.bb => pidgin_2.10.12.bb} | 10 ++-----
3 files changed, 26 insertions(+), 30 deletions(-)
delete mode 100644 meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch
rename meta-oe/recipes-support/pidgin/{pidgin_2.10.9.bb => pidgin_2.10.12.bb} (91%)meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +23 -12
@@ -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 <[email protected]> +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]) +
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -11
@@ -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
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +3 -7
@@ -2,23 +2,19 @@ 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" +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 -# 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" +SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76" +SRC_URI[sha256sum] = "2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd" EXTRA_OECONF = " \ --enable-vv \
Signature · 1 line
2.8.2
PATCH 2/4 pidgin: add PACKAGECONFIGs
* disable gstreamer and vv, because gstreamer 0.10 is in meta-multimedia now
* disable farsight2/farstream, because farsight2 is blacklisted
* don't enable X11 support without x11 in DISTRO_FEATURES
* allow to disable all UI, useful for DISTROs who want just the purple libraries like LuneOS
--- meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb | 31 ++++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-)
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb +23 -8
@@ -2,7 +2,7 @@ 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" +DEPENDS = "python virtual/libintl intltool-native libxml2 gconf" inherit autotools gettext pkgconfig gconf perlnative
@@ -16,18 +16,33 @@ SRC_URI = "\ SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76" SRC_URI[sha256sum] = "2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd" +PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ +" +PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" +# --disable-gstreamer compile without GStreamer audio support +# --disable-gstreamer-video +# compile without GStreamer 1.0 Video Overlay support +# --disable-gstreamer-interfaces +# compile without GStreamer 0.10 interface support +# --with-gstreamer=<version> +# compile with GStreamer 0.10 or 1.0 interface +PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" +PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer" +PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" +PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" +PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" +PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" +PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" +PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" + 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 \
Signature · 1 line
2.8.2
PATCH 3/4 pidgin: use pkg-config instead of hardcoded paths or python-config
In reply to Martin Jansa* also fix following QA warning:
WARNING: pidgin-2.10.12-r0 do_package: QA Issue: pidgin: Files/directories were installed but not shipped in any package:
/usr/share/appdata
/usr/share/appdata/pidgin.appdata.xml
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
pidgin: 2 installed and not shipped files. [installed-vs-shipped]
--- .../pidgin/pidgin/pidgin-cross-python-265.patch | 51 ++++++++++++---------- meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb | 2 +- 2 files changed, 30 insertions(+), 23 deletions(-)
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +29 -22
@@ -1,27 +1,34 @@ -From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001 -From: Herrie <[email protected]> -Date: Thu, 5 May 2016 13:33:29 +0200 -Subject: [PATCH] Updated python patch +Use pkg-config instead of ${PYTHON}-config to find python ---- - 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) +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 @@ + 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 - AC_MSG_CHECKING(for Python compile flags) - if test -f ${PYTHON}-config; 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.]) - AC_MSG_RESULT(ok) - else - AC_MSG_RESULT([Cannot find ${PYTHON}-config]) - +- AC_MSG_RESULT(ok) +- else +- AC_MSG_RESULT([Cannot find ${PYTHON}-config]) +- PY_CFLAGS="" +- PY_LIBS="" +- fi ++ AC_MSG_CHECKING(for Python compile flags) ++ PKG_CHECK_MODULES(PY, python, [ ++ AC_SUBST(PY_CFLAGS) ++ AC_SUBST(PY_LIBS) ++ ], [ ++ AC_MSG_RESULT(no) ++ AC_MSG_ERROR([Can't find python]) ++ ]) + fi +-AC_SUBST(PY_CFLAGS) +-AC_SUBST(PY_LIBS) + + dnl ####################################################################### + dnl # Check for Mono support
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb +1 -1
@@ -83,7 +83,7 @@ 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}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" FILES_${PN}-dev += "${libdir}/${PN}/*.la" PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*"
Signature · 1 line
2.8.2
PATCH 4/4 poppler: add --std=c++11 to fix build with Qt 5.7
In reply to Martin Jansa--- ...h-C-11-compilers-that-don-t-define-isinfi.patch | 39 ++++++++++++++++++++++ meta-oe/recipes-support/poppler/poppler_0.41.0.bb | 4 +++ 2 files changed, 43 insertions(+) create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch
meta-oe/recipes-support/poppler/poppler/0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch new file +39 -0
@@ -0,0 +1,39 @@ +From a8e3399487258e53df0fd4a79c570c8d71188bed Mon Sep 17 00:00:00 2001 +From: Takahiro Hashimoto <[email protected]> +Date: Wed, 27 Apr 2016 00:16:52 +0200 +Subject: [PATCH] Compile with C++11 compilers that don't define isinfinite + +Bug #94761 +--- + poppler/SplashOutputDev.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc +index 13d090c..0e50702 100644 +--- a/poppler/SplashOutputDev.cc ++++ b/poppler/SplashOutputDev.cc +@@ -36,6 +36,7 @@ + // Copyright (C) 2014 Richard PALO <[email protected]> + // Copyright (C) 2015 Tamas Szekeres <[email protected]> + // Copyright (C) 2015 Kenji Uno <[email protected]> ++// Copyright (C) 2016 Takahiro Hashimoto <[email protected]> + // + // To see a description of the changes please see the Changelog file that + // came with your tarball or type make ChangeLog if you are building from git +@@ -94,6 +95,13 @@ extern "C" int unlink(char *filename); + #endif + #endif + ++#if __cplusplus > 199711L ++#include <cmath> ++#ifndef isfinite ++#define isfinite(x) std::isfinite(x) ++#endif ++#endif ++ + static inline void convertGfxColor(SplashColorPtr dest, + SplashColorMode colorMode, + GfxColorSpace *colorSpace, +-- +2.8.2 +
meta-oe/recipes-support/poppler/poppler_0.41.0.bb +4 -0
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = " \ http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ + file://0001-Compile-with-C-11-compilers-that-don-t-define-isinfi.patch \ " SRC_URI[md5sum] = "849a8bd6af5794efb961b70418414e5a" SRC_URI[sha256sum] = "420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b"
@@ -22,6 +23,9 @@ PACKAGECONFIG[openjpeg] = "--enable-libopenjpeg=openjpeg2,--disable-libopenjpeg, PACKAGECONFIG[qt5] = "--enable-poppler-qt5 --with-moc-qt5=${STAGING_BINDIR_NATIVE}/qt5/moc,--disable-poppler-qt5,qtbase" PACKAGECONFIG[qt4e] = "--enable-poppler-qt4 --with-moc-qt4=${STAGING_BINDIR_NATIVE}/moc4,--disable-poppler-qt4,qt4-embedded" +# Needed for qt5 +CXXFLAGS += "--std=c++11" + EXTRA_OECONF = "\ --enable-xpdf-headers \ --disable-gtk-test \
Signature · 1 line
2.8.2