diff options
Diffstat (limited to 'dev-libs/libgee')
| -rw-r--r-- | dev-libs/libgee/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/libgee/files/libgee-0.20.6-c99-2.patch | 55 | ||||
| -rw-r--r-- | dev-libs/libgee/files/libgee-0.20.6-c99.patch | 43 | ||||
| -rw-r--r-- | dev-libs/libgee/libgee-0.20.6-r1.ebuild | 40 |
4 files changed, 141 insertions, 0 deletions
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest index f510ad9a31f5..dc5c922ad149 100644 --- a/dev-libs/libgee/Manifest +++ b/dev-libs/libgee/Manifest @@ -1,3 +1,6 @@ +AUX libgee-0.20.6-c99-2.patch 1678 BLAKE2B c330cfeb42663f26160ec73e3a75b1789335b1e3f4b83f6220677ac812df0748daea9d5c5f86f9db82ea8eaee67d3bdaa7bd741ec21fdd01807a0946aa787fa5 SHA512 65dd3ecdd5b72813c421e96a5ce448ac451175cadef2db6708ee7b0ebedab2a725c2d57f9822d3644893a87856aa45d7b119b8e02ef9eef20dcd5ae31cc76646 +AUX libgee-0.20.6-c99.patch 1427 BLAKE2B b817ccdcd0e49f45c652b2ab6ccdb70992b9e50cb4d3340007b15acc50ef7ff32e2304f294afc64fde47689b35464a603d90bf1f3f561b46070078d51c5cda48 SHA512 83c898d6ece8cbb9d8cbb22a71ef97b15abf31f87fbf8be81f4d0b9ef9ebad6f581abcfa34f6270354c2151f1bfed1c183dc1353d1e00d3e8a7d9d124b85a40d DIST libgee-0.20.6.tar.xz 690436 BLAKE2B cdb88719e0e1bceccefd6a824823e6e514bf1f4d6b8cf5330d6d83f781649312b23554c7dfc4a6b4eeb3bbcd81ca42843666d596b85634ff95fc90e90fea44bd SHA512 05176b221274b2a0512b018b93ae730ca750482bbc7a4951376eb868c0a388950371e80a438b5af792ebe4a64b6a38e0c94ca52ebd0fc4539f0fe233e0be5903 +EBUILD libgee-0.20.6-r1.ebuild 975 BLAKE2B 53c3e781a0fd8d37979124a5959d7823f185e447606d83454fe3db72e35f8234fac0bfe8741892349a126328ac6a384d6062911741282135b3589f0b2c3160f8 SHA512 96f2868e1040a90fc681dcd383b2383efc8e301b34153cb0135433ea18a58be1e49c9b6437c0d5e9fee8be6633979bd4321dbb5e0d803ba9025b06bafaa777dd EBUILD libgee-0.20.6.ebuild 698 BLAKE2B fd01d8294672ad071b8e5326656e88ea084faf92387ee4166a4b2397cd09d555ee2ec29c301a287ae90658c4dc49d91032d3a67aa02cf5dd376ee4316d2abbf0 SHA512 b428084d36a3d9d8e3908183f6fa1fcadee8f46b3162f8a5162f3358d4fc7716d5fb816ee882dc9e59bf0f01659c541b5201149e7aab6b9241d7db20f883bd04 MISC metadata.xml 347 BLAKE2B c0d6f55760dc3a10dca3c4d56e1833da7bb94a048d5f1c44c4275685b441eeea003e0a858a0544d720b165e8ed0c9162dffe205b9a526b40fb428caa275899ad SHA512 93d4276fb984fb4bfd9959ceb26b88acaffdec1da9e8c4b6fe62a0c5abbfb89b1707de6d392e026d23846feb17147d3ca6baaa336cd3127747c92d778467120f diff --git a/dev-libs/libgee/files/libgee-0.20.6-c99-2.patch b/dev-libs/libgee/files/libgee-0.20.6-c99-2.patch new file mode 100644 index 000000000000..3c55704739e3 --- /dev/null +++ b/dev-libs/libgee/files/libgee-0.20.6-c99-2.patch @@ -0,0 +1,55 @@ +https://bugs.gentoo.org/894376 +https://gitlab.gnome.org/GNOME/libgee/-/commit/2f0bbe8987e5eb1390b23ac531c971b202c2ef77 + +From 2f0bbe8987e5eb1390b23ac531c971b202c2ef77 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Thu, 13 Apr 2023 23:43:03 +0200 +Subject: [PATCH] Implementations of "G List.get()" should use non-nullable + return as defined + +--- a/gee/abstractlist.vala ++++ b/gee/abstractlist.vala +@@ -39,7 +39,7 @@ public abstract class Gee.AbstractList<G> : Gee.AbstractCollection<G>, List<G> { + /** + * {@inheritDoc} + */ +- public abstract new G? get (int index); ++ public abstract new G get (int index); + + /** + * {@inheritDoc} +--- a/gee/concurrentlist.vala ++++ b/gee/concurrentlist.vala +@@ -170,7 +170,7 @@ public class Gee.ConcurrentList<G> : AbstractList<G> { + /** + * {@inheritDoc} + */ +- public override G? get (int index) { ++ public override G get (int index) { + HazardPointer.Context ctx = new HazardPointer.Context (); + Utils.Misc.unused (ctx); + assert (index >= 0); +--- a/gee/readonlylist.vala ++++ b/gee/readonlylist.vala +@@ -74,7 +74,7 @@ internal class Gee.ReadOnlyList<G> : Gee.ReadOnlyCollection<G>, List<G> { + /** + * {@inheritDoc} + */ +- public new G? get (int index) { ++ public new G get (int index) { + return ((Gee.List<G>) _collection).get (index); + } + +--- a/gee/unrolledlinkedlist.vala ++++ b/gee/unrolledlinkedlist.vala +@@ -158,7 +158,7 @@ public class Gee.UnrolledLinkedList<G> : AbstractBidirList<G>, Queue<G>, Deque<G + return new Iterator<G> (this); + } + +- public override G? get (int index) { ++ public override G get (int index) { + assert (index >= 0); + assert (index < this._size); + +-- +GitLab diff --git a/dev-libs/libgee/files/libgee-0.20.6-c99.patch b/dev-libs/libgee/files/libgee-0.20.6-c99.patch new file mode 100644 index 000000000000..99275ff821d7 --- /dev/null +++ b/dev-libs/libgee/files/libgee-0.20.6-c99.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/894376 +https://gitlab.gnome.org/GNOME/libgee/-/commit/b33a6627f4fc96938b6015e05849867c472160a8 + +From b33a6627f4fc96938b6015e05849867c472160a8 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sat, 8 Apr 2023 22:39:35 +0200 +Subject: [PATCH] Add more missing generic type arguments + +--- a/gee/hashmap.vala ++++ b/gee/hashmap.vala +@@ -253,7 +253,7 @@ public class Gee.HashMap<K,V> : Gee.AbstractMap<K,V> { + for (int i = 0; i < _array_size; i++) { + Node<K,V> node = (owned) _nodes[i]; + while (node != null) { +- Node next = (owned) node.next; ++ Node<K,V> next = (owned) node.next; + node.key = null; + node.value = null; + node = (owned) next; +--- a/gee/hashset.vala ++++ b/gee/hashset.vala +@@ -210,7 +210,7 @@ public class Gee.HashSet<G> : AbstractSet<G> { + for (int i = 0; i < _array_size; i++) { + Node<G> node = (owned) _nodes[i]; + while (node != null) { +- Node next = (owned) node.next; ++ Node<G> next = (owned) node.next; + node.key = null; + node = (owned) next; + } +--- a/gee/linkedlist.vala ++++ b/gee/linkedlist.vala +@@ -233,7 +233,7 @@ public class Gee.LinkedList<G> : AbstractBidirList<G>, Queue<G>, Deque<G> { + n.next.prev = n; + this._head = (owned)n; + } else { +- weak Node prev = this._head; ++ weak Node<G> prev = this._head; + for (int i = 0; i < index - 1; i++) { + prev = prev.next; + } +-- +GitLab diff --git a/dev-libs/libgee/libgee-0.20.6-r1.ebuild b/dev-libs/libgee/libgee-0.20.6-r1.ebuild new file mode 100644 index 000000000000..3c469a418ef2 --- /dev/null +++ b/dev-libs/libgee/libgee-0.20.6-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 vala + +DESCRIPTION="GObject-based interfaces and classes for commonly used data structures" +HOMEPAGE="https://wiki.gnome.org/Projects/Libgee" + +LICENSE="LGPL-2.1+" +SLOT="0.8/2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux" +IUSE="+introspection" + +# FIXME: add doc support, requires valadoc +RDEPEND=" + >=dev-libs/glib-2.36:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/libgee-0.20.6-c99.patch + "${FILESDIR}"/libgee-0.20.6-c99-2.patch +) + +src_prepare() { + vala_setup + gnome2_src_prepare +} + +src_configure() { + # Commented out VALAC="$(type -P false)" for c99 patches + # We can drop all the Vala wiring and use the shipped files once + # a new release is made. + gnome2_src_configure \ + $(use_enable introspection) +} |