Skip to content

Commit

Permalink
libsoup: update to 2.66.2.
Browse files Browse the repository at this point in the history
Switch to meson since autotools build system was removed.

Changes in libsoup from 2.66.1 to 2.66.2:

	* Make gettext optional (might not be available in Windows)
	  [Seungha Yang]

	* MSVC: set encoding to UTF-8 to avoid errors [Seungha Yang]

	* MinGW tests build fix [Tomas Popela]

	* Check for TLS support only when external glib dependency is available
	  [Seungha Yang]

Changes in libsoup from 2.66.0 to 2.66.1:

        * Fix dylib versioning in MacOS [Tom Schoonjans]

        * Visual Studio build fixes [Chun-wei Fan]

        * MinGW build fixes [Руслан Ижбулатов]

        * Meson build system improvements [Claudio Saavedra, Jakub Adam]

        * Fix random CI failures due to parallel apache tests [Claudio Saavedra]

        * Code cleanups [Claudio Saavedra]

Changes in libsoup from 2.65.92 to 2.66.0:

        * Fix lookup for libxml2 on Visual Studio builds [Chun-wei Fan]

Changes in libsoup from 2.65.91 to 2.65.92:

        * SoupConnection: Fix check for remote disconnectin idle state
          [Michael Catanzaro, #134]

        * Code cleanups and warnings fixed [Michael Catanzaro]

        * Remove stale .pc.in files [Claudio Saavedra, #137]

        * Updated translations: Dutch

Changes in libsoup from 2.65.90 to 2.65.91:

	* Remove RFCs from sources [Tomas Popela, #133]

Changes in libsoup from 2.65.2 to 2.65.90:

        * Avoid using threads in SoupRequestFile asynchronous API
          [Ignacio Casal Quinteiro]

Changes in libsoup from 2.65.1 to 2.65.2:

	* Remove autotools build system and change to meson by default
          [#12, Tomas Popela]

	* Many fixes to Meson [Claudio Saavedra, Tomas Popela, Xavier
          Claessens]

	* Improvements to the continuous integration infrastructure
          [Xavier Claessens]

	* Make sure SoupSession features are not disposed until all
          pending messages are processed [#130, Claudio Saavedra]

	* Updated translations: Greek, Slovak, French.

Changes in libsoup from 2.64.0 to 2.65.1:

	* Added MTLMv2 responses support [Michal Hrubý]
	* Many fixes to the meson build system [Tomas Popela]
	* Remove Visual Studio project files [Chun-wei Fan]
	* Enable VAPI by default [#119, Jeremy Bicha]
	* New strict header field parameter parsing API [Claudio Saavedra]
	* Code cleanups [Claudio Saavedra]
	* Updated translations: Belarusian, Serbian
  • Loading branch information
0-wiz-0 committed Aug 16, 2019
1 parent b0080f0 commit 4c6381a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 126 deletions.
36 changes: 11 additions & 25 deletions net/libsoup/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.51 2019/04/03 00:32:59 ryoon Exp $
# $NetBSD: Makefile,v 1.52 2019/08/16 13:08:58 wiz Exp $

DISTNAME= libsoup-2.64.2
PKGREVISION= 3
DISTNAME= libsoup-2.66.2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
Expand All @@ -14,32 +13,18 @@ LICENSE= gnu-lgpl-v2
DEPENDS+= glib-networking-[0-9]*:../../net/glib-networking

USE_TOOLS+= pkg-config gmake intltool msgfmt
USE_LIBTOOL= yes
GNU_CONFIGURE= yes

# XXX work around botched gettext check (ignores libintl)
CONFIGURE_ENV+= DATADIRNAME=share
PKGCONFIG_OVERRIDE+= output/meson-private/libsoup-2.4.pc
PKGCONFIG_OVERRIDE+= output/meson-private/libsoup-gnome-2.4.pc
PKGCONFIG_OVERRIDE_STAGE=pre-install
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}

# XXX: disable Vala bindings otherwise the configure phase fails because is not
# XXX: able to find vapigen.
CONFIGURE_ARGS+= --enable-vala=no
CONFIGURE_ARGS+= --disable-tls-check
CONFIGURE_ARGS+= --with-apache-httpd=no
# disable vala detection
MESON_ARGS+= -Dvapi=false

PKGCONFIG_OVERRIDE+= libsoup-2.4.pc.in
PKGCONFIG_OVERRIDE+= libsoup-gnome-2.4.pc.in

TEST_TARGET= check

BUILDLINK_TRANSFORM+= rm:-Werror=missing-include-dirs

# gcc>=4.2 specific -Werror=XXX flags will be added unconditionally.
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-4.[01].*) || !empty(CC_VERSION:Mgcc-[1-3].*)
CONFIGURE_ARGS+= --disable-more-warnings
.endif

.if !empty(PKGSRC_COMPILER:Mclang)

_WRAP_EXTRA_ARGS.CC+= -Wno-error=format-nonliteral
CWRAPPERS_APPEND.cc+= -Wno-error=format-nonliteral
.endif
Expand All @@ -50,9 +35,10 @@ CWRAPPERS_APPEND.cc+= -Wno-error=format-nonliteral
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
BUILDLINK_DEPMETHOD.gobject-introspection+= build
BUILDLINK_DEPMETHOD.gobject-introspection= build
.include "../../devel/gobject-introspection/buildlink3.mk"
CONFIGURE_ARGS+= --enable-introspection
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../www/libpsl/buildlink3.mk"
.include "../../devel/py-meson/build.mk"
.include "../../mk/bsd.pkg.mk"
72 changes: 7 additions & 65 deletions net/libsoup/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.12 2018/04/27 14:24:26 wiz Exp $
@comment $NetBSD: PLIST,v 1.13 2019/08/16 13:08:58 wiz Exp $
include/libsoup-2.4/libsoup/soup-address.h
include/libsoup-2.4/libsoup/soup-auth-domain-basic.h
include/libsoup-2.4/libsoup/soup-auth-domain-digest.h
Expand Down Expand Up @@ -57,74 +57,16 @@ include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h
include/libsoup-gnome-2.4/libsoup/soup-gnome.h
lib/girepository-1.0/Soup-2.4.typelib
lib/girepository-1.0/SoupGNOME-2.4.typelib
lib/libsoup-2.4.la
lib/libsoup-gnome-2.4.la
lib/libsoup-2.4.so
lib/libsoup-2.4.so.1
lib/libsoup-2.4.so.1.8.0
lib/libsoup-gnome-2.4.so
lib/libsoup-gnome-2.4.so.1
lib/libsoup-gnome-2.4.so.1.8.0
lib/pkgconfig/libsoup-2.4.pc
lib/pkgconfig/libsoup-gnome-2.4.pc
share/gir-1.0/Soup-2.4.gir
share/gir-1.0/SoupGNOME-2.4.gir
share/gtk-doc/html/libsoup-2.4/SoupAddress.html
share/gtk-doc/html/libsoup-2.4/SoupAuth.html
share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html
share/gtk-doc/html/libsoup-2.4/SoupAuthDomainBasic.html
share/gtk-doc/html/libsoup-2.4/SoupAuthDomainDigest.html
share/gtk-doc/html/libsoup-2.4/SoupAuthManager.html
share/gtk-doc/html/libsoup-2.4/SoupCache.html
share/gtk-doc/html/libsoup-2.4/SoupContentDecoder.html
share/gtk-doc/html/libsoup-2.4/SoupContentSniffer.html
share/gtk-doc/html/libsoup-2.4/SoupCookie.html
share/gtk-doc/html/libsoup-2.4/SoupCookieJar.html
share/gtk-doc/html/libsoup-2.4/SoupCookieJarDB.html
share/gtk-doc/html/libsoup-2.4/SoupCookieJarText.html
share/gtk-doc/html/libsoup-2.4/SoupLogger.html
share/gtk-doc/html/libsoup-2.4/SoupMessage.html
share/gtk-doc/html/libsoup-2.4/SoupMessageBody.html
share/gtk-doc/html/libsoup-2.4/SoupMessageHeaders.html
share/gtk-doc/html/libsoup-2.4/SoupMultipart.html
share/gtk-doc/html/libsoup-2.4/SoupMultipartInputStream.html
share/gtk-doc/html/libsoup-2.4/SoupProxyResolverDefault.html
share/gtk-doc/html/libsoup-2.4/SoupRequest.html
share/gtk-doc/html/libsoup-2.4/SoupRequestData.html
share/gtk-doc/html/libsoup-2.4/SoupRequestFile.html
share/gtk-doc/html/libsoup-2.4/SoupRequestHTTP.html
share/gtk-doc/html/libsoup-2.4/SoupServer.html
share/gtk-doc/html/libsoup-2.4/SoupSession.html
share/gtk-doc/html/libsoup-2.4/SoupSessionAsync.html
share/gtk-doc/html/libsoup-2.4/SoupSessionFeature.html
share/gtk-doc/html/libsoup-2.4/SoupSessionSync.html
share/gtk-doc/html/libsoup-2.4/SoupSocket.html
share/gtk-doc/html/libsoup-2.4/SoupURI.html
share/gtk-doc/html/libsoup-2.4/annotation-glossary.html
share/gtk-doc/html/libsoup-2.4/ch01.html
share/gtk-doc/html/libsoup-2.4/ch02.html
share/gtk-doc/html/libsoup-2.4/ch03.html
share/gtk-doc/html/libsoup-2.4/ch04.html
share/gtk-doc/html/libsoup-2.4/ch05.html
share/gtk-doc/html/libsoup-2.4/home.png
share/gtk-doc/html/libsoup-2.4/index.html
share/gtk-doc/html/libsoup-2.4/ix01.html
share/gtk-doc/html/libsoup-2.4/left-insensitive.png
share/gtk-doc/html/libsoup-2.4/left.png
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-HTML-Form-Support.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-Soup-Miscellaneous-Utilities.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-SoupServer-deprecated-API.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-Top-Level-Domain-utils.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-Version-Information.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-WebSockets.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-XMLRPC-Support.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-soup-method.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4-soup-status.html
share/gtk-doc/html/libsoup-2.4/libsoup-2.4.devhelp2
share/gtk-doc/html/libsoup-2.4/libsoup-build-howto.html
share/gtk-doc/html/libsoup-2.4/libsoup-client-howto.html
share/gtk-doc/html/libsoup-2.4/libsoup-request-howto.html
share/gtk-doc/html/libsoup-2.4/libsoup-server-howto.html
share/gtk-doc/html/libsoup-2.4/libsoup-session-porting.html
share/gtk-doc/html/libsoup-2.4/right-insensitive.png
share/gtk-doc/html/libsoup-2.4/right.png
share/gtk-doc/html/libsoup-2.4/style.css
share/gtk-doc/html/libsoup-2.4/up-insensitive.png
share/gtk-doc/html/libsoup-2.4/up.png
share/locale/an/LC_MESSAGES/libsoup.mo
share/locale/as/LC_MESSAGES/libsoup.mo
share/locale/be/LC_MESSAGES/libsoup.mo
Expand Down
11 changes: 5 additions & 6 deletions net/libsoup/distinfo
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.21 2018/10/23 07:17:53 leot Exp $
$NetBSD: distinfo,v 1.22 2019/08/16 13:08:58 wiz Exp $

SHA1 (libsoup-2.64.2.tar.xz) = 286b2dc5e4396b6328870da761798e61701f901a
RMD160 (libsoup-2.64.2.tar.xz) = 12af987a048627f662788742ec3f66e3f8053348
SHA512 (libsoup-2.64.2.tar.xz) = c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
Size (libsoup-2.64.2.tar.xz) = 1793440 bytes
SHA1 (patch-tests_Makefile.in) = 7144b1b29fc35a950f2f0c3e2a1600483636a645
SHA1 (libsoup-2.66.2.tar.xz) = f549a0ab984895a11053505806068bbad22a1dfc
RMD160 (libsoup-2.66.2.tar.xz) = 787dc933e36ac75edb95438d47a4e495de5550ab
SHA512 (libsoup-2.66.2.tar.xz) = 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092
Size (libsoup-2.66.2.tar.xz) = 1446024 bytes
6 changes: 1 addition & 5 deletions net/libsoup/options.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.4 2016/05/03 11:37:39 prlw1 Exp $
# $NetBSD: options.mk,v 1.5 2019/08/16 13:08:58 wiz Exp $

PKG_OPTIONS_VAR= PKG_OPTIONS.libsoup
PKG_SUPPORTED_OPTIONS= gssapi
Expand All @@ -8,8 +8,4 @@ PKG_SUGGESTED_OPTIONS=

.if !empty(PKG_OPTIONS:Mgssapi)
. include "../../mk/krb5.buildlink3.mk"
CONFIGURE_ARGS+= --with-gssapi
CONFIGURE_ARGS+= --with-krb5-config=${KRB5_CONFIG}
.else
CONFIGURE_ARGS+= --without-gssapi
.endif
25 changes: 0 additions & 25 deletions net/libsoup/patches/patch-tests_Makefile.in

This file was deleted.

0 comments on commit 4c6381a

Please sign in to comment.