cups - fixes for dbus

3 files changed, 37 insertions, 18 deletions

diff --git a/printer/cups/BUILD b/printer/cups/BUILD
index 6922de6439..9fc455870f 100755
--- a/printer/cups/BUILD
+++ b/printer/cups/BUILD
@@ -16,4 +16,9 @@ OPTS="--libdir=$INSTALL_ROOT/usr/lib $CUPS_OPTS $OPTS"  &&
 OPTS="$OPTS CC=gcc CXX=g++" &&
 OPTS+=" --disable-static" &&
 
+# needed for dbus 1.14
+if is_depends_enabled $SPELL dbus;then
+  OPTS+=" --with-dbusdir=$INSTALL_ROOT/usr/share/dbus-1"
+fi &&
+
 default_build
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index eb77a5fd79..cda12135ba 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -4,34 +4,44 @@ depends  pkgconfig                                &&
 
 depends shared-mime-info &&
 
-optional_depends  avahi --with{,out}-avahi \
-                  'Avahi Service Discovery' &&
-
-optional_depends  mdnsresponder --with{,out}-dnssd \
-                  'DNS Service Discovery'       &&
-
-optional_depends  libpaper --with{,out}-libpaper  \
+optional_depends avahi \
+                   '--enable-avahi' \
+                   '--disable-avahi' \
+                   'use Avahi Service Discovery' &&
+
+optional_depends mdnsresponder                    \
+                   '--enable-dnssd'   \
+                   '--disable-dnssd'              \
+                   'DNS Service Discovery'       &&
+
+optional_depends  libpaper                        \
+                  '--enable-libpaper'             \
+                  '--disable-libpaper'            \
                   'Enable libpaper support'       &&
 
-optional_depends  libusb   --with{,out}-libusb \
+optional_depends  "libusb" \
+                  '--enable-libusb' \
+                  '--disable-libusb' \
                   'usb printers' &&
-
-optional_depends  dbus   --with{,out}-dbus \
+optional_depends  "dbus"                          \
+                  "--enable-dbus"                 \
+                  "--disable-dbus"                \
                   "hardware notifications"        &&
 
-optional_depends  linux-pam --with{,out}-pam \
+optional_depends  "linux-pam"                     \
+                  "--enable-pam"                  \
+                  "--disable-pam"                 \
                   "for pluggable authentication"  &&
 
-optional_depends  gnutls --with{,out}-gnutls \
-                  'security' &&
+optional_depends gnutls "--enable-gnutls" "--disable-gnutls --disable-ssl" 'security' &&
 
-optional_depends  acl --with{,out}-acl \
+optional_depends  "acl"                                           \
+                  "--enable-acl"                                              \
+                  "--disable-acl"                                              \
                   "for file system access control lists support"  &&
 
-optional_depends  krb5 --with{,out}-gssapi 'Kerberos support - deprecated' &&
-
-optional_depends  systemd --with{,out}-systemd \
-                  'SystemD support' &&
+optional_depends krb5 '--enable-gssapi' '--disable-gssapi' 'GSSAPI support' &&
+optional_depends systemd '--enable-systemd' '--disable-systemd' 'SystemD support' &&
 
 suggest_depends ghostscript '' '' 'to print Postscript files'
 suggest_depends cups-filters '' '' 'extra backends and filters'
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 203cdbe5fd..ce94512081 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,7 @@
+2022-04-19 Treeve Jelbert <treeve@sourcemage.org>
+	* DEPENDS: revert to old enable/disable format
+	* BUILD: use /usr/share/dbus-1 for dbus files; needed for dbus-1.14
+
 2022-01-28 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.4.1
 	* op.gpg: update Zdenek Dohnal