Merge pull request #10434 from flyn-org/libsoup

libsoup: update to 2.68.2 and build with meson
This commit is contained in:
Rosen Penev 2019-11-04 17:31:07 -08:00 committed by GitHub
commit 20db00e01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions

View File

@ -6,24 +6,25 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libsoup PKG_NAME:=libsoup
PKG_VERSION:=2.65.1 PKG_VERSION:=2.68.2
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.65 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.68
PKG_HASH:=3f3718623338f1bd7d7899dae2bdb613348212d59999a27432120afc1435ff04 PKG_HASH:=51ad3001a946fe3bcf29b692dc9ffe05cdf702ea6ca0ee8c3099a99a2f4e3933
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:gnome:libsoup PKG_CPE_ID:=cpe:/a:gnome:libsoup
PKG_BUILD_DEPENDS:=intltool/host PKG_BUILD_DEPENDS:=meson/host glib2/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
define Package/libsoup define Package/libsoup
SECTION:=libs SECTION:=libs
@ -34,17 +35,16 @@ define Package/libsoup
DEPENDS:=+glib2 +libxml2 +libgnutls +libsqlite3 +libpsl $(ICONV_DEPENDS) $(INTL_DEPENDS) DEPENDS:=+glib2 +libxml2 +libgnutls +libsqlite3 +libpsl $(ICONV_DEPENDS) $(INTL_DEPENDS)
endef endef
CONFIGURE_ARGS += \ MESON_ARGS += \
--disable-debug \ -Dtests=false \
--disable-glibtest \ -Dinstalled_tests=false \
--disable-gtk-doc-html \ -Dgtk_doc=false \
--disable-introspection \ -Dintrospection=disabled \
--disable-more-warnings \ -Dtls_check=false \
--disable-vala \ -Dvapi=disabled \
--without-apache-httpd \ -Dgnome=false \
--without-gnome \ -Dgssapi=disabled \
--without-gssapi \ -Dntlm=disabled \
--without-ntlm-auth
define package/libsoup/decription define package/libsoup/decription
Libsoup is an HTTP library implementation in C Libsoup is an HTTP library implementation in C
@ -54,7 +54,7 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-2.4/libsoup} $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-2.4/libsoup}
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.{so*,la,a} \ $(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(INSTALL_DATA) \ $(INSTALL_DATA) \