From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-util/gnome-builder/Manifest | 7 +- .../gnome-builder/files/3.34.1-optional-vala.patch | 42 ----- .../gnome-builder/files/libgit2-1.0-compat.patch | 26 --- .../gnome-builder/gnome-builder-3.34.1-r1.ebuild | 193 --------------------- dev-util/gnome-builder/metadata.xml | 1 - 5 files changed, 1 insertion(+), 268 deletions(-) delete mode 100644 dev-util/gnome-builder/files/3.34.1-optional-vala.patch delete mode 100644 dev-util/gnome-builder/files/libgit2-1.0-compat.patch delete mode 100644 dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild (limited to 'dev-util/gnome-builder') diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index 3527b789dcf2..560e5e3cd346 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,8 +1,3 @@ -AUX 3.34.1-optional-vala.patch 1249 BLAKE2B dcec506c976b6438cec14d941b911cdc11fe0941c4a1a1590e6069fc42dcf12d6e76fedcc0b356e2ac6e5f4558851bb041fa3de4b54d7d9161cf2232965ead21 SHA512 e037dddb89330807c48228600d43ef34569e9fbfbb4b75b9ca2561d7d5ee25d1953ea94afb85ee3555eeefdd3105cd402c2b231584ae241ba661ca0ced28c046 -AUX libgit2-1.0-compat.patch 968 BLAKE2B c17cfba66245c6dd15973a094a89b5fe23493e2f83521c80c214b0ca9edde99fe8982ff73cc779de07b8a4fd548c8a85ca7570d2828299cf7b1e9e599ff9c5cf SHA512 da367d649bf14e1a4b8d0d59e446e6198939fc25f49484eb05d0f9195cd1136d098d581781e872e80f385996a7b043fd5756fea12fd24a931bece04b8ba3698a -DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f1dc209ac22db790a29d724dad20e337fe1962f3d407b59e7f976f1e88277833849c962a470346bb5a308e39b637e6e9ca1dc2c2a SHA512 a114346b093976db227087743a7bbe2ca9523b64a67c95729bfeb7c3c346b3bfb4d02f5e11d36bbbaf506bc7a7f140883bdea7c78407243287bc400dfda43b57 -DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2 -EBUILD gnome-builder-3.34.1-r1.ebuild 7373 BLAKE2B 92642b4c86bb5eb125ce98e2e1e0ebd88e899fd8190de1ead83f1407a78baedbbd7c99978b34e0e6cf4b070dd5a06c5e0488c0a1b2142aae8ec955ab7268f284 SHA512 c56c98b53de6d4de9e3100caf907d0d72df9c8ed4df585578713c69c8cae66eb323b4fc92fc2339d41df5dfacb71eed476494c66a288d317a28b4f66963e28e0 EBUILD gnome-builder-3.36.1.ebuild 6736 BLAKE2B 5d431790f425c8030785833770b60e374a80faf3e9c11c3a7ec5874c66bc5701820d430af57bd43f3335d87bfa1d2417a1402f6639376462342f2d5de1124050 SHA512 91ff5b073bca65e41dc5834b1363bec51c1217d9432c4f05f16990852673d1da36de188758a0115446e43114c5c6cd089a7f28beb8cabd7d893122a657029fc6 -MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987 +MISC metadata.xml 976 BLAKE2B 088592bf7fc4c650b17862e771d3283aced4d7a5003f66938dd5830c4a8b88884fb46362e50745b09f9903347dad3233b1ba8339bdaa66c7ea9f70024071a3b8 SHA512 136ec6b271c0084e86f8b7e309f46cd89d382e96d815269f50f0dae33795084d17790daf360fb760a17a2d4885a4a5aae5f8563449160ebec49bf4c9f69438a8 diff --git a/dev-util/gnome-builder/files/3.34.1-optional-vala.patch b/dev-util/gnome-builder/files/3.34.1-optional-vala.patch deleted file mode 100644 index 6116de17267d..000000000000 --- a/dev-util/gnome-builder/files/3.34.1-optional-vala.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 84249e315c4a95b3ef9421dbf8492e10422e40d9 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Thu, 12 Mar 2020 13:28:38 +0200 -Subject: [PATCH] build: Make vapi generation optional - ---- - meson_options.txt | 1 + - src/meson.build | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/meson_options.txt b/meson_options.txt -index 8984e9f69..27f9a368b 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,7 @@ option('channel', - - option('help', type: 'boolean', value: false) - option('docs', type: 'boolean', value: false) -+option('vapi', type: 'boolean') - - option('network_tests', type: 'boolean', value: true, description: 'Allow networking in unit-tests') - -diff --git a/src/meson.build b/src/meson.build -index 113a142ad..b0510270b 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -134,6 +134,7 @@ libide_gir = gnome.generate_gir(gnome_builder, - extra_args: gnome_builder_gir_extra_args, - ) - -+if get_option('vapi') - configure_file( - input: 'libide.deps', - output: 'libide-' + libide_api_version + '.deps', -@@ -165,3 +166,4 @@ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version, - - # Must be after vapi generation - subdir('plugins/vala-pack') -+endif --- -2.20.1 - diff --git a/dev-util/gnome-builder/files/libgit2-1.0-compat.patch b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch deleted file mode 100644 index 3e857eaac933..000000000000 --- a/dev-util/gnome-builder/files/libgit2-1.0-compat.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 582bf0281358437cc35d96d363f0af81a1b21068 Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Tue, 3 Mar 2020 13:17:31 +0100 -Subject: [PATCH] plugins/git: Fix compatibility with libgit2 0.99.x - -Signed-off-by: Igor Raits ---- - src/plugins/git/daemon/ipc-git-repository-impl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c -index abcca5476..f2631945d 100644 ---- a/src/plugins/git/daemon/ipc-git-repository-impl.c -+++ b/src/plugins/git/daemon/ipc-git-repository-impl.c -@@ -34,7 +34,7 @@ - #include "ipc-git-types.h" - #include "ipc-git-util.h" - --#if LIBGIT2_SOVERSION >= 28 -+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) - G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) - #else - G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free) --- -2.26.2 - diff --git a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild deleted file mode 100644 index 93fea980b04c..000000000000 --- a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -VALA_MIN_API_VERSION="0.36" -DISABLE_AUTOFORMATTING=1 -FORCE_PRINT_ELOG=1 - -inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg - -DESCRIPTION="An IDE for writing GNOME-based software" -HOMEPAGE="https://wiki.gnome.org/Apps/Builder" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -# FIXME: Review licenses at some point -LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test vala" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. -# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. -# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path. -# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of -# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small -# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. - -# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled -# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? -# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 - -# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build -RDEPEND=" - >=dev-libs/libdazzle-3.33.90[introspection,vala?] - >=dev-libs/glib-2.61.2:2 - >=x11-libs/gtk+-3.22.26:3[introspection] - >=x11-libs/gtksourceview-4.0.0:4[introspection] - >=dev-libs/json-glib-1.2.0 - >=dev-libs/jsonrpc-glib-3.19.91[vala?] - >=x11-libs/pango-1.38.0 - >=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}] - >=dev-libs/template-glib-3.28.0[introspection,vala?] - >=x11-libs/vte-0.40.2:2.91[introspection,vala?] - >=net-libs/webkit-gtk-2.12.0:4=[introspection] - >=dev-libs/libxml2-2.9.0 - git? ( dev-libs/libgit2[ssh,threads] - >=dev-libs/libgit2-glib-0.28.0.1[ssh] - ) - dev-libs/libpcre:3 - dev-libs/libpcre2 - - >=dev-libs/gobject-introspection-1.54.0:= - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - clang? ( sys-devel/clang:= ) - devhelp? ( >=dev-util/devhelp-3.25.1:= ) - glade? ( >=dev-util/glade-3.22.0:3.10= ) - spell? ( >=app-text/gspell-1.8:0= - app-text/enchant:2 ) - >=dev-util/sysprof-capture-3.33.1:3 - sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] ) - vala? ( - dev-lang/vala:= - $(vala_depend) - ) -" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_ -# usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against -DEPEND="${RDEPEND}" -# TODO: runtime ctags path finding.. - -# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional -# appstream-glib needed for validation with appstream-util with FEATURES=test -BDEPEND=" - doc? ( dev-python/sphinx - dev-python/sphinx_rtd_theme ) - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - test? ( - dev-libs/appstream-glib - sys-apps/dbus ) - dev-util/desktop-file-utils - dev-util/glib-utils - >=dev-util/meson-0.49.2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide -extra capabilities beyond these expressed via USE flags. Some of these -that are currently available with packages include: - -* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier - plugin out of the box functionality. -* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for - C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic - highlighting and symbol resolving support. -* dev-python/jedi and dev-python/lxml for more accurate Python - autocompletion support. -* dev-util/valgrind for integration with valgrind. -* dev-util/meson for integration with the Meson build system. -* dev-util/cargo for integration with the Rust Cargo build system. -* dev-util/cmake for integration with the CMake build system. -* net-libs/nodejs[npm] for integration with the NPM package system. -' -# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important -# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) -# jhbuild support -# rust language server via rls; Go via go-langserver -# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template -# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE - -PATCHES=( - "${WORKDIR}/patches" # gnome-builder-3-34 branch 2020-01-22 (commit bf485934b37) + cherry-picked meson link_whole fixes - "${FILESDIR}"/${PV}-optional-vala.patch - "${FILESDIR}"/libgit2-1.0-compat.patch -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - python-single-r1_pkg_setup - use clang && llvm_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Dtracing=false - -Dprofiling=false # not passing -pg to CFLAGS - -Dfusermount_wrapper=false # meant for flatpak builds - -Dtcmalloc=false - -Dchannel=other - - $(meson_use vala vapi) # TODO: doesn't work anymore; crude patch included - $(meson_use doc help) - $(meson_use gtk-doc docs) - - -Dnetwork_tests=false - $(meson_use clang plugin_clang) - $(meson_use devhelp plugin_devhelp) - -Dplugin_deviced=false - -Dplugin_editorconfig=true # needs libpcre - -Dplugin_flatpak=false - $(meson_use git plugin_git) - $(meson_use glade plugin_glade) - -Dplugin_podman=false - $(meson_use spell plugin_spellcheck) - $(meson_use sysprof plugin_sysprof) - $(meson_use vala plugin_vala) - ) - meson_src_configure -} - -src_install() { - meson_src_install - python_optimize - if use doc; then - rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die - rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die - rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die - # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 - mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die - # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. - rmdir "${ED}"/usr/share/doc/gnome-builder/ || die - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} - -src_test() { - # FIXME: can't run meson_src_test together with virtx or dbus-run-session - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml index e1647c887759..21138d9f8fb7 100644 --- a/dev-util/gnome-builder/metadata.xml +++ b/dev-util/gnome-builder/metadata.xml @@ -12,6 +12,5 @@ (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter) Provide integration with dev-util/glade UI designer for Gtk Provide an integrated profiler via dev-util/sysprof - Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala -- cgit v1.2.3