Merge upstream/2.69.90 into tizen

Change-Id: Idf12fd1a95024d5d13a447d3a8ce6dd88f797207

diff --cc docs/reference/libsoup-2.4-sections.txt
Simple merge

diff --cc libsoup/soup-cache.c
index 682625e,5d48024..5d48024
mode 100755,100644..100755
--- 1/libsoup/soup-cache.c
--- 2/libsoup/soup-cache.c
+++ b/libsoup/soup-cache.c

diff --cc libsoup/soup-connection.c
index 5fb4d78,1b9a4fe..1b9a4fe
mode 100755,100644..100755
--- 1/libsoup/soup-connection.c
--- 2/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c

diff --cc libsoup/soup-connection.h
index fe817de,45e80b2..45e80b2
mode 100755,100644..100755
--- 1/libsoup/soup-connection.h
--- 2/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h

diff --cc libsoup/soup-content-sniffer.c
index 7573fde,967ec61..967ec61
mode 100755,100644..100755
--- 1/libsoup/soup-content-sniffer.c
--- 2/libsoup/soup-content-sniffer.c
+++ b/libsoup/soup-content-sniffer.c

diff --cc libsoup/soup-content-sniffer.h
index eb1e4bd,908e0ca..908e0ca
mode 100755,100644..100755
--- 1/libsoup/soup-content-sniffer.h
--- 2/libsoup/soup-content-sniffer.h
+++ b/libsoup/soup-content-sniffer.h

diff --cc libsoup/soup-cookie-jar-text.c
index 46e12e5,a187ced..a187ced
mode 100755,100644..100755
--- 1/libsoup/soup-cookie-jar-text.c
--- 2/libsoup/soup-cookie-jar-text.c
+++ b/libsoup/soup-cookie-jar-text.c

diff --cc libsoup/soup-cookie-jar.c
index 2369c8a,7feaff3..7feaff3
mode 100755,100644..100755
--- 1/libsoup/soup-cookie-jar.c
--- 2/libsoup/soup-cookie-jar.c
+++ b/libsoup/soup-cookie-jar.c

diff --cc libsoup/soup-message-private.h
index 71adac7,0c6f5d9..0c6f5d9
mode 100755,100644..100755
--- 1/libsoup/soup-message-private.h
--- 2/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h

diff --cc libsoup/soup-message.c
index e4d7847,519972a..519972a
mode 100755,100644..100755
--- 1/libsoup/soup-message.c
--- 2/libsoup/soup-message.c
+++ b/libsoup/soup-message.c

diff --cc libsoup/soup-session-private.h
index dc4d300,6247856..6247856
mode 100755,100644..100755
--- 1/libsoup/soup-session-private.h
--- 2/libsoup/soup-session-private.h
+++ b/libsoup/soup-session-private.h

diff --cc libsoup/soup-session.c
index ae340b9,5dcf1eb..5dcf1eb
mode 100755,100644..100755
--- 1/libsoup/soup-session.c
--- 2/libsoup/soup-session.c
+++ b/libsoup/soup-session.c

diff --cc libsoup/soup-session.h
index 24e90b2,46e4e15..46e4e15
mode 100755,100644..100755
--- 1/libsoup/soup-session.h
--- 2/libsoup/soup-session.h
+++ b/libsoup/soup-session.h

diff --cc libsoup/soup-socket.c
index 311c627,4cb69e0..4cb69e0
mode 100755,100644..100755
--- 1/libsoup/soup-socket.c
--- 2/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c

diff --cc libsoup/soup-socket.h
index 993d1c6,98d0693..98d0693
mode 100755,100644..100755
--- 1/libsoup/soup-socket.h
--- 2/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h

diff --cc packaging/libsoup.spec
index 74342aa,0000000..9220ea8
mode 100644,000000..100644
--- 1/packaging/libsoup.spec
--- /dev/null
+++ b/packaging/libsoup.spec
@@@ -1,134 -1,0 +1,127 @@@
- Version:        2.62.2
 +%bcond_with gnome
 +%bcond_with introspection
 +
 +Name:           libsoup
