From patchwork Sun Oct 26 18:45:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 403285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 4822C140082 for ; Mon, 27 Oct 2014 05:47:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 68992A322C; Sun, 26 Oct 2014 18:47:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UNqr68JqmGiO; Sun, 26 Oct 2014 18:47:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B7670A30E8; Sun, 26 Oct 2014 18:47:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 23BE71C107B for ; Sun, 26 Oct 2014 18:46:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1AD4F334A7 for ; Sun, 26 Oct 2014 18:46:44 +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 vmPDy4JFHm0r for ; Sun, 26 Oct 2014 18:46:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by silver.osuosl.org (Postfix) with ESMTPS id C1C3733785 for ; Sun, 26 Oct 2014 18:46:33 +0000 (UTC) Received: by mail-wg0-f44.google.com with SMTP id y10so4190425wgg.15 for ; Sun, 26 Oct 2014 11:46:32 -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=xeDgW104nqpNfgxVJFRxJZFeKgnsfxfluRDEcclFLuw=; b=T+rhUagOR5pwKFlQQpnvBDBR7bfBpG7pCIfFhISLZcvGt6pwuQ3l0pcUpPzW8e0ngX 1mywJ3BPsuny5HS97J6GaSNNtTMZIzTGgb0sKhr+ePWhuVt7HZrM5td484WBYaTKsXA9 iXcFA07ncW0vTyZ6Edxls7XSXaG6oRrCOP4Y9jFF9d59pz+0myUzpGyB4VDwJgu2JtOq zUhC445hW4No80IpqSU/JF24FL4f/W3epuJ7PaOEiyl76e4CuGM7scUwdS9Wc+sCXhEN r9DjVtE1ur+IBkmY/+YEgND5nCNRsUJEvxssaNwRM0p6aHwJhDRcOW4QDevDLscMsEnZ KRHQ== X-Received: by 10.180.81.134 with SMTP id a6mr7952009wiy.11.1414349192314; Sun, 26 Oct 2014 11:46:32 -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.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Oct 2014 11:46:31 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sun, 26 Oct 2014 19:45:20 +0100 Message-Id: <1414349157-22749-14-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 14/51] libenca: 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 all the patches as they were accepted upstream. Signed-off-by: Maxime Hadjinlian Reviewed-by: Bernd Kuhls --- .../libenca-001-fix-installation-error.patch | 44 ---------------------- ...benca-002-remove-prefix-hack-in-configure.patch | 33 ---------------- package/libenca/libenca-003-iconv.patch | 15 -------- package/libenca/libenca.mk | 2 +- 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 package/libenca/libenca-001-fix-installation-error.patch delete mode 100644 package/libenca/libenca-002-remove-prefix-hack-in-configure.patch delete mode 100644 package/libenca/libenca-003-iconv.patch diff --git a/package/libenca/libenca-001-fix-installation-error.patch b/package/libenca/libenca-001-fix-installation-error.patch deleted file mode 100644 index fc27841..0000000 --- a/package/libenca/libenca-001-fix-installation-error.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1ca09a1a8f3dd07e2805855a1f1a67a54e8d8adb Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Wed, 15 Jan 2014 00:20:08 +0100 -Subject: [PATCH 2/3] Fix installation error - -ln will complain that the link already exists and will error. -Adding the -f flag, force ln to recreate the link without failing the -build. - -Signed-off-by: Maxime Hadjinlian ---- - Makefile.am | 2 +- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index b5b50be..ddf1d5f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -54,7 +54,7 @@ install-data-hook: - cd $(DESTDIR)$(man1dir); \ - inst1=`echo enca | sed '$(transform)'`.1; \ - inst2=`echo enconv | sed '$(transform)'`.1; \ -- $(LN_S) $$inst1 $$inst2 -+ $(LN_S) -f $$inst1 $$inst2 - - uninstall-hook: - inst=`echo enconv | sed '$(transform)'`.1; \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 2f01a12..3885137 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -47,7 +47,7 @@ install-exec-hook: - cd $(DESTDIR)$(bindir); \ - inst1=`echo enca | sed '$(transform)'`; \ - inst2=`echo enconv | sed '$(transform)'`; \ -- $(LN_S) $$inst1$(EXEEXT) $$inst2$(EXEEXT) -+ $(LN_S) -f $$inst1$(EXEEXT) $$inst2$(EXEEXT) - - uninstall-hook: - inst=`echo enconv | sed '$(transform)'`; \ --- -1.8.5.2 - diff --git a/package/libenca/libenca-002-remove-prefix-hack-in-configure.patch b/package/libenca/libenca-002-remove-prefix-hack-in-configure.patch deleted file mode 100644 index 45701f9..0000000 --- a/package/libenca/libenca-002-remove-prefix-hack-in-configure.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 354a8217eb735c9678f42436d647571fcebc3ead Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Wed, 15 Jan 2014 00:46:10 +0100 -Subject: [PATCH 3/3] Remove prefix hack in configure - -Signed-off-by: Maxime Hadjinlian ---- - configure.ac | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9db3b21..9b99df4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,15 +100,6 @@ gtk_CHECK_GTK_DOC - dnl Check for good random number sources - AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) - --dnl Dirty path hack. Helps some people with badly set up search paths. --if test "$prefix" = "NONE"; then -- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" --else -- LDFLAGS="$LDFLAGS -L$prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$prefix/include" --fi -- - dnl Checks for libraries. - ye_CHECK_LIBM - --- -1.8.5.2 - diff --git a/package/libenca/libenca-003-iconv.patch b/package/libenca/libenca-003-iconv.patch deleted file mode 100644 index 2ea43c0..0000000 --- a/package/libenca/libenca-003-iconv.patch +++ /dev/null @@ -1,15 +0,0 @@ -libiconv.m4: Fix AM_ICONV macro usage - -Signed-off-by: Bernd Kuhls - ---- a/m4/libiconv.m4 2013-09-30 09:48:22.000000000 +0200 -+++ b/m4/libiconv.m4 2014-01-18 12:56:32.634514555 +0100 -@@ -17,7 +17,7 @@ - dnl - - dnl Use standard iconv test --AM_ICONV -+m4_pattern_allow([AM_ICONV]) - CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" - - dnl Compile iconvcap.c and run it to determine what encodings iconv actually diff --git a/package/libenca/libenca.mk b/package/libenca/libenca.mk index 66fcfaa..b46de9a 100644 --- a/package/libenca/libenca.mk +++ b/package/libenca/libenca.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBENCA_VERSION = 1.15 +LIBENCA_VERSION = 1.16 LIBENCA_SITE = $(call github,nijel,enca,$(LIBENCA_VERSION)) LIBENCA_INSTALL_STAGING = YES LIBENCA_AUTORECONF = YES