From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/osinfo-db-tools/, sys-apps/osinfo-db-tools/files/
Date: Sun, 9 Oct 2022 23:25:41 +0000 (UTC) [thread overview]
Message-ID: <1665357937.fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca.mattst88@gentoo> (raw)
commit: fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 23:23:11 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 23:25:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2ea941
sys-apps/osinfo-db-tools: Add patch to force libsoup:2.4
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch | 16 ++++++++++++++++
sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild | 4 ++++
2 files changed, 20 insertions(+)
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}]" && \
next reply other threads:[~2022-10-09 23:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-09 23:25 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-03 14:08 [gentoo-commits] repo/gentoo:master commit in: sys-apps/osinfo-db-tools/, sys-apps/osinfo-db-tools/files/ Matt Turner
2023-10-04 16:50 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1665357937.fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca.mattst88@gentoo \
--to=mattst88@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox