From fdda6a2d257389ef3ca897c383a7ec69c2133d0f Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Jun 04 2020 19:30:49 +0000 Subject: groups/231.native_packages_etc.group: ghostscript: switch to ghostpdl Signed-off-by: Lucio Andrés Illanes Albornoz --- diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 4b7ff21..13d0281 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -4,7 +4,7 @@ GROUP_TARGET="native_packages"; NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " alsa_lib apr apr_util bdwgc bmake bochs bzip2 clzip cmake cron dante dbus -emacs expat ffmpeg file gdbm geoip gettext_tiny ghostscript +emacs expat ffmpeg file gdbm geoip gettext_tiny ghostpdl giflib gnuchess gzip hastyhex hexcurse htop imagemagick infounzip infozip john lcms2 less libmetalink lolcode mintty mlogin musl_compat musl_fts ncdu ncurses ncursestw ncursesw npth openjpeg p7zip pcre popt procps_ng qemu @@ -108,13 +108,13 @@ zstd")"; : ${PKG_GETTEXT_TINY_VERSION:=0.3.1}; : ${PKG_GETTEXT_TINY_URL:=http://ftp.barfooze.de/pub/sabotage/tarballs/gettext-tiny-${PKG_GETTEXT_TINY_VERSION}.tar.xz}; : ${PKG_GETTEXT_TINY_BUILD_DIR:=gettext-tiny-${PKG_GETTEXT_TINY_VERSION}}; -: ${PKG_GHOSTSCRIPT_DEPENDS:="libpng"}; -: ${PKG_GHOSTSCRIPT_SHA256SUM:=831fc019bd477f7cc2d481dc5395ebfa4a593a95eb2fe1eb231a97e450d7540d}; -: ${PKG_GHOSTSCRIPT_VERSION:=9.26}; -: ${PKG_GHOSTSCRIPT_URL:=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/ghostscript-${PKG_GHOSTSCRIPT_VERSION}.tar.gz}; -: ${PKG_GHOSTSCRIPT_CONFIGURE_ARGS_EXTRA:="--without-x --disable-compile-inits --enable-dynamic --with-system-libtiff --with-memory-alignment=8"}; -: ${PKG_GHOSTSCRIPT_ENV_VARS_EXTRA:="CCAUX=cc:CFLAGSAUX=${DEFAULT_CFLAGS} -L${PREFIX}/lib:LDFLAGSAUX=-L${PREFIX}/lib:SHARE_ZLIB=-lz"} -: ${PKG_GHOSTSCRIPT_MAKEFLAGS_BUILD_EXTRA:="TARGET_ARCH_FILE=${BUILD_WORKDIR}/ghostscript-native-${DEFAULT_TARGET}/ghostscript-${PKG_GHOSTSCRIPT_VERSION}/arch/${DEFAULT_TARGET}.h"} +: ${PKG_GHOSTPDL_DEPENDS:="libpng"}; +: ${PKG_GHOSTPDL_SHA256SUM:=b0d4916b669a63ed861f563c4607cc1230949c53431ab0798db8e680fdacc777}; +: ${PKG_GHOSTPDL_VERSION:=9.26}; +: ${PKG_GHOSTPDL_URL:=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/ghostpdl-${PKG_GHOSTPDL_VERSION}.tar.gz}; +: ${PKG_GHOSTPDL_CONFIGURE_ARGS_EXTRA:="--without-x --disable-compile-inits --enable-dynamic --with-system-libtiff --with-memory-alignment=8"}; +: ${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}/ghostscript-native-${DEFAULT_TARGET}/ghostscript-${PKG_GHOSTPDL_VERSION}/arch/${DEFAULT_TARGET}.h"} : ${PKG_GIFLIB_SHA256SUM:=df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5}; : ${PKG_GIFLIB_VERSION:=5.1.4}; : ${PKG_GIFLIB_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/giflib/giflib-${PKG_GIFLIB_VERSION}.tar.bz2}; diff --git a/patches/ghostpdl-9.26.local.patch b/patches/ghostpdl-9.26.local.patch new file mode 100644 index 0000000..b64cab8 --- /dev/null +++ b/patches/ghostpdl-9.26.local.patch @@ -0,0 +1,56 @@ +diff -ru ghostscript-9.26.orig/configure ghostscript-9.26/configure +--- ghostscript-9.26.orig/configure 2018-11-20 11:08:58.000000000 +0100 ++++ ghostscript-9.26/configure 2019-03-25 13:54:01.738597533 +0100 +@@ -3787,7 +3787,7 @@ + echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in + echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in + +- ../$0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers="" ++ $0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS= LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers="" + status=$? + cp config.log ../configaux.log + if test $status -eq 0 ; then +diff -ru ghostscript-9.26.orig/devices/devs.mak ghostscript-9.26/devices/devs.mak +--- ghostscript-9.26.orig/devices/devs.mak 2018-11-20 11:08:19.000000000 +0100 ++++ ghostscript-9.26/devices/devs.mak 2019-03-25 16:52:13.774662402 +0100 +@@ -308,7 +308,7 @@ + + # See the main makefile for the definition of XLIBDIRS and XLIBS. + x11_=$(DEVOBJ)gdevx.$(OBJ) $(DEVOBJ)gdevxcmp.$(OBJ) $(DEVOBJ)gdevxini.$(OBJ)\ +- $(DEVOBJ)gdevxres.$(OBJ) $(DEVOBJ)gsparamx.$(OBJ) ++ $(DEVOBJ)gdevxres.$(OBJ) $(DEVOBJ)gsparamx.$(OBJ) $(DEVOBJ)gsparam.$(OBJ) $(DEVOBJ)gdevnfwd.$(OBJ) + $(DD)x11_.dev : $(x11_) $(GLD)bboxutil.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS) + $(SETMOD) $(DD)x11_ $(x11_) + $(ADDMOD) $(DD)x11_ -link $(XLIBDIRS) +--- /dev/null 2019-05-07 18:48:18.199999973 -0400 ++++ ghostscript-9.26/arch/x86_64-nt64-midipix.h 2019-05-09 22:02:33.196268736 -0400 +@@ -0,0 +1,29 @@ ++#define ARCH_ALIGN_SHORT_MOD 2 ++#define ARCH_ALIGN_INT_MOD 4 ++#define ARCH_ALIGN_LONG_MOD 8 ++#define ARCH_ALIGN_PTR_MOD 8 ++#define ARCH_ALIGN_FLOAT_MOD 4 ++#define ARCH_ALIGN_DOUBLE_MOD 8 ++ ++#define ARCH_LOG2_SIZEOF_CHAR 0 ++#define ARCH_LOG2_SIZEOF_SHORT 1 ++#define ARCH_LOG2_SIZEOF_INT 2 ++#define ARCH_LOG2_SIZEOF_LONG 3 ++#define ARCH_LOG2_SIZEOF_LONG_LONG 3 ++#define ARCH_SIZEOF_GX_COLOR_INDEX 8 ++#define ARCH_SIZEOF_PTR 8 ++#define ARCH_SIZEOF_FLOAT 4 ++#define ARCH_SIZEOF_DOUBLE 8 ++#define ARCH_FLOAT_MANTISSA_BITS 24 ++#define ARCH_DOUBLE_MANTISSA_BITS 53 ++ ++#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) ++#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) ++#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) ++#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) ++ ++#define ARCH_IS_BIG_ENDIAN 0 ++#define ARCH_PTRS_ARE_SIGNED 0 ++#define ARCH_FLOATS_ARE_IEEE 1 ++#define ARCH_ARITH_RSHIFT 2 ++#define ARCH_DIV_NEG_POS_TRUNCATES 1 diff --git a/patches/ghostscript-9.26.local.patch b/patches/ghostscript-9.26.local.patch deleted file mode 100644 index b64cab8..0000000 --- a/patches/ghostscript-9.26.local.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ru ghostscript-9.26.orig/configure ghostscript-9.26/configure ---- ghostscript-9.26.orig/configure 2018-11-20 11:08:58.000000000 +0100 -+++ ghostscript-9.26/configure 2019-03-25 13:54:01.738597533 +0100 -@@ -3787,7 +3787,7 @@ - echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in - echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in - -- ../$0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers="" -+ $0 CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS= LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host= --build= --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-luratech --without-jbig2dec --without-x --with-drivers="" - status=$? - cp config.log ../configaux.log - if test $status -eq 0 ; then -diff -ru ghostscript-9.26.orig/devices/devs.mak ghostscript-9.26/devices/devs.mak ---- ghostscript-9.26.orig/devices/devs.mak 2018-11-20 11:08:19.000000000 +0100 -+++ ghostscript-9.26/devices/devs.mak 2019-03-25 16:52:13.774662402 +0100 -@@ -308,7 +308,7 @@ - - # See the main makefile for the definition of XLIBDIRS and XLIBS. - x11_=$(DEVOBJ)gdevx.$(OBJ) $(DEVOBJ)gdevxcmp.$(OBJ) $(DEVOBJ)gdevxini.$(OBJ)\ -- $(DEVOBJ)gdevxres.$(OBJ) $(DEVOBJ)gsparamx.$(OBJ) -+ $(DEVOBJ)gdevxres.$(OBJ) $(DEVOBJ)gsparamx.$(OBJ) $(DEVOBJ)gsparam.$(OBJ) $(DEVOBJ)gdevnfwd.$(OBJ) - $(DD)x11_.dev : $(x11_) $(GLD)bboxutil.dev $(GDEV) $(DEVS_MAK) $(MAKEDIRS) - $(SETMOD) $(DD)x11_ $(x11_) - $(ADDMOD) $(DD)x11_ -link $(XLIBDIRS) ---- /dev/null 2019-05-07 18:48:18.199999973 -0400 -+++ ghostscript-9.26/arch/x86_64-nt64-midipix.h 2019-05-09 22:02:33.196268736 -0400 -@@ -0,0 +1,29 @@ -+#define ARCH_ALIGN_SHORT_MOD 2 -+#define ARCH_ALIGN_INT_MOD 4 -+#define ARCH_ALIGN_LONG_MOD 8 -+#define ARCH_ALIGN_PTR_MOD 8 -+#define ARCH_ALIGN_FLOAT_MOD 4 -+#define ARCH_ALIGN_DOUBLE_MOD 8 -+ -+#define ARCH_LOG2_SIZEOF_CHAR 0 -+#define ARCH_LOG2_SIZEOF_SHORT 1 -+#define ARCH_LOG2_SIZEOF_INT 2 -+#define ARCH_LOG2_SIZEOF_LONG 3 -+#define ARCH_LOG2_SIZEOF_LONG_LONG 3 -+#define ARCH_SIZEOF_GX_COLOR_INDEX 8 -+#define ARCH_SIZEOF_PTR 8 -+#define ARCH_SIZEOF_FLOAT 4 -+#define ARCH_SIZEOF_DOUBLE 8 -+#define ARCH_FLOAT_MANTISSA_BITS 24 -+#define ARCH_DOUBLE_MANTISSA_BITS 53 -+ -+#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) -+#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) -+#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) -+#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) -+ -+#define ARCH_IS_BIG_ENDIAN 0 -+#define ARCH_PTRS_ARE_SIGNED 0 -+#define ARCH_FLOATS_ARE_IEEE 1 -+#define ARCH_ARITH_RSHIFT 2 -+#define ARCH_DIV_NEG_POS_TRUNCATES 1 diff --git a/vars/ghostpdl.vars b/vars/ghostpdl.vars new file mode 100644 index 0000000..73380d0 --- /dev/null +++ b/vars/ghostpdl.vars @@ -0,0 +1,14 @@ +# +# set +o errexit -o noglob -o nounset is assumed. +# + +pkg_ghostpdl_configure_patch_pre() { + if ! rtl_fileop rm "${PKG_BASE_DIR}/ghostpdl-${PKG_VERSION}/libpng" \ + || ! rtl_fileop rm "${PKG_BASE_DIR}/ghostpdl-${PKG_VERSION}/zlib" \ + || ! rtl_fileop rm "${PKG_PREFIX}/freetype" \ + || ! rtl_fileop rm "${PKG_PREFIX}/lcms2mt"; then + return 1; + fi; +}; + +# vim:filetype=sh textwidth=0 diff --git a/vars/ghostscript.vars b/vars/ghostscript.vars deleted file mode 100644 index c604580..0000000 --- a/vars/ghostscript.vars +++ /dev/null @@ -1,14 +0,0 @@ -# -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_ghostscript_configure_patch_pre() { - if ! rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/libpng" \ - || ! rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/zlib" \ - || ! rtl_fileop rm "${PKG_PREFIX}/freetype" \ - || ! rtl_fileop rm "${PKG_PREFIX}/lcms2mt"; then - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0