commit: 749c26be5e5cf37aaaf445af0d174f8fc31f1a8c Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Aug 24 09:47:51 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Aug 24 09:49:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749c26be
net-libs/libsoup-2.66.2: fix build with USE=samba Closes: https://bugs.gentoo.org/692814 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../libsoup/files/2.66.2-meson-ntlm_auth-fix.patch | 28 ++++++++++++++++++++++ net-libs/libsoup/libsoup-2.66.2.ebuild | 1 + 2 files changed, 29 insertions(+) diff --git a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch new file mode 100644 index 00000000000..04c9cccfeec --- /dev/null +++ b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch @@ -0,0 +1,28 @@ +From ecd64363f82eb9d6cea07674f49c2d2869e5b62b Mon Sep 17 00:00:00 2001 +From: Claudio Saavedra <csaave...@igalia.com> +Date: Tue, 20 Aug 2019 16:04:06 +0300 +Subject: [PATCH] NTLM: Fix build with ntlm enabled + +Just realized that build with NTLM enabled was broken (!?) + +(cherry picked from commit bab0db142d508e92e72970db72cbbce3c13a526a) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f0e34cb0..346ed2fd 100644 +--- a/meson.build ++++ b/meson.build +@@ -271,7 +271,7 @@ if host_machine.system() != 'windows' + + if ntlm_auth.found() + add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c') +- add_project_arguments('-DNTLM_AUTH=' + ntlm_auth.path(), language : 'c') ++ add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c') + endif + endif + endif +-- +2.20.1 + diff --git a/net-libs/libsoup/libsoup-2.66.2.ebuild b/net-libs/libsoup/libsoup-2.66.2.ebuild index 57963364f49..238bf9bb966 100644 --- a/net-libs/libsoup/libsoup-2.66.2.ebuild +++ b/net-libs/libsoup/libsoup-2.66.2.ebuild @@ -49,6 +49,7 @@ PATCHES=( "${FILESDIR}"/disable-apache-tests.patch # Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2 "${FILESDIR}"/${PV}-vala-0.46-compat.patch + "${FILESDIR}"/${PV}-meson-ntlm_auth-fix.patch ) src_prepare() {
