Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libgee 0.20.8 #204515

Merged
merged 2 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/autobump.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1713,6 +1713,7 @@ libgedit-amtk
libgedit-gfls
libgedit-gtksourceview
libgedit-tepl
libgee
libgeotiff
libgetdata
libgit2
Expand Down
73 changes: 8 additions & 65 deletions Formula/lib/libgee.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
class Libgee < Formula
desc "Collection library providing GObject-based interfaces"
homepage "https://wiki.gnome.org/Projects/Libgee"
url "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.6.tar.xz"
sha256 "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d"
url "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.8.tar.xz"
sha256 "189815ac143d89867193b0c52b7dc31f3aa108a15f04d6b5dca2b6adfad0b0ee"
license "LGPL-2.1-or-later"

bottle do
rebuild 1
sha256 cellar: :any, arm64_sequoia: "2e94fefbe95465772e0676f4d0f65ae212867caeaf659921e069ae1f153e5c4e"
sha256 cellar: :any, arm64_sonoma: "0f3ac7bcee7e8a3ef342362cc6fb67c7f20f6e616ccaebe0b6d187069498f559"
sha256 cellar: :any, arm64_ventura: "648c253edc216944b0e678393a1376050dce9c2136a2e23543e0c2c399d9c27b"
sha256 cellar: :any, arm64_monterey: "4db78ce506f169e6cf5e958f3fe5b53b53cd8b89658b27177021d38446705ec1"
sha256 cellar: :any, sonoma: "81a4559f30db3797dc6f91af8e0cc639814ddbb36a625fdfcaad51de153a7990"
sha256 cellar: :any, ventura: "49e93aa588f553b9781e84a7e9e0e9fe2dcb511976218ef2385983da6e318d67"
sha256 cellar: :any, monterey: "1514560672301f3b58ea438cbe537af7e878b0def106674bee39f022902a2508"
sha256 cellar: :any_skip_relocation, x86_64_linux: "cfcece11cd71b887bf40f1ea11e69d2fdb14133ae914b1d67858213b6e49fe0c"
sha256 cellar: :any, arm64_sequoia: "f6f8a615e12ebbf0e2d1ef652b9d6118ce7090cf975e76c9199b80f2d54a0ee2"
sha256 cellar: :any, arm64_sonoma: "a74893c386bc3c98b3eca70f4698eac4fc16a7c7ce9621ecd9951881b52617b2"
sha256 cellar: :any, arm64_ventura: "9f59442b282ad4bc6857568f22fc866f04111dfa83f52a36fdff920b72404efd"
sha256 cellar: :any, sonoma: "54b304a5bb1c6cd0b4cf4ad92e33497616250375a1d199b056f712059484c8f8"
sha256 cellar: :any, ventura: "18ef7dfdbad016c9f6027374cb705a7e2195204d524cc42439d98855e24837f0"
sha256 cellar: :any_skip_relocation, x86_64_linux: "695ca3b94a6452ef5d365da12bcf3b9b12a3e80c298f5c6d032bd873926a9ef4"
end

depends_on "gobject-introspection" => :build
Expand All @@ -27,10 +24,6 @@ class Libgee < Formula
depends_on "gettext"
end

# incompatible function pointer types build patch
# upstream bug report, https://gitlab.gnome.org/GNOME/libgee/-/issues/47
patch :DATA

def install
# ensures that the gobject-introspection files remain within the keg
inreplace "gee/Makefile.in" do |s|
Expand Down Expand Up @@ -59,53 +52,3 @@ def install
system "./test"
end
end

