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 DA74B158094 for ; Mon, 29 Aug 2022 23:51:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10EFEE0893; Mon, 29 Aug 2022 23:51:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EFAA9E0893 for ; Mon, 29 Aug 2022 23:51:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 03D1A33BE4E for ; Mon, 29 Aug 2022 23:51:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A01CD4 for ; Mon, 29 Aug 2022 23:51:33 +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: <1661816888.351a580acab57f68f1f9773ecd8f06115615400c.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/, dev-util/devhelp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/devhelp/Manifest dev-util/devhelp/devhelp-41.3.ebuild dev-util/devhelp/files/41.3-webkitgtk40.patch X-VCS-Directories: dev-util/devhelp/files/ dev-util/devhelp/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 351a580acab57f68f1f9773ecd8f06115615400c X-VCS-Branch: master Date: Mon, 29 Aug 2022 23:51:33 +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: 42b39221-d3e7-47f1-91f2-50da63403fbb X-Archives-Hash: f554922f694c6265e8d816bcc0d318dd commit: 351a580acab57f68f1f9773ecd8f06115615400c Author: Matt Turner gentoo org> AuthorDate: Mon Aug 29 16:42:20 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Aug 29 23:48:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351a580a dev-util/devhelp: Version bump to 41.3 Signed-off-by: Matt Turner gentoo.org> dev-util/devhelp/Manifest | 1 + dev-util/devhelp/devhelp-41.3.ebuild | 83 +++++++++++++++++++++++++++ dev-util/devhelp/files/41.3-webkitgtk40.patch | 34 +++++++++++ 3 files changed, 118 insertions(+) diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest index 9e1facd9d301..98bd8fd423b8 100644 --- a/dev-util/devhelp/Manifest +++ b/dev-util/devhelp/Manifest @@ -1 +1,2 @@ DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98 +DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d diff --git a/dev-util/devhelp/devhelp-41.3.ebuild b/dev-util/devhelp/devhelp-41.3.ebuild new file mode 100644 index 000000000000..b9eb3583a6e9 --- /dev/null +++ b/dev-util/devhelp/devhelp-41.3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) + +inherit gnome.org gnome2-utils meson python-single-r1 xdg + +DESCRIPTION="An API documentation browser for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp" + +LICENSE="GPL-3+ CC-BY-SA-4.0" +SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version) +KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86" +IUSE="+gedit gtk-doc +introspection" +REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )" + +DEPEND=" + >=dev-libs/glib-2.64:2 + >=x11-libs/gtk+-3.22:3[introspection?] + >=net-libs/webkit-gtk-2.26:4[introspection?] + gnome-base/gsettings-desktop-schemas + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND} + gedit? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) +" +# libxml2 required for glib-compile-resources +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2:2 + dev-util/glib-utils + dev-util/itstool + gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/41.2-optional-introspection.patch + "${FILESDIR}"/${PV}-webkitgtk40.patch +) + +pkg_setup() { + use gedit && python-single-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + -Dflatpak_build=false + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + -Dplugin_emacs=true + $(meson_use gedit plugin_gedit) + -Dplugin_vim=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die + fi + use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/dev-util/devhelp/files/41.3-webkitgtk40.patch b/dev-util/devhelp/files/41.3-webkitgtk40.patch new file mode 100644 index 000000000000..bd798e8ce7cf --- /dev/null +++ b/dev-util/devhelp/files/41.3-webkitgtk40.patch @@ -0,0 +1,34 @@ +From bdb13ad7f18c90d6409da713ac49dc3995d2dfe2 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Sun, 3 Oct 2021 23:52:27 +0300 +Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1 + +That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out, +so it wouldn't be picked up automagically once it's added or comes from some +overlay. + +This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca. +--- + meson.build | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 307a351a..64dc385a 100644 +--- a/meson.build ++++ b/meson.build +@@ -46,12 +46,8 @@ lt_revision = 3 + lt_age = 0 + LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age) + +-webkit_dep = dependency('webkit2gtk-4.1', required : false) +-webkit_abi = '4.1' +-if not webkit_dep.found() + webkit_abi = '4.0' + webkit_dep = dependency('webkit2gtk-4.0') +-endif + + LIBDEVHELP_PUBLIC_DEPS = [ + dependency('gio-2.0', version: '>= 2.64'), +-- +2.35.1 +