From b353269498d505e949446b3c8a7d4a4dc0396f6f Mon Sep 17 00:00:00 2001
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Tue, 5 Nov 2013 11:25:16 +0200
Subject: diffstat: upgrade to 1.58

Adjusted aclocal.patch to apply correctly.

(From OE-Core rev: f5bf674d0497a094682609b74da018e040f8d150)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../diffstat/diffstat/aclocal.patch                | 11 ++++-----
 meta/recipes-devtools/diffstat/diffstat_1.57.bb    | 26 ----------------------
 meta/recipes-devtools/diffstat/diffstat_1.58.bb    | 26 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 31 deletions(-)
 delete mode 100644 meta/recipes-devtools/diffstat/diffstat_1.57.bb
 create mode 100644 meta/recipes-devtools/diffstat/diffstat_1.58.bb

(limited to 'meta/recipes-devtools/diffstat')

diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
index 37e518f..ff18f1b 100644
--- a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
+++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
@@ -11,11 +11,11 @@ The original macro name (AC_ACVERSION) leads to this error:
 Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
 
-diff --git a/aclocal.m4 b/aclocal.m4
-index 144a074..fce6eba 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -13,15 +13,15 @@ dnl ------------------
+Index: diffstat-1.58/aclocal.m4
+===================================================================
+--- diffstat-1.58.orig/aclocal.m4	2013-10-29 01:43:23.000000000 +0200
++++ diffstat-1.58/aclocal.m4	2013-11-04 11:22:53.461562567 +0200
+@@ -13,16 +13,16 @@
  dnl Conditionally generate script according to whether we're using a given autoconf.
  dnl
  dnl $1 = version to compare against
@@ -25,6 +25,7 @@ index 144a074..fce6eba 100644
 +dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1.
  define([CF_ACVERSION_CHECK],
  [
+ ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
  ifdef([m4_version_compare],
 -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 +[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])],
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.57.bb b/meta/recipes-devtools/diffstat/diffstat_1.57.bb
deleted file mode 100644
index c25005f..0000000
--- a/meta/recipes-devtools/diffstat/diffstat_1.57.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Tool to produce a statistics based on a diff"
-DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \
-the insertions, deletions, and modifications per-file. It is useful for \
-reviewing large, complex patch files."
-HOMEPAGE = "http://invisible-island.net/diffstat/"
-SECTION = "devel"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5"
-
-SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
-           file://dirfix.patch \
-           file://aclocal.patch"
-
-SRC_URI[md5sum] = "a70ae35e479ab91da7eb6023a4e9240a"
-SRC_URI[sha256sum] = "cb9845839d695f178d6b5458b08d3e04773e400f35c0c062c4c0102220fba1e6"
-
-S = "${WORKDIR}/diffstat-${PV}"
-
-inherit autotools gettext
-
-do_configure () {
-	if [ ! -e ${S}/acinclude.m4 ]; then
-		mv ${S}/aclocal.m4 ${S}/acinclude.m4
-	fi
-	autotools_do_configure
-}
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.58.bb b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
new file mode 100644
index 0000000..8f73bfc
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Tool to produce a statistics based on a diff"
+DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \
+the insertions, deletions, and modifications per-file. It is useful for \
+reviewing large, complex patch files."
+HOMEPAGE = "http://invisible-island.net/diffstat/"
+SECTION = "devel"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5"
+
+SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
+           file://dirfix.patch \
+           file://aclocal.patch"
+
+SRC_URI[md5sum] = "6d6e13f7dcfe4db5da65c5175260ea47"
+SRC_URI[sha256sum] = "fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793"
+
+S = "${WORKDIR}/diffstat-${PV}"
+
+inherit autotools gettext
+
+do_configure () {
+	if [ ! -e ${S}/acinclude.m4 ]; then
+		mv ${S}/aclocal.m4 ${S}/acinclude.m4
+	fi
+	autotools_do_configure
+}
-- 
cgit v1.1