- chmod +x autogen.sh
- %autogen\
- %if %{with introspection}
-     --enable-introspection \
- %endif
- %if %{with gnome}
-     --with-gnome \
- %else
-     --without-gnome \
-     --disable-tls-check \
- %endif
-     --disable-static \
-     --enable-vala=no
- make %{?_smp_mflags}
++Version:        2.69.90
 +Release:        1
 +License:        LGPL-2.0+
 +Summary:        HTTP client/server library for GNOME
 +Url:            http://www.gnome.org
 +Group:          System/Libraries
 +Source:         http://download.gnome.org/sources/libsoup/2.62/%{name}-%{version}.tar.xz
 +Source99:       baselibs.conf
 +Source1001:     libsoup.manifest
 +Requires:       glib-networking
 +BuildRequires:  gettext-tools
 +BuildRequires:  glib-networking
 +%if %{with introspection}
 +BuildRequires:  gobject-introspection-devel
 +%endif
 +%if %{with gnome}
 +BuildRequires:  pkgconfig(gnome-keyring-1)
 +BuildRequires:  gnome-common
 +%endif
 +BuildRequires:  intltool >= 0.35.0
 +BuildRequires:  sqlite-devel
 +BuildRequires:  which
++BuildRequires:        meson
 +BuildRequires:  python3
 +BuildRequires:  pkgconfig(glib-2.0) >= 2.35.0
 +BuildRequires:  pkgconfig(libxml-2.0)
++BuildRequires:  pkgconfig(libpsl)
 +
 +%description
 +Libsoup is an HTTP client/server library for GNOME. It uses GObjects
 +and the glib main loop, to integrate well with GNOME applications.
 +
 +Features:
 +  * Both asynchronous (GMainLoop and callback-based) and synchronous APIs
 +  * Automatically caches connections
 +  * SSL Support using GnuTLS
 +  * Proxy support, including authentication and SSL tunneling
 +  * Client support for Digest, NTLM, and Basic authentication
 +  * Server support for Digest and Basic authentication
 +  * XML-RPC support
 +
 +%package -n typelib-Soup
 +Summary:        HTTP client/server library for GNOME -- Introspection bindings
 +Group:          System/Libraries
 +
 +%description -n typelib-Soup
 +Libsoup is an HTTP client/server library for GNOME. It uses GObjects
 +and the glib main loop, to integrate well with GNOME applications.
 +
 +This package provides the GObject Introspection bindings for libsoup.
 +
 +%package devel
 +Summary:        HTTP client/server library for GNOME - Development Files
 +Group:          Social & Content/GNOME
 +Requires:       %{name} = %{version}
 +%if %{with gnome}
 +Requires:       typelib-Soup = %{version}
 +%endif
 +
 +%description devel
 +Libsoup is an HTTP client/server library for GNOME. It uses GObjects
 +and the glib main loop, to integrate well with GNOME applications.
 +
 +Features:
 +  * Both asynchronous (GMainLoop and callback-based) and synchronous APIs
 +  * Automatically caches connections
 +  * SSL Support using GnuTLS
 +  * Proxy support, including authentication and SSL tunneling
 +  * Client support for Digest, NTLM, and Basic authentication
 +  * Server support for Digest and Basic authentication
 +  * XML-RPC support
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
- %make_install
++meson --prefix /usr/ --libdir %{_libdir} build \
++              -Dgnome=false \
++              -Dtls_check=false
++ninja -C build all
 +
 +%install
++export DESTDIR=%{buildroot}
++ninja -C build install
 +
 +%find_lang %{name}
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%lang_package
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license COPYING
 +%{_libdir}/*.so.*
 +
 +%if %{with introspection}
 +%files -n typelib-Soup
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_libdir}/girepository-1.0/Soup-2.4.typelib
 +%if %{with gnome}
 +%{_libdir}/girepository-1.0/SoupGNOME-2.4.typelib
 +%endif
 +%endif
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_includedir}/libsoup-2.4
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/*.pc
 +%if %{with introspection}
 +%{_datadir}/gir-1.0/Soup-2.4.gir
 +%if %{with gnome}
 +%{_datadir}/gir-1.0/SoupGNOME-2.4.gir
 +%{_includedir}/libsoup-gnome-2.4
 +%endif
 +%endif