From c41425018d5ec6539a82ab289c85f1bb5ae15c0c Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 12 Mar 2019 11:00:14 +0100 Subject: [PATCH] libsoup: update to 2.66.0. --- srcpkgs/libsoup/patches/fix-gir-cross.patch | 13 +++++++++++ srcpkgs/libsoup/template | 25 ++++++--------------- 2 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 srcpkgs/libsoup/patches/fix-gir-cross.patch diff --git a/srcpkgs/libsoup/patches/fix-gir-cross.patch b/srcpkgs/libsoup/patches/fix-gir-cross.patch new file mode 100644 index 00000000000..fbd01e72f50 --- /dev/null +++ b/srcpkgs/libsoup/patches/fix-gir-cross.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index a979362..9059918 100644 +--- meson.build ++++ meson.build +@@ -269,7 +269,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows' + # FIXME: once we start to require meson 0.49.0+ and gnome-introspection 1.58.1+ + # the we can enable the introspection even for the static build. See + # https://github.com/mesonbuild/meson/pull/4478. +-enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build() and not is_static_library ++enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not is_static_library + + ############ + # Vala API # diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index 73560da004f..282ab32eddd 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,13 +1,12 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.64.2 -revision=2 -build_style=gnu-configure +version=2.66.0 +revision=1 +build_style=meson build_helper="gir" -configure_args="--disable-tls-check --disable-static - $(vopt_enable gir introspection) $(vopt_enable vala)" -hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config - $(vopt_if vala 'vala')" +configure_args="-Dgssapi=false -Dintrospection=$(vopt_if gir true false) + -Dvapi=$(vopt_if vala true false)" +hostmakedepends="gettext-devel glib-devel pkg-config $(vopt_if vala 'vala')" makedepends="libglib-devel libxml2-devel sqlite-devel libpsl-devel $(vopt_if vala 'vala-devel')" depends="glib-networking" @@ -17,7 +16,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/libsoup" changelog="https://raw.githubusercontent.com/GNOME/libsoup/gnome-3-28/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6 +checksum=51adc2ad6c8c670cf6339fcfa88190a3b58135a9cddd21f623a0f80fdb9c8921 # Package build options build_options="gir vala" @@ -28,15 +27,6 @@ case "$XBPS_TARGET_MACHINE" in *) build_options_default+=" gir vala" ;; esac -pre_configure() { - autoreconf -fi -} - -do_check() { - # /bin/sh: no: command not found - : -} - libsoup-devel_package() { depends="${makedepends} libsoup>=${version}_${revision}" short_desc+=" - development files" @@ -49,7 +39,6 @@ libsoup-devel_package() { vmove usr/share/vala fi vmove usr/include/libsoup-2.4 - vmove usr/share/gtk-doc vmove "usr/lib/libsoup-2.4.so" } }