diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-02-06 21:47:37 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-02-06 21:47:39 +0100 |
commit | 3e8e9b4ae76d9b461bfd748c61450156158768f7 (patch) | |
tree | 337ba11f1d3dc4feee077d453111a1274466fa51 /patches | |
parent | de9fa4b11393c77fb9ca9f17fd1c0df266b61ea4 (diff) | |
download | ptxdist-3e8e9b4ae76d9b461bfd748c61450156158768f7.tar.gz ptxdist-3e8e9b4ae76d9b461bfd748c61450156158768f7.tar.xz |
cups: fix installing cups.conf
If /etc/dbus-1/ does not exist, then cups.conf is not installed.
Add the upstream patches that ensure that -with-dbusdir= actually works and
set it. Use /usr/share/dbus-1/ like all other packages instead of
/etc/dbus-1/.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/cups-2.2.5/0001-Fix-with-dbusdir-Issue-5671.patch | 31 | ||||
-rw-r--r-- | patches/cups-2.2.5/0002-Another-fix-for-DBUSDIR-Issue-5671.patch | 57 | ||||
-rw-r--r-- | patches/cups-2.2.5/series | 5 |
3 files changed, 93 insertions, 0 deletions
diff --git a/patches/cups-2.2.5/0001-Fix-with-dbusdir-Issue-5671.patch b/patches/cups-2.2.5/0001-Fix-with-dbusdir-Issue-5671.patch new file mode 100644 index 000000000..d9f8100a1 --- /dev/null +++ b/patches/cups-2.2.5/0001-Fix-with-dbusdir-Issue-5671.patch @@ -0,0 +1,31 @@ +From: Michael R Sweet <michael.r.sweet@gmail.com> +Date: Mon, 21 Oct 2019 10:55:57 -0400 +Subject: [PATCH] Fix --with-dbusdir (Issue #5671) + +--- + config-scripts/cups-common.m4 | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 +index a1185bccce0b..2da6abe6f6ad 100644 +--- a/config-scripts/cups-common.m4 ++++ b/config-scripts/cups-common.m4 +@@ -306,14 +306,14 @@ fi + LIBS="$SAVELIBS" + + dnl Check for DBUS support +-AC_ARG_ENABLE(dbus, [ --disable-dbus build without DBUS support]) +-AC_ARG_WITH(dbusdir, [ --with-dbusdir set DBUS configuration directory ], +- DBUSDIR="$withval") +- + DBUSDIR="" + DBUS_NOTIFIER="" + DBUS_NOTIFIERLIBS="" + ++AC_ARG_ENABLE(dbus, [ --disable-dbus build without DBUS support]) ++AC_ARG_WITH(dbusdir, [ --with-dbusdir set DBUS configuration directory ], ++ DBUSDIR="$withval") ++ + if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then + AC_MSG_CHECKING(for DBUS) + if $PKGCONFIG --exists dbus-1; then diff --git a/patches/cups-2.2.5/0002-Another-fix-for-DBUSDIR-Issue-5671.patch b/patches/cups-2.2.5/0002-Another-fix-for-DBUSDIR-Issue-5671.patch new file mode 100644 index 000000000..0116b01bd --- /dev/null +++ b/patches/cups-2.2.5/0002-Another-fix-for-DBUSDIR-Issue-5671.patch @@ -0,0 +1,57 @@ +From: Michael R Sweet <michael.r.sweet@gmail.com> +Date: Mon, 21 Oct 2019 11:12:11 -0400 +Subject: [PATCH] Another fix for DBUSDIR (Issue #5671) + +--- + config-scripts/cups-common.m4 | 2 +- + configure | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 +index 2da6abe6f6ad..996cc5844bf0 100644 +--- a/config-scripts/cups-common.m4 ++++ b/config-scripts/cups-common.m4 +@@ -330,7 +330,7 @@ if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdar + AC_CHECK_FUNC(dbus_threads_init, + AC_DEFINE(HAVE_DBUS_THREADS_INIT)) + LIBS="$SAVELIBS" +- if test -d /etc/dbus-1; then ++ if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then + DBUSDIR="/etc/dbus-1" + fi + else +diff --git a/configure b/configure +index 0328227a26c1..e8fd33698720 100755 +--- a/configure ++++ b/configure +@@ -5815,6 +5815,10 @@ fi + fi + LIBS="$SAVELIBS" + ++DBUSDIR="" ++DBUS_NOTIFIER="" ++DBUS_NOTIFIERLIBS="" ++ + # Check whether --enable-dbus was given. + if test "${enable_dbus+set}" = set; then : + enableval=$enable_dbus; +@@ -5827,10 +5831,6 @@ if test "${with_dbusdir+set}" = set; then : + fi + + +-DBUSDIR="" +-DBUS_NOTIFIER="" +-DBUS_NOTIFIERLIBS="" +- + if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } +@@ -5858,7 +5858,7 @@ if test "x$ac_cv_func_dbus_threads_init" = xyes; then : + fi + + LIBS="$SAVELIBS" +- if test -d /etc/dbus-1; then ++ if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then + DBUSDIR="/etc/dbus-1" + fi + else diff --git a/patches/cups-2.2.5/series b/patches/cups-2.2.5/series new file mode 100644 index 000000000..a4ed0d8e6 --- /dev/null +++ b/patches/cups-2.2.5/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-with-dbusdir-Issue-5671.patch +0002-Another-fix-for-DBUSDIR-Issue-5671.patch +# 26c75a7e3e6b22e00489b874caaa5b02 - git-ptx-patches magic |