upg cups

added cups-filter-no-dbus

cups-filters-no-dbus/PKGBUILD

@@ -0,0 +1,68 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=cups-filters-no-dbus
+_pkgname=cups-filters
+pkgver=1.28.16
+pkgrel=03
+pkgdesc="OpenPrinting CUPS Filters w/o systemd"
+arch=('x86_64')
+url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+checkdepends=('ttf-dejavu') # ttf-dejavu for make check
+depends=('lcms2' 'poppler' 'qpdf' 'ijs' 'libcups-no-dbus>=2.2.4-02' 'libexif')
+makedepends=('ghostscript' 'python' 'mupdf-tools' 'liblouis')
+optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
+	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'antiword: to convert MS Word documents'
+	    'docx2txt: to convert Microsoft OOXML text from DOCX files'
+	    'imagemagick: for Braille embosser support'
+	    'liblouis: for Braille embosser support')
+backup=(etc/cups/cups-browsed.conf)
+conflicts=(cups-filters)
+replaces=(cups-filters)
+provides=(cups-filters)
+source=(https://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.xz)
+
+build() {
+  cd "$_pkgname"-$pkgver
+  ./configure --prefix=/usr  \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --with-rcdir=no \
+    --disable-avahi \
+    --with-browseremoteprotocols=DNSSD,CUPS \
+    --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd "$_pkgname"-$pkgver
+  make check
+}
+
+package() {
+  cd "$_pkgname"-$pkgver
+  make DESTDIR="$pkgdir/" install
+  
+  # use cups group from cups pkg FS#56818
+  chgrp -R 209 "${pkgdir}"/etc/cups
+
+  # license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${_pkgname}
+  install -m644 "${srcdir}"/${_pkgname}-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/
+}
+
+#---- license gpg-key sha256sums ----
+
+license=('custom')
+
+sha256sums=(3a400bfa751da2020775cd7d48d1647448551ff051f9345abc1df6357b199ac0) # cups-filters-1.28.16.tar.xz
+ 

cups-filters-no-dbus/buildfix.diff

@@ -0,0 +1,23 @@
+--- cups-filters/Makefile.am	2020-11-17 21:25:27.000000000 +0100
++++ cups-filters/Makefile.am.new	2020-11-17 21:30:00.696488598 +0100
+@@ -772,7 +772,8 @@
+ 
+ bannertopdf_DEPENDENCIES = \
+ 	$(GETLINE) \
+-	libfontembed.la
++	libfontembed.la \
++	libcupsfilters.la
+ 
+ commandtoescpx_SOURCES = \
+ 	cupsfilters/driver.h \
+@@ -947,7 +947,9 @@
+ 	$(STRCASESTR) \
+ 	$(CUPS_LIBS) \
+ 	$(LIBICONV)
+-texttotext_DEPENDENCIES = $(STRCASESTR)
++texttotext_DEPENDENCIES = \
++	$(STRCASESTR) \
++	libppd.la
+ 
+ pdftops_SOURCES = \
+ 	filter/pdftops.c

cups-filters-no-dbus/clean

@@ -0,0 +1 @@
+rm -rvf {src,pkg,*tar.xz}

cups-filters-no-dbus/deps

@@ -0,0 +1,13 @@
+mupdf-tools
+lcms2
+poppler
+qpdf
+liblouis
+ijs
+libcups-no-dbus
+ghostscript
+ttf-dejavu
+python
+libexif
+
+

cups-filters-no-dbus/test.patch

@@ -0,0 +1,25 @@
+--- cups-filters/ppd/testppd.c	2020-11-16 22:40:25.000000000 +0100
++++ cups-filters/ppd/testppd.c.new	2020-11-16 22:44:11.495836665 +0100
+@@ -455,7 +455,7 @@
+ 
+     fputs("ppdOpenFile(test.ppd): ", stdout);
+ 
+-    if ((ppd = ppdOpenFileWithLocalization("test.ppd", PPD_LOCALIZATION_ALL)) != NULL)
++    if ((ppd = ppdOpenFileWithLocalization("ppd/test.ppd", PPD_LOCALIZATION_ALL)) != NULL)
+       puts("PASS");
+     else
+     {
+--- cups-filters/ppd/testppd.c	2020-11-16 22:45:54.000000000 +0100
++++ cups-filters/ppd/testppd.c.new	2020-11-16 22:54:32.592990707 +0100
+@@ -911,9 +911,9 @@
+     * Test new constraints...
+     */
+ 
+-    fputs("ppdOpenFile(test2.ppd): ", stdout);
++    fputs("ppdOpenFile(ppd/test2.ppd): ", stdout);
+ 
+-    if ((ppd = ppdOpenFile("test2.ppd")) != NULL)
++    if ((ppd = ppdOpenFile("ppd/test2.ppd")) != NULL)
+       puts("PASS");
+     else
+     {

cups-filters-no-dbus/time

@@ -0,0 +1,6 @@
+
+
+real	1m17.181s
+user	1m6.769s
+sys	0m5.040s
+

cups-no-dbus/PKGBUILD

@@ -5,16 +5,16 @@
 # Website		: https://pozol.eu
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
-pkgbase="cups"
+pkgbase="cups-no-dbus"
 pkgname=('libcups-no-dbus' 'cups-no-dbus')
 _pkgname=('libcups' 'cups')
 pkgver=2.4.2
-pkgrel=04
+pkgrel=05
 epoch=1
 arch=('x86_64')
 url="https://openprinting.github.io/cups/"
 makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
-	'cups-filters' 'bc' 'libcolord' 'gzip' 'autoconf' 'libusb'
+	'cups-filters-no-dbus' 'bc' 'libcolord' 'gzip' 'autoconf' 'libusb'
 	'hicolor-icon-theme' 'libxcrypt' 'inetutils' 'libpaper' 'valgrind'
 	'git' 'libeudev')
 source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
@@ -31,7 +31,7 @@ source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-$
 #options=(!makeflags)
 
 prepare() {
-  cd "${pkgbase}"-${pkgver}
+  cd cups-${pkgver}
 
   # move /var/run -> /run for pid file
   patch -Np1 -i "${srcdir}"/cups-2.4.0-statedir.patch
@@ -59,7 +59,7 @@ prepare() {
 }
 
 build() {
-  cd "${pkgbase}"-${pkgver}
+  cd cups-${pkgver}
 
   # The build system uses only DSOFLAGS but not LDFLAGS to build some libraries.
   export DSOFLAGS=${LDFLAGS}
@@ -92,7 +92,7 @@ build() {
 }
 
 check() {
-  cd "${pkgbase}"-${pkgver}
+  cd cups-${pkgver}
 #  make -k check || /bin/true
 #  make check
 }
@@ -103,11 +103,11 @@ depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'libusb' 'libxcrypt')
 conflicts=('libcups')
 provides=('libcups')
 conflicts=('libcups')
-  cd ${pkgbase}-${pkgver}
+  cd cups-${pkgver}
   make BUILDROOT="${pkgdir}" install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)
   mkdir -p "${pkgdir}"/usr/bin
-  install -m755 "${srcdir}"/"${pkgbase}"-${pkgver}/cups-config "${pkgdir}"/usr/bin/cups-config
+  install -m755 "${srcdir}"/cups-${pkgver}/cups-config "${pkgdir}"/usr/bin/cups-config
 
   # add license + exception
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" {LICENSE,NOTICE}
@@ -124,7 +124,7 @@ backup=(etc/cups/cupsd.conf
         etc/cups/subscriptions.conf
         etc/logrotate.d/cups
         etc/pam.d/cups)
-depends=('acl' 'pam' "libcups-no-dbus>=${pkgver}" 'cups-filters' 'bc' 
+depends=('acl' 'pam' "libcups-no-dbus>=${pkgver}" 'cups-filters-no-dbus' 'bc' 
 		'libpaper' 'hicolor-icon-theme' 'xinetd')
 optdepends=('ipp-usb: allows to send HTTP requests via a USB connection on devices without Ethernet or WiFi connections' 
 			'xdg-utils: xdg .desktop file support'
@@ -133,7 +133,7 @@ optdepends=('ipp-usb: allows to send HTTP requests via a USB connection on devic
 conflicts=('cups')
 replaces=('cups')
 provides=('cups')
-  cd "${pkgbase}"-${pkgver}
+  cd cups-${pkgver}
   make BUILDROOT="${pkgdir}" install-data install-exec
 
   # this one we ship in the libcups pkg

cups-no-dbus/deps

@@ -11,7 +11,7 @@ libpaper
 valgrind
 git
 automake
-cups-filters
+cups-filters-no-dbus
 libmicrohttpd
 libcups-no-dbus
 

cups/PKGBUILD

@@ -8,7 +8,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=2.4.2
-pkgrel=02
+pkgrel=03
 epoch=1
 arch=('x86_64')
 url="https://openprinting.github.io/cups/"
@@ -202,3 +202,4 @@ sha256sums=(f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908 # c
 	0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474 # guid.patch
 	632faf08bfd1863e9ad6807aff766983e84030a0e4df441167f17de7266ca152) # 0001_Fix_OpenSSL_crash_bug.patch
 
+ 

cups/deps

@@ -14,3 +14,4 @@ automake
 cups-filters
 libmicrohttpd
 
+