Commit 79055cc0 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded glib to 2.64.3

parent a143fdf8
all:
tar xf glib-2.60.4.tar.xz
patch -Np1 -d glib-2.60.4 < glib-2.60.4-fix_tests.patch
cd glib-2.60.4 && mkdir -p build
cd glib-2.60.4/build && meson --prefix=/usr -Dman=false -Dselinux=disabled ..
cd glib-2.60.4/build && ninja
cd glib-2.60.4/build && ninja install
mkdir -p /usr/share/doc/glib-2.60.4
cp -r glib-2.60.4/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.60.4
tar xf glib-2.64.3.tar.xz
patch -Np1 -d glib-2.64.3 < glib-2.64.3-fix_tests.patch
cd glib-2.64.3 && mkdir -p build
cd glib-2.64.3/build && meson --prefix=/usr -Dman=false -Dselinux=disabled ..
cd glib-2.64.3/build && ninja
cd glib-2.64.3/build && ninja install
mkdir -p /usr/share/doc/glib-2.64.3
cp -r glib-2.64.3/docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-2.64.3
tests:
mkdir glib-home
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
chown -R nobody.nobody glib-2.60.4 glib-home ; \
cd glib-2.60.4/build ; \
chown -R nobody.nobody glib-2.64.3 glib-home ; \
cd glib-2.64.3/build ; \
su nobody -s /bin/bash -c "HOME=$(CURDIR)/glib-home ninja test" ; \
fi
rm -rf glib-2.60.4
rm -rf glib-2.64.3
rm -rf glib-home
diff -uNr glib-2.60.4/gio/tests/gsocketclient-slow.c glib-2.60.4-fix_tests/gio/tests/gsocketclient-slow.c
--- glib-2.60.4/gio/tests/gsocketclient-slow.c 2019-06-11 03:17:20.000000000 +0930
+++ glib-2.60.4-fix_tests/gio/tests/gsocketclient-slow.c 2019-10-18 08:47:06.918556973 +1030
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.
*/
......@@ -28,9 +28,9 @@ diff -uNr glib-2.60.4/gio/tests/gsocketclient-slow.c glib-2.60.4-fix_tests/gio/t
g_signal_connect (client, "event", G_CALLBACK (on_event), &got_completed_event);
g_main_loop_run (loop);
diff -uNr glib-2.60.4/glib/tests/gwakeuptest.c glib-2.60.4-fix_tests/glib/tests/gwakeuptest.c
--- glib-2.60.4/glib/tests/gwakeuptest.c 2019-06-11 03:17:20.000000000 +0930
+++ glib-2.60.4-fix_tests/glib/tests/gwakeuptest.c 2019-10-18 18:05:36.112559614 +1030
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;
......@@ -49,27 +49,17 @@ diff -uNr glib-2.60.4/glib/tests/gwakeuptest.c glib-2.60.4-fix_tests/glib/tests/
/* simple mainloop test based on GWakeup.
*
diff -uNr glib-2.60.4/gobject/tests/meson.build glib-2.60.4-fix_tests/gobject/tests/meson.build
--- glib-2.60.4/gobject/tests/meson.build 2019-06-11 03:17:20.000000000 +0930
+++ glib-2.60.4-fix_tests/gobject/tests/meson.build 2019-10-18 18:26:48.437573636 +1030
@@ -112,5 +112,6 @@
python,
args: files('mkenums.py'),
env: test_env,
+ timeout: test_timeout,
suite: ['gobject'],
)
diff -uNr glib-2.60.4/meson.build glib-2.60.4-fix_tests/meson.build
--- glib-2.60.4/meson.build 2019-06-11 03:17:20.000000000 +0930
+++ glib-2.60.4-fix_tests/meson.build 2019-10-18 17:08:29.398239887 +1030
@@ -1983,8 +1983,8 @@
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 = 120
-test_timeout_slow = 180
+test_timeout = 600
+test_timeout_slow = 1200
+test_timeout_slow = 1800
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