[arch-commits] Commit in cups-filters/repos/testing-x86_64 (4 files)

Andreas Radke andyrtr at archlinux.org
Tue Nov 17 18:40:22 UTC 2020


    Date: Tuesday, November 17, 2020 @ 18:40:22
  Author: andyrtr
Revision: 401316

archrelease: copy trunk to testing-x86_64

Added:
  cups-filters/repos/testing-x86_64/PKGBUILD
    (from rev 401315, cups-filters/trunk/PKGBUILD)
  cups-filters/repos/testing-x86_64/PKGBUILD.v20
    (from rev 401315, cups-filters/trunk/PKGBUILD.v20)
  cups-filters/repos/testing-x86_64/test.patch
    (from rev 401315, cups-filters/trunk/test.patch)
Deleted:
  cups-filters/repos/testing-x86_64/PKGBUILD

--------------+
 PKGBUILD     |  113 ++++++++++++++++++++++++++++-----------------------------
 PKGBUILD.v20 |   86 +++++++++++++++++++++++++++++++++++++++++++
 test.patch   |   25 ++++++++++++
 3 files changed, 168 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-17 18:40:11 UTC (rev 401315)
+++ PKGBUILD	2020-11-17 18:40:22 UTC (rev 401316)
@@ -1,56 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.28.5
-pkgrel=2
-pkgdesc="OpenPrinting CUPS Filters"
-arch=('x86_64')
-url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-license=('custom')
-depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups>=2.2.6-2' 'systemd')
-makedepends=('ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools') # ttf-dejavu for make check
-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')
-backup=(etc/cups/cups-browsed.conf)
-source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
-sha256sums=('a8425fc7bcbf50794264ab30239003936f88c38a2d6bf08e1eb14bc8c928f60f')
-
-build() {
-  cd "$pkgname"-$pkgver
-  ./configure --prefix=/usr  \
-    --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --localstatedir=/var \
-    --with-rcdir=no \
-    --enable-avahi \
-    --with-browseremoteprotocols=DNSSD,CUPS \
-    --enable-auto-setup-driverless \
-    --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
-  make
-}
-
-check() {
-  cd "$pkgname"-$pkgver
-  make check
-}
-
-package() {
-  cd "$pkgname"-$pkgver
-  make DESTDIR="$pkgdir/" install
-  
-  # add upstream systemd support file
-  install -Dm644 utils/cups-browsed.service "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
-  sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
-  #sed -i "s|cups.service|org.cups.cupsd.service|g" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
-  
-  # 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}/
-}

Copied: cups-filters/repos/testing-x86_64/PKGBUILD (from rev 401315, cups-filters/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-17 18:40:22 UTC (rev 401316)
@@ -0,0 +1,57 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=cups-filters
+pkgver=1.28.5
+pkgrel=3
+pkgdesc="OpenPrinting CUPS Filters"
+arch=('x86_64')
+url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+license=('custom')
+depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups>=2.2.6-2' 'systemd')
+makedepends=('ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools') # ttf-dejavu for make check
+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')
+backup=(etc/cups/cups-browsed.conf)
+source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
+sha256sums=('a8425fc7bcbf50794264ab30239003936f88c38a2d6bf08e1eb14bc8c928f60f')
+
+build() {
+  cd "$pkgname"-$pkgver
+  ./configure --prefix=/usr  \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --with-rcdir=no \
+    --enable-avahi \
+    --with-browseremoteprotocols=DNSSD,CUPS \
+    --enable-auto-setup-driverless \
+    --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
+  
+  # add upstream systemd support file
+  install -Dm644 utils/cups-browsed.service "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
+  sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
+  #sed -i "s|cups.service|org.cups.cupsd.service|g" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
+  
+  # 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}/
+}

Copied: cups-filters/repos/testing-x86_64/PKGBUILD.v20 (from rev 401315, cups-filters/trunk/PKGBUILD.v20)
===================================================================
--- PKGBUILD.v20	                        (rev 0)
+++ PKGBUILD.v20	2020-11-17 18:40:22 UTC (rev 401316)
@@ -0,0 +1,86 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=cups-filters
+_commit=52c6150ffd0325c60b04bf5f34d7764899f855cd # master 2020-11-16
+pkgver=1.27.5+259+g52c6150f
+pkgrel=1
+pkgdesc="OpenPrinting CUPS Filters"
+arch=('x86_64')
+url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+license=('custom')
+depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups' 'systemd')
+makedepends=('ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools' 'psutils' 'git') # ttf-dejavu for make check
+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')
+backup=(etc/cups/cups-browsed.conf)
+#source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
+source=("git+https://github.com/OpenPrinting/cups-filters#commit=$_commit"
+        test.patch)
+#sha256sums=('SKIP')
+sha256sums=('SKIP'
+            'c3236df810b329ddf276d707a7b24bb88e727bb050c3eaa2399575ca078ded4f')
+
+pkgver() {
+  cd $pkgname
+  #git describe --tags | sed 's/-/+/g' | sed 's/v//'
+  git describe --tags | sed 's/release-1-27-5/1.27.5/;s/-/+/g'
+  #git rev-list --count HEAD # = 25
+  #printf "0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" # 0.r25.2e43897
+}
+
+prepare() {
+  cd "$pkgname" 
+  patch -Np1 -i ../test.patch
+  autoreconf -vfi
+}
+
+build() {
+  cd "$pkgname" #-$pkgver
+
+  # The build system uses only DSOFLAGS but not LDFLAGS to build some libraries.
+#  export DSOFLAGS=${LDFLAGS}
+  
+  ./configure --prefix=/usr  \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --with-rcdir=no \
+    --enable-avahi \
+    --with-browseremoteprotocols=DNSSD,CUPS \
+    --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
+
+#  make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}' | grep ^install
+#  return 1
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  
+  make -j1 V=1
+  #make V=1
+}
+
+check() {
+  cd "$pkgname" #-$pkgver
+  make -j1 check # || /bin/true
+}
+
+package() {
+  cd "$pkgname" #-$pkgver
+  make DESTDIR="$pkgdir/" install
+  
+  # add upstream systemd support file
+  install -Dm644 utils/cups-browsed.service "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
+  sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
+  #sed -i "s|cups.service|org.cups.cupsd.service|g" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service
+  
+  # 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}/
+  #install -m644 "${srcdir}"/${pkgname}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+}

Copied: cups-filters/repos/testing-x86_64/test.patch (from rev 401315, cups-filters/trunk/test.patch)
===================================================================
--- test.patch	                        (rev 0)
+++ test.patch	2020-11-17 18:40:22 UTC (rev 401316)
@@ -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
+     {


More information about the arch-commits mailing list