diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-14 03:52:55 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-14 03:52:55 +0000 |
| commit | 7c266ff5a9e1f533fd8bd8c2fbbcc05df350dcd3 (patch) | |
| tree | a65448ff1236d65a3fea9015e7cd01e6483eb282 /extra/cups/cups-systemd-socket.patch | |
| parent | 3d6877ee9ee7bba813a4b6be30a11d2b1942c656 (diff) | |
Mon Apr 14 03:47:31 UTC 2014
Diffstat (limited to 'extra/cups/cups-systemd-socket.patch')
| -rw-r--r-- | extra/cups/cups-systemd-socket.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index ad13a6da7..54a951200 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -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; |