diff mbox series

[meta-oe,079/109] pngcheck: upgrade 2.3.0 -> 3.0.2

Message ID 20260814224539.1523174-79-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,001/109] xorg-docs: upgrade 1.7.2 -> 1.7.3 | expand

Commit Message

Khem Raj Aug. 14, 2026, 10:45 p.m. UTC 
Major release. Three patches rebased onto 3.0.2's shifted line numbers:
0001-make-Respect-variables-from-environement.patch (upstream added an
alternate -L$(ZPATH) -lz definition, commented out, above our target lines;
same changes, offset only), 0001-png-fix-IDAT-windowsize-...patch and
10-pngsplit-format-strings.patch (upstream renamed the usage-string macros
png_fix_IDAT_windowsize_usage/PNGSPLIT_HDR/PNGSPLIT_USAGE to their current
names; same %s-format fix, offset only).

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...-Respect-variables-from-environement.patch | 13 +++++----
 ...dowsize-Fix-format-string-errors-in-.patch | 17 ++++++-----
 .../pngcheck/10-pngsplit-format-strings.patch | 28 ++++++++++---------
 .../{pngcheck_2.3.0.bb => pngcheck_3.0.2.bb}  |  4 +--
 4 files changed, 32 insertions(+), 30 deletions(-)
 rename meta-oe/recipes-support/pngcheck/{pngcheck_2.3.0.bb => pngcheck_3.0.2.bb} (84%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch
index 12333cc1f1..1ca4ecab1a 100644
--- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch
+++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch
@@ -5,6 +5,9 @@  Subject: [PATCH] make: Respect variables from environement
 
 link with shared zlib
 
+Rebased on 3.0.2: context shifted by 2 lines (upstream added an alternate
+-L$(ZPATH) -lz definition, commented out); same changes, offset only.
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 Upstream-Status: Pending
@@ -13,11 +16,10 @@  Upstream-Status: Pending
  1 file changed, 8 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile.unx b/Makefile.unx
-index 772da46..4ae7061 100644
 --- a/Makefile.unx
 +++ b/Makefile.unx
-@@ -24,18 +24,16 @@ ZINC = -I$(ZPATH)
- ZLIB = $(ZPATH)/libz.a
+@@ -24,18 +24,16 @@
+ #ZLIB = $(ZPATH)/libz.a
  
  INCS = $(ZINC)
 -LIBS = $(ZLIB)
@@ -40,7 +42,7 @@  index 772da46..4ae7061 100644
  PROG = pngcheck
  PROG2 = pngsplit
  PROG3 = png-fix-IDAT-windowsize
-@@ -57,13 +55,13 @@ EXES = $(PROG)$(E) $(PROG2)$(E) $(PROG3)$(E)
+@@ -57,13 +55,13 @@
  all:  $(EXES)
  
  $(PROG)$(E): $(PROG).c
@@ -57,6 +59,5 @@  index 772da46..4ae7061 100644
  
  
  # maintenance ---------------------------------------------------------------
--- 
+--
 2.12.2
-
diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch
index 0fc5a8e0d2..97ddb8df09 100644
--- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch
+++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch
@@ -12,27 +12,26 @@  Upstream-Status: Pending
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gpl/png-fix-IDAT-windowsize.c b/gpl/png-fix-IDAT-windowsize.c
-index 6d4ef9c..d212017 100644
+index 6543d20..b190906 100644
 --- a/gpl/png-fix-IDAT-windowsize.c
 +++ b/gpl/png-fix-IDAT-windowsize.c
-@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
+@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
              fprintf(stderr, "  Compiled with zlib %s; using zlib %s.\n",
                ZLIB_VERSION, zlib_version);
              fprintf(stderr, "\n");
--            fprintf(stderr, png_fix_IDAT_windowsize_usage);
-+            fprintf(stderr, "%s", png_fix_IDAT_windowsize_usage);
+-            fprintf(stderr, PNG_FIX_IDAT_WINDOWSIZE_USAGE);
++            fprintf(stderr, "%s", PNG_FIX_IDAT_WINDOWSIZE_USAGE);
              fflush(stderr);
              return 1;
          }
