diff mbox series

diffstat: upgrade 1.68 -> 1.69

Message ID 20260603030911.3769426-1-changqing.li@windriver.com
State Changes Requested
Headers show
Series diffstat: upgrade 1.68 -> 1.69 | expand

Commit Message

Changqing Li June 3, 2026, 3:09 a.m. UTC 
License-Update:  Lincense Year update

refresg standard-autoconf.patch based on 1.69

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../diffstat/diffstat/standard-autoconf.patch | 41 ++++++++++++++-----
 .../{diffstat_1.68.bb => diffstat_1.69.bb}    |  4 +-
 2 files changed, 32 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/diffstat/{diffstat_1.68.bb => diffstat_1.69.bb} (81%)

Comments

Ross Burton June 9, 2026, 10:55 a.m. UTC | #1 
Hi,

On 3 Jun 2026, at 04:09, Changqing Li via lists.openembedded.org <changqing.li=windriver.com@lists.openembedded.org> wrote:
> License-Update:  Lincense Year update
> 
> refresg standard-autoconf.patch based on 1.69

Typo in “Lincense” and “refresg”, but looking at the rebased patch I wonder if we can drop it in this upgrade. The problem before was that new autoconf notices and errors on the four-argument AC_OUTPUT call that diffstat does (expecting the autoconf fork is being used).  It doesn’t do this now, so we might be able to drop the patch and simply delete config_h.in in a do_configure:prepend().

Ross
Changqing Li June 10, 2026, 8:21 a.m. UTC | #2 
On 6/9/26 18:55, Ross Burton wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> Hi,
>
> On 3 Jun 2026, at 04:09, Changqing Li via lists.openembedded.org <changqing.li=windriver.com@lists.openembedded.org> wrote:
>> License-Update:  Lincense Year update
>>
>> refresg standard-autoconf.patch based on 1.69
> Typo in “Lincense” and “refresg”, but looking at the rebased patch I wonder if we can drop it in this upgrade. The problem before was that new autoconf notices and errors on the four-argument AC_OUTPUT call that diffstat does (expecting the autoconf fork is being used).  It doesn’t do this now, so we might be able to drop the patch and simply delete config_h.in in a do_configure:prepend().

Thanks.  V2 is send,  patch configure.in since failure: configure.in:88: 
error: undefined or overquoted macro: AC_SETUP_DEFS

//Changqing

>
> Ross
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch b/meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch
index b301c2d86d..4b80fb205d 100644
--- a/meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch
+++ b/meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch
@@ -1,4 +1,4 @@ 
-From 0069056a23b39f53a05b89b2545a3a5ad1ff070a Mon Sep 17 00:00:00 2001
+From 841f8f26b5b10fee4fed86ddb8bb97d36b118610 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Wed, 18 Mar 2026 11:27:24 +0000
 Subject: [PATCH] Use standard autoconf
@@ -11,11 +11,16 @@  form of AC_OUTPUT.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+Refresh for version 1.69
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
- config_h.in  | 8 --------
- configure.in | 2 +-
- 2 files changed, 1 insertion(+), 9 deletions(-)
+ config_h.in      | 8 --------
+ configure.in     | 1 -
+ configure.in.rej | 9 +++++++++
+ 3 files changed, 9 insertions(+), 9 deletions(-)
  delete mode 100644 config_h.in
+ create mode 100644 configure.in.rej
 
 diff --git a/config_h.in b/config_h.in
 deleted file mode 100644
@@ -32,17 +37,31 @@  index ac8ff1d..0000000
 -
 -@DEFS@
 diff --git a/configure.in b/configure.in
-index cb641d4..7042800 100644
+index 24dfbb9..5da5d89 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -83,5 +83,6 @@ CF_WITH_MAN2HTML
- CF_DISABLE_LEAKS
+@@ -85,6 +85,5 @@ CF_DISABLE_LEAKS
  
  ###	output makefile and config.h
--AC_OUTPUT(makefile,,,cat)
-+AC_CONFIG_FILES([makefile])
-+AC_OUTPUT
+ AC_CONFIG_FILES([makefile])
+-AC_SETUP_DEFS([cat])
+ AC_OUTPUT
  CF_MAKE_DOCS(diffstat,1)
+diff --git a/configure.in.rej b/configure.in.rej
+new file mode 100644
+index 0000000..2c917a4
+--- /dev/null
++++ b/configure.in.rej
+@@ -0,0 +1,9 @@
++diff a/configure.in b/configure.in	(rejected hunks)
++@@ -83,5 +83,6 @@ CF_WITH_MAN2HTML
++ CF_DISABLE_LEAKS
++ 
++ ###	output makefile and config.h
++-AC_OUTPUT(makefile,,,cat)
+++AC_CONFIG_FILES([makefile])
+++AC_OUTPUT
++ CF_MAKE_DOCS(diffstat,1)
 -- 
-2.43.0
+2.34.1
 
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.68.bb b/meta/recipes-devtools/diffstat/diffstat_1.69.bb
similarity index 81%
rename from meta/recipes-devtools/diffstat/diffstat_1.68.bb
rename to meta/recipes-devtools/diffstat/diffstat_1.69.bb
index ce1ba79c2d..0c62537e8c 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.68.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.69.bb
@@ -5,7 +5,7 @@  reviewing large, complex patch files."
 HOMEPAGE = "http://invisible-island.net/diffstat/"
 SECTION = "devel"
 LICENSE = "X11"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0c432d3aeb935855b2ca1ad2a0542ce4"
+LIC_FILES_CHKSUM = "file://COPYING;md5=53d95e97e08db153daa45bfe4e4be37e"
 
 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
            file://run-ptest \
@@ -13,7 +13,7 @@  SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
            file://avoid-check-user-break-cc.patch \
            "
 
-SRC_URI[sha256sum] = "89f9294a8ac74fcef6f1b9ac408f43ebedf8d208e3efe0b99b4acc16dc6582c7"
+SRC_URI[sha256sum] = "bb02464072f769dd9832fd999526734c90eb4d66fb56d5351540a750c88a77f6"
 
 inherit autotools gettext ptest