* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2-glib/, dev-libs/libgit2-glib/files/
@ 2022-02-10 12:02 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-02-10 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 90f5cd3e91638639625327d5299f464bce86b05d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 11:59:21 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 11:59:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f5cd3e
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-0.99.0.1-vapilink.patch | 26 ---------
.../libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild | 64 ----------------------
3 files changed, 91 deletions(-)
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 99cf22959a87..358ae576cfbf 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,2 +1 @@
-DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
DIST libgit2-glib-1.0.0.1.tar.xz 141664 BLAKE2B a99ad6db55d0d4bee4d7d96b92e92d12712843e41e25e5ab57f5722926fe3e95109a33654d0ab94b7f919bd5d51a0b159dcae720eee763200c964d0327b8a37d SHA512 8e156791783f79d585fa83267a5e14a4a93324fcca75e836478ddd5b5c53d9e827b07a3738c67116478435613639aab0992f32413b9a4de5fc4ff641dd042e80
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
deleted file mode 100644
index a1838b403ab8..000000000000
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7f63349fd0405439532f2ff0896a3697c73ccaaf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 27 Feb 2020 15:20:20 +0100
-Subject: [PATCH] Fix meson_vapi_link.py to respect DESTDIR
-
-Fixes #5
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6d314b5..3a423b3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -135,7 +135,7 @@ if enable_vapi
- assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
- assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
-
-- meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
-+ meson.add_install_script('meson_vapi_link.py', get_option('datadir'))
- endif
-
- # Check for libgit2 ssh support
---
-2.25.1
-
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
deleted file mode 100644
index 24d9151a5225..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-
-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 ~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-0.26.0:0=[ssh?]
- python? (
- ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.1.2 )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/libgit2-glib-0.99.0.1-vapilink.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- use vala && vala_src_prepare
-}
-
-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)
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2-glib/, dev-libs/libgit2-glib/files/
@ 2025-03-22 10:30 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2025-03-22 10:30 UTC (permalink / raw
To: gentoo-commits
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 <dimstar@opensuse.org>
-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-22 10:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-10 12:02 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2-glib/, dev-libs/libgit2-glib/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2025-03-22 10:30 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox