[packages/libsoup] - updated to 2.68.0 - added ugly path-override patch to allow specifying runtime path of ntlm_auth n
qboosh
qboosh at pld-linux.org
Wed Sep 11 20:24:02 CEST 2019
commit 4d3f1f19ab75c5c9300a27e42fe1fe9bbd36db28
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 11 20:26:54 2019 +0200
- updated to 2.68.0
- added ugly path-override patch to allow specifying runtime path of ntlm_auth not existing at build time
libsoup-path-override.patch | 24 ++++++++++++++++++++++++
libsoup.spec | 15 ++++++++++-----
2 files changed, 34 insertions(+), 5 deletions(-)
---
diff --git a/libsoup.spec b/libsoup.spec
index 9168e84..3086214 100644
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -1,12 +1,13 @@
Summary: SOAP (Simple Object Access Protocol) implementation in C
Summary(pl.UTF-8): Implementacja w C SOAP (Simple Object Access Protocol)
Name: libsoup
-Version: 2.66.2
+Version: 2.68.0
Release: 1
License: LGPL v2+
Group: Libraries
-Source0: http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.66/%{name}-%{version}.tar.xz
-# Source0-md5: 66c2ae89d6031b01337d78a2c57c75d5
+Source0: http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.68/%{name}-%{version}.tar.xz
+# Source0-md5: be8181fc6c0e0f3a5f269eef7e40a351
+Patch0: %{name}-path-override.patch
URL: https://wiki.gnome.org/Projects/libsoup
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-tools
@@ -14,9 +15,10 @@ BuildRequires: glib2-devel >= 1:2.38.0
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk-doc >= 1.20
BuildRequires: heimdal-devel
+BuildRequires: libbrotli-devel
BuildRequires: libpsl-devel >= 0.20.0
BuildRequires: libxml2-devel >= 1:2.6.31
-BuildRequires: meson >= 0.48
+BuildRequires: meson >= 0.50
BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.736
@@ -24,6 +26,7 @@ BuildRequires: sqlite3-devel
BuildRequires: tar >= 1:1.22
BuildRequires: vala
BuildRequires: xz
+BuildRequires: zlib-devel
Requires: glib2 >= 1:2.38.0
Requires: libpsl >= 0.20.0
# for TLS support
@@ -141,11 +144,13 @@ API libsoup dla języka Vala.
%prep
%setup -q
+%patch0 -p1
%build
%meson build \
-Ddoc=true \
- -Dntlm=true \
+ -Dgtk_doc=true \
+ -Dntlm=enabled \
-Dntlm_auth=/usr/bin/ntlm_auth \
-Dtests=false \
-Dtls_check=false
diff --git a/libsoup-path-override.patch b/libsoup-path-override.patch
new file mode 100644
index 0000000..a0a1923
--- /dev/null
+++ b/libsoup-path-override.patch
@@ -0,0 +1,24 @@
+--- libsoup-2.68.0/meson.build.orig 2019-09-11 11:08:25.000000000 +0200
++++ libsoup-2.68.0/meson.build 2019-09-11 17:30:07.856616832 +0200
+@@ -311,11 +311,18 @@
+ ################
+ # NTLM not supported on Windows
+ if host_machine.system() != 'windows'
+- ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
++ ntlm_auth_path = get_option('ntlm_auth')
++ if ntlm_auth_path[0] == '/'
++ ntlm_auth_found = true
++ else
++ ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
++ ntlm_auth_found = ntlm_auth.found()
++ ntlm_auth_path = ntlm_auth.path()
++ endif
+
+- if ntlm_auth.found()
++ 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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsoup.git/commitdiff/4d3f1f19ab75c5c9300a27e42fe1fe9bbd36db28
More information about the pld-cvs-commit
mailing list