From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by mail.openembedded.org (Postfix) with ESMTP id 017DB731A3 for ; Thu, 5 May 2016 15:01:42 +0000 (UTC) Received: by mail-wm0-f51.google.com with SMTP id g17so32477276wme.1 for ; Thu, 05 May 2016 08:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QJAumuXQerwwHGSbxg5kIWBKgB8iKRC/olqZa7rROdQ=; b=XCY2PhsRYca0smTxoT8dblRZSP02YvvAvdT/yoK9sRrlsUMw/do0gosqQYzhhkEU/k nxWj7jL+lX2G7wR51gEEGthF1apOJoJtxjoZVZKkrlKW5ubdW/teMkQq58xfSx36f6Lj QzhFaJB6SCe/nOmAUAg2TjGzvB9mMeVtycCfx2w+P5mvhJ+xoBHYJZVpDvS4OMn81TDK Xve4GZnQRTykVkX6k8qv0bm/zSwigwShD66xcDeejkz+x8+O2msfXda/VCvjDOe5w9jH E+UPEGDDC9UR97shVMTnB2EeFPeCqJGqm8r77AOLHhIAQXjUwwRtj+UURud8jdCpapz9 JDaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QJAumuXQerwwHGSbxg5kIWBKgB8iKRC/olqZa7rROdQ=; b=llu551hWCNoIANiOKKUoAPjROWU8u3Ix7bb7jt+2gO2koYeld/GbYcZsUi/bXDv021 Eb2SLtt8mFvS3/LuihRxSYnHIz+CM5PaG/H1TCNLx+y+njZdgnMm4c5zvgWWm8EVwi74 IEafUEA8I8bqpU4Hb7phm0oDxYJAwqMh+9aSpOuj/zfkxJxddXVJMFgz6XveXCmaDtvK yQMShejH7kPE5p1+ylovGVkV0zMVU1YfJ/qaqRqzbQA5fvDQaFpeqMFEzrWrTVEB4Oyt OVNi/Ldif8xoBgoqLE0icUFfjnoeBIjhdFQ1Ys9rNNAcppKi8foqIy/OsP41trYdnOcI tNGQ== X-Gm-Message-State: AOPr4FWy2ngrZ/2BbNjY7sqV1w4BRtM/CgijHGdA8P4hFg0Xew512+pFop/heRk7tCEDlQ== X-Received: by 10.28.10.7 with SMTP id 7mr3782086wmk.43.1462460502842; Thu, 05 May 2016 08:01:42 -0700 (PDT) Received: from localhost (ip-86-49-34-37.net.upcbroadband.cz. [86.49.34.37]) by smtp.gmail.com with ESMTPSA id f188sm3642096wma.2.2016.05.05.08.01.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 May 2016 08:01:41 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Date: Thu, 5 May 2016 17:02:59 +0200 Message-Id: <1462460580-12774-3-git-send-email-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1462460580-12774-1-git-send-email-Martin.Jansa@gmail.com> References: <1462460580-12774-1-git-send-email-Martin.Jansa@gmail.com> Subject: [PATCH][meta-oe 3/4] pidgin: use pkg-config instead of hardcoded paths or python-config X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2016 15:01:45 -0000 * 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] Signed-off-by: Martin Jansa --- .../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(-) 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 cfc681c..72bf4ed 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,27 +1,34 @@ -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 +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 diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb index ac0871f..cd46140 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb @@ -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-.*" -- 2.8.2