[gentoo-commits] repo/gentoo:master commit in: dev-util/gnome-builder/, dev-util/gnome-builder/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/gnome-builder/, dev-util/gnome-builder/files/

[Mart Raudsepp]

commit:     6ba09a115d3664eceb82bf0c949dc43f2b750e86
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 09:21:03 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 09:21:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba09a11

dev-util/gnome-builder: fix compat with libgit2:0/1.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 .../gnome-builder/files/libgit2-1.0-compat.patch   | 26 ++++++++++++++++++++++
 .../gnome-builder/gnome-builder-3.34.1-r1.ebuild   |  1 +
 2 files changed, 27 insertions(+)

diff --git a/dev-util/gnome-builder/files/libgit2-1.0-compat.patch b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch
new file mode 100644
index 00000000000..3e857eaac93
--- /dev/null
+++ b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch
@@ -0,0 +1,26 @@
+From 582bf0281358437cc35d96d363f0af81a1b21068 Mon Sep 17 00:00:00 2001
+From: Igor Raits <i.gnatenko.brain@gmail.com>
+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 <i.gnatenko.brain@gmail.com>
+---
+ 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
index a46b8a4cacf..a7817290a9e 100644
--- a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
@@ -116,6 +116,7 @@ that are currently available with packages include:
 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() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/gnome-builder/, dev-util/gnome-builder/files/

[Pacho Ramos]

commit:     370bd730ce61d46d7672c08266ed928d34947aa0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 15:12:14 2025 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 16:51:18 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370bd730

dev-util/gnome-builder: drop 44.2-r1

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 dev-util/gnome-builder/Manifest                    |   1 -
 .../files/44.2-fix-gtk-4.12.5-build.patch          |  26 --
 .../gnome-builder/gnome-builder-44.2-r1.ebuild     | 288 ---------------------
 3 files changed, 315 deletions(-)

diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 2c6a1a52332c..cfd0e40f7c34 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090
 DIST gnome-builder-46.3.tar.xz 9102324 BLAKE2B 3c03eab7e60e4e8a4f10e165b5ae8bbc764fb102df3b594160def47720b94787f6b8d25479e0148c5369b7cf3256d5c8455cf54cf0f42c78424a5e1e17028682 SHA512 1d765f9a4da17d6c1cda688c0590d34b9fc8da8c2d427e4fde57e35b4b78b13905792da065d630d1b351d90ca25a276cc7a680c3b02fd9d5ba4c236a150325cc
 DIST gnome-builder-47.2.tar.xz 10652952 BLAKE2B 93356472ff321766dec00eb26f7f5e44e66f61661f5d5d67ace2290cf1e176925e05334769665ef381fd1469d8f04c297c01d97877357e349e4f5b5ee9f3f1c1 SHA512 fa26efcede1b44bf0a7e48dffb02fb80d11399386c2be65ac39207816191fe1c59900a1200c987a9077e64caf8a8ece60899b49019452caf66dc2076de75c5ea

