summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--cups-systemd-socket.patch7
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c0fa7e5b7f4..176d2f5a08e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = cups-git
- pkgver = 2.3b7.r98.g21609267e
+ pkgver = 2.3b7.r147.g400e67c15
pkgrel = 1
url = https://www.cups.org/
arch = x86_64
@@ -41,7 +41,7 @@ pkgbase = cups-git
sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
- sha256sums = f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a
+ sha256sums = 08b017a08a94eaf46c8ba47a176a5bbd2acacf512de2d4e539f483c310ab5ea9
sha256sums = d4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d
pkgname = libcups-git
@@ -52,7 +52,7 @@ pkgname = libcups-git
depends = krb5
depends = avahi
depends = libusb
- provides = libcups=2.3b7.r98.g21609267e
+ provides = libcups=2.3b7.r147.g400e67c15
conflicts = libcups
pkgname = cups-git
diff --git a/PKGBUILD b/PKGBUILD
index e9d99e5715e..29a5b5d00b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase="cups-git"
_pkgbase=cups
pkgname=('libcups-git' 'cups-git')
-pkgver=2.3b7.r98.g21609267e
+pkgver=2.3b7.r147.g400e67c15
pkgrel=1
arch=('x86_64')
license=('GPL')
@@ -29,8 +29,9 @@ sha256sums=('SKIP'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
- 'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a'
+ '08b017a08a94eaf46c8ba47a176a5bbd2acacf512de2d4e539f483c310ab5ea9'
'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
+
pkgver() {
cd "$_pkgbase"
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -61,6 +62,8 @@ prepare() {
sed -i -e '7iMaxLogSize 0' conf/cupsd.conf.in
sed -i -e 's/WARNING_OPTIONS="-Werror /WARNING_OPTIONS="/g' config-scripts/cups-compiler.m4
+ sed -i -e 's/subtype)/subtypes)/g' test/ippeveprinter.c
+
# Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
autoconf -I config-scripts
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 3369ceb57ce..ec8c7076be1 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -33,11 +33,11 @@ diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler
diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
--- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg 2014-10-21 13:55:01.000000000 +0200
+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in 2015-02-10 13:40:24.296545049 +0100
-@@ -1,10 +1,11 @@
- [Unit]
+@@ -2,10 +2,11 @@
Description=CUPS Scheduler
Documentation=man:cupsd(8)
-+After=network.target
+ After=sssd.service
++After=network.taget
[Service]
ExecStart=@sbindir@/cupsd -l
@@ -46,4 +46,3 @@ diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/schedu
Restart=on-failure
[Install]
-