Bug#1066378: pike8.0: FTBFS: zlibmod.c:1235:5: error: implicit declaration of function ‘pop_n_elems’ [-Werror=implicit-function-declaration]

[Zixing Liu]

Package: pike8.0
Followup-For: Bug #1066378
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/gz_test_fix.patch: Fix zlib detection logic.  Closes
    LP: #2061023.


Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy-updates
  APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'), 
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.5.0-26-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

diff -Nru pike8.0-8.0.1738/debian/patches/gz_test_fix.patch 
pike8.0-8.0.1738/debian/patches/gz_test_fix.patch
--- pike8.0-8.0.1738/debian/patches/gz_test_fix.patch   1969-12-31 
17:00:00.000000000 -0700
+++ pike8.0-8.0.1738/debian/patches/gz_test_fix.patch   2024-04-11 
14:31:45.000000000 -0600
@@ -0,0 +1,18 @@
+Description: Fix zlib detection logic
+ Fixes the issue where vendored zlib fails to compile on armhf
+Author: Zixing Liu <zixing....@canonical.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066378
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/pike8.0/+bug/2061023
+Forwarded: no
+Last-Update: 2024-04-11
+--- pike8.0-8.0.1738.orig/src/modules/Gz/gz_test.c
++++ pike8.0-8.0.1738/src/modules/Gz/gz_test.c
+@@ -320,6 +320,8 @@ void test_sync(compr, comprLen, uncompr,
+     err = inflateSync(&d_stream);           /* but skip the damaged part */
+     CHECK_ERR(err, "inflateSync");
+ 
++    inflateEnd(&d_stream);
++    inflateInit(&d_stream);
+     err = inflate(&d_stream, Z_FINISH);
+     if (err != Z_DATA_ERROR) {
+         fprintf(stderr, "inflate should report DATA_ERROR\n");
diff -Nru pike8.0-8.0.1738/debian/patches/series 
pike8.0-8.0.1738/debian/patches/series
--- pike8.0-8.0.1738/debian/patches/series      2022-04-18 11:30:23.000000000 
-0600
+++ pike8.0-8.0.1738/debian/patches/series      2024-04-11 14:19:11.000000000 
-0600
@@ -13,3 +13,4 @@
 undefined_htons.patch
 bad_size_t_redef.patch
 dont_disable_debug_symbols.patch
+gz_test_fix.patch