[arch-commits] Commit in cups-filters/trunk (PKGBUILD fix_segfault.diff)

[Andreas Radke]

    Date: Sunday, August 26, 2018 @ 11:12:52
  Author: andyrtr
Revision: 333031

upgpkg: cups-filters 1.21.1-1

upstream update 1.21.1

Modified:
  cups-filters/trunk/PKGBUILD
Deleted:
  cups-filters/trunk/fix_segfault.diff

-------------------+
 PKGBUILD          |   16 ++++------------
 fix_segfault.diff |   28 ----------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-26 09:56:17 UTC (rev 333030)
+++ PKGBUILD	2018-08-26 11:12:52 UTC (rev 333031)
@@ -2,8 +2,8 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=cups-filters
-pkgver=1.21.0
-pkgrel=2
+pkgver=1.21.1
+pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('x86_64')
 url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
@@ -16,17 +16,9 @@
 	    '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')
+source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
+sha256sums=('a02e88ed70cae3429591202d43d6100fec3f2c21fd0b9b40a122e11ab6449f7f')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # FS#59775
-  patch -Np1 -i ../fix_segfault.diff
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr  \

Deleted: fix_segfault.diff
===================================================================
--- fix_segfault.diff	2018-08-26 09:56:17 UTC (rev 333030)
+++ fix_segfault.diff	2018-08-26 11:12:52 UTC (rev 333031)
@@ -1,28 +0,0 @@
-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;
- }
- 
-