Commit 64d727f7 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded glib to 2.68.3

parent 5c725910
all: all:
tar xf glib-2.64.3.tar.xz tar xf glib-2.68.3.tar.xz
patch -Np1 -d glib-2.64.3 < glib-2.64.3-fix_tests.patch cd glib-2.68.3 && mkdir -p build
cd glib-2.64.3 && mkdir -p build cd glib-2.68.3/build && meson --prefix=/usr -Dman=false -Dselinux=disabled ..
cd glib-2.64.3/build && meson --prefix=/usr -Dman=false -Dselinux=disabled .. cd glib-2.68.3/build && ninja
cd glib-2.64.3/build && ninja cd glib-2.68.3/build && ninja install
cd glib-2.64.3/build && ninja install mkdir -p /usr/share/doc/glib-2.68.3
mkdir -p /usr/share/doc/glib-2.64.3 cp -r glib-2.68.3/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.68.3
cp -r glib-2.64.3/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.64.3
tests: tests:
mkdir glib-home mkdir glib-home
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \ if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
chown -R nobody.nobody glib-2.64.3 glib-home ; \ /bin/systemd-machine-id-setup ; \
cd glib-2.64.3/build ; \ chown -R nobody.nobody glib-2.68.3 glib-home ; \
cd glib-2.68.3/build ; \
su nobody -s /bin/bash -c "HOME=$(CURDIR)/glib-home ninja test" ; \ su nobody -s /bin/bash -c "HOME=$(CURDIR)/glib-home ninja test" ; \
/usr/bin/truncate --size 0 /etc/machine-id ; \
fi fi
rm -rf glib-2.64.3 rm -rf glib-2.68.3
rm -rf glib-home rm -rf glib-home
diff -uNr glib-2.64.3/gio/tests/gsocketclient-slow.c glib-2.64.3-fix_tests/gio/tests/gsocketclient-slow.c
--- glib-2.64.3/gio/tests/gsocketclient-slow.c 2020-05-20 20:16:43.169102200 +0930
+++ glib-2.64.3-fix_tests/gio/tests/gsocketclient-slow.c 2020-07-02 17:00:20.395399352 +0930
@@ -55,7 +55,7 @@
* trigger the logic to make multiple parallel connections.
*/
client = g_socket_client_new ();
- g_socket_client_connect_to_host_async (client, "localhost", port, NULL, on_connected, loop);
+ g_socket_client_connect_to_host_async (client, "127.0.0.1", port, NULL, on_connected, loop);
g_main_loop_run (loop);
g_main_loop_unref (loop);
@@ -123,7 +123,7 @@
client = g_socket_client_new ();
cancel = g_cancellable_new ();
- g_socket_client_connect_to_host_async (client, "localhost", port, cancel, on_connected_cancelled, loop);
+ g_socket_client_connect_to_host_async (client, "127.0.0.1", port, cancel, on_connected_cancelled, loop);
g_timeout_add (1, (GSourceFunc) on_timer, cancel);
g_signal_connect (client, "event", G_CALLBACK (on_event), &got_completed_event);
g_main_loop_run (loop);
@@ -159,7 +159,7 @@
client = g_socket_client_new ();
cancel = g_cancellable_new ();
g_cancellable_cancel (cancel);
- g_socket_client_connect_to_host_async (client, "localhost", port, cancel, on_connected_cancelled, loop);
+ g_socket_client_connect_to_host_async (client, "127.0.0.1", port, cancel, on_connected_cancelled, loop);
g_signal_connect (client, "event", G_CALLBACK (on_event), &got_completed_event);
g_main_loop_run (loop);
diff -uNr glib-2.64.3/glib/tests/gwakeuptest.c glib-2.64.3-fix_tests/glib/tests/gwakeuptest.c
--- glib-2.64.3/glib/tests/gwakeuptest.c 2020-05-20 20:16:43.240103000 +0930
+++ glib-2.64.3-fix_tests/glib/tests/gwakeuptest.c 2020-07-02 17:00:20.395399352 +0930
@@ -33,7 +33,7 @@
gint i;
/* prevent the test from deadlocking */
- alarm (60);
+ alarm (60 * 10);
wakeup = g_wakeup_new ();
g_assert (!check_signaled (wakeup));
@@ -214,7 +214,7 @@
gint i;
/* make sure we don't block forever */
- alarm (60);
+ alarm (60 * 10);
/* simple mainloop test based on GWakeup.
*
diff -uNr glib-2.64.3/meson.build glib-2.64.3-fix_tests/meson.build
--- glib-2.64.3/meson.build 2020-05-20 20:16:43.261103400 +0930
+++ glib-2.64.3-fix_tests/meson.build 2020-07-02 17:01:36.836678767 +0930
@@ -2169,8 +2169,8 @@
enable_systemtap = true
endif
-test_timeout = 60
-test_timeout_slow = 180
+test_timeout = 1200
+test_timeout_slow = 3600
pkg = import('pkgconfig')
windows = import('windows')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment