commit: 983969ac58d81eedfe391b0e9d22513e45309ce5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Mar 22 10:28:16 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Mar 22 10:28:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=983969ac
dev-libs/libgit2-glib: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-libs/libgit2-glib/Manifest | 1 - .../files/libgit2-glib-1.2.0-libgit2-1.8.0.patch | 54 ----------------- dev-libs/libgit2-glib/libgit2-glib-1.2.0-r2.ebuild | 67 ---------------------- 3 files changed, 122 deletions(-) diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest index 6726af99f34b..94aa64e070c1 100644 --- a/dev-libs/libgit2-glib/Manifest +++ b/dev-libs/libgit2-glib/Manifest @@ -1,2 +1 @@ -DIST libgit2-glib-1.2.0.tar.xz 140576 BLAKE2B f49f808e7f97c45d7df49d780fdf036422b794e551f2e42d934b015fb227b1cb80d5067198a5ef7ac0539460bf6c0eab74025bcf367a0aebb43518448015e22e SHA512 37004e86c663ce5fe1bd54878b908575eb9195c1012e88e39c2efdb0b6cfa1de3d2ed9754cecc1b942d001698870025c87d95856f2a0a9f2d0dba1979b07b1f8 DIST libgit2-glib-1.2.1.tar.xz 141252 BLAKE2B 39348a9fe0de82f622748fb231e041610c49c8f62915fcbec0924f1c6c56b18933a9568be5040e393edf61fc826afc44e8bdbf53067e7bb03eb3b7853089f01b SHA512 024b8699f1b5d53e36bef7acb618bddf21f053cde795245b69b8ea2cf681435dc5353cee6e05b189c7fc6395ac3b897de58b671c3bfc0157e00cfbeed53a2261 diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-1.2.0-libgit2-1.8.0.patch b/dev-libs/libgit2-glib/files/libgit2-glib-1.2.0-libgit2-1.8.0.patch deleted file mode 100644 index 2c61e32fec8b..000000000000 --- a/dev-libs/libgit2-glib/files/libgit2-glib-1.2.0-libgit2-1.8.0.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 (modified to drop const changes, dep increase) - -From a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger <[email protected]> -Date: Fri, 5 Apr 2024 10:28:16 +0200 -Subject: [PATCH] build: Fix build against, and require, libgit2 1.8.0 - ---- - libgit2-glib/ggit-clone-options.c | 1 + - libgit2-glib/ggit-cred-ssh-interactive.c | 2 +- - libgit2-glib/ggit-remote-callbacks.h | 1 + - libgit2-glib/ggit-repository.c | 4 ++-- - libgit2-glib/ggit-types.h | 3 ++- - meson.build | 2 +- - 6 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c -index b47fdb1..30c7d86 100644 ---- a/libgit2-glib/ggit-clone-options.c -+++ b/libgit2-glib/ggit-clone-options.c -@@ -19,6 +19,7 @@ - */ - - #include <git2.h> -+#include <git2/sys/errors.h> - #include <gio/gio.h> - - #include "ggit-clone-options.h" -diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h -index 3005ff4..2340712 100644 ---- a/libgit2-glib/ggit-remote-callbacks.h -+++ b/libgit2-glib/ggit-remote-callbacks.h -@@ -24,6 +24,7 @@ - - #include <glib-object.h> - #include <git2.h> -+#include <git2/sys/errors.h> - #include <libgit2-glib/ggit-cred.h> - - G_BEGIN_DECLS -diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h -index 7e28975..2a2ed99 100644 ---- a/libgit2-glib/ggit-types.h -+++ b/libgit2-glib/ggit-types.h -@@ -355,7 +355,8 @@ typedef enum - GGIT_CONFIG_LEVEL_XDG = 3, - GGIT_CONFIG_LEVEL_GLOBAL = 4, - GGIT_CONFIG_LEVEL_LOCAL = 5, -- GGIT_CONFIG_LEVEL_APP = 6, -+ GGIT_CONFIG_LEVEL_WORKTREE = 6, -+ GGIT_CONFIG_LEVEL_APP = 7, - GGIT_CONFIG_LEVEL_HIGHEST = -1 - } GgitConfigLevel; - diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r2.ebuild deleted file mode 100644 index 05cb8b3582c7..000000000000 --- a/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r2.ebuild +++ /dev/null @@ -1,67 +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} ) - -inherit gnome.org meson python-r1 vala xdg - -DESCRIPTION="Git library for GLib" -HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"; - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" -IUSE="gtk-doc python +ssh +vala" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/gobject-introspection-1.54:= - >=dev-libs/glib-2.44.0:2 - <dev-libs/libgit2-1.9:=[ssh?] - >=dev-libs/libgit2-0.26.0 - python? ( - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig - gtk-doc? ( dev-util/gi-docgen ) - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.0-libgit2-1.8.0.patch -) - -src_prepare() { - default - - sed -i -e '/meson_python_compile.py/d' meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - -Dintrospection=true - -Dpython=false # we install python scripts manually - $(meson_use ssh) - $(meson_use vala vapi) - ) - - use vala && vala_setup - meson_src_configure -} - -src_install() { - meson_src_install - - if use python ; then - python_moduleinto gi.overrides - python_foreach_impl python_domodule libgit2-glib/Ggit.py - fi -}
