From patchwork Sun Oct 26 18:45:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 403292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id A50F0140097 for ; Mon, 27 Oct 2014 05:47:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E3A843321F; Sun, 26 Oct 2014 18:47:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T6Ld3EjxiYoR; Sun, 26 Oct 2014 18:47:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7777C33922; Sun, 26 Oct 2014 18:46:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4B7EF1C107B for ; Sun, 26 Oct 2014 18:46:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 48EE9925AF for ; Sun, 26 Oct 2014 18:46:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lqoAOm-hKido for ; Sun, 26 Oct 2014 18:46:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 05AF091D59 for ; Sun, 26 Oct 2014 18:46:34 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id z12so1699483wgg.9 for ; Sun, 26 Oct 2014 11:46:33 -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=BL2kQqOGSRcHg5uPvLbvemYWL942woNh+1By+zEy+fo=; b=GlLIuNtC7daJu3FvDdHqqug61AJYHOAjbabwo9VNpDMkJOLona2x+Xdc6FZopJO2Yp 8b6I178YH/jbObny/jm5C7KLl5WatTU7klbffv/CSQZyQRlD/hyyTrF91RNRwZCaoLnp zPUWyBaQzPhxANco2kShKMWwwrJ1F3T7+zqKRWjXkGJ2rF3XqbL5q3MUHEvwT2e2T4iP aU1lvs1P1YmRQvojTj3v5H5qZ9ax2EwEPewdaiz69a5aTecOLhrDui217+RWpl9kf+HF FaN7P+Vm4OwBpl0+E7hbsxQhQUm1bZ/G8c56gjPe992DssXHTSZgRQTMUprkdGzwhbU9 s9uA== X-Received: by 10.180.219.106 with SMTP id pn10mr16753778wic.63.1414349193569; Sun, 26 Oct 2014 11:46:33 -0700 (PDT) Received: from localhost.localdomain (13-105-190-109.dsl.ovh.fr. [109.190.105.13]) by mx.google.com with ESMTPSA id fx2sm12905341wjb.37.2014.10.26.11.46.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Oct 2014 11:46:32 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sun, 26 Oct 2014 19:45:21 +0100 Message-Id: <1414349157-22749-15-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414349157-22749-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1414349157-22749-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 15/51] libstrophe: bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove patch that was accepted upstream. The other one was never sent before. Signed-off-by: Maxime Hadjinlian --- ...-configure.ac-fix-misdetection-of-libxml2.patch | 32 ---------------------- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 package/libstrophe/libstrophe-02-configure.ac-fix-misdetection-of-libxml2.patch diff --git a/package/libstrophe/libstrophe-02-configure.ac-fix-misdetection-of-libxml2.patch b/package/libstrophe/libstrophe-02-configure.ac-fix-misdetection-of-libxml2.patch deleted file mode 100644 index 7f6610c..0000000 --- a/package/libstrophe/libstrophe-02-configure.ac-fix-misdetection-of-libxml2.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 816df67088fc590c9e8f8598a1a7e90ff1fc425d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 20 Apr 2014 21:07:41 +0200 -Subject: [PATCH] configure.ac: fix misdetection of libxml2 - -A small typo in the detection of libxml2 leads to a successful -pkg-config discovery of libxml2 to be ignored. As a consequence, -configure.ac falls back to detecting the host libxml2, which does not -work in cross-compilation situation. This commit fixes this small -typo. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e4f9299..a3e48ee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,7 +16,7 @@ AC_ARG_WITH([libxml2], - if test "x$with_libxml2" != xno; then - PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7], - [with_libxml2=yes], [dummy=1]) -- if test "x$with_libxml2" != yes; then -+ if test "x$with_libxml2" != xyes; then - old_CFLAGS=$CFLAGS - CFLAGS="-I /usr/include/libxml2" - AC_CHECK_HEADER([libxml/parser.h], --- -1.9.2 - diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 21f7d29..d7202d7 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = d408eaf2bbfe5ff5c56eab01463c278f9891c08e +LIBSTROPHE_VERSION = 0.8.6 LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION)) LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf LIBSTROPHE_AUTORECONF = YES