From 048bd060badd229e3bb596029874760a86d27060 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 30 Aug 2022 04:47:47 +0100 Subject: gentoo auto-resync : 30:08:2022 - 04:47:47 --- dev-util/devhelp/Manifest | 3 + dev-util/devhelp/devhelp-41.3.ebuild | 83 +++++++++++++++++++++++++++ dev-util/devhelp/files/41.3-webkitgtk40.patch | 34 +++++++++++ 3 files changed, 120 insertions(+) create mode 100644 dev-util/devhelp/devhelp-41.3.ebuild create mode 100644 dev-util/devhelp/files/41.3-webkitgtk40.patch (limited to 'dev-util/devhelp') diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest index 1334fb46070c..9625321a39e6 100644 --- a/dev-util/devhelp/Manifest +++ b/dev-util/devhelp/Manifest @@ -1,6 +1,9 @@ AUX 41.2-meson-0.61.patch 1775 BLAKE2B b169bd8ea9d84c074426219fcf9b2a37557490c1dc3a2e647016b6c46d2ecbc02000f9595da9375cf9a4b00d22c95ad831ef72fceb3192030bcefcdc073afe8c SHA512 50500f5ddaf5eafb1299f24d1b1dba4b0808c9a140f1d7c0748cc73d8da25e0a444bcd1a1293c331158a3f0f96af1ab9cb27c37498437f0bdbffb191d93777ac AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7 AUX 41.2-webkitgtk40.patch 1174 BLAKE2B 9c93f1d8b214f8569f560de51d3e8f308e2ecb4dd00f8dc1e4daef5eef87a785289c1ab53b94de0e8e75493015fa13669c1a7b0cdfe7750617275fa13e830a47 SHA512 22b45421fe5e0e312cff0128f98fce32f76a15b5316ca8a4065db3a300dc0e12e04ac2a0a6c47e47ca7ff49c4a4e0c2e0a4accd10981f05eb6bf312860da0138 +AUX 41.3-webkitgtk40.patch 1005 BLAKE2B 59b4d5d197be0837f166ddebbaa63abd235934398b6df3c7a715ce05a13c006e20fe83ab91604ac2fce2a737e46812011f8dac7158b2b77cf1f85742a949ca17 SHA512 8afaea3f0ae6ebb64b5ea4518f091aee6fa90f63badbcfaef5d06d411300d93027c8e64ce3f3e4fcee7e7a31c53627afeaf0ce1c83797fd348163277a88726c5 DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98 +DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d EBUILD devhelp-41.2.ebuild 1987 BLAKE2B 6a1fce0b8bf95a811b8e19133779ba29ec708f9f19c7da726c6a4eaa75b300d8d1a885de8b7a01cfb7507f7684325200b435210e88656de508089f4a1e2a1017 SHA512 223d44651c3e98b1837e4012ad4bec4144d440e780b9cdb548e96656934b1cea06808aa0902d2aa37379e66c9485fa9d999f53c4c1c0cee8d94b1144fae9f0fa +EBUILD devhelp-41.3.ebuild 1949 BLAKE2B 3f7b01682a51ad0bb559c9fc9bfbb1b313a710ab1a8808dc3f9a62ac478e1d07b728817944d9dfdcfc0654316ae0a17432f098510ff89171345105a3edfa1507 SHA512 494515f891dc4c2d12e6c76e73262ac7216252dc64def2220879048eeb727d71ac6b2cd2147a45f8905959fa6772fe28de5ae96e96149269a38f1034557f9b87 MISC metadata.xml 338 BLAKE2B 50e6d39aa8a020fad15ddf7fe529f56c440696730b7400135d5ce97694d15feb64a1bd02bb156b21faf7e6fb1772e10f5c90ddaf0cf62dd19bbe8cf8af8462fa SHA512 5a00a79928fadab11128ec6d73fa4f119c9a93b69ddc0ac4832d94a1d72b6e1eb1e5c128839281c4ec272b5fe6ec6608ef1b344d6a7f8b46ea59989bca5dc8a6 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 + -- cgit v1.2.3