Merge pull request #3255 from mariux64/update-ghostscript

Update ghostscript

cups.be0

@@ -1,9 +1,9 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION cups-2.2.11-1
+# BEE_VERSION cups-2.4.12-0
 
-# SRCURL[0]="https://github.com/apple/cups/releases/download/v${PKGVERSION}/cups-${PKGVERSION}-source.tar.gz"
-SRCURL[0]="https://beehive.molgen.mpg.de/7afbbcd2497e7d742583c492f6de40cd/cups-2.2.11-source.tar.gz"
+#SRCURL[0]="https://github.com/OpenPrinting/cups/releases/download/v${PKGVERSION}/cups-${PKGVERSION}-source.tar.gz"
+SRCURL[0]="https://beehive.molgen.mpg.de/1f9281c661b95acc7925a220919210e2/cups-2.4.12-source.tar.gz"
 
 # fix install -g which rersults in "var/cache/cups/rss': Operation not permitted"
 PATCHURL+=("https://beehive.molgen.mpg.de/85482e86fb26e092f2757378c030196e/cups-2211-remove-chgrp-install.patch")
@@ -22,13 +22,13 @@ build_in_sourcedir
 #}
 
 mee_configure() {
-    start_cmd sed -i 's:444:644:' ${S}/Makedefs.in
-    start_cmd sed -i '/MAN.EXT/s:.gz::' ${S}/configure ${S}/config-scripts/cups-manpages.m4
-    start_cmd aclocal  -I ${S}/config-scripts
-    start_cmd autoconf -I ${S}/config-scripts
-
-    bee_configure --with-rcdir=${PREFIX}/etc/kannweg \
-                  --disable-libusb
+    bee_configure --disable-acl \
+                  --with-rcdir=${PREFIX}/etc/kannweg \
+                  --with-systemd=${PREFIX}/etc/kannweg \
+                  --disable-dbus \
+                  --with-tls=gnutls \
+                  --disable-libusb \
+                  --with-config-file-perm=644
 }
 
 #mee_build() {

ghostscript.be0

@@ -1,38 +1,44 @@
 #!/bin/env beesh
 
-# BEE_VERSION ghostscript-9.55.0-1
+# BEE_VERSION ghostscript-10.05.1-0
 
 XPKGVERSION_COMPACT=$(echo ${PKGVERSION} | tr -d '.')
 
 #SRCURL[0]="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${XPKGVERSION_COMPACT}/ghostscript-${PKGVERSION}.tar.gz"
-SRCURL[0]="https://beehive.molgen.mpg.de/4d3e03b54741265dfbcd24c08a1680a7/ghostscript-9.55.0.tar.gz"
+SRCURL[0]="https://beehive.molgen.mpg.de/40d4284b50b5d6ecc61533e3fdf2ee13/ghostscript-10.05.1.tar.gz"
 
 build_in_sourcedir
 
 mee_patch() {
     bee_patch "${@}"
-    sed -i 's/ZLIBDIR=src/ZLIBDIR=$includedir/' configure.ac configure
-    rm -rf freetype lcms2 jpeg libpng openjpeg
-    sed -i 's/gscms_transformm_color_const/gscms_transform_color_const/' base/gsicc_lcms2.c
+    rm -r freetype lcms2mt jpeg libpng openjpeg tiff zlib
+    # libs link unwanted to libgpdl that isn't installed
+    rm -rf gpdl
+    # Remove internal CMaps (CMaps from poppler-data are used instead)
+    rm -r Resource/CMap
 }
 
 mee_configure() {
     bee_configure \
-      --enable-dynamic \
-      --with-drivers=ALL,x11 \
+      --with-x \
+      --with-drivers=ALL \
       --with-system-libtiff \
+      --enable-fontconfig \
+      --enable-freetype \
+      --enable-openjpeg \
       --disable-compile-inits
 }
 
 mee_build() {
-    bee_build
     start_cmd make ${BEE_MAKEFLAGS} so
 }
 
 mee_install() {
     bee_install soinstall
 
-    install -v -m644 base/*.h ${D}/${INCLUDEDIR}/ghostscript &&
-    ln -v -s ghostscript ${D}/${INCLUDEDIR}/ps
+    install -v -m644 base/*.h ${D}${INCLUDEDIR}/ghostscript &&
+    ln -v -s ghostscript ${D}${INCLUDEDIR}/ps
+    ln -s /usr/share/poppler/cMap ${D}/usr/share/ghostscript/${PKGVERSION}/Resource/CMap
+    ln -s gs ${D}/usr/bin/ghostscript
     cd ${D} && rm -rf usr/share/doc
 }