From 9829160a8b61e79299f5c41f0c8049b9569b0b86 Mon Sep 17 00:00:00 2001
From: Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de>
Date: Nov 27 2022 19:43:54 +0000
Subject: groups/231.native_packages_etc.group:ghostpdl:${PKG_CONFIGURE_ARGS_EXTRA}: additionally configure w/ --without-local-zlib. groups/231.native_packages_etc.group:ghostpdl:${PKG_ENV_VARS_EXTRA}: additionally build w/ ZLIBDIR=${PREFIX}/include}. patches/ghostpdl-9.52.local.patch: updated.


---

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 0490060..99f025b 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -170,9 +170,9 @@ zstd")";
 : ${PKG_GHOSTPDL_VERSION:=9.52};
 : ${PKG_GHOSTPDL_URL:=https://mirror.midipix.org/ghostpdl/ghostpdl-${PKG_GHOSTPDL_VERSION}.tar.xz};
 : ${PKG_GHOSTPDL_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
-: ${PKG_GHOSTPDL_CONFIGURE_ARGS_EXTRA:="--with-system-libtiff --with-memory-alignment=8 --without-x"};
-: ${PKG_GHOSTPDL_ENV_VARS_EXTRA:="CCAUX=cc:CFLAGSAUX=${DEFAULT_CFLAGS} -L${PREFIX}/lib:LDFLAGSAUX=-L${PREFIX}/lib:SHARE_ZLIB=-lz"}
-: ${PKG_GHOSTPDL_MAKEFLAGS_BUILD_EXTRA:="TARGET_ARCH_FILE=${BUILD_WORKDIR}/ghostpdl-native-${DEFAULT_TARGET}/ghostpdl-${PKG_GHOSTPDL_VERSION}/arch/${DEFAULT_TARGET}.h"}
+: ${PKG_GHOSTPDL_CONFIGURE_ARGS_EXTRA:="--with-system-libtiff --with-memory-alignment=8 --without-x --without-local-zlib"};
+: ${PKG_GHOSTPDL_ENV_VARS_EXTRA:="CCAUX=cc:CFLAGSAUX=${DEFAULT_CFLAGS} -L${PREFIX}/lib:LDFLAGSAUX=-L${PREFIX}/lib:SHARE_ZLIB=-lz:ZLIBDIR=${PREFIX}/include"};
+: ${PKG_GHOSTPDL_MAKEFLAGS_BUILD_EXTRA:="TARGET_ARCH_FILE=${BUILD_WORKDIR}/ghostpdl-native-${DEFAULT_TARGET}/ghostpdl-${PKG_GHOSTPDL_VERSION}/arch/${DEFAULT_TARGET}.h"};
 : ${PKG_GIFLIB_SHA256SUM:=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd};
 : ${PKG_GIFLIB_VERSION:=5.2.1};
 : ${PKG_GIFLIB_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/giflib/giflib-${PKG_GIFLIB_VERSION}.tar.gz};
diff --git a/patches/ghostpdl-9.52.local.patch b/patches/ghostpdl-9.52.local.patch
index 11712f1..5a9646f 100644
--- a/patches/ghostpdl-9.52.local.patch
+++ b/patches/ghostpdl-9.52.local.patch
@@ -31,7 +31,17 @@ diff -ru ghostpdl-9.52.orig/base/fapi_ft.c ghostpdl-9.52/base/fapi_ft.c
 diff -ru ghostpdl-9.52.orig/configure ghostpdl-9.52/configure
 --- ghostpdl-9.52.orig/configure        2020-06-05 13:19:23.032760767 +0200
 +++ ghostpdl-9.52/configure     2020-06-05 13:18:58.367780811 +0200
-@@ -10957,7 +10957,7 @@
+@@ -7566,9 +7566,6 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local zlib source" >&5
+ $as_echo_n "checking for local zlib source... " >&6; }
+-# we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
+-# this seems a harmless default
+-ZLIBDIR=src
+ AUX_SHARED_ZLIB=
+ ZLIBCFLAGS=""
+ 
+@@ -10957,7 +10954,7 @@
    enableval=$enable_dynamic;
    if test "x$enable_dynamic" != xno; then
      case $host in