[arch-commits] Commit in lib32-libcups/trunk (PKGBUILD cupsGetDests.diff)
Date: Thursday, March 22, 2018 @ 12:16:04
Author: arojas
Revision: 310505
Update to 2.2.6
Modified:
lib32-libcups/trunk/PKGBUILD
Deleted:
lib32-libcups/trunk/cupsGetDests.diff
---+
PKGBUILD | 18 +
cupsGetDests.diff | 167
2 files changed, 5 insertions(+), 180 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-22 12:13:21 UTC (rev 310504)
+++ PKGBUILD2018-03-22 12:16:04 UTC (rev 310505)
@@ -3,26 +3,18 @@
_pkgbasename=libcups
pkgname=lib32-$_pkgbasename
-pkgver=2.2.4
-pkgrel=2
+pkgver=2.2.6
+pkgrel=1
pkgdesc="The CUPS Printing System - client libraries (32-bit)"
arch=('x86_64')
license=('GPL')
url="https://www.cups.org/;
depends=(lib32-krb5 lib32-libtiff lib32-libpng lib32-gnutls $_pkgbasename)
-source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
-cupsGetDests.diff)
-sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
-'SKIP'
-'25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d')
+source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig})
+sha256sums=('40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b'
+'SKIP')
validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org
PGP key)
-prepare() {
- cd ${srcdir}/cups-${pkgver}
-
- patch -Np1 -i ../cupsGetDests.diff
-}
-
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
Deleted: cupsGetDests.diff
===
--- cupsGetDests.diff 2018-03-22 12:13:21 UTC (rev 310504)
+++ cupsGetDests.diff 2018-03-22 12:16:04 UTC (rev 310505)
@@ -1,167 +0,0 @@
-diff --git a/cups/dest.c b/cups/dest.c
-index fc57ed342..9d7426ed3 100644
a/cups/dest.c
-+++ b/cups/dest.c
-@@ -1015,6 +1015,8 @@ cupsEnumDests(
- #endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-
-+ DEBUG_printf(("cupsEnumDests(flags=%x, msec=%d, cancel=%p, type=%x,
mask=%x, cb=%p, user_data=%p)", flags, msec, (void *)cancel, type, mask, (void
*)cb, (void *)user_data));
-+
- /*
- * Range check input...
- */
-@@ -1022,7 +1024,10 @@ cupsEnumDests(
- (void)flags;
-
- if (!cb)
-+ {
-+DEBUG_puts("1cupsEnumDests: No callback, returning 0.");
- return (0);
-+ }
-
- /*
- * Get ready to enumerate...
-@@ -1141,7 +1146,10 @@ cupsEnumDests(
-
- # ifdef HAVE_DNSSD
- if (DNSServiceCreateConnection(_ref) != kDNSServiceErr_NoError)
-+ {
-+DEBUG_puts("1cupsEnumDests: Unable to create service browser, returning
0.");
- return (0);
-+ }
-
- main_fd = DNSServiceRefSockFD(data.main_ref);
-
-@@ -1172,8 +1180,8 @@ cupsEnumDests(
- # else /* HAVE_AVAHI */
- if ((data.simple_poll = avahi_simple_poll_new()) == NULL)
- {
--DEBUG_puts("cupsEnumDests: Unable to create Avahi simple poll object.");
--return (1);
-+DEBUG_puts("1cupsEnumDests: Unable to create Avahi poll, returning 0.");
-+return (0);
- }
-
- avahi_simple_poll_set_func(data.simple_poll, cups_dnssd_poll_cb, );
-@@ -1183,9 +1191,9 @@ cupsEnumDests(
-);
- if (!data.client)
- {
--DEBUG_puts("cupsEnumDests: Unable to create Avahi client.");
-+DEBUG_puts("1cupsEnumDests: Unable to create Avahi client, returning 0.");
- avahi_simple_poll_free(data.simple_poll);
--return (1);
-+return (0);
- }
-
- data.browsers = 1;
-@@ -1374,6 +1382,8 @@ cupsEnumDests(
- # endif /* HAVE_DNSSD */
- #endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-+ DEBUG_puts("1cupsEnumDests: Returning 1.");
-+
- return (1);
- }
-
-@@ -2040,13 +2050,16 @@ cupsGetDests2(http_t *http, /* I -
Connection to server or @code CUPS_HTTP_
- _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
-
-
-- /*
-+ DEBUG_printf(("cupsGetDests2(http=%p, dests=%p)", (void *)http, (void
*)dests));
-+
-+/*
- * Range check the input...
- */
-
- if (!dests)
- {
- _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad NULL dests pointer"), 1);
-+DEBUG_puts("1cupsGetDests2: NULL dests pointer, returning 0.");
- return (0);
- }
-
-@@ -2061,6 +2074,8 @@ cupsGetDests2(http_t *http, /* I - Connection to
server or @code CUPS_HTTP_
-
- if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
- {
-+DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.",
cupsLastErrorString()));
-+
- cupsFreeDests(data.num_dests, data.dests);
-
- *dests = (cups_dest_t *)0;
-@@ -2178,6 +2193,8 @@ cupsGetDests2(http_t *http, /* I - Connection to
server or @code CUPS_HTTP_
- if (data.num_dests > 0)
- _cupsSetError(IPP_STATUS_OK, NULL, 0);
-
-+ DEBUG_printf(("1cupsGetDests2: Returning %d destinations.",
data.num_dests));
-+
- return (data.num_dests);
- }
-
[arch-commits] Commit in lib32-libcups/trunk (PKGBUILD cupsGetDests.diff)
Date: Sunday, July 9, 2017 @ 05:02:50
Author: lcarlier
Revision: 243377
upgpkg: lib32-libcups 2.2.4-2
fix FS#54744
Added:
lib32-libcups/trunk/cupsGetDests.diff
Modified:
lib32-libcups/trunk/PKGBUILD
---+
PKGBUILD | 14 +++-
cupsGetDests.diff | 167
2 files changed, 178 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-07-09 03:59:45 UTC (rev 243376)
+++ PKGBUILD2017-07-09 05:02:50 UTC (rev 243377)
@@ -4,17 +4,25 @@
_pkgbasename=libcups
pkgname=lib32-$_pkgbasename
pkgver=2.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="The CUPS Printing System - client libraries (32-bit)"
arch=('x86_64')
license=('GPL')
url="https://www.cups.org/;
depends=(lib32-krb5 lib32-libtiff lib32-libpng lib32-gnutls $_pkgbasename)
-source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig})
+source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
+cupsGetDests.diff)
sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
-'SKIP')
+'SKIP'
+'25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d')
validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org
PGP key)
+prepare() {
+ cd ${srcdir}/cups-${pkgver}
+
+ patch -Np1 -i ../cupsGetDests.diff
+}
+
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
Added: cupsGetDests.diff
===
--- cupsGetDests.diff (rev 0)
+++ cupsGetDests.diff 2017-07-09 05:02:50 UTC (rev 243377)
@@ -0,0 +1,167 @@
+diff --git a/cups/dest.c b/cups/dest.c
+index fc57ed342..9d7426ed3 100644
+--- a/cups/dest.c
b/cups/dest.c
+@@ -1015,6 +1015,8 @@ cupsEnumDests(
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+
++ DEBUG_printf(("cupsEnumDests(flags=%x, msec=%d, cancel=%p, type=%x,
mask=%x, cb=%p, user_data=%p)", flags, msec, (void *)cancel, type, mask, (void
*)cb, (void *)user_data));
++
+ /*
+ * Range check input...
+ */
+@@ -1022,7 +1024,10 @@ cupsEnumDests(
+ (void)flags;
+
+ if (!cb)
++ {
++DEBUG_puts("1cupsEnumDests: No callback, returning 0.");
+ return (0);
++ }
+
+ /*
+ * Get ready to enumerate...
+@@ -1141,7 +1146,10 @@ cupsEnumDests(
+
+ # ifdef HAVE_DNSSD
+ if (DNSServiceCreateConnection(_ref) != kDNSServiceErr_NoError)
++ {
++DEBUG_puts("1cupsEnumDests: Unable to create service browser, returning
0.");
+ return (0);
++ }
+
+ main_fd = DNSServiceRefSockFD(data.main_ref);
+
+@@ -1172,8 +1180,8 @@ cupsEnumDests(
+ # else /* HAVE_AVAHI */
+ if ((data.simple_poll = avahi_simple_poll_new()) == NULL)
+ {
+-DEBUG_puts("cupsEnumDests: Unable to create Avahi simple poll object.");
+-return (1);
++DEBUG_puts("1cupsEnumDests: Unable to create Avahi poll, returning 0.");
++return (0);
+ }
+
+ avahi_simple_poll_set_func(data.simple_poll, cups_dnssd_poll_cb, );
+@@ -1183,9 +1191,9 @@ cupsEnumDests(
+);
+ if (!data.client)
+ {
+-DEBUG_puts("cupsEnumDests: Unable to create Avahi client.");
++DEBUG_puts("1cupsEnumDests: Unable to create Avahi client, returning 0.");
+ avahi_simple_poll_free(data.simple_poll);
+-return (1);
++return (0);
+ }
+
+ data.browsers = 1;
+@@ -1374,6 +1382,8 @@ cupsEnumDests(
+ # endif /* HAVE_DNSSD */
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+
++ DEBUG_puts("1cupsEnumDests: Returning 1.");
++
+ return (1);
+ }
+
+@@ -2040,13 +2050,16 @@ cupsGetDests2(http_t *http, /* I -
Connection to server or @code CUPS_HTTP_
+ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
+
+
+- /*
++ DEBUG_printf(("cupsGetDests2(http=%p, dests=%p)", (void *)http, (void
*)dests));
++
++/*
+ * Range check the input...
+ */
+
+ if (!dests)
+ {
+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad NULL dests pointer"), 1);
++DEBUG_puts("1cupsGetDests2: NULL dests pointer, returning 0.");
+ return (0);
+ }
+
+@@ -2061,6 +2074,8 @@ cupsGetDests2(http_t *http, /* I - Connection to
server or @code CUPS_HTTP_
+
+ if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
+ {
++DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.",
cupsLastErrorString()));
++
+ cupsFreeDests(data.num_dests, data.dests);
+
+ *dests = (cups_dest_t *)0;
+@@ -2178,6 +2193,8 @@ cupsGetDests2(http_t *http, /* I - Connection to
server or @code CUPS_HTTP_
+ if (data.num_dests > 0)
+ _cupsSetError(IPP_STATUS_OK, NULL, 0);
+
++ DEBUG_printf(("1cupsGetDests2: Returning %d destinations.",
data.num_dests));
++
+ return (data.num_dests);
+ }
+
+diff --git a/xcode/CUPS.xcodeproj/project.pbxproj