-@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
+@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
      fflush(stdout);
  
      if ( argn == argc ) {
--        fprintf(stderr, png_fix_IDAT_windowsize_usage);
-+        fprintf(stderr, "%s", png_fix_IDAT_windowsize_usage);
+-        fprintf(stderr, PNG_FIX_IDAT_WINDOWSIZE_USAGE);
++        fprintf(stderr, "%s", PNG_FIX_IDAT_WINDOWSIZE_USAGE);
          fflush(stderr);
          return 5;
      } else {
 -- 
-2.12.2
-
+2.25.1
diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch
index 2ff6d664c0..d71cd12def 100644
--- a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch
+++ b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch
@@ -7,36 +7,38 @@  Upstream-Status: Pending
  gpl/pngsplit.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
+diff --git a/gpl/pngsplit.c b/gpl/pngsplit.c
+index ca4567b..0147ef4 100644
 --- a/gpl/pngsplit.c
 +++ b/gpl/pngsplit.c
-@@ -141,8 +141,8 @@
+@@ -141,8 +141,8 @@ int main(int argc, char *argv[])
                    0 == strncmp( argv[argn], "-quiet", 2 ) )
              verbose = 0;
          else {
--            fprintf(stderr, pngsplit_hdr);
--            fprintf(stderr, pngsplit_usage);
-+            fprintf(stderr, "%s", pngsplit_hdr);
-+            fprintf(stderr, "%s", pngsplit_usage);
+-            fprintf(stderr, PNGSPLIT_HDR);
+-            fprintf(stderr, PNGSPLIT_USAGE);
++            fprintf(stderr, "%s", PNGSPLIT_HDR);
++            fprintf(stderr, "%s", PNGSPLIT_USAGE);
              fflush(stderr);
              return 1;
          }
-@@ -150,8 +150,8 @@
+@@ -150,8 +150,8 @@ int main(int argc, char *argv[])
      }
  
      if ( argn == argc ) {
--        fprintf(stderr, pngsplit_hdr);
--        fprintf(stderr, pngsplit_usage);
-+        fprintf(stderr, "%s", pngsplit_hdr);
-+        fprintf(stderr, "%s", pngsplit_usage);
+-        fprintf(stderr, PNGSPLIT_HDR);
+-        fprintf(stderr, PNGSPLIT_USAGE);
++        fprintf(stderr, "%s", PNGSPLIT_HDR);
++        fprintf(stderr, "%s", PNGSPLIT_USAGE);
          fflush(stderr);
          return 5;
      } else {
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
  
      /*=============================  MAIN LOOP  =============================*/
  
--    fprintf(stdout, pngsplit_hdr);
-+    fprintf(stdout, "%s", pngsplit_hdr);
+-    fprintf(stdout, PNGSPLIT_HDR);
++    fprintf(stdout, "%s", PNGSPLIT_HDR);
      fflush(stdout);
  
      while (argn <= argc) {
diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_3.0.2.bb
similarity index 84%
rename from meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
rename to meta-oe/recipes-support/pngcheck/pngcheck_3.0.2.bb
index 3bd2f414d7..69eeb204f8 100644
--- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
+++ b/meta-oe/recipes-support/pngcheck/pngcheck_3.0.2.bb
@@ -1,7 +1,7 @@ 
 SUMMARY = "pngcheck verifies the integrity of PNG, JNG and MNG files"
 HOMEPAGE = "http://www.libpng.org/pub/png/apps/pngcheck.html"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://gpl/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://gpl/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "zlib libpng"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
@@ -10,7 +10,7 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.g
            file://0001-make-Respect-variables-from-environement.patch \
            "
 
-SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f"
+SRC_URI[sha256sum] = "0d7e262f24116fddf2847a8ceb5c92d9f5f26efb42e9fff63ec2bb7676131ca7"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/png-mng/files/pngcheck/"
 UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"