diff --git a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch b/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch
deleted file mode 100644
index eccf90851fb7..000000000000
--- a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 43a7c586b7291b5cf82febdaa80b4fe4efea8f54 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Mon, 15 Jan 2024 11:54:38 -0800
-Subject: [PATCH] libide/tweaks: remove autoptr cleanup
-
-This is not needed now with recent GTK changes merged this morning.
----
- src/libide/tweaks/ide-tweaks-window.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/libide/tweaks/ide-tweaks-window.c b/src/libide/tweaks/ide-tweaks-window.c
-index f2553a396..dcb55bb35 100644
---- a/src/libide/tweaks/ide-tweaks-window.c
-+++ b/src/libide/tweaks/ide-tweaks-window.c
-@@ -32,8 +32,6 @@
- #include "ide-tweaks-panel-list-private.h"
- #include "ide-tweaks-window.h"
- 
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkStackPage, g_object_unref)
--
- struct _IdeTweaksWindow
- {
-   AdwWindow               parent_instance;
--- 
-2.43.0
-

diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
deleted file mode 100644
index 6471a24d65e3..000000000000
--- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
-
-# 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 ~arm64"
-IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	flatpak? ( git )
-"
-
-# 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 should 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.
-
-# 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
-
-# >=gtk-4.12.5 for relying on GtkStackPage autoptr cleanup added in that version
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/glib-2.75.0:2
-	>=gui-libs/gtk-4.12.5:4[introspection]
-	>=gui-libs/libadwaita-1.3.0:1
-	>=gui-libs/libpanel-1.1.2:1
-	>=gui-libs/gtksourceview-5.7.2:5[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.43.0:=
-	>=dev-libs/libdex-0.1.1:=
-	>=dev-libs/libpeas-1.34.0:0[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.36.1:=[introspection]
-	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
-	>=dev-libs/libxml2-2.9.0
-	webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] )
-	>=app-text/cmark-0.29.0:0=
-	d-spy? ( >=dev-debug/d-spy-1.4.0:1 )
-	app-text/editorconfig-core-c
-	flatpak? (
-		dev-util/ostree
-		>=net-libs/libsoup-3:3.0
-		>=sys-apps/flatpak-1.10.2
-	)
-	git? (
-		dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-1.1.0[ssh]
-	)
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( llvm-core/clang:= )
-	spell? (
-		app-text/enchant:2
-		dev-libs/icu:=
-	)
-	sysprof? (
-		>=dev-util/sysprof-capture-3.46.0:4
-		>=dev-util/sysprof-3.46.0:0/4
-	)
-"
-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? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.3
-	)
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus
-	)
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=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/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/python-lsp-server for more accurate Python
-  autocompletion support.
-* dev-debug/valgrind for integration with valgrind.
-* dev-build/meson for integration with the Meson build system.
-* dev-lang/rust{,-bin} for integration with the Rust Cargo build system.
-* dev-build/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# 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 support via rust-analyzer; 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
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-gtk-4.12.5-build.patch
-)
-
-llvm_check_deps() {
-	has_version "llvm-core/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fails with clang due to `environ` variable name shadowing unistd.h one
-	sed -i -e '/-Werror=shadow/d' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dchannel=other
-
-		-Ddevelopment=false
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dwith_safe_path=''
-		-Dgnome_sdk_version=master
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-		-Dnetwork_tests=false
-		-Dctags_path=''
-		$(meson_feature webkit)
-
-		-Dplugin_autotools=true
-		-Dplugin_bash_language_server=true
-		-Dplugin_blueprint=true
-		-Dplugin_buildstream=true
-		-Dplugin_c_pack=true
-		-Dplugin_cargo=true
-		$(meson_use clang plugin_clang)
-		$(meson_use clang plugin_clangd)
-		$(meson_use clang plugin_clang_format)
-		-Dplugin_cmake=true
-		-Dplugin_codesearch=true
-		-Dplugin_codeshot=true
-		-Dplugin_codespell=true
-		-Dplugin_code_index=true
-		-Dplugin_copyright=true
-		-Dplugin_ctags=true
-		-Dplugin_deviced=false # libdeviced not packaged?
-		$(meson_use d-spy plugin_dspy)
-		-Dplugin_dub=true
-		-Dplugin_editorconfig=true
-		-Dplugin_eslint=true
-		-Dplugin_file_search=true
-		$(meson_use flatpak plugin_flatpak)
-		-Dplugin_gdb=true
-		-Dplugin_gdiagnose=true
-		-Dplugin_gettext=true
-		$(meson_use git plugin_git)
-		-Dplugin_glsl_language_server=true
-		-Dplugin_golang=true
-		-Dplugin_gopls=true
-		-Dplugin_gradle=true
-		-Dplugin_grep=true
-		-Dplugin_hadolint=true
-		-Dplugin_html_completion=true
-		$(meson_use webkit plugin_html_preview)
-		-Dplugin_intelephense=true
-		-Dplugin_jdtls=true
-		-Dplugin_jedi_language_server=false
-		-Dplugin_jhbuild=true
-		-Dplugin_lua_language_server=true
-		-Dplugin_make=true
-		-Dplugin_make_templates=true
-		$(meson_use webkit plugin_markdown_preview)
-		$(meson_use webkit plugin_markdown_indenter)
-		-Dplugin_maven=true
-		-Dplugin_meson=true
-		-Dplugin_meson_templates=true
-		-Dplugin_modelines=true
-		-Dplugin_mono=true
-		-Dplugin_newcomers=true
-		-Dplugin_notification=true
-		-Dplugin_npm=true
-		-Dplugin_phpize=true
-		-Dplugin_podman=true
-		-Dplugin_pygi=true
-		-Dplugin_python_lsp_server=true
-		-Dplugin_qemu=true
-		-Dplugin_quick_highlight=true
-		-Dplugin_retab=true
-		-Dplugin_rstcheck=true
-		-Dplugin_rubocop=true
-		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
-		-Dplugin_serve_d=true
-		-Dplugin_shellcheck=true
-		-Dplugin_shellcmd=true
-		-Dplugin_sourcekit_lsp=true
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use webkit plugin_sphinx_preview)
-		-Dplugin_stylelint=true
-		-Dplugin_swift=true
-		-Dplugin_swiftformat=true
-		-Dplugin_swiftlint=true
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_todo=true
-		-Dplugin_ts_language_server=true
-		-Dplugin_update_manager=true
-		-Dplugin_valac=true
-		-Dplugin_vala_indenter=true
-		-Dplugin_vala_language_server=true
-		-Dplugin_valgrind=true
-		-Dplugin_waf=true
-		-Dplugin_words=true
-		-Dplugin_xml_pack=true
-		-Dplugin_zls=true
-	)
-	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
-		# 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
-
-	optfeature_header "Language support"
-	optfeature "Rust's Cargo build system" dev-lang/rust dev-lang/rust-bin
-	optfeature "CMake" dev-build/cmake
-	optfeature "Java Maven build system" dev-java/maven-bin
-	optfeature "Meson Build system" dev-build/meson
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}