Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
glib
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
glib
Commits
79055cc0
Commit
79055cc0
authored
May 26, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgraded glib to 2.64.3
parent
a143fdf8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
33 deletions
+23
-33
Makefile
Makefile
+11
-11
glib-2.64.3-fix_tests.patch
glib-2.64.3-fix_tests.patch
+12
-22
glib-2.64.3.tar.xz
glib-2.64.3.tar.xz
+0
-0
No files found.
Makefile
View file @
79055cc0
all
:
tar
xf glib-2.6
0.4
.tar.xz
patch
-Np1
-d
glib-2.6
0.4 < glib-2.60.4
-fix_tests.patch
cd
glib-2.6
0.4
&&
mkdir
-p
build
cd
glib-2.6
0.4
/build
&&
meson
--prefix
=
/usr
-Dman
=
false
-Dselinux
=
disabled ..
cd
glib-2.6
0.4
/build
&&
ninja
cd
glib-2.6
0.4
/build
&&
ninja
install
mkdir
-p
/usr/share/doc/glib-2.6
0.4
cp
-r
glib-2.6
0.4/docs/reference/
{
NEWS,gio,glib,gobject
}
/usr/share/doc/glib-2.60.4
tar
xf glib-2.6
4.3
.tar.xz
patch
-Np1
-d
glib-2.6
4.3 < glib-2.64.3
-fix_tests.patch
cd
glib-2.6
4.3
&&
mkdir
-p
build
cd
glib-2.6
4.3
/build
&&
meson
--prefix
=
/usr
-Dman
=
false
-Dselinux
=
disabled ..
cd
glib-2.6
4.3
/build
&&
ninja
cd
glib-2.6
4.3
/build
&&
ninja
install
mkdir
-p
/usr/share/doc/glib-2.6
4.3
cp
-r
glib-2.6
4.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.6
0.4
glib-home
;
\
cd
glib-2.6
0.4
/build
;
\
chown
-R
nobody.nobody glib-2.6
4.3
glib-home
;
\
cd
glib-2.6
4.3
/build
;
\
su nobody
-s
/bin/bash
-c
"HOME=
$(CURDIR)
/glib-home ninja test"
;
\
fi
rm
-rf
glib-2.6
0.4
rm
-rf
glib-2.6
4.3
rm
-rf
glib-home
glib-2.6
0.4
-fix_tests.patch
→
glib-2.6
4.3
-fix_tests.patch
View file @
79055cc0
diff -uNr glib-2.6
0.4/gio/tests/gsocketclient-slow.c glib-2.60.4
-fix_tests/gio/tests/gsocketclient-slow.c
--- glib-2.6
0.4/gio/tests/gsocketclient-slow.c 2019-06-11 03:17:20.0000000
00 +0930
+++ glib-2.6
0.4-fix_tests/gio/tests/gsocketclient-slow.c 2019-10-18 08:47:06.918556973 +10
30
diff -uNr glib-2.6
4.3/gio/tests/gsocketclient-slow.c glib-2.64.3
-fix_tests/gio/tests/gsocketclient-slow.c
--- glib-2.6
4.3/gio/tests/gsocketclient-slow.c 2020-05-20 20:16:43.1691022
00 +0930
+++ glib-2.6
4.3-fix_tests/gio/tests/gsocketclient-slow.c 2020-07-02 17:00:20.395399352 +09
30
@@ -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.6
0.4/glib/tests/gwakeuptest.c glib-2.60.4
-fix_tests/glib/tests/gwakeuptest.c
--- glib-2.6
0.4/glib/tests/gwakeuptest.c 2019-06-11 03:17:20.000000
000 +0930
+++ glib-2.6
0.4-fix_tests/glib/tests/gwakeuptest.c 2019-10-18 18:05:36.112559614 +10
30
diff -uNr glib-2.6
4.3/glib/tests/gwakeuptest.c glib-2.64.3
-fix_tests/glib/tests/gwakeuptest.c
--- glib-2.6
4.3/glib/tests/gwakeuptest.c 2020-05-20 20:16:43.240103
000 +0930
+++ glib-2.6
4.3-fix_tests/glib/tests/gwakeuptest.c 2020-07-02 17:00:20.395399352 +09
30
@@ -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 = 1
2
0
-test_timeout_slow = 1
8
0
+test_timeout = 600
+test_timeout_slow = 1
2
00
+test_timeout_slow = 1
8
00
pkg = import('pkgconfig')
windows = import('windows')
glib-2.6
0.4
.tar.xz
→
glib-2.6
4.3
.tar.xz
View file @
79055cc0
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment