gentoo resync : 06.04.2022

5 files changed, 483 insertions, 3 deletions

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 9c1ec431da32..e5c6c9081bd8 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,9 +1,13 @@
 AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89
+AUX dbus-1.12.22-check-fd.patch 1055 BLAKE2B a4889677a778fe0698128b2399273adb5373a11927a5610e6a9757237226fa866ce33bb603a89c44b8c2d3e2fccd4131637821ba1bb14782276223d5fa5db337 SHA512 667e76237868c177b9299eb0259dee2a5f820fde15fed0a21823b435e34ad734ec9e850f1a1b5408a6b099a78f77564b2396c38b82d931f3b0b5b93c0e5b8c4e
+AUX dbus-1.14.0-x-autoconf-fixes.patch 5171 BLAKE2B 6b7453397e467da695b3efd70e53f6a50dad44c44130f973037a4cb4139d62c7adab758a495ddebb97a35d068333417051adb5eb17bae86df31c998137eb6052 SHA512 e74b09c7da445c02fe84148b43ca61b21a95b67edbde4dc9f1916a9a628182097630336010f15f366063dc1432da7b1ae52e73b04185493b48ce28bf79873e54
 AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
 DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7 SHA512 0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6
+DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f
 EBUILD dbus-1.12.20-r4.ebuild 7533 BLAKE2B 19b9f34046bea0cbef61a641255f56bf98005c96aa61de9212e9e6ddca1957b02a217f8ff28b23b51fee6337b3fa7b48d4aebe707589bf0452ec4f987af8081e SHA512 0369f3de41131f9ea8fa6577a5fc992f62c16f3a995017fe1becf65bdbe6c9676f02a99d11e706ae9afc63dc2202a850543d69fd3bc2cd4d4d9545c73432375b
-EBUILD dbus-1.12.22.ebuild 7542 BLAKE2B 8d7de8f0ef34cc158618fcd43f42bcb296b0ef2939ec5b39dadd2f79001e2ebe5a9b6169adb08fd66f6e1a128a86cc0c3e9e48726352e9bea4c36e0ca786ebc0 SHA512 17770a75450c4b9514657799a44d49f887982008945da2ceaab6c7efdb71ca583ecd24dbb1ddd776343491661e9aabcc4fcc0db6956218972c908b243235d689
+EBUILD dbus-1.12.22.ebuild 7654 BLAKE2B ac43f49c5079ed47a73c4447738b90ca9b5fa8f62a891e7724892ae195cfe24212fbe58949d747c9a7c28dfd0d2713ef08ec8eefb73eb8aa7c77c16820a2cdd0 SHA512 eeac6c8ad9a7e1da9c3603d4ea9a205b2fef70a8484258b349fa3a502e8f6f7a955149e0a251aa3486166d989ed8da7acf8e6e99d0e19113ed326256d92eb42e
+EBUILD dbus-1.14.0.ebuild 7862 BLAKE2B a2e4d2adc0b5d4a6d766091be9ce2bf8ccef55a689055b5c6187368fa0161674d813313f6c3ff35f36aa7f7917ddbf5dc20b66204844515cb7908b5244c01b20 SHA512 bbb4bd2d2844f60bb1492777c691b1010bd95e3401587faba07e18d004a282a818b70efd744fd86cf51a72035de402bc9d2be9f49deb1e93aa8f71ef08106c3c
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.12.22.ebuild b/sys-apps/dbus/dbus-1.12.22.ebuild
index 7427d268d82c..f4d09190728e 100644
--- a/sys-apps/dbus/dbus-1.12.22.ebuild
+++ b/sys-apps/dbus/dbus-1.12.22.ebuild
@@ -60,8 +60,10 @@ DOC_CONTENTS="
 TBD="${WORKDIR}/${P}-tests-build"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+	"${FILESDIR}/dbus-enable-elogind.patch"
+	"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+
+	"${FILESDIR}/dbus-1.12.22-check-fd.patch"
 )
 
 pkg_setup() {
@@ -205,6 +207,9 @@ multilib_src_compile() {
 }
 
 src_test() {
+	# https://bugs.gentoo.org/836560
+	addwrite /proc/self/oom_score_adj
+
 	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
 }
 
diff --git a/sys-apps/dbus/dbus-1.14.0.ebuild b/sys-apps/dbus/dbus-1.14.0.ebuild
new file mode 100644
index 000000000000..07da8e03b737
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.14.0.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+# At least at the moment, while a CMake port exists, it's not recommended
+# for distributions.
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+	acct-user/messagebus
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+	>=dev-libs/expat-2.1.0
+	elogind? ( sys-auth/elogind )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/expat
+	test? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.40:2
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-user/messagebus
+	selinux? ( sec-policy/selinux-dbus )
+	systemd? ( virtual/tmpfiles )
+"
+
+DOC_CONTENTS="
+	Some applications require a session bus in addition to the system
+	bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+	"${FILESDIR}/dbus-enable-elogind.patch"
+	"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+
+	"${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
+	"${FILESDIR}/dbus-1.12.22-check-fd.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~EPOLL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# fix standards conflict, due to gcc being c99 by default nowadays
+		sed -i \
+			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+			configure.ac || die
+	fi
+
+	# required for bug #263909, cross-compile so don't remove eautoreconf
+	eautoreconf
+}
+
+src_configure() {
+	local rundir=$(usex kernel_linux /run /var/run)
+
+	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+		> "${T}"/dbus.initd || die
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local docconf myconf testconf
+
+	# so we can get backtraces from apps
+	case ${CHOST} in
+		*-mingw*)
+			# error: unrecognized command line option '-rdynamic', bug #488036
+			;;
+		*)
+			append-flags -rdynamic
+			;;
+	esac
+
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_enable static-libs static)
+		$(use_enable debug verbose-mode)
+		--disable-asserts
+		--disable-checks
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		--disable-apparmor
+		$(use_enable kernel_linux inotify)
+		--disable-kqueue
+		$(use_enable elogind)
+		$(use_enable systemd)
+		$(use_enable systemd user-session)
+		--disable-embedded-tests
+		--disable-modular-tests
+		$(use_enable debug stats)
+		--with-session-socket-dir="${EPREFIX}"/tmp
+		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--with-dbus-user=messagebus
+		$(use_with X x)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=(
+			--enable-launchd
+			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		docconf=(
+			--enable-xml-docs
+			$(use_enable doc doxygen-docs)
+		)
+	else
+		docconf=(
+			--disable-xml-docs
+			--disable-doxygen-docs
+		)
+		myconf+=(
+			--disable-daemon
+			--disable-selinux
+			--disable-libaudit
+			--disable-elogind
+			--disable-systemd
+			--without-x
+		)
+	fi
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+	if multilib_is_native_abi && use test; then
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		testconf=(
+			$(use_enable test asserts)
+			$(use_enable test checks)
+			$(use_enable test embedded-tests)
+			$(use_enable test stats)
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+		)
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		# After the compile, it uses a selinuxfs interface to
+		# check if the SELinux policy has the right support
+		use selinux && addwrite /selinux/access
+
+		einfo "Running make in ${BUILD_DIR}"
+		emake
+
+		if use test; then
+			einfo "Running make in ${TBD}"
+			emake -C "${TBD}"
+		fi
+	else
+		emake -C dbus libdbus-1.la
+	fi
+}
+
+src_test() {
+	# https://bugs.gentoo.org/836560
+	addwrite /proc/self/oom_score_adj
+
+	# DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
+	# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
+	DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C dbus \
+			install-libLTLIBRARIES install-dbusincludeHEADERS \
+			install-nodist_dbusarchincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	newinitd "${T}"/dbus.initd dbus
+
+	if use X; then
+		# dbus X session script (bug #77504)
+		# turns out to only work for GDM (and startx). has been merged into
+		# other desktop (kdm and such scripts)
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/80-dbus
+	fi
+
+	# Needs to exist for dbus sessions to launch
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/{session,system}.d
+	# machine-id symlink from pkg_postinst()
+	keepdir /var/lib/dbus
+	# Let the init script create the /var/run/dbus directory
+	rm -rf "${ED}"/var/run
+
+	# bug #761763
+	rm -rf "${ED}"/usr/lib/sysusers.d
+
+	dodoc AUTHORS NEWS README doc/TODO
+	readme.gentoo_create_doc
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if use systemd; then
+		tmpfiles_process dbus.conf
+	fi
+
+	# Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
+	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+	# dependencies with hardcoded paths (although the known ones got fixed already)
+	# TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local plist="org.freedesktop.dbus-session.plist"
+		elog
+		elog
+		elog "For MacOS/Darwin we now ship launchd support for dbus."
+		elog "This enables autolaunch of dbus at session login and makes"
+		elog "dbus usable under MacOS/Darwin."
+		elog
+		elog "The launchd plist file ${plist} has been"
+		elog "installed in ${EPREFIX}/Library/LaunchAgents."
+		elog "For it to be used, you will have to do all of the following:"
+		elog " + cd ~/Library/LaunchAgents"
+		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+		elog " + logout and log back in"
+		elog
+		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+		elog "specified and refused to start otherwise, then export the"
+		elog "the following to your environment:"
+		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+	fi
+}
diff --git a/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch b/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch
new file mode 100644
index 000000000000..9038411bb13b
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch
@@ -0,0 +1,33 @@
+From 769a0462befb9829594a76e675526aba8579317e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 27 Mar 2022 15:09:48 -0400
+Subject: [PATCH] sysdeps-unix: check fd before calling
+ _dbus_fd_set_close_on_exec()
+
+If /proc/self/oom_score_adj does not exist, fd will invalid (-1).
+Attempting to set the CLOEXEC flag will obviously fail, and we lose the
+original errno value from open().
+
+Bug: https://bugs.gentoo.org/834725
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ dbus/dbus-sysdeps-util-unix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
+index 314ce64b..8f079cbf 100644
+--- a/dbus/dbus-sysdeps-util-unix.c
++++ b/dbus/dbus-sysdeps-util-unix.c
+@@ -1633,7 +1633,8 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
+   if (fd < 0)
+     {
+       fd = open ("/proc/self/oom_score_adj", O_RDWR);
+-      _dbus_fd_set_close_on_exec (fd);
++      if (fd >= 0)
++        _dbus_fd_set_close_on_exec (fd);
+     }
+ 
+   if (fd >= 0)
+-- 
+GitLab
+
diff --git a/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch b/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch
new file mode 100644
index 000000000000..d9eb2a611bfd
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch
@@ -0,0 +1,147 @@
+https://gitlab.freedesktop.org/dbus/dbus/-/commit/7d462fe93844df711ff8433ad798b54e57f8609d.patch
+(dropped NEWS to avoid conflicts with more patches in future)
+
+From fdbb32bd1f3c972d3d5fd3998930749206a1095a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 15:56:30 +0100
+Subject: [PATCH 1/6] build: Treat --with-x[=yes] the same as --with-x=auto
+
+Previously, --with-x would disable the check for X11 libraries, which
+was not intended.
+
+(cherry picked from commit 99cc28e0eb1a37233c0f7d3595175d1f331550e7)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1115,7 +1115,7 @@ if test "x$dbus_win" = xyes; then
+ 
+     enable_x11_autolaunch=no
+     have_x11=no
+-else if test "x$with_x" = xauto; then
++else if test "x$with_x" != xno; then
+     PKG_CHECK_MODULES([X], [x11],
+             [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
+             [ have_x11=no ])
+GitLab
+From 5f2577aea3c5291dbb97e77c7384924851b30102 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:01:29 +0100
+Subject: [PATCH 2/6] Move DBUS_X_* definitions into PKG_CHECK_MODULES block
+
+(cherry picked from commit 51e468d828785cbc7060678f6f257723ba11cd10)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1117,15 +1117,15 @@ if test "x$dbus_win" = xyes; then
+     have_x11=no
+ else if test "x$with_x" != xno; then
+     PKG_CHECK_MODULES([X], [x11],
+-            [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
++            [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
++	     have_x11=yes
++	     DBUS_X_LIBS="$X_LIBS"
++	     DBUS_X_CFLAGS="$X_CFLAGS"
++            ],
+             [ have_x11=no ])
+ 
+     if test "x$have_x11" = xno; then
+         AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
+-    else
+-        have_x11=yes
+-        DBUS_X_LIBS="$X_LIBS"
+-        DBUS_X_CFLAGS="$X_CFLAGS"
+     fi
+ else
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+GitLab
+From 5dad12f34c54e2359adfe8e7f122681df1d24bcb Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:05:52 +0100
+Subject: [PATCH 3/6] Emit an error when --with-x was given but no X11 libs
+ were found
+
+(cherry picked from commit 17c88a894499da64460a0ef76db1d8b88ceb9eeb)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1121,12 +1121,13 @@ else if test "x$with_x" != xno; then
+ 	     have_x11=yes
+ 	     DBUS_X_LIBS="$X_LIBS"
+ 	     DBUS_X_CFLAGS="$X_CFLAGS"
+-            ],
+-            [ have_x11=no ])
+-
+-    if test "x$have_x11" = xno; then
+-        AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
+-    fi
++            ], [
++             AS_IF([test "x$with_x" = xyes],
++                [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])],
++                [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])]
++             )
++             have_x11=no
++            ])
+ else
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+       AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
+GitLab
+From e03554eb0bf2731e39c06191403f7544df9bb307 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:08:06 +0100
+Subject: [PATCH 4/6] Add have_x11=no if --without-x was given to make later
+ checks happy
+
+(cherry picked from commit bf3cb42c6db1f4479467d66a111b08a98afef31b)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1129,6 +1129,7 @@ else if test "x$with_x" != xno; then
+              have_x11=no
+             ])
+ else
++    have_x11=no
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+       AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
+     ])
+GitLab
+From 62361f47f9da2346a9ff9a8c4b4bd4a288dc44d5 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 1 Mar 2022 16:11:05 +0100
+Subject: [PATCH 5/6] Convert "if" calls to AS_IF macro for the block that
+ handles X11
+
+(cherry picked from commit c71f013a64cd7f6de4c9cf3cf3b236239d713eb1)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1108,14 +1108,14 @@ AC_ARG_ENABLE([x11-autolaunch],
+   AS_HELP_STRING([--enable-x11-autolaunch], [build with X11 auto-launch support]),
+   [], [enable_x11_autolaunch=auto])
+ 
+-if test "x$dbus_win" = xyes; then
+-    if test "x$enable_x11_autolaunch" = xyes; then
++AS_IF([test "x$dbus_win" = xyes], [
++    AS_IF([test "x$enable_x11_autolaunch" = xyes], [
+         AC_MSG_ERROR([X11 auto-launch is not supported on Windows])
+-    fi
++    ])
+ 
+     enable_x11_autolaunch=no
+     have_x11=no
+-else if test "x$with_x" != xno; then
++], [test "x$with_x" != xno], [
+     PKG_CHECK_MODULES([X], [x11],
+             [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
+ 	     have_x11=yes
+@@ -1128,13 +1128,12 @@ else if test "x$with_x" != xno; then
+              )
+              have_x11=no
+             ])
+-else
++], [
+     have_x11=no
+     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
+       AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
+     ])
+-fi
+-fi
++])
+ 
+ if test "x$enable_x11_autolaunch,$have_x11" = xyes,no; then
+     AC_MSG_ERROR([X11 auto-launch requires X headers/libraries])
+GitLab