From 0a58a9e3055902ef268f60c2a06ad3fb3e56f07f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 19 Oct 2017 09:15:29 +0200
Subject: [PATCH] cups: update to 2.2.5.

---
 .../cups/patches/cups-fix-install-perms.patch  | 18 ------------------
 srcpkgs/cups/patches/cups-no-gcrypt.patch      | 11 -----------
 srcpkgs/cups/template                          |  6 +++---
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/cups/patches/cups-fix-install-perms.patch
 delete mode 100644 srcpkgs/cups/patches/cups-no-gcrypt.patch

diff --git a/srcpkgs/cups/patches/cups-fix-install-perms.patch b/srcpkgs/cups/patches/cups-fix-install-perms.patch
deleted file mode 100644
index bb85063747b..00000000000
--- a/srcpkgs/cups/patches/cups-fix-install-perms.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makedefs.in
-+++ b/Makedefs.in
-@@ -39,12 +39,12 @@
- #
- 
- INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_DATA	=	$(INSTALL) -c -m 644
- INSTALL_DIR	=	$(INSTALL) -d
- INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
- INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
- 
- #
diff --git a/srcpkgs/cups/patches/cups-no-gcrypt.patch b/srcpkgs/cups/patches/cups-no-gcrypt.patch
deleted file mode 100644
index 0cd64b19187..00000000000
--- a/srcpkgs/cups/patches/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4
---- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry	2014-09-12 15:41:23.324760213 +0200
-+++ cups-2.0rc1/config-scripts/cups-ssl.m4	2014-09-12 15:43:13.124203363 +0200
-@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then
-     dnl Then look for GNU TLS...
-     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
--    	AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
- 	if $PKGCONFIG --exists gnutls; then
- 	    have_ssl=1
- 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index b7905c48d28..f7f301b9aa3 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,14 +1,14 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.2.4
-revision=2
+version=2.2.5
+revision=1
 patch_args="-Np1"
 short_desc="Common Unix Printing System"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="https://www.cups.org/"
 license="GPL-2"
 distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc
+checksum=a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21
 
 hostmakedepends="automake pkg-config poppler-utils gnutls-devel avahi-libs-devel"
 makedepends="acl-devel libjpeg-turbo-devel libpng-devel tiff-devel