summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-08-24 12:47:51 +0300
committerMart Raudsepp <leio@gentoo.org>2019-08-24 12:49:59 +0300
commit749c26be5e5cf37aaaf445af0d174f8fc31f1a8c (patch)
treed3ffc554c9e3025c730c39d433e9316745861d27 /net-libs/libsoup
parentsys-devel/autogen: override *_cv_* fro corss-case, bug #425174 (diff)
downloadgentoo-749c26be5e5cf37aaaf445af0d174f8fc31f1a8c.tar.gz
gentoo-749c26be5e5cf37aaaf445af0d174f8fc31f1a8c.tar.bz2
gentoo-749c26be5e5cf37aaaf445af0d174f8fc31f1a8c.zip
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@gentoo.org>
Diffstat (limited to 'net-libs/libsoup')
-rw-r--r--net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch28
-rw-r--r--net-libs/libsoup/libsoup-2.66.2.ebuild1
2 files changed, 29 insertions, 0 deletions
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 000000000000..04c9cccfeec0
--- /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 <csaavedra@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 57963364f494..238bf9bb9666 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() {