From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75204158094 for ; Sun, 9 Oct 2022 23:25:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 884D5E0831; Sun, 9 Oct 2022 23:25:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68FDBE0828 for ; Sun, 9 Oct 2022 23:25:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 771FC340FA5 for ; Sun, 9 Oct 2022 23:25:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E18FC523 for ; Sun, 9 Oct 2022 23:25:41 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1665357937.fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/osinfo-db-tools/, sys-apps/osinfo-db-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild X-VCS-Directories: sys-apps/osinfo-db-tools/ sys-apps/osinfo-db-tools/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca X-VCS-Branch: master Date: Sun, 9 Oct 2022 23:25:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b14c43f5-5867-423d-bde0-8f45bbf87169 X-Archives-Hash: e6ef2f24c5e85f3df6a69b52bc559636 commit: fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca Author: Matt Turner gentoo org> AuthorDate: Sun Oct 9 23:23:11 2022 +0000 Commit: Matt Turner gentoo 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 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}]" && \