[arch-commits] Commit in cups-filters/repos/extra-x86_64 (8 files)

Andreas Radke andyrtr at archlinux.org
Thu Jan 7 18:58:18 UTC 2021


    Date: Thursday, January 7, 2021 @ 18:58:17
  Author: andyrtr
Revision: 405700

archrelease: copy trunk to extra-x86_64

Added:
  cups-filters/repos/extra-x86_64/PKGBUILD
    (from rev 405699, cups-filters/trunk/PKGBUILD)
  cups-filters/repos/extra-x86_64/PKGBUILD.v20
    (from rev 405699, cups-filters/trunk/PKGBUILD.v20)
  cups-filters/repos/extra-x86_64/buildfix.diff
    (from rev 405699, cups-filters/trunk/buildfix.diff)
  cups-filters/repos/extra-x86_64/test.patch
    (from rev 405699, cups-filters/trunk/test.patch)
Deleted:
  cups-filters/repos/extra-x86_64/PKGBUILD
  cups-filters/repos/extra-x86_64/PKGBUILD.v20
  cups-filters/repos/extra-x86_64/buildfix.diff
  cups-filters/repos/extra-x86_64/test.patch

---------------+
 PKGBUILD      |  114 ++++++++++++++++++++--------------------
 PKGBUILD.v20  |  156 ++++++++++++++++++++++++++++----------------------------
 buildfix.diff |   46 ++++++++--------
 test.patch    |   50 ++++++++---------
 4 files changed, 183 insertions(+), 183 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-07 18:58:09 UTC (rev 405699)
+++ PKGBUILD	2021-01-07 18:58:17 UTC (rev 405700)
@@ -1,57 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.28.6
-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>=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=('756b433cac3718e492d1da58859461862ec70bd863dbd2d4d221ab724f145f6c')
-
-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/extra-x86_64/PKGBUILD (from rev 405699, cups-filters/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-01-07 18:58:17 UTC (rev 405700)
@@ -0,0 +1,57 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=cups-filters
+pkgver=1.28.7
+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>=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=('e4150902809c58dfff7089c9345f196ecd88e38bce2be4800fa4811a0902057d')
+
+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}/
+}

Deleted: PKGBUILD.v20
===================================================================
--- PKGBUILD.v20	2021-01-07 18:58:09 UTC (rev 405699)
+++ PKGBUILD.v20	2021-01-07 18:58:17 UTC (rev 405700)
@@ -1,78 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=cups-filters
-_commit=378a821080ecb140a1319ee2be4cacc1150e82d6 # master 2020-11-16
-pkgver=1.27.5+260+g378a8210
-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"
-	buildfix.diff)
-sha256sums=('SKIP'
-            '4dcb21b719df28f1b275aef091014420dce2b57fbb1dacabd1eb067167629bd0')
-
-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 ../buildfix.diff
-  autoreconf -vfi
-}
-
-build() {
-  cd "$pkgname" #-$pkgver
-  ./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 #V=1
-}
-
-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
-  
-  # 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/extra-x86_64/PKGBUILD.v20 (from rev 405699, cups-filters/trunk/PKGBUILD.v20)
===================================================================
--- PKGBUILD.v20	                        (rev 0)
+++ PKGBUILD.v20	2021-01-07 18:58:17 UTC (rev 405700)
@@ -0,0 +1,78 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=cups-filters
+_commit=378a821080ecb140a1319ee2be4cacc1150e82d6 # master 2020-11-16
+pkgver=1.27.5+260+g378a8210
+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"
+	buildfix.diff)
+sha256sums=('SKIP'
+            '4dcb21b719df28f1b275aef091014420dce2b57fbb1dacabd1eb067167629bd0')
+
+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 ../buildfix.diff
+  autoreconf -vfi
+}
+
+build() {
+  cd "$pkgname" #-$pkgver
+  ./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 #V=1
+}
+
+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
+  
+  # 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}/
+}

Deleted: buildfix.diff
===================================================================
--- buildfix.diff	2021-01-07 18:58:09 UTC (rev 405699)
+++ buildfix.diff	2021-01-07 18:58:17 UTC (rev 405700)
@@ -1,23 +0,0 @@
---- 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

Copied: cups-filters/repos/extra-x86_64/buildfix.diff (from rev 405699, cups-filters/trunk/buildfix.diff)
===================================================================
--- buildfix.diff	                        (rev 0)
+++ buildfix.diff	2021-01-07 18:58:17 UTC (rev 405700)
@@ -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

Deleted: test.patch
===================================================================
--- test.patch	2021-01-07 18:58:09 UTC (rev 405699)
+++ test.patch	2021-01-07 18:58:17 UTC (rev 405700)
@@ -1,25 +0,0 @@
---- 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
-     {

Copied: cups-filters/repos/extra-x86_64/test.patch (from rev 405699, cups-filters/trunk/test.patch)
===================================================================
--- test.patch	                        (rev 0)
+++ test.patch	2021-01-07 18:58:17 UTC (rev 405700)
@@ -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