From afdd716b1f0f4effa20fab2990b149068f311d00 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 16 Jan 2025 15:27:58 -0500 Subject: [PATCH] libgee 0.20.8 autobump: add libgee Signed-off-by: Rui Chen libgee: remove build patch Signed-off-by: Rui Chen --- .github/autobump.txt | 1 + Formula/lib/libgee.rb | 58 ++----------------------------------------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/.github/autobump.txt b/.github/autobump.txt index a89e851d47165..1b1c0b3145f76 100644 --- a/.github/autobump.txt +++ b/.github/autobump.txt @@ -1713,6 +1713,7 @@ libgedit-amtk libgedit-gfls libgedit-gtksourceview libgedit-tepl +libgee libgeotiff libgetdata libgit2 diff --git a/Formula/lib/libgee.rb b/Formula/lib/libgee.rb index 1ead02c3f7f25..a0359700c4ce5 100644 --- a/Formula/lib/libgee.rb +++ b/Formula/lib/libgee.rb @@ -1,8 +1,8 @@ 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 @@ -27,10 +27,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| @@ -59,53 +55,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);