From fd7bf06d88ac431e7d531701551815fd63c73963 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 May 2023 23:26:49 +0100 Subject: gentoo auto-resync : 03:05:2023 - 23:26:49 --- dev-util/Manifest.gz | Bin 68315 -> 68318 bytes dev-util/glade/Manifest | 2 + .../glade/files/glade-3.40.0-webkitgtk-4.1.patch | 21 +++++ dev-util/glade/glade-3.40.0-r1.ebuild | 87 +++++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 dev-util/glade/files/glade-3.40.0-webkitgtk-4.1.patch create mode 100644 dev-util/glade/glade-3.40.0-r1.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index a75de336609b..1113a313a583 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest index 330da2323f29..9cc74a66aa82 100644 --- a/dev-util/glade/Manifest +++ b/dev-util/glade/Manifest @@ -1,4 +1,6 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf +AUX glade-3.40.0-webkitgtk-4.1.patch 673 BLAKE2B 530d034a64b38684a48f292bc792ff4eaf4fa8e0e11708f0974678ad9b396cb9a5281dd9669ed08dd7aa33c4c5668d09ac3cba5b73a55df250b03da66c47d897 SHA512 e62966e164a0e452d2b2e403f17a8abf89aaa0d2e52b9f7f28eea16e105769d3b71a04faa56436e0203fb28e5529005fa001f1a1582a2d3d2d8b24114d9fc67d DIST glade-3.40.0.tar.xz 2654772 BLAKE2B 472dfd841e9501f7bbc96bde49ebe26dfd54193cd479658d042547eba5d1af196c0a06212ec5c894c53c12f3791967f6c77859f96802e3df5760b36c6c0c4af1 SHA512 6b018f882e9d155a4b2256c0b4c72743f971c8d730a53f16faa240d01e14051f5b6ce04e355dcc78e1679579fb091facaa06acdda6297c5b8efc642c42bb7b4e +EBUILD glade-3.40.0-r1.ebuild 2114 BLAKE2B 75e99e4f7b057f670e95b81faa8376b4f5a35bbd46871e799ff02c4c0cd9eb4a7343ffd036f2f1474f3ce29376d234985306c6853b5a4be315ba8ffe26d9e653 SHA512 20e2c34db11ed4106edf14cdd5c26cc80419dfd513648fd12dd16c2e0182cd890e47697821c04d2cafae895dca70a4b348e68555f74aaf3f4a418f98dd8eb9d6 EBUILD glade-3.40.0.ebuild 2004 BLAKE2B 3ff0d7da3c9f4200759f9285de049ed439ffef1925ec95e5ce8ee103a6d39979ed7e2b6ccfd1f948b14db2c3284f62b0575f85fd2058a0e565fdc487756cbb0a SHA512 9883eb00364c2159064fd12eb9df2cb332a57e37e30a870baee09bbc8e9a1afb7f69dc0a67c5eb7b4415283958d418d49d3e2d3b20bd93e3c35788daf0a6391f MISC metadata.xml 549 BLAKE2B 50f112215883d1628dadc355533b44b504e1e1a6d2cc7fb46f257aeb5c4b52589a1bcaa5b8500bd5f04f3b92ce0c256b8833d33052e150ce669df6db6108a5ce SHA512 7153d8384151784c266e74f700f3c2b58729dbf5f09cb78f9b488117558d4b732e78471d18d1739c7d94202e676c834c236ed69bf882093bae9dcaeca1e61a31 diff --git a/dev-util/glade/files/glade-3.40.0-webkitgtk-4.1.patch b/dev-util/glade/files/glade-3.40.0-webkitgtk-4.1.patch new file mode 100644 index 000000000000..508c6ad85885 --- /dev/null +++ b/dev-util/glade/files/glade-3.40.0-webkitgtk-4.1.patch @@ -0,0 +1,21 @@ +From: Jeremy Bicha +Date: Thu, 15 Sep 2022 08:04:05 -0400 +Subject: build: use webkitgtk 4.1 + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 187555f..3f156e3 100644 +--- a/meson.build ++++ b/meson.build +@@ -162,7 +162,7 @@ if have_python + endif + + # WebKit2GTK support +-webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>= 2.28.0', required: get_option('webkit2gtk')) ++webkit2gtk_dep = dependency('webkit2gtk-4.1', version: '>= 2.28.0', required: get_option('webkit2gtk')) + have_webkit2gtk = webkit2gtk_dep.found() + + # Check for GDK Quartz and MacOSX integration package diff --git a/dev-util/glade/glade-3.40.0-r1.ebuild b/dev-util/glade/glade-3.40.0-r1.ebuild new file mode 100644 index 000000000000..c7f4c73ee9b0 --- /dev/null +++ b/dev-util/glade/glade-3.40.0-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) + +inherit gnome2 python-single-r1 meson optfeature virtualx + +DESCRIPTION="A user interface designer for GTK+ and GNOME" +HOMEPAGE="https://glade.gnome.org https://gitlab.gnome.org/GNOME/glade" + +LICENSE="GPL-2+ FDL-1.1+" +SLOT="3.10/13" # subslot = suffix of libgladeui-2.so +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="gjs gtk-doc +introspection python webkit" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + dev-libs/atk[introspection?] + >=dev-libs/glib-2.53.2:2 + >=dev-libs/libxml2-2.4.0:2 + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2[introspection?] + >=x11-libs/gtk+-3.22.0:3[introspection?] + x11-libs/pango[introspection?] + introspection? ( >=dev-libs/gobject-introspection-1.32:= ) + gjs? ( >=dev-libs/gjs-1.64.0 ) + python? ( + ${PYTHON_DEPS} + x11-libs/gtk+:3[introspection] + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] + ') + ) + webkit? ( >=net-libs/webkit-gtk-2.12.0:4.1 ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.2 + ) + dev-libs/libxslt + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333 + +PATCHES=( + # To avoid file collison with other slots, rename help module. + # Prevent the UI from loading glade:3's gladeui devhelp documentation. + "${FILESDIR}"/${PN}-3.14.1-doc-version.patch + # https://gitlab.gnome.org/GNOME/glade/-/issues/555 + "${FILESDIR}"/${PN}-3.40.0-webkitgtk-4.1.patch +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + -Dgladeui=true + $(meson_feature gjs) + $(meson_feature python) + $(meson_feature webkit webkit2gtk) + + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + gnome2_pkg_postinst + + optfeature_header + optfeature "integration API documentation support" dev-util/devhelp +} -- cgit v1.2.3