From 9fe4353b46f298a65b2674e09a465b19bac1a4b5 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 3 Oct 2021 09:45:30 +0200
Subject: Fallback to libsoup2 for systems with glib-2.0 <2.66.0

This is the case on Ubuntu 20.04 for example.
---
 configure | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 3776bfa..bfb04b8 100755
--- a/configure
+++ b/configure
@@ -69,7 +69,7 @@ case "${WITH_WEBKITGTK}n" in
 		DEPS="${DEPS} webkit2gtk-4.0"
 	;;
 	n)
-		echo "warning: Packagers should specify the ABI version (4.0 or 4.1) in WITH_WEBKITGTK" >&2
+		echo "notice: Packagers should consider setting the ABI version (4.0 or 4.1) in WITH_WEBKITGTK" >&2
 		if pkg_config_check --atleast-version=2.32.0 webkit2gtk-4.1
 		then
 			DEPS="${DEPS} webkit2gtk-4.1"
@@ -84,6 +84,47 @@ case "${WITH_WEBKITGTK}n" in
 	;;
 esac
 
+case "${WITH_URI_PARSER}n" in
+	gurin)
+		echo "URI parser selected: GUri from glib-2.0"
+		pkg_config_check --atleast-version=2.66.0 glib-2.0 || exit 1
+		DEPS="${DEPS} glib-2.0"
+	;;
+	libsoup2n)
+		echo "URI parser selected: libsoup-2.4"
+		pkg_config_check libsoup-2.4 || exit 1
+		DEPS="${DEPS} libsoup-2.4"
+		CFLAGS="${CFLAGS} -DUSE_LIBSOUP2"
+
+		if echo "${DEPS}" | grep -q 'webkit2gtk-4.1'
+		then
+			echo 'warning: libsoup2 selected while WebKitGTK with libsoup3 API is used' >&2
+		fi
+	;;
+	n)
+		echo "notice: Packagers should consider setting the URI parsing library (guri or libsoup2) in WITH_URI_PARSER" >&2
+
+		if pkg_config_check --atleast-version=2.66.0 glib-2.0
+		then
+			echo "URI parser selected: GUri from glib-2.0"
+			DEPS="${DEPS} glib-2.0"
+		else
+			pkg_config_check libsoup-2.4 || exit 1
+			echo "URI parser selected: libsoup-2.4"
+			DEPS="${DEPS} libsoup-2.4"
+			CFLAGS="${CFLAGS} -DUSE_LIBSOUP2"
+
+			if echo "${DEPS}" | grep -q 'webkit2gtk-4.1'
+			then
+				echo 'warning: libsoup2 selected while WebKitGTK with libsoup3 API is used' >&2
+			fi
+		fi
+	;;
+	*)
+		echo "error: invalid uri provider in WITH_URI_PARSER environment variable, must be guri or libsoup2" >&2
+	;;
+esac
+
 get_cflags() { "${PKGCONFIG}" --cflags "${DEPS}"; }
 DEPS_cflags="$(get_cflags)"
 get_libs() { "${PKGCONFIG}" --libs "${DEPS}";  }
-- 
cgit v1.3.1-26-gb76a


From 1815d7a01c07f2cc69f406e343005e3e93c80123 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Mon, 1 Nov 2021 13:17:34 +0100
Subject: configure: Pick libsoup2 instead of GUri with webkit2gtk-4.0

As seen in the parent commit GUri seems rather unwieldy regarding memory management.

Related: https://queer.hacktivis.me/objects/cec7c4e8-6a58-4358-85bf-b66f9bb21a98
---
 configure | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index bfb04b8..7f52579 100755
--- a/configure
+++ b/configure
@@ -104,20 +104,16 @@ case "${WITH_URI_PARSER}n" in
 	n)
 		echo "notice: Packagers should consider setting the URI parsing library (guri or libsoup2) in WITH_URI_PARSER" >&2
 
-		if pkg_config_check --atleast-version=2.66.0 glib-2.0
+		if echo "${DEPS}" | grep -q 'webkit2gtk-4.0'
 		then
-			echo "URI parser selected: GUri from glib-2.0"
-			DEPS="${DEPS} glib-2.0"
-		else
 			pkg_config_check libsoup-2.4 || exit 1
 			echo "URI parser selected: libsoup-2.4"
 			DEPS="${DEPS} libsoup-2.4"
 			CFLAGS="${CFLAGS} -DUSE_LIBSOUP2"
-
-			if echo "${DEPS}" | grep -q 'webkit2gtk-4.1'
-			then
-				echo 'warning: libsoup2 selected while WebKitGTK with libsoup3 API is used' >&2
-			fi
+		else
+			pkg_config_check --atleast-version="${min_glib_guri}" glib-2.0 || exit 1
+			echo "URI parser selected: GUri from glib-2.0"
+			DEPS="${DEPS} glib-2.0"
 		fi
 	;;
 	*)
-- 
cgit v1.3.1-26-gb76a