[arch-commits] Commit in lib32-libcups/repos/multilib-x86_64 (3 files)
Laurent Carlier
lcarlier at archlinux.org
Sun Jul 9 05:02:55 UTC 2017
Date: Sunday, July 9, 2017 @ 05:02:55
Author: lcarlier
Revision: 243378
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libcups/repos/multilib-x86_64/PKGBUILD
(from rev 243377, lib32-libcups/trunk/PKGBUILD)
lib32-libcups/repos/multilib-x86_64/cupsGetDests.diff
(from rev 243377, lib32-libcups/trunk/cupsGetDests.diff)
Deleted:
lib32-libcups/repos/multilib-x86_64/PKGBUILD
-------------------+
PKGBUILD | 90 +++++++++++++++-------------
cupsGetDests.diff | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 216 insertions(+), 41 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-09 05:02:50 UTC (rev 243377)
+++ PKGBUILD 2017-07-09 05:02:55 UTC (rev 243378)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-_pkgbasename=libcups
-pkgname=lib32-$_pkgbasename
-pkgver=2.2.4
-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})
-sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
- 'SKIP')
-validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd ${srcdir}/cups-${pkgver}
-
- aclocal -I config-scripts
- autoconf -I config-scripts
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
- --enable-ssl=yes--enable-threads --enable-libusb=no \
- --disable-avahi --disable-dnssd \
- --with-optim="$CFLAGS" --libdir=/usr/lib32
- make libs
-}
-
-package() {
- cd ${srcdir}/cups-${pkgver}
- make BUILDROOT=${pkgdir} install-libs
- rm -rf "$pkgdir/usr/lib"
-}
-
Copied: lib32-libcups/repos/multilib-x86_64/PKGBUILD (from rev 243377, lib32-libcups/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-07-09 05:02:55 UTC (rev 243378)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+_pkgbasename=libcups
+pkgname=lib32-$_pkgbasename
+pkgver=2.2.4
+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}
+ cupsGetDests.diff)
+sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
+ 'SKIP'
+ '25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d')
+validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
+
+prepare() {
+ cd ${srcdir}/cups-${pkgver}
+
+ patch -Np1 -i ../cupsGetDests.diff
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd ${srcdir}/cups-${pkgver}
+
+ aclocal -I config-scripts
+ autoconf -I config-scripts
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
+ --enable-ssl=yes--enable-threads --enable-libusb=no \
+ --disable-avahi --disable-dnssd \
+ --with-optim="$CFLAGS" --libdir=/usr/lib32
+ make libs
+}
+
+package() {
+ cd ${srcdir}/cups-${pkgver}
+ make BUILDROOT=${pkgdir} install-libs
+ rm -rf "$pkgdir/usr/lib"
+}
+
Copied: lib32-libcups/repos/multilib-x86_64/cupsGetDests.diff (from rev 243377, lib32-libcups/trunk/cupsGetDests.diff)
===================================================================
--- cupsGetDests.diff (rev 0)
+++ cupsGetDests.diff 2017-07-09 05:02:55 UTC (rev 243378)
@@ -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(&data.main_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, &data);
+@@ -1183,9 +1191,9 @@ cupsEnumDests(
+ &error);
+ 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 b/xcode/CUPS.xcodeproj/project.pbxproj
+index 2edef8343..bdbb62d19 100644
+--- a/xcode/CUPS.xcodeproj/project.pbxproj
++++ b/xcode/CUPS.xcodeproj/project.pbxproj
+@@ -11049,8 +11049,6 @@
+ buildSettings = {
+ ASSETCATALOG_COMPRESSION = lossless;
+ CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+- CLANG_WARN_COMMA = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+@@ -11067,7 +11065,7 @@
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
++ GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+@@ -11096,8 +11094,6 @@
+ buildSettings = {
+ ASSETCATALOG_COMPRESSION = "respect-asset-catalog";
+ CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+- CLANG_WARN_COMMA = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+@@ -11112,7 +11108,7 @@
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
++ GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+
+diff --git a/cups/dest.c b/cups/dest.c
+index 9d7426ed3..09bb76b73 100644
+--- a/cups/dest.c
++++ b/cups/dest.c
+@@ -2072,17 +2072,6 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+
+ cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_get_cb, &data);
+
+- 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;
+-
+- return (0);
+- }
+-
+ /*
+ * Make a copy of the "real" queues for a later sanity check...
+ */
+
More information about the arch-commits
mailing list