From 8614273a0acc98240e9a52d966d19a79f614c636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Fri, 8 Jan 2021 15:35:19 +0100 Subject: groups/251.native_packages_lib.group: glib: bump to v2.56.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lucio Andrés Illanes Albornoz --- groups/251.native_packages_lib.group | 4 +- patches/glib-2.54.0.local.patch | 103 ----------------------------------- patches/glib-2.56.2.local.patch | 103 +++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 105 deletions(-) delete mode 100644 patches/glib-2.54.0.local.patch create mode 100644 patches/glib-2.56.2.local.patch diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index aec598f3..9853e407 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -10,8 +10,8 @@ libreadline libredwg libressl libsasl2 libshine libsndfile libsolv libssh libstr libtelnet libtheora libtirpc libudns libunistring libuv libvorbis libxml2 libxslt libz libzip lzo sdl1 sdl1_net sdl1_image sdl2 sdl2_image sdl2_ttf wolfssl")"; : ${PKG_GLIB_DEPENDS:="libffi libz pcre"}; -: ${PKG_GLIB_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a}; -: ${PKG_GLIB_VERSION:=2.54.0}; +: ${PKG_GLIB_SHA256SUM:=d64abd16813501c956c4e123ae79f47f1b58de573df9fdd3b0795f1e2c1aa789}; +: ${PKG_GLIB_VERSION:=2.56.2}; : ${PKG_GLIB_URL:="https://download.gnome.org/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz"}; : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount --with-python=${PREFIX}/bin/python3"}; : ${PKG_JANSSON_SHA256SUM:=f4f377da17b10201a60c1108613e78ee15df6b12016b116b6de42209f47a474f}; diff --git a/patches/glib-2.54.0.local.patch b/patches/glib-2.54.0.local.patch deleted file mode 100644 index da5baae4..00000000 --- a/patches/glib-2.54.0.local.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- glib-2.54.0/configure.orig 2017-09-11 02:18:49.000000000 +0200 -+++ glib-2.54.0/configure 2017-09-20 19:03:31.573166756 +0200 -@@ -16675,6 +16675,7 @@ - - - -+can_build_shared=yes; - # Report what library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 - $as_echo_n "checking if libtool supports shared libraries... " >&6; } -@@ -29484,7 +29485,7 @@ - -Wall -Wstrict-prototypes -Werror=declaration-after-statement \ - -Werror=missing-prototypes -Werror=implicit-function-declaration \ - -Werror=pointer-arith -Werror=init-self -Werror=format-security \ -- -Werror=format=2 -Werror=missing-include-dirs; do -+ ; do - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 - $as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } ---- glib-2.54.0/gio/gdbusmenumodel.c.orig 2017-07-14 01:03:38.000000000 +0200 -+++ glib-2.54.0/gio/gdbusmenumodel.c 2017-09-20 19:03:31.565166706 +0200 -@@ -625,7 +625,7 @@ - while (g_variant_iter_loop (&iter, "@a{sv}", &item)) - g_sequence_insert_before (point, g_dbus_menu_group_create_item (item)); - -- if (g_sequence_is_empty (items)) -+ if (g_sequence_get_length (items) == 0) - { - g_hash_table_remove (group->menus, GINT_TO_POINTER (menu_id)); - items = NULL; ---- glib-2.54.0/gio/gio-tool-mount.c.orig 2017-07-14 01:03:38.000000000 +0200 -+++ glib-2.54.0/gio/gio-tool-mount.c 2017-09-20 19:03:31.565166706 +0200 -@@ -780,7 +780,7 @@ - g_object_unref (icon); - } - -- g_print ("%*sis_removable=%d\n", indent + 2, "", g_drive_is_removable (drive)); -+ //g_print ("%*sis_removable=%d\n", indent + 2, "", g_drive_is_removable (drive)); - g_print ("%*sis_media_removable=%d\n", indent + 2, "", g_drive_is_media_removable (drive)); - g_print ("%*shas_media=%d\n", indent + 2, "", g_drive_has_media (drive)); - g_print ("%*sis_media_check_automatic=%d\n", indent + 2, "", g_drive_is_media_check_automatic (drive)); ---- glib-2.54.0/gio/glocalfilemonitor.c.orig 2017-07-14 01:03:38.000000000 +0200 -+++ glib-2.54.0/gio/glocalfilemonitor.c 2017-09-20 19:03:31.565166706 +0200 -@@ -504,7 +504,7 @@ - g_mutex_lock (&fms->lock); - - /* Create events for any pending changes that are due to fire */ -- while (!g_sequence_is_empty (fms->pending_changes)) -+ while (g_sequence_get_length (fms->pending_changes)) - { - GSequenceIter *iter = g_sequence_get_begin_iter (fms->pending_changes); - PendingChange *pending = g_sequence_get (iter); -@@ -572,7 +572,7 @@ - while ((event = g_queue_pop_head (&fms->event_queue))) - queued_event_free (event); - -- g_assert (g_sequence_is_empty (fms->pending_changes)); -+ g_assert (g_sequence_get_length (fms->pending_changes) == 0); - g_assert (g_hash_table_size (fms->pending_changes_table) == 0); - g_assert (fms->event_queue.length == 0); - fms->instance = NULL; -@@ -592,7 +592,7 @@ - - /* should already have been cleared in dispose of the monitor */ - g_assert (fms->instance == NULL); -- g_assert (g_sequence_is_empty (fms->pending_changes)); -+ g_assert (g_sequence_get_length (fms->pending_changes) == 0); - g_assert (g_hash_table_size (fms->pending_changes_table) == 0); - g_assert (fms->event_queue.length == 0); - ---- glib-2.54.0/gio/gmenuexporter.c.orig 2017-07-14 01:03:38.000000000 +0200 -+++ glib-2.54.0/gio/gmenuexporter.c 2017-09-20 19:03:31.569166731 +0200 -@@ -377,7 +377,7 @@ - guint id = GPOINTER_TO_INT (key); - GMenuExporterMenu *menu = val; - -- if (!g_sequence_is_empty (menu->item_links)) -+ if (g_sequence_get_length (menu->item_links)) - { - g_variant_builder_open (builder, G_VARIANT_TYPE ("(uuaa{sv})")); - g_variant_builder_add (builder, "u", group->id); ---- glib-2.54.0/gio/inotify/Makefile.in.orig 2017-09-11 02:18:51.000000000 +0200 -+++ glib-2.54.0/gio/inotify/Makefile.in 2017-09-20 19:03:31.561166681 +0200 -@@ -180,7 +180,7 @@ - "$(DESTDIR)$(installed_test_metadir)" \ - "$(DESTDIR)$(installed_testdir)" - LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_LTLIBRARIES) --libinotify_la_LIBADD = -+libinotify_la_LIBADD = -L../../glib -lglib-2.0 - am__objects_1 = - am_libinotify_la_OBJECTS = libinotify_la-inotify-kernel.lo \ - libinotify_la-inotify-sub.lo libinotify_la-inotify-path.lo \ ---- glib-2.54.0/glib-2.0.pc.in.orig 2016-10-22 07:17:22.000000000 +0200 -+++ glib-2.54.0/glib-2.0.pc.in 2017-09-20 19:03:31.561166681 +0200 -@@ -5,7 +5,7 @@ - - glib_genmarshal=glib-genmarshal - gobject_query=gobject-query --glib_mkenums=glib-mkenums -+glib_mkenums=@exec_prefix@/bin/glib-mkenums - - Name: GLib - Description: C Utility Library diff --git a/patches/glib-2.56.2.local.patch b/patches/glib-2.56.2.local.patch new file mode 100644 index 00000000..da5baae4 --- /dev/null +++ b/patches/glib-2.56.2.local.patch @@ -0,0 +1,103 @@ +--- glib-2.54.0/configure.orig 2017-09-11 02:18:49.000000000 +0200 ++++ glib-2.54.0/configure 2017-09-20 19:03:31.573166756 +0200 +@@ -16675,6 +16675,7 @@ + + + ++can_build_shared=yes; + # Report what library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } +@@ -29484,7 +29485,7 @@ + -Wall -Wstrict-prototypes -Werror=declaration-after-statement \ + -Werror=missing-prototypes -Werror=implicit-function-declaration \ + -Werror=pointer-arith -Werror=init-self -Werror=format-security \ +- -Werror=format=2 -Werror=missing-include-dirs; do ++ ; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 + $as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } +--- glib-2.54.0/gio/gdbusmenumodel.c.orig 2017-07-14 01:03:38.000000000 +0200 ++++ glib-2.54.0/gio/gdbusmenumodel.c 2017-09-20 19:03:31.565166706 +0200 +@@ -625,7 +625,7 @@ + while (g_variant_iter_loop (&iter, "@a{sv}", &item)) + g_sequence_insert_before (point, g_dbus_menu_group_create_item (item)); + +- if (g_sequence_is_empty (items)) ++ if (g_sequence_get_length (items) == 0) + { + g_hash_table_remove (group->menus, GINT_TO_POINTER (menu_id)); + items = NULL; +--- glib-2.54.0/gio/gio-tool-mount.c.orig 2017-07-14 01:03:38.000000000 +0200 ++++ glib-2.54.0/gio/gio-tool-mount.c 2017-09-20 19:03:31.565166706 +0200 +@@ -780,7 +780,7 @@ + g_object_unref (icon); + } + +- g_print ("%*sis_removable=%d\n", indent + 2, "", g_drive_is_removable (drive)); ++ //g_print ("%*sis_removable=%d\n", indent + 2, "", g_drive_is_removable (drive)); + g_print ("%*sis_media_removable=%d\n", indent + 2, "", g_drive_is_media_removable (drive)); + g_print ("%*shas_media=%d\n", indent + 2, "", g_drive_has_media (drive)); + g_print ("%*sis_media_check_automatic=%d\n", indent + 2, "", g_drive_is_media_check_automatic (drive)); +--- glib-2.54.0/gio/glocalfilemonitor.c.orig 2017-07-14 01:03:38.000000000 +0200 ++++ glib-2.54.0/gio/glocalfilemonitor.c 2017-09-20 19:03:31.565166706 +0200 +@@ -504,7 +504,7 @@ + g_mutex_lock (&fms->lock); + + /* Create events for any pending changes that are due to fire */ +- while (!g_sequence_is_empty (fms->pending_changes)) ++ while (g_sequence_get_length (fms->pending_changes)) + { + GSequenceIter *iter = g_sequence_get_begin_iter (fms->pending_changes); + PendingChange *pending = g_sequence_get (iter); +@@ -572,7 +572,7 @@ + while ((event = g_queue_pop_head (&fms->event_queue))) + queued_event_free (event); + +- g_assert (g_sequence_is_empty (fms->pending_changes)); ++ g_assert (g_sequence_get_length (fms->pending_changes) == 0); + g_assert (g_hash_table_size (fms->pending_changes_table) == 0); + g_assert (fms->event_queue.length == 0); + fms->instance = NULL; +@@ -592,7 +592,7 @@ + + /* should already have been cleared in dispose of the monitor */ + g_assert (fms->instance == NULL); +- g_assert (g_sequence_is_empty (fms->pending_changes)); ++ g_assert (g_sequence_get_length (fms->pending_changes) == 0); + g_assert (g_hash_table_size (fms->pending_changes_table) == 0); + g_assert (fms->event_queue.length == 0); + +--- glib-2.54.0/gio/gmenuexporter.c.orig 2017-07-14 01:03:38.000000000 +0200 ++++ glib-2.54.0/gio/gmenuexporter.c 2017-09-20 19:03:31.569166731 +0200 +@@ -377,7 +377,7 @@ + guint id = GPOINTER_TO_INT (key); + GMenuExporterMenu *menu = val; + +- if (!g_sequence_is_empty (menu->item_links)) ++ if (g_sequence_get_length (menu->item_links)) + { + g_variant_builder_open (builder, G_VARIANT_TYPE ("(uuaa{sv})")); + g_variant_builder_add (builder, "u", group->id); +--- glib-2.54.0/gio/inotify/Makefile.in.orig 2017-09-11 02:18:51.000000000 +0200 ++++ glib-2.54.0/gio/inotify/Makefile.in 2017-09-20 19:03:31.561166681 +0200 +@@ -180,7 +180,7 @@ + "$(DESTDIR)$(installed_test_metadir)" \ + "$(DESTDIR)$(installed_testdir)" + LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_LTLIBRARIES) +-libinotify_la_LIBADD = ++libinotify_la_LIBADD = -L../../glib -lglib-2.0 + am__objects_1 = + am_libinotify_la_OBJECTS = libinotify_la-inotify-kernel.lo \ + libinotify_la-inotify-sub.lo libinotify_la-inotify-path.lo \ +--- glib-2.54.0/glib-2.0.pc.in.orig 2016-10-22 07:17:22.000000000 +0200 ++++ glib-2.54.0/glib-2.0.pc.in 2017-09-20 19:03:31.561166681 +0200 +@@ -5,7 +5,7 @@ + + glib_genmarshal=glib-genmarshal + gobject_query=gobject-query +-glib_mkenums=glib-mkenums ++glib_mkenums=@exec_prefix@/bin/glib-mkenums + + Name: GLib + Description: C Utility Library -- cgit v1.2.3