summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-10-09 19:23:11 -0400
committerMatt Turner <mattst88@gentoo.org>2022-10-09 19:25:37 -0400
commitfe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca (patch)
tree9974aeacf678256c621f7b1f8a144e7b8ba682b8 /sys-apps
parentmedia-video/ffmpeg: sync live (diff)
downloadgentoo-fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca.tar.gz
gentoo-fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca.tar.bz2
gentoo-fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca.zip
sys-apps/osinfo-db-tools: Add patch to force libsoup:2.4
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch16
-rw-r--r--sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild4
2 files changed, 20 insertions, 0 deletions
diff --git a/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
new file mode 100644
index 000000000000..a59e451baed9
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
@@ -0,0 +1,16 @@
+diff --git a/meson.build b/meson.build
+index 1cc5ff5..72b18a8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -58,11 +58,7 @@ gobject_dep = dependency('gobject-2.0', version: glib_version_info)
+ # everything else
+ json_glib_dep = dependency('json-glib-1.0')
+ libarchive_dep = dependency('libarchive', version: '>= 3.0.0')
+-libsoup_dep = dependency('libsoup-3.0', required: false)
+-# fallback to libsoup2
+-if not libsoup_dep.found()
+ libsoup_dep = dependency('libsoup-2.4')
+-endif
+ libxml_dep = dependency('libxml-2.0', version: '>= 2.6.0')
+
+ # common dependencies
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
index a202146e59fb..ab5d9f49f3fe 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-use-libsoup-2.4.patch
+)
+
python_check_deps() {
use test && \
has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \