cups: update to 1.7.2.

This commit is contained in:
Juan RP 2014-04-14 12:47:47 +02:00
parent e2236f8aa9
commit 26849e2744
2 changed files with 5 additions and 14 deletions

View File

@ -32,11 +32,11 @@ diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/c
+ [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_MSG_CHECKING(for libsystemd-daemon)
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ if $PKGCONFIG --exists libsystemd-daemon; then
+ AC_MSG_RESULT(yes)
+ SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
+ SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ AC_DEFINE(HAVE_SYSTEMD)
+ else
+ AC_MSG_RESULT(no)
@ -213,15 +213,6 @@ diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/lis
diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
@@ -26,6 +26,8 @@
* launchd_checkin() - Check-in with launchd and collect the listening
* fds.
* launchd_checkout() - Update the launchd KeepAlive file as needed.
+ * systemd_checkin() - Check-in with systemd and collect the
+ * listening fds.
* parent_handler() - Catch USR1/CHLD signals...
* process_children() - Process all dead children...
* select_timeout() - Calculate the select timeout value.
@@ -62,6 +64,10 @@
# endif /* !LAUNCH_JOBKEY_SERVICEIPC */
#endif /* HAVE_LAUNCH_H */
@ -238,7 +229,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
+static void systemd_checkin(void);
+static int systemd_checkin(void);
+#endif /* HAVE_SYSTEMD */
static void parent_handler(int sig);
static void process_children(void);
@ -278,7 +269,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
+static void
+static int
+systemd_checkin(void)
+{
+ int n, fd;

View File

@ -1,6 +1,6 @@
# Template file for 'cups'
pkgname=cups
version=1.7.1
version=1.7.2
revision=1
patch_args="-Np1"
short_desc="Common Unix Printing System"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.cups.org/"
license="GPL-2"
distfiles="http://www.cups.org/software/${version}/cups-${version}-source.tar.gz"
checksum=ce5aec8c5f7c9f6d3898334aedbc5e29cacb783ff9d04fa29d41f5d4a2d03b3d
checksum=0330f8a427fecbd91b101a056a84b7588e1e3c9ec2d79321ab48c6043756e565
hostmakedepends="automake pkg-config poppler-utils"
makedepends="acl-devel libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel