- up to 2.2.5

[packages/cups.git] / cups-eggcups.patch

diff --git a/cups-eggcups.patch b/cups-eggcups.patch
index 908f5185eb3db70f1feec7c20ceb64ccb9628888..b1eb218463fda423c83f18b9ee3a06de923464ce 100644 (file)
--- a/cups-eggcups.patch
+++ b/cups-eggcups.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.1b1/backend/ipp.c.eggcups cups-2.1b1/backend/ipp.c
---- cups-2.1b1/backend/ipp.c.eggcups   2015-05-28 03:19:14.000000000 +0200
-+++ cups-2.1b1/backend/ipp.c   2015-06-29 12:56:54.872807227 +0200
+diff -up cups-2.2.5/backend/ipp.c.eggcups cups-2.2.5/backend/ipp.c
+--- cups-2.2.5/backend/ipp.c.eggcups   2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/backend/ipp.c   2017-10-17 18:56:42.409024451 +0200
 @@ -149,6 +149,70 @@ static char               tmpfilename[1024] = "";
  static char           mandatory_attrs[1024] = "";
                                        /* cupsMandatory value */
@@ -72,7 +72,7 @@ diff -up cups-2.1b1/backend/ipp.c.eggcups cups-2.1b1/backend/ipp.c
  
  /*
   * Local functions...
-@@ -1700,6 +1764,15 @@ main(int  argc,                         /* I - Number of comm
+@@ -1743,6 +1807,15 @@ main(int  argc,                         /* I - Number of comm
        fprintf(stderr, "DEBUG: Print job accepted - job ID %d.\n", job_id);
      }
  
@@ -88,22 +88,22 @@ diff -up cups-2.1b1/backend/ipp.c.eggcups cups-2.1b1/backend/ipp.c
      ippDelete(response);
  
      if (job_canceled)
-diff -up cups-2.1b1/backend/Makefile.eggcups cups-2.1b1/backend/Makefile
---- cups-2.1b1/backend/Makefile.eggcups        2014-05-09 00:42:44.000000000 +0200
-+++ cups-2.1b1/backend/Makefile        2015-06-29 12:54:55.753026774 +0200
-@@ -264,7 +264,7 @@ dnssd:     dnssd.o ../cups/$(LIBCUPS) libbac
+diff -up cups-2.2.5/backend/Makefile.eggcups cups-2.2.5/backend/Makefile
+--- cups-2.2.5/backend/Makefile.eggcups        2017-10-17 18:56:42.409024451 +0200
++++ cups-2.2.5/backend/Makefile        2017-10-17 18:59:11.696781116 +0200
+@@ -262,7 +262,7 @@ dnssd:     dnssd.o ../cups/$(LIBCUPS) libbac
  
  ipp:  ipp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
--      $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS)
+-      $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
++      $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS)
        $(RM) http
        $(LN) ipp http
  
-diff -up cups-2.1b1/scheduler/subscriptions.c.eggcups cups-2.1b1/scheduler/subscriptions.c
---- cups-2.1b1/scheduler/subscriptions.c.eggcups       2014-02-06 19:33:34.000000000 +0100
-+++ cups-2.1b1/scheduler/subscriptions.c       2015-06-29 12:54:55.753026774 +0200
-@@ -1293,13 +1293,13 @@ cupsd_send_dbus(cupsd_eventmask_t event,
+diff -up cups-2.2.5/scheduler/subscriptions.c.eggcups cups-2.2.5/scheduler/subscriptions.c
+--- cups-2.2.5/scheduler/subscriptions.c.eggcups       2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/subscriptions.c       2017-10-17 18:56:42.409024451 +0200
+@@ -1291,13 +1291,13 @@ cupsd_send_dbus(cupsd_eventmask_t event,
      what = "PrinterAdded";
    else if (event & CUPSD_EVENT_PRINTER_DELETED)
      what = "PrinterRemoved";
@@ -119,7 +119,7 @@ diff -up cups-2.1b1/scheduler/subscriptions.c.eggcups cups-2.1b1/scheduler/subsc
    else
      return;
  
-@@ -1335,7 +1335,7 @@ cupsd_send_dbus(cupsd_eventmask_t event,
+@@ -1333,7 +1333,7 @@ cupsd_send_dbus(cupsd_eventmask_t event,
    dbus_message_append_iter_init(message, &iter);
    if (dest)
      dbus_message_iter_append_string(&iter, dest->name);