__END__
diff --git a/gee/hashmap.c b/gee/hashmap.c
index a9aabdf..7e7e278 100644
--- a/gee/hashmap.c
+++ b/gee/hashmap.c
@@ -4086,7 +4086,7 @@ gee_hash_map_map_iterator_gee_map_iterator_interface_init (GeeMapIteratorIface *
iface->next = (gboolean (*) (GeeMapIterator*)) gee_hash_map_node_iterator_next;
iface->has_next = (gboolean (*) (GeeMapIterator*)) gee_hash_map_node_iterator_has_next;
iface->get_mutable = gee_hash_map_map_iterator_real_get_mutable;
- iface->get_read_only = gee_hash_map_map_iterator_real_get_read_only;
+ iface->get_read_only = (gboolean (*) (GeeMapIterator*)) gee_hash_map_map_iterator_real_get_read_only;
iface->get_valid = (gboolean (*) (GeeMapIterator *)) gee_hash_map_node_iterator_get_valid;
}

diff --git a/gee/treemap.c b/gee/treemap.c
index af3233b..40504b8 100644
--- a/gee/treemap.c
+++ b/gee/treemap.c
@@ -13955,7 +13955,7 @@ gee_tree_map_map_iterator_gee_map_iterator_interface_init (GeeMapIteratorIface *
iface->next = (gboolean (*) (GeeMapIterator*)) gee_tree_map_node_iterator_next;
iface->has_next = (gboolean (*) (GeeMapIterator*)) gee_tree_map_node_iterator_has_next;
iface->unset = (void (*) (GeeMapIterator*)) gee_tree_map_node_iterator_unset;
- iface->get_read_only = gee_tree_map_map_iterator_real_get_read_only;
+ iface->get_read_only = (gboolean (*) (GeeMapIterator*)) gee_tree_map_map_iterator_real_get_read_only;
iface->get_mutable = gee_tree_map_map_iterator_real_get_mutable;
iface->get_valid = (gboolean (*) (GeeMapIterator *)) gee_tree_map_node_iterator_get_valid;
}
@@ -14320,7 +14320,7 @@ gee_tree_map_sub_map_iterator_gee_map_iterator_interface_init (GeeMapIteratorIfa
iface->next = (gboolean (*) (GeeMapIterator*)) gee_tree_map_sub_node_iterator_next;
iface->has_next = (gboolean (*) (GeeMapIterator*)) gee_tree_map_sub_node_iterator_has_next;
iface->unset = (void (*) (GeeMapIterator*)) gee_tree_map_sub_node_iterator_unset;
- iface->get_read_only = gee_tree_map_sub_map_iterator_real_get_read_only;
+ iface->get_read_only = (gboolean (*) (GeeMapIterator*)) gee_tree_map_sub_map_iterator_real_get_read_only;
iface->get_mutable = gee_tree_map_sub_map_iterator_real_get_mutable;
iface->get_valid = (gboolean (*) (GeeMapIterator *)) gee_tree_map_sub_node_iterator_get_valid;
}
diff --git a/tests/testcase.c b/tests/testcase.c
index 18fdf82..9d6420e 100644
--- a/tests/testcase.c
+++ b/tests/testcase.c
@@ -278,7 +278,7 @@ gee_test_case_add_test (GeeTestCase* self,
_tmp3_ = self->priv->suite;
_tmp4_ = gee_test_case_adaptor_get_name (adaptor);
_tmp5_ = _tmp4_;
- _tmp6_ = g_test_create_case (_tmp5_, (gsize) 0, adaptor, _gee_test_case_adaptor_set_up_gtest_fixture_func, _gee_test_case_adaptor_run_gtest_fixture_func, _gee_test_case_adaptor_tear_down_gtest_fixture_func);
+ _tmp6_ = g_test_create_case (_tmp5_, (gsize) 0, adaptor, (GTestFixtureFunc *) _gee_test_case_adaptor_set_up_gtest_fixture_func, (GTestFixtureFunc *) _gee_test_case_adaptor_run_gtest_fixture_func, (GTestFixtureFunc *) _gee_test_case_adaptor_tear_down_gtest_fixture_func);
g_test_suite_add (_tmp3_, _tmp6_);
_gee_test_case_adaptor_unref0 (adaptor);
(test_target_destroy_notify == NULL) ? NULL : (test_target_destroy_notify (test_target), NULL);
Loading