Xavier Claessens
6e0a03ee07
Merge branch '1536-link-whole' into 'master'
...
Meson: Fix static linking of convenience libraries
Closes #1536
See merge request GNOME/glib!357
2018-09-28 14:54:40 +00:00
Simon McVittie
62af03bda8
Meson: Extract objects from convenience libraries to link them
...
This avoids the convenience library being treated as though it was
an installed static library (objects not included in the dependent
static library, and convenience library being listed in the pkg-config
metadata), both of which would make static linking impossible.
This is a workaround for meson not having
https://github.com/mesonbuild/meson/pull/3939 merged yet.
Fixes: https://gitlab.gnome.org/GNOME/glib/issues/1536
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-28 15:15:48 +01:00
Philip Withnall
0e117cffa5
Merge branch 'ci-meson-0-48' into 'master'
...
Ci meson 0 48
See merge request GNOME/glib!347
2018-09-28 13:47:40 +00:00
Philip Withnall
c824ffd377
Merge branch 'wip/rishi/docs-garray' into 'master'
...
Documentation tweaks for g_array_free
See merge request GNOME/glib!348
2018-09-28 13:06:04 +00:00
Xavier Claessens
24d7a73b93
Meson: Bump dependency to 0.48.0
2018-09-27 16:01:41 -04:00
Xavier Claessens
4b983e5122
ci: Upgrade meson to 0.48.0 and use --fatal-meson-warnings
2018-09-27 16:00:53 -04:00
Xavier Claessens
686d60d77b
Merge branch 'printf' into 'master'
...
Tests: Mark printf wrappers with G_GNUC_PRINTF
See merge request GNOME/glib!363
2018-09-27 18:23:07 +00:00
Simon McVittie
6b0b4381bf
Tests: Mark printf wrappers with G_GNUC_PRINTF
...
If we tell clang that we're passing the arguments on to a compatible
printf call, it can see that we're doing it right, and won't warn us
about -Wformat-nonliteral. This follows up from commit abac67c0
.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-27 09:21:32 +01:00
Emmanuele Bassi
b71d7e4b33
Merge branch 'cross' into 'master'
...
Autotools: Always run glib-genmarshal, even if cross-compiling
Closes #1546
See merge request GNOME/glib!362
2018-09-26 21:16:17 +00:00
Simon McVittie
a5e900c329
Merge branch 'libmount' into 'master'
...
Autotools: Move libmount from Libs.private to Requires.private
See merge request GNOME/glib!358
2018-09-26 16:24:44 +00:00
Xavier Claessens
3b61570e06
Merge branch '1514-appinfo-test' into 'master'
...
Meson: appinfo tests are racy if run in parallel
Closes #1514
See merge request GNOME/glib!356
2018-09-26 16:13:48 +00:00
Simon McVittie
129512b67c
Autotools: Always run glib-genmarshal, even if cross-compiling
...
glib-genmarshal is now written in Python rather than C, so we can
always run it directly, even if we're cross-compiling for an
architecture whose binaries we can't run. This matches the behaviour
of the Meson build system.
Fixes: https://gitlab.gnome.org/GNOME/glib/issues/1546
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908334
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-26 16:57:57 +01:00
Simon McVittie
59f3c1f17a
Autotools: Move libmount from Libs.private to Requires.private
...
libmount depends on libblkid, so if we statically link a trivial
executable to GIO, we need to pull in both libmount and libblkid.
Linking with -lmount is not enough to achieve that, but recursing
into mount.pc is.
This makes the Autotools build a bit more like the Meson build,
which already puts mount in Requires.private.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-26 10:08:38 +01:00
Xavier Claessens
27b5fb5892
Meson: appinfo tests are racy if run in parallel
2018-09-25 15:14:53 -04:00
Xavier Claessens
88a1188fc1
Merge branch 'speling' into 'master'
...
Fix spelling mistakes detected by Debian's Lintian tool
See merge request GNOME/glib!354
2018-09-25 18:16:52 +00:00
Xavier Claessens
af9e67c776
Merge branch '1544-gtester-report' into 'master'
...
Generate gtester-report from .in file
Closes #1544
See merge request GNOME/glib!352
2018-09-25 18:00:13 +00:00
Simon McVittie
5040aee5bf
Merge branch 'tap-fix' into 'master'
...
Meson: Do not run tests/refcount with --tap
See merge request GNOME/glib!353
2018-09-25 17:55:14 +00:00
Simon McVittie
8346017b17
Generate gtester-report from .in file
...
Previously, it was installed unmodified by the Meson build system.
We don't need to define @bindir@, because gtester-report never
actually referred to it. We also don't need a definition of
GTESTER_REPORT for use by GLib itself, because its last use was removed
in 2013 (https://bugzilla.gnome.org/show_bug.cgi?id=709995 ).
Fixes: https://gitlab.gnome.org/GNOME/glib/issues/1544
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 17:34:57 +01:00
Simon McVittie
1830ebba91
Spelling: Fix spelling of "interpreted"
...
Detected by Debian's Lintian tool.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 15:58:56 +01:00
Simon McVittie
ec951e9de8
Spelling: avoid the "allows to" pattern
...
This is detected by Debian's Lintian tool, which suggests
"allows one to" as a replacement. I've rephrased the documentation
in question to avoid both of those.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 15:57:49 +01:00
Simon McVittie
03cf374848
Spelling: Fix spelling of "unknown"
...
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 14:35:13 +01:00
Simon McVittie
55cfbd3bc4
Spelling: Fix spelling of "constructed"
...
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 14:35:13 +01:00
Simon McVittie
e0a8df12ef
Spelling: Fix spelling of "similarly"
...
Detected by Debian's Lintian tool.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 14:35:13 +01:00
Simon McVittie
59bede934c
Spelling: Fix a common en_FR spelling of "information"
...
Detected by Debian's Lintian tool.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 14:35:11 +01:00
Simon McVittie
7a903bd044
Spelling: fix spelling of specify
...
Detected by Debian's Lintian tool.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 14:34:48 +01:00
Simon McVittie
214c991d5b
Spelling: fix "every time"
...
Detected by Debian's Lintian tool.
Also fix the spelling of "linking" in one error message.
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-25 14:34:48 +01:00
Xavier Claessens
7c8e1f15cc
Meson: Do not run tests/refcount with --tap
...
This is a partial revert of a change introduced in cbc7fbbf7
.
2018-09-25 09:33:15 -04:00
Xavier Claessens
b6171b97bf
Merge branch '1528-build-time-tap' into 'master'
...
meson: Run build-time tests with --tap where supported
Closes #1528
See merge request GNOME/glib!351
2018-09-25 11:25:53 +00:00
Simon McVittie
cbc7fbbf7d
meson: Run build-time tests with --tap where supported
...
This makes it easier to debug test failures, by ensuring that g_debug()
and g_test_message() are printed as TAP diagnostics.
Fixes: https://gitlab.gnome.org/GNOME/glib/issues/1528
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-24 23:37:12 +01:00
Xavier Claessens
b803d94366
Merge branch '1541-timeloop-closure' into 'master'
...
Meson: Install timeloop-closure test
Closes #1541
See merge request GNOME/glib!349
2018-09-24 19:27:38 +00:00
Xavier Claessens
178b943be7
Meson: Install timeloop-closure test
2018-09-24 11:21:27 -04:00
Xavier Claessens
b512135fc6
Merge branch '1535-tap' into 'master'
...
Meson: Run in TAP mode installed tests that support it
Closes #1535
See merge request GNOME/glib!343
2018-09-24 14:49:40 +00:00
Xavier Claessens
8bfb1d0ea3
Merge branch '1537-fixxref' into 'master'
...
Meson: doc: fix cross references
Closes #1537
See merge request GNOME/glib!344
2018-09-24 14:49:02 +00:00
Debarshi Ray
0a8f3698a0
docs: Simplify the text for g_array_free
...
The text about deallocation of GArrays with elements containing
dynamically-allocated memory was confusing. It initially mentioned
clear_func, but later said elements with dynamically allocated memory
"should be freed separately".
Clarify this by using the same structure as g_ptr_array_free —
highlight the need to set a clear_func by consolidating the text about
it in a separate paragraph.
https://gitlab.gnome.org/GNOME/glib/merge_requests/348
2018-09-24 16:34:53 +02:00
Debarshi Ray
30ccd6f01b
docs: Use the correct terminology for g_array_free
...
GArray uses the term clear_func (eg., g_array_set_clear_func), while
element_free_func comes from GPtrArray.
https://gitlab.gnome.org/GNOME/glib/merge_requests/348
2018-09-24 16:34:49 +02:00
Xavier Claessens
c1999271b5
Merge branch '1538-growing-stack' into 'master'
...
Meson: define G_HAVE_GROWING_STACK to 0 or 1
Closes #1538
See merge request GNOME/glib!342
2018-09-24 14:28:24 +00:00
Xavier Claessens
bec7e2fa78
Merge branch 'issue1539' into 'master'
...
Remove unnecessary +x permissions
Closes #1539
See merge request GNOME/glib!341
2018-09-23 20:19:05 +00:00
Xavier Claessens
780f7c64f9
Meson: doc: fix cross references
2018-09-23 16:09:34 -04:00
Xavier Claessens
8391219e4c
Meson: Run in TAP mode installed tests that support it
2018-09-23 13:44:15 -04:00
Xavier Claessens
3896bc3659
Meson: define G_HAVE_GROWING_STACK to 0 or 1
2018-09-23 12:59:40 -04:00
Simon McVittie
fa32ee6481
Remove unnecessary +x permissions
...
None of these files starts with a #! line, and they are not native
binary executables, so if a user attempts to execute them as a program,
Unix shells will run them as /bin/sh scripts. This is not going to end
well, since none of them are shell scripts (the gio bash completion
is for bash, which is not a lowest-common-denominator POSIX shell, and
in any case is designed to be sourced rather than executed).
Fixes : #1539
Signed-off-by: Simon McVittie <smcv@collabora.com >
2018-09-23 17:01:04 +01:00
Emmanuele Bassi
032f1a9782
Merge branch 'gio-fix-build' into 'master'
...
gio: automake: Add libgmodule dependency
See merge request GNOME/glib!334
2018-09-22 15:49:07 +00:00
Xavier Claessens
66bf585776
Merge branch 'install-tests' into 'master'
...
Meson: Fix missing files when installing tests
Closes #1527
See merge request GNOME/glib!336
2018-09-21 13:18:32 +00:00
Xavier Claessens
abac67c050
Tests: Fix -Wformat-nonliteral causing build failure with clang
2018-09-21 08:45:54 -04:00
Руслан Ижбулатов
3ae1244ba1
tests W32: ifdef a variable not used on Windows
2018-09-21 08:45:54 -04:00
Руслан Ижбулатов
665677ce5e
tests W32: Move timeloop test to the non-Windows section
...
It just doesn't work on Windows, and that can't be fixed with a quick patch.
2018-09-21 08:45:54 -04:00
Руслан Ижбулатов
4c91334412
tests W32: ugly fix for sscanf() format
...
As we recently established, G_G*_FORMAT macros are for glib
functions *only*. It's not guaranteed that they will work for
C runtime printf() or scanf() variants, and indeed - in this case
they do not (GCC thinks that MSVCRT sscanf() requires %I64 prefix
for 64-bit values; whether that is true or not is irrelevant at this
point - we need to make the werror go away).
2018-09-21 08:45:54 -04:00
Руслан Ижбулатов
d2c9543f2e
tests W32: include process.h for getpid()
...
At least, MinGW has POSIX names. No idea if this works in MSVC.
2018-09-21 08:45:54 -04:00
Руслан Ижбулатов
190ea6ed10
tests W32: Fix Windows values casting
...
LPARAM is LONG_PTR which is the same as INT_PTR on Windows.
WPARAM is UINT_PTR.
HWND is a pointer.
(%p prints pointers without 0x prefix, hence the extra 0x).
2018-09-21 08:45:54 -04:00
Руслан Ижбулатов
3cdce16668
tests W32: Cast the MSG struct as (gchar *) for g_io_channel_read
2018-09-21 08:45:54 -04:00