[arch-commits] Commit in cups-filters/repos/extra-x86_64 (3 files)
Andreas Radke
andyrtr at archlinux.org
Sat Aug 25 17:59:02 UTC 2018
Date: Saturday, August 25, 2018 @ 17:59:01
Author: andyrtr
Revision: 333012
archrelease: copy trunk to extra-x86_64
Added:
cups-filters/repos/extra-x86_64/PKGBUILD
(from rev 333011, cups-filters/trunk/PKGBUILD)
cups-filters/repos/extra-x86_64/fix_segfault.diff
(from rev 333011, cups-filters/trunk/fix_segfault.diff)
Deleted:
cups-filters/repos/extra-x86_64/PKGBUILD
-------------------+
PKGBUILD | 120 +++++++++++++++++++++++++++-------------------------
fix_segfault.diff | 28 ++++++++++++
2 files changed, 92 insertions(+), 56 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-25 17:58:52 UTC (rev 333011)
+++ PKGBUILD 2018-08-25 17:59:01 UTC (rev 333012)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.21.0
-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: needed to convert MS Word documents (requires also docx2txt (AUR)')
-backup=(etc/cups/cups-browsed.conf)
-source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
-sha256sums=('d1e975eaece2884ffa726f8d57dc249bd220e09cc5bd48ef7a0892987a07493b')
-
-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/extra-x86_64/PKGBUILD (from rev 333011, cups-filters/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-25 17:59:01 UTC (rev 333012)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=cups-filters
+pkgver=1.21.0
+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: needed to convert MS Word documents (requires also docx2txt (AUR)')
+backup=(etc/cups/cups-browsed.conf)
+source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz
+ fix_segfault.diff)
+sha256sums=('d1e975eaece2884ffa726f8d57dc249bd220e09cc5bd48ef7a0892987a07493b'
+ '7de12167759002c863006d6939e995534dbd9cbc6e9de56293c9440518addc59')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # FS#59775
+ patch -Np1 -i ../fix_segfault.diff
+}
+
+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/extra-x86_64/fix_segfault.diff (from rev 333011, cups-filters/trunk/fix_segfault.diff)
===================================================================
--- fix_segfault.diff (rev 0)
+++ fix_segfault.diff 2018-08-25 17:59:01 UTC (rev 333012)
@@ -0,0 +1,28 @@
+diff --git a/filter/foomatic-rip/options.c b/filter/foomatic-rip/options.c
+index 14eddc75..0f46855a 100644
+--- a/filter/foomatic-rip/options.c
++++ b/filter/foomatic-rip/options.c
+@@ -1031,12 +1031,10 @@ int option_set_value(option_t *opt, int optionset, const char *value)
+ /* TODO only set the changed option, not all of them */
+ choice = option_find_choice(fromopt,
+ option_get_value(fromopt, optionset));
+-
+ composite_set_values(fromopt, optionset, choice->command);
+- }
+- else {
++ free(newvalue);
++ } else
+ val->value = newvalue;
+- }
+
+ if (option_is_composite(opt)) {
+ /* set dependent values */
+@@ -1044,7 +1042,6 @@ int option_set_value(option_t *opt, int optionset, const char *value)
+ if (choice && !isempty(choice->command))
+ composite_set_values(opt, optionset, choice->command);
+ }
+- free(newvalue);
+ return 1;
+ }
+
+
More information about the arch-commits
mailing list