commit 2219cfb92daf9b9413de35a1089efa3a1dff7602
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 16:29:40 2017 +0100
mkenums: Keep compatibility with Python 2.x
Since every other tool in GLib is allowed to be used with Python 2.x,
glib-mkenums should follow suit.
gobject/glib-mkenums.in | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
commit f18556749c75629b9bff538dced6311cf77a3ffb
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 16:04:03 2017 +0100
mkenums: Skip unparsed lines
The old glib-mkenums just skipped lines it could not understand.
gobject/glib-mkenums.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1e4135f253bcc315a459363bfe62a8f01b127ee7
Author: Matthias Clasen <mclasen@redhat.com>
Date: Mon Jul 17 10:46:19 2017 -0400
2.53.4
NEWS | 34 ++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 35 insertions(+), 1 deletion(-)
commit a45bf85ce5c9bc7dd26551430cd2e2d80e079d1c
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 13:59:20 2017 +0100
tests: Do not use gnome.genmarshal()
We are providing glib-genmarshal; using the gnome module in Meson does
not call the just built glib-genmarshal tool.
tests/gobject/meson.build | 44
+++++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 13 deletions(-)
commit 4f17d1049f49d8d9e880b4e8a34cc62e0da9092e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 11:15:06 2017 +0100
mkenums: Add missing --fprod handler
We are not generating the template for the --fprod command line
argument.
gobject/glib-mkenums.in | 1 +
1 file changed, 1 insertion(+)
commit 3c03cc8f68b5d81c7b47423b1a3be3b8c9197d1c
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 10:54:28 2017 +0100
meson: Simplify the use of built tools
The Meson build has fallen a bit behind the Autotools one, when
it comes
to the internally built tools like glib-mkenums and glib-genmarshals.
We don't need to generate gmarshal.strings any more, and since the
glib-genmarshal tool is now written in Python it can also be used when
cross-compiling, and without indirection, just like we use
glib-mkenums.
We can also coalesce various rules into a simple array iteration, with
minimal changes to glib-mkenums, thus making the build a bit more
resilient and without unnecessary duplication.
gobject/glib-mkenums.in | 21 ++++++-------
gobject/gmarshal-list-to-strings.py | 21 -------------
gobject/meson.build | 43 +++++++++++++--------------
gobject/tests/gobject_test_marshal.py | 21 -------------
gobject/tests/meson.build | 55
+++++++++++++++++++++--------------
meson.build | 1 +
tests/gobject/meson.build | 2 +-
7 files changed, 65 insertions(+), 99 deletions(-)
commit 7ee050dc4bf5187842f656889017414aa1c9a729
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 10:32:33 2017 +0100
mkenums: Use the same reporting functions from genmarshal
We can reuse the same code to make error reporting stand out a
bit more,
with colors and potentially with the ability to make warnings fatal.
gobject/glib-mkenums.in | 49
++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 46 insertions(+), 3 deletions(-)
commit 69515e9f5c43046e673e8751e3703703cd41e540
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 10:24:32 2017 +0100
mkenums: Skip files not found
The old glib-mkenums was more forgiving, and simply ignored any
files it
could not find.
We're going to print a warning, as in the future we may want to allow
more strictness.
gobject/glib-mkenums.in | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 77a3a962189df86a48c28a3c35d46575f35f7b95
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jul 17 09:36:13 2017 +0100
mkenums: Change ordering for template file and arguments
This is a bit of a hack to maintain some semblance of backward
compatibility with the old, Perl-based glib-mkenums. The old tool
had an
implicit ordering on the arguments and templates; each argument was
parsed in order, and all the strings appended. This allowed developers
to write:
glib-mkenums \
--fhead ... \
--template a-template-file.c.in \
--ftail ...
And have the fhead be prepended to the file-head stanza in the
template,
as well as the ftail be appended to the file-tail stanza in the
template. Short of throwing away ArgumentParser and going over
sys.argv[] element by element, we can simulate that behaviour by
ensuring some ordering in how we build the template strings:
- the head stanzas are always prepended to the template
- the prod stanzas are always appended to the template
- the tail stanzas are always appended to the template
Within each instance of the command line argument, we append each
value
to the array in the order in which it appears on the command line.
This change fixes the libqmi build.
gobject/glib-mkenums.in | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)
commit 5ba3b4022ebda9e1756d568b7baac7f285bfc0b4
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Jul 17 12:49:24 2017 +0800
meson.build: Improve checks for va_copy() and __va_copy()
On Visual Studio, the compilation of the check program for va_copy()
and
__va_copy() succeeds even though they may not be really available.
So,
make sure we include msvc_recommended_pragmas.h which helps us
to detect
this situation by bailing out when warning C4013 (which means this
function is really not available) is encountered.
Also make sure that on Visual Studio builds we always include
msvc_recommended_pragmas.h is included so that it helps us to find out
problems in the build, and update comments for dirent.h and sys/time.h
as they are not shipped with any Visual Studio.
https://bugzilla.gnome.org/show_bug.cgi?id=783270
meson.build | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
commit 35db0457297d29a5d2446c7af840eb74324e90be
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Jul 16 17:25:08 2017 +0100
mkenums: Fix typo
There's a stray '~' that needs to be removed.
gobject/glib-mkenums.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 69389bdc3475e2b5621f69bb1da2b3781a52539c
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Jul 16 12:06:34 2017 +0100
mkenums: Do not check for None
The symprefix variable can only be a string.
gobject/glib-mkenums.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit af4a6457eb2ee67296f7f0b8bf05413bb285724b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Jul 16 11:56:52 2017 +0100
mkenums: Some arguments can be used multiple times
Some of the arguments that affect the generated result in glib-mkenums
can be used multiple times, to avoid embedding unnecessary newlines in
their values.
This change fixes the NetworkManager build.
gobject/glib-mkenums.in | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
commit d19f53a7676f456cc18b14750675bd1f70852bb2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Jul 16 11:15:07 2017 +0100
Add more compatibility mode hacks
When using the `--header --body` compatibility mode, we need to emit
things we generally define in the header, such as the aliases for
standard marshallers, and aliases for deprecated tokens.
This fixes dbus-binding-tool, which is using `--header --body` and
deprecated tokens.
See: https://bugs.freedesktop.org/show_bug.cgi?id=101799
gobject/glib-genmarshal.in | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
commit fbf35113093e79c8c80f44ade21b5e8a338fe9b2
Author: Christoph Reiter <creiter@src.gnome.org>
Date: Sun Jul 16 00:18:43 2017 +0200
meson: fix typo in install path for gobject_gdb.py
gobject/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8451f0b8173cf726d0c6d5275aff465960383276
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sat Jul 15 10:17:48 2017 +0100
glib-mkenums: unescape \n etc. in command line arguments
Fixes generation of GStreamer enumtype files with autotools build.
https://bugzilla.gnome.org/show_bug.cgi?id=779332
gobject/glib-mkenums.in | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
commit a882c974d30174f308dff325d9f3cec0e303d7c6
Author: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Sat Jul 15 15:31:05 2017 +0200
mkenums: pass string for re.sub() for real
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
gobject/glib-mkenums.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1a182df5d1abdc7a1101c53651561e6cc5f30f73
Author: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Sat Jul 15 15:30:16 2017 +0200
mkenums: don't try to call undefined function
argparse will take care about everything
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
gobject/glib-mkenums.in | 3 ---
1 file changed, 3 deletions(-)
commit 615238d0a46bcce8fa7109c7d6653f5fbf239e24
Author: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Sat Jul 15 15:26:54 2017 +0200
mkenums: make string raw for real regex
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
gobject/glib-mkenums.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit d753a411c0f74b8fc8f4e9bc106b29bd1b603776
Author: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Sat Jul 15 15:22:20 2017 +0200
mkenums: trivial style fixes
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
gobject/glib-mkenums.in | 58
++++++++++++++++++++++++++-----------------------
1 file changed, 31 insertions(+), 27 deletions(-)
commit 112908d9e4a7a9ecac8cda830dba599f88b47672
Author: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Sat Jul 15 15:21:11 2017 +0200
mkenums: fix main incompatibility with python2
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
gobject/glib-mkenums.in | 2 ++
1 file changed, 2 insertions(+)
commit 9306ada4fdd2c00813c7ea088cd6fb5003ccd352
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sat Jul 15 11:21:57 2017 +0100
meson: fix 'Unknown variable "gtester"' error on windows
With msys64/mingw.
glib/tests/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 683809d5f751575775d12917581eb7b9a2acf0f5
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jul 14 22:05:01 2017 +0100
Use env for gdbus-codegen's script
This allows us to build with Python 3 without using an absolute path.
gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4395a8977727e2c569b472dbe8710ffb87c219e2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jul 14 21:21:33 2017 +0100
Use env to run the Python-based tools
Otherwise overriding the Python interpreter with `--with-python` won't
work correctly.
gobject/glib-genmarshal.in | 2 +-
gobject/glib-mkenums.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 0f18a2ebda4ec0440ec545542f9fc2f60cd54c5d
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jul 14 20:43:19 2017 +0100
meson: Substitute the Python shebang
Just like we do with Autotools. This allows building glib-mkenums and
glib-genmarshal on older platforms that only have Python 2.
gobject/glib-genmarshal.in | 2 +-
gobject/glib-mkenums.in | 2 +-
gobject/meson.build | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
commit 1eda0627f3792cc626f19c28eb1f478dd9d2df5e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jul 14 13:56:47 2017 +0100
meson: Use the appropriate libdir-relative paths
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 065a8a488ad2ee4a7523fb673e1555e5cf8762b5
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jul 14 13:56:02 2017 +0100
meson: Use the appropriate interface and binary ages
We need to build them out of the project version, and then propagate
them.
glib/tests/meson.build | 2 +-
gobject/tests/meson.build | 2 +-
meson.build | 15 +++++++++------
3 files changed, 11 insertions(+), 8 deletions(-)
commit 37ff4189fdbb73e81c6431c6862317d94fbef55e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jul 14 13:55:42 2017 +0100
meson: Sync the version with Autotools
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit be8820128faf1eb466ad896afd6133c8e5092156
Author: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Thu Jul 13 22:22:16 2017 -0400
meson: fix remaining wrong #include's for gdbus_codegen files
This is a follow up on 266bc1e510e154f7b5e793adb227d979ae655446
to fix building tests and examples when using GLib as a meson
subproject.
gio/tests/gdbus-object-manager-example/meson.build | 5 +++--
gio/tests/meson.build | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
commit b8c8bb73b0683456b632cf8a49fa9d00568115b5
Author: Matthias Clasen <mclasen@redhat.com>
Date: Thu Jul 13 19:35:09 2017 -0400
Fix glib-genmarshal build with meson
This is no longer built from a C source, but a python file.
gobject/glib-genmarshal.in | 2 +-
gobject/meson.build | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
commit 653be67d7d756958917f6107d676c78666416dc4
Author: Matthias Clasen <mclasen@redhat.com>
Date: Thu Jul 13 19:34:21 2017 -0400
Add gopenuriportal.c to the meson build
This was added recently.
gio/meson.build | 6 ++++++
1 file changed, 6 insertions(+)
commit 4db695bfb7d9f2d085020ace67b370afc8838172
Author: Alessandro Decina <alessandro.d@gmail.com>
Date: Wed Jul 12 21:57:11 2017 +1000
meson: replace meson.current_source_dir() with files()
As the meson reference doc says, files() is preferred over building
paths with current_source_dir().
gio/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 266bc1e510e154f7b5e793adb227d979ae655446
Author: Alessandro Decina <alessandro.d@gmail.com>
Date: Wed Jul 12 16:15:38 2017 +1000
meson: fix wrong #include's for gdbus_codegen files
When building glib as a subproject, #include's for xdp-dbus.h from
xdp-dbus.c
and for gdbus-daemon-generated.h from gdbus-daemon-generated.c were
generated as
being prefixed with the subproject prefix, eg
#include "subproject/glib/gio/gdbus-daemon-generated.h".
That failed since the root of the build directory is obviously not
part of the
include path when building a subproject.
Passing --output-directory @OUTDIR@ to gdbus-codegen and removing
@OUTDIR@ from
--generate-c-code fixes the issue.
gio/meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit dbf0a566703586db9777c3d56e01aa40c02ab9ac
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Mon Jun 26 23:50:01 2017 +0100
glib-mkenums: pick up /*< nick=xyz >*/ annotation again
... in glib-mkenums python port.
Was parsed correctly but then skipped due to inverted condition.
https://bugzilla.gnome.org/show_bug.cgi?id=779332
gobject/glib-mkenums.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4268372fae64a1942bcab0f8b1acb0b16a1d65cd
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Wed Jun 14 23:57:11 2017 +0100
meson: error out if atomic ops would be available with -march=i486
Same as autotools build.
meson.build | 9 +++++++++
1 file changed, 9 insertions(+)
commit 0689231bd61f86190688cc262fcc3058cb672557
Author: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Fri Jun 23 12:36:38 2017 -0400
meson: Fix the build defining HAVE_RTLD_X
Otherwise RTLD_XXX get redefined.
https://bugzilla.gnome.org/show_bug.cgi?id=784133
config.h.meson | 3 +++
meson.build | 12 ++++++++++++
2 files changed, 15 insertions(+)
commit eb2196e89d1700941b35c604bf6b657660b3b2c8
Author: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Fri Jun 23 12:00:13 2017 -0400
meson: Fix building as a subproject
meson.source_root() returns the toplevel source directory
of the toplevel project, thus the paths were wrong when using
it. Simply using files() gets us the right path
https://bugzilla.gnome.org/show_bug.cgi?id=784133
gio/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1d30c9eebc8bc4efcd8da8c479040389edd0cfe3
Author: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Fri Jun 23 11:58:51 2017 -0400
meson: Defining MAJOR_IN_ as done by AC_HEADER_MAJOR
https://bugzilla.gnome.org/show_bug.cgi?id=784133
config.h.meson | 3 +++
meson.build | 6 ++++++
2 files changed, 9 insertions(+)
commit 10ae3867274457aa2906b96991e46fbce3db63bd
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sun Jun 4 16:13:21 2017 +0100
meson: gio tests need to link against gobject as well
With meson from git dependencies of dependencies are no
longer added automatically and recursively to the linker
lines. Meaning dependencies that are used have to be
passed directly and explicitly or we'll get linker errors.
gio/tests/meson.build | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
commit 24ea260b4cb623db4af02085f8f8492ddf635b7e
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Wed May 31 23:54:59 2017 +0100
meson: docs: make gtk-doc find the gobject.types file
Should really use files('gobject.types') instead, but that
seems to get expanded to the build path for some reason:
https://github.com/mesonbuild/meson/issues/1875
docs/reference/gobject/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 42705b57f78556ce0327f3a4bf741bf8bb1d3a2b
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Mon May 29 15:59:11 2017 +0100
meson add missing gio/tests subdirectory/file
gio/tests/de/LC_MESSAGES/meson.build | 8 ++++++++
1 file changed, 8 insertions(+)
commit dc9b01fd64e74fc678ee5f03360778c5fc32b9da
Author: Matej Knopp <matej.knopp@gmail.com>
Date: Sun May 28 22:29:20 2017 +0200
glib-mkenums: add back missing --fprod option
... in glib-mkenums python port.
https://bugzilla.gnome.org/show_bug.cgi?id=779332
https://bugzilla.gnome.org/show_bug.cgi?id=783198
gobject/glib-mkenums.in | 2 ++
1 file changed, 2 insertions(+)
commit 29f9fe041b75c32d0d7400a22dae346f4ad6a670
Author: Matej Knopp <matej.knopp@gmail.com>
Date: Sun May 28 22:29:20 2017 +0200
glib-mkenums: Fix parsing of multiline comments
... in glib-mkenums python port.
https://bugzilla.gnome.org/show_bug.cgi?id=779332
https://bugzilla.gnome.org/show_bug.cgi?id=783198
gobject/glib-mkenums.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 69bfd1a7710fb4da4b2a226a401a406aec24df6b
Author: Sebastian Dröge <sebastian@centricular.com>
Date: Mon May 22 13:07:19 2017 +0300
meson: Install missing guuid.h header
glib/meson.build | 1 +
1 file changed, 1 insertion(+)
commit 1672678bc48c1c060d1ee6bb3df124b3e4f9ca33
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sat May 13 14:56:29 2017 +0100
glib-mkenums: fix parsing of /*< flags >*/ annotation
Fixes get_type function generation for:
- GMountMountFlags
- GDriveStartFlags
- GResourceLookupFlags
- GSocketMsgFlags
- GTlsDatabaseVerifyFlags
- GTestDBusFlags
which were registered as enum types before, which broke
some unit tests.
Problem is that the flags annotation has no value, so
options.get('flags') would always return None even if
it was present.
https://bugzilla.gnome.org/show_bug.cgi?id=779332
gobject/glib-mkenums.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 03eac5fac51da789085ad60dc1858b2cf2c6a80d
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sat May 13 11:10:52 2017 +0100
meson: rebase on top of master ~2.53.1
From 2.51.2
gio/meson.build | 29 ++++++++++++++++++-----------
gio/tests/meson.build | 34 ++++++++++++++++++++++------------
meson.build | 22 +++++++++++++++++++++-
3 files changed, 61 insertions(+), 24 deletions(-)
commit 2e9fd74b2576d276e246655aef7c40e04e51ea9e
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Tue May 2 17:04:58 2017 +0100
meson: add tests/gobject and tests/refcount
meson.build | 3 ++-
tests/gobject/meson.build | 59
++++++++++++++++++++++++++++++++++++++++++++++
tests/meson.build | 14 +++++++++++
tests/refcount/meson.build | 29 +++++++++++++++++++++++
4 files changed, 104 insertions(+), 1 deletion(-)
commit 6af4f1752a44384290f378594c9fb7f655e31682
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Fri Feb 24 20:58:04 2017 +0000
meson: gio/tests: remove some leftover rubbish
gio/tests/meson.build | 40 ----------------------------------------
1 file changed, 40 deletions(-)
commit 613e00826ead73e541648fcb53cbfde77c36650d
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Fri Feb 24 09:46:36 2017 +0000
meson: gio/tests: add more gio tests
Need to fix up some of the tests a little, because the
test binary will not necessarily be run from the current
build sub-directory, and the build directory structure
might not always be a mirror of the source directory
structure, so pass location of glib-mkenums and
glib-compile-scheme and such directly.
gio/meson.build | 2 +-
gio/tests/appinfo.c | 9 ++++++++
gio/tests/desktop-app-info.c | 8 +++++++
gio/tests/gschema-compile.c | 7 +++++-
gio/tests/gsettings.c | 30 +++++++++++++++++++++-----
gio/tests/meson.build | 51
++++++++++++++++++++++++++++++++++++++++----
6 files changed, 96 insertions(+), 11 deletions(-)
commit 1acd6de763b33f43b366c0298653734087001f5f
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat Mar 25 11:09:46 2017 +0530
meson: Use glib-mkenums directly instead of via build_mkenum.py
This is no longer needed because we use templates and custom targets
can capture output just fine on all platforms.
gio/build_mkenum.py | 25 -------------------------
gio/meson.build | 14 ++++++++------
2 files changed, 8 insertions(+), 31 deletions(-)
commit 2d72a9e1d13fbcf9483eaf9ddb2a258d7aaf3ca2
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Thu Mar 23 10:29:50 2017 +0530
glib-mkenums: misc fixes to python port
gobject/glib-mkenums.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 806a4be4cfd6186b43a379bf1653224804d3a224
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue Mar 21 22:45:42 2017 +0530
Add zlib, libffi, and proxy-libintl subproject wraps
This allows you to clone glib and just build it anywhere without any
extra dependencies besides Python 3 and Meson itself (and maybe git).
.gitignore | 2 +-
subprojects/libffi.wrap | 4 ++++
subprojects/proxy-libintl.wrap | 4 ++++
subprojects/zlib.wrap | 4 ++++
4 files changed, 13 insertions(+), 1 deletion(-)
commit dd8ff547362bb407f786ff31d853a0b3a61024f7
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue Mar 21 22:12:19 2017 +0530
meson: Use Python port of glib-mkenums
This reduces the build-time dependencies of glib to only Python 3,
Meson, and git. Git is also optional if you provide a tarball in
which the subproject directories already exist.
The Python port was done by Jussi Pakkanen on bugzilla:
https://bugzilla.gnome.org/show_bug.cgi?id=779332
This version contains some fixes from that and also changes all
instances of `@` to `\u0040` because Meson does not yet provide a
configure_file() mode that ignores unknown @MACRO@ values.
gio/build_mkenum.py | 4 +-
gio/meson.build | 4 +-
gobject/glib-mkenums.in | 1150
+++++++++++++++++++++++------------------------
gobject/meson.build | 1 -
meson.build | 3 -
5 files changed, 579 insertions(+), 583 deletions(-)
commit ee94ad776ef533f16c2561ea038106a8e23b1a75
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue Mar 21 22:06:22 2017 +0530
meson: Use proxy-libintl if gettext is not found
This is a stub-only library that can be used while building against
MSVC and contains no i18n machinery at all.
The dependencies added indirectly use the libintl.h header, and when
built as a subproject, the header won't be in a path known the
pre-processor.
gio/meson.build | 2 +-
gio/win32/meson.build | 1 +
glib/meson.build | 8 ++++----
gobject/meson.build | 2 +-
meson.build | 25 ++++++++++++++++---------
5 files changed, 23 insertions(+), 15 deletions(-)
commit fb1f52e32fa21e0d7a3b5ac5e37afbd155ed8cee
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue Mar 21 16:49:55 2017 +0530
meson: Only require libmount on Linux
It's not available on other platforms, so don't require the user to
explicitly disable it there.
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit eb07a2c87dd22039f2ce90aef7872aaef2e5d4af
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue Mar 21 16:49:09 2017 +0530
meson: Allow using libffi and zlib as subprojects
Also use the python3 module to find python3, and require Meson 0.37.1
meson.build | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
commit 2f792f64848307d6662e7b2f026c1c8ea1fc9437
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue Mar 21 16:41:40 2017 +0530
meson: Print output for more compiler checks
When no 'name:' kwarg is specified for cc.run, no output is printed.
This makes it difficult to figure out what is causing a pause in the
configure process.
meson.build | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 88e437873ad1444e6f93b8c47145b1c9eea9c592
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue Mar 21 16:38:47 2017 +0530
meson: Detect with-docs and with-man automatically
By default, only build man pages and gtk-doc if the build-deps were
found. To force-enable, pass -Dwith-docs=yes and -Dwith-man=yes.
Also use a foreach loop for man pages instead of listing them all
manually
docs/reference/gio/meson.build | 86
++++++--------------------------------
docs/reference/glib/meson.build | 36 +++++-----------
docs/reference/gobject/meson.build | 36 +++++-----------
meson.build | 11 +++--
meson_options.txt | 4 +-
5 files changed, 42 insertions(+), 131 deletions(-)
commit 5549a1d0c387d320f6141d46e34db58d1d041f84
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Fri Feb 24 16:07:45 2017 +0530
meson: Rebase and update to 2.51.2
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 192cd652d4a2c3b6fec9cfab357c87a6850492f8
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Thu Feb 23 16:13:23 2017 +0000
tests: gio/tests: add gdbus tests
gio/tests/meson.build | 130
++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 116 insertions(+), 14 deletions(-)
commit 4e0ef7655de3692e10d17f56224310ccb3f6cf9c
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Thu Feb 23 00:40:45 2017 +0000
meson: gio/tests: add more gresource tests
gio/meson.build | 2 +-
gio/tests/meson.build | 72
++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 72 insertions(+), 2 deletions(-)
commit 2f29ee1735fe83e65505c47e1a68630d9f7e1032
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Thu Feb 16 09:52:58 2017 +0000
meson: add -fvisibility=hidden explicitly to selected targets
Don't use it project-wide for building everything. Otherwise
symbols for shared modules won't be exposed, e.g. in the
resourceplugin used by the gio resource unit test.
gio/meson.build | 3 +++
gio/xdgmime/meson.build | 2 +-
glib/libcharset/meson.build | 2 +-
glib/meson.build | 2 +-
glib/pcre/meson.build | 2 +-
gmodule/meson.build | 3 +--
gobject/meson.build | 2 +-
gthread/meson.build | 3 +--
meson.build | 5 +++--
9 files changed, 13 insertions(+), 11 deletions(-)
commit 1224ff0c39b9975e685f433893fe7163eec1a81b
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Thu Feb 16 09:50:56 2017 +0000
meson: use add_project_arguments() instead of add_global_arguments()
add_global_arguments() doesn't work if the project is used as a
subproject.
meson.build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit 34e4e25d53d72db65bb2225a607d3274854fb549
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sat Jan 28 12:52:18 2017 +0000
meson: gio/tests: add more missing tests
gio/meson.build | 3 +-
gio/tests/gdbus-object-manager-example/meson.build | 23 ++++
gio/tests/gengiotypefuncs.py | 45 ++++++
gio/tests/meson.build | 151
++++++++++++---------
gobject/tests/meson.build | 8 ++
5 files changed, 163 insertions(+), 67 deletions(-)
commit f438c04fac22d31d43afef5f7666bf04dda75bf3
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sat Jan 28 17:00:41 2017 +0000
gio: tests: rename generated giotypefunc.c to giotypefuncs.inc
This is needed for the Meson port, a file name .c that's included
and shouldn't be compiled into an object is difficult to manage
otherwise.
gio/tests/.gitignore | 2 +-
gio/tests/Makefile.am | 6 +++---
gio/tests/defaultvalue.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
commit 33fb1bbb61bce38368acd5d503a16e46c511b674
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Sat Jan 28 16:59:45 2017 +0000
meson: gio, gobject: use files() for headers list
Since these variables are referenced from other directories
such as the tests/ subdir as well.
gio/meson.build | 16 ++++++++--------
gobject/meson.build | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
commit 89ee284d2b4487096d7881060ff7fc6d363c824f
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Thu Jan 26 10:49:47 2017 +0000
meson: glib/tests: add missing tests
glib/meson.build | 2 +-
glib/tests/meson.build | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
commit d29f022b0b2697df22918e7675bf18a6ca0b83c4
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Wed Jan 25 17:02:51 2017 +0000
meson: add support for dtrace/systemtap
Still at least one FIXME. And untested so far. It builds.
gio/meson.build | 17 +++++++++++++++++
glib/meson.build | 17 +++++++++++++++++
gobject/meson.build | 17 +++++++++++++++++
meson.build | 44 ++++++++++++++++++++++++++++++++++++++++++++
meson_options.txt | 6 ++++++
5 files changed, 101 insertions(+)
commit 9fdcb2bf37d5a877ac35e040d8f8570cd776a073
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed Jan 25 18:29:59 2017 +0530
meson: Add a comment about the gdbus-peer gio test
So that it's not forgotten later.
gio/tests/meson.build | 1 +
1 file changed, 1 insertion(+)
commit 5afc6600e8de778c73d8b9addbc9860830d1ba6d
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed Jan 25 18:17:24 2017 +0530
meson: Add missing termios.h check
Same change as d1d1aba3b4c024255b530b0f4f2dc9dd19a7086e
https://bugzilla.gnome.org/show_bug.cgi?id=775517
meson.build | 1 +
1 file changed, 1 insertion(+)
commit 3c6261993073ea83f5f985790964e503db26e8ea
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Thu Dec 29 08:09:44 2016 +0530
tests: autoptr test can be run on gcc, clang, intel
The only place where it won't work, is MSVC and maybe Sun Studio, but
we'd need someone to test Sun Studio first.
gio/tests/meson.build | 2 +-
glib/tests/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 9096bde3ce3f5a03abffcd9f08645dbe3b159bfb
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed Dec 21 08:51:50 2016 +0530
build: Remove function checks for unused functions
These were removed several years ago.
configure.ac | 4 ++--
meson.build | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
commit 70021b0e837c7b74ab687d95c6b788f8288c3463
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed Dec 21 08:50:30 2016 +0530
meson: Derive defines from header, struct, function names
This is what Autoconf macros do too, so no need to hard-code the
names.
meson.build | 288
++++++++++++++++++++++++++++++------------------------------
1 file changed, 146 insertions(+), 142 deletions(-)
commit 122f4c051db2d1f02569db5b167c0932ae29aa4d
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed Dec 21 07:46:30 2016 +0530
meson: Add tls-interaction test, and fix giomodule test
giomodule test needed symbol visibility pragmas added. This is
needed on
Windows anyway, so it's better to do it this way rather than disabling
-fvisibility=hidden for the test modules.
gio/tests/meson.build | 8 ++++++++
gio/tests/modules/symbol-visibility.h | 16 ++++++++++++++++
gio/tests/modules/test-module-a.c | 6 ++++--
gio/tests/modules/test-module-b.c | 6 ++++--
4 files changed, 32 insertions(+), 4 deletions(-)
commit e2da3cb5996707c1c351ce02695fdb6a9b2af78b
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed Dec 21 06:34:47 2016 +0530
meson: Port to latest master (2.51.0)
Also remove headers from some gio sources. Headers do not need to be
added to the list of sources.
+ various smaller self-explanatory fixes.
docs/reference/gio/meson.build | 9 +++++
gio/meson.build | 78
+++++++++++++++++++++++++++++++-----------
glib/meson.build | 2 +-
gobject/meson.build | 2 +-
meson.build | 34 +++++++++++++++---
meson_options.txt | 1 +
6 files changed, 99 insertions(+), 27 deletions(-)
commit d10be6102f28e63f5d85c9d8500af28dff2b7ca7
Author: Patrick Griffis <tingping@tingping.se>
Date: Fri Dec 9 14:30:22 2016 -0500
meson: Minor modernizations
gio/gdbus-2.0/codegen/meson.build | 12 ++-
gio/inotify/meson.build | 3 +-
gio/kqueue/meson.build | 3 +-
gio/meson.build | 11 ++-
gio/win32/meson.build | 3 +-
gio/xdgmime/meson.build | 3 +-
glib/libcharset/meson.build | 3 +-
glib/meson.build | 176
+++++++++++++++++++-------------------
glib/pcre/meson.build | 40 ++++-----
gmodule/meson.build | 2 +-
gobject/meson.build | 6 +-
meson.build | 40 +++++----
12 files changed, 158 insertions(+), 144 deletions(-)
commit bc2bb5639b4d499e07ae2f718def07c86a3ded67
Author: Patrick Griffis <tingping@tingping.se>
Date: Fri Dec 9 13:51:41 2016 -0500
meson: Match upstream gtkdoc changes
docs/reference/gio/meson.build | 6 +-----
docs/reference/glib/meson.build | 8 +-------
docs/reference/gobject/meson.build | 6 +-----
3 files changed, 3 insertions(+), 17 deletions(-)
commit 0df9aab0537dd61e2ee637c3b6ddc9d9d60bcddf
Author: Patrick Griffis <tingping@tingping.se>
Date: Wed Dec 7 05:28:33 2016 -0500
meson: Build all docs
docs/reference/gio/meson.build | 216
+++++++++++++++++++++++
docs/reference/gio/xml/gtkdocentities.ent.in | 8 +
docs/reference/gio/xml/meson.build | 14 ++
docs/reference/glib/meson.build | 123 +++++++++++++
docs/reference/glib/xml/gtkdocentities.ent.in | 8 +
docs/reference/glib/xml/meson.build | 14 ++
docs/reference/gobject/meson.build | 82 +++++++++
docs/reference/gobject/xml/gtkdocentities.ent.in | 8 +
docs/reference/gobject/xml/meson.build | 14 ++
meson.build | 27 ++-
10 files changed, 512 insertions(+), 2 deletions(-)
commit c61a72f4bc01d7e4f5071c8f6a8de29405cac1d0
Author: Patrick Griffis <tingping@tingping.se>
Date: Tue Dec 6 10:14:57 2016 -0500
meson: Match soname version of autotools
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a690e2a375ac0803412186b68eadf8723ee43a39
Author: Patrick Griffis <tingping@tingping.se>
Date: Tue Dec 6 08:07:03 2016 -0500
meson: More build fixes
- Fix installing various data files
- Build translations
gio/meson.build | 25 ++++++----
glib/meson.build | 13 ++++++
gobject/meson.build | 11 +++++
meson.build | 10 +++-
meson_options.txt | 2 +
po/meson.build | 129
++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 178 insertions(+), 12 deletions(-)
commit fe2a9887a8ccb14f2386e01b14834e97a33bc2d7
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed Dec 21 04:07:24 2016 +0530
meson: Improve MSVC and MinGW support and fix dependencies everywhere
Disable gio tests on Windows, fix .gitignore to not ignore
config.h.meson, and add more things to it.
Rename the library file naming and versioning to match what Autotools
outputs, e.g., libglib-2.0.so.0.5000.2 on Linux, libglib-2.0-0.dll
and
glib-2.0-0.dll on Windows with MSVC.
Several more tiny fixes, more executables built and installed, install
pkg-config and m4 files, fix building of gobject tests.
Changes to gdbus-codegen to support out-of-tree builds without
environment variables set (which you can't in Meson). We now add the
build directory to the Python module search path.
.gitignore | 15 +-
config.h.meson | 15 +-
gio/build_mkenum.py | 16 +-
gio/data-to-c.py | 16 +
gio/gdbus-2.0/codegen/codegen.py | 2 +-
gio/gdbus-2.0/codegen/config.py.in | 3 -
gio/gdbus-2.0/codegen/gdbus-codegen.in | 12 +-
gio/gdbus-2.0/codegen/meson.build | 35 ++
gio/inotify/meson.build | 3 +-
gio/kqueue/meson.build | 4 +-
gio/meson.build | 365 +++++++--------
gio/tests/meson.build | 40 +-
gio/tests/modules/meson.build | 6 +-
gio/win32/meson.build | 4 +-
gio/xdgmime/meson.build | 2 +-
glib/libcharset/meson.build | 2 +-
glib/meson.build | 95 +++-
glib/pcre/meson.build | 50 +++
glib/tests/meson.build | 50 +--
gmodule/meson.build | 40 +-
gobject/gmarshal-list-to-strings.py | 21 +
gobject/meson.build | 53 ++-
gobject/tests/gobject_test_marshal.py | 10 +-
gobject/tests/meson.build | 20 +-
gthread/meson.build | 9 +-
meson.build | 799
+++++++++++++++++++--------------
26 files changed, 981 insertions(+), 706 deletions(-)
commit 213957970ee4e58e37ee2c81766284af34dddcb9
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Mon Mar 7 11:13:24 2016 +0000
meson: Fix glib, add gobject, gio, gthread, gmodule, etc
Several small fixes to the build files.
Lots of tests have also been added, and glib tests pass now.
config.h.meson | 786 ++++++++++++++++++++++
gio/build_mkenum.py | 23 +
gio/inotify/meson.build | 13 +
gio/kqueue/meson.build | 15 +
gio/meson.build | 802 ++++++++++++++++++++++
gio/tests/meson.build | 219 ++++++
gio/tests/modules/meson.build | 13 +
gio/win32/meson.build | 13 +
gio/xdgmime/meson.build | 15 +
glib/glibconfig.h.in | 83 +--
glib/libcharset/meson.build | 4 +-
glib/meson.build | 108 ++-
glib/tests/Makefile.am | 1 +
glib/tests/meson.build | 165 +++++
gmodule/meson.build | 90 +++
gobject/meson.build | 65 ++
gobject/tests/gobject_test_marshal.py | 17 +
gobject/tests/meson.build | 69 ++
gthread/meson.build | 11 +
meson.build | 1197
++++++++++++++++++++++++++-------
20 files changed, 3405 insertions(+), 304 deletions(-)
commit 98e641424b2e24cdae8c6e4ba022e53fc89d4640
Author: Jussi Pakkanen <jpakkane@gmail.com>
Date: Wed Aug 7 23:41:12 2013 +0300
meson: initial glib build
https://mail.gnome.org/archives/gtk-devel-list/2013-August/msg00001.html
glib/glibconfig.h.in | 222 ++++++++++++++++++
glib/libcharset/meson.build | 3 +
glib/meson.build | 106 +++++++++
meson.build | 538
++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 869 insertions(+)
commit 41385745e73df690ff3ab9f07d975626935a51de
Author: Matthias Clasen <mclasen@redhat.com>
Date: Thu Jul 13 19:03:00 2017 -0400
Revert "mkenums: Support public/private trigraph"
This reverts commit 9ba17d511e325eec1e0c1c27cb4d37de4f12ac1e.
This conflicts with the python port in the meson branch.
gobject/glib-mkenums.in | 19 -------------------
1 file changed, 19 deletions(-)
commit 9aa98db40450bc539a5cf59640c9f9cf28da93e8
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Jul 13 17:45:44 2017 +0800
Visual Studio builds: Use PythonDir instead of PythonPath
This is to avoid confusion with the PYTHONPATH envvar that is commonly
used to determine where additional Python modules can be loaded,
especially in the case of a MSBuild build. Note that envvar names are
not case sensitive on Windows in general.
win32/vs10/README.txt | 2 +-
win32/vs10/glib-install.propsin | 8 ++++----
win32/vs10/glib-version-paths.props.in | 14 +++++++-------
win32/vs9/README.txt | 2 +-
win32/vs9/glib-install.vspropsin | 8 ++++----
win32/vs9/glib-version-paths.vsprops.in | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
commit 75fa8c2afbab4f414d2eb03684d9f807bd690aef
Author: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Thu Jul 13 01:42:13 2017 +0000
W32 - don't use gettext & gcov during gettext init
Non-representable characters during UTF16->locale conversion
will cause gcov code to return an error, for which it will try
to use gettext, so that the error message is localized.
If such call is made while gettext is being initialized
(there's a g_once_init_enter up the stack), the thread will hang
forever.
To solve this, use W32 API to do the UTF16->locale conversion
and don't use gettext when it returns an error.
Also optimize g_win32_locale_filename_from_utf8() a bit,
as we need more UTF16 and less UTF8 now.
https://bugzilla.gnome.org/show_bug.cgi?id=784579
glib/gwin32.c | 76
++++++++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 60 insertions(+), 16 deletions(-)
commit b803c0a224f88c4d9afac1ae967832c6d9633551
Author: Christoph Reiter <creiter@src.gnome.org>
Date: Wed Jul 12 23:36:18 2017 +0200
gspawn-win32: Fix multiple definition error with a static build
gspawn-win32.c gets included by gspawn-win32-helper.c and in case
of a static build the definitions there clash with the ones from
libglib. Fixed by not compiling the ABI comapt code in case
GSPAWN_HELPER is defined.
I missed this issue in commit 23dffdd949eb1c
https://bugzilla.gnome.org/show_bug.cgi?id=780634
glib/gspawn-win32.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit b60e4665ef3c74179885f528c3f675526600830e
Author: Christoph Reiter <creiter@src.gnome.org>
Date: Wed Jul 12 22:32:25 2017 +0200
gwin32: Fix missing prototypes on win64
I missed this in commit 5067d25a74783a8b6e
https://bugzilla.gnome.org/show_bug.cgi?id=780634
glib/gwin32.h | 2 --
1 file changed, 2 deletions(-)
commit c4b5702e08d97b1b1163c2022ad4c7d92bee140c
Author: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Wed Jul 12 19:46:07 2017 +0000
Use %lu format for DWORD
glib/gmain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5eededccda6236cd307b0f0bcc852e495e9fd8f8
Author: Daniel Boles <dboles@src.gnome.org>
Date: Wed Jul 12 19:23:40 2017 +0100
gsettingsschema: Fix a compiler warning
g_build_filename() returns a gchar*, but it was stored in a const
gchar*
and then g_free()d, which is wrong and led to a warning about
the const
qualifier being cast away.
gio/gsettingsschema.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7d64d109f0d78ba683df1122ddfadd5ace3e9143
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Jul 12 18:18:28 2017 +0800
MSVC 201x builds: Allow different Python versions per toolset
Use conditionals to select the Python installation, so that we
can more
stick to the default Visual Studio versions used to compile each
official Python releases more closely.
This means by default:
-2010/2012/2013 builds use Python 3.4.x, which is built with 2010
-2015/2017 builds use Python 3.6.x, which is built with 2015
win32/vs10/glib-version-paths.props.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit a00e7ed32e510791016725ce0a3dc08f59b9a443
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Jul 12 11:45:34 2017 +0800
win32: Update MSVC projects for glib-genmarshal
glib-genmarshal is now a Python script instead of a compiled
program, so
we need to:
-Remove the projects that are used to build the glib-genmarshal
sources.
-Generate the full glib-genmarshal Python script from
glib-genmarshal.in
-Make Python a hard build-time requirement, since we use this tool
in many parts of the stack (and it is the case for glib-mkenums).
-Tell people in the Visual Studio build README.txt files that Python
2.7.x or 3.x is now required for the build/"install".
win32/gen_util_scripts.py | 7 +-
win32/vs10/Makefile.am | 2 -
win32/vs10/README.txt | 5 +
win32/vs10/glib-genmarshal.vcxproj | 173
-----------------------------
win32/vs10/glib-genmarshal.vcxproj.filters | 22 ----
win32/vs10/glib-install.propsin | 19 ++--
win32/vs10/glib-install.vcxproj | 12 +-
win32/vs10/glib-install.vcxproj.filters | 1 +
win32/vs10/glib.sln | 90 ++++++---------
win32/vs11/Makefile.am | 2 -
win32/vs12/Makefile.am | 2 -
win32/vs14/Makefile.am | 2 -
win32/vs15/Makefile.am | 2 -
win32/vs9/Makefile.am | 1 -
win32/vs9/README.txt | 7 +-
win32/vs9/glib-genmarshal.vcproj | 161
---------------------------
win32/vs9/glib-install.vcproj | 34 ++++++
win32/vs9/glib-install.vspropsin | 17 +--
win32/vs9/glib.sln | 70 ++++--------
19 files changed, 141 insertions(+), 488 deletions(-)
commit c6793d1cfb845ae1cab7fa03a8044568e3494ecd
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Jul 11 18:23:38 2017 +0100
Allow whitespace between marshallers list tokens
Some (older) list files use whitespace, and we need to take that into
account when splitting off the various tokens.
gobject/glib-genmarshal.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit cf7ee86b97981f116a4f2c736cbfb355588a5262
Author: Aleksandr Slobodeniuk <alenuke@yandex.ru>
Date: Tue Jul 11 15:48:58 2017 +0300
docs: fixing lost character
https://bugzilla.gnome.org/show_bug.cgi?id=784792
glib/gvariant.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 522ba7303ea4302dd3b36221304d309efaaca238
Author: Daniel Boles <dboles@src.gnome.org>
Date: Tue Jul 11 12:49:40 2017 +0100
docs: tut_gsignal: Fix mismatched argument names
The names differed between the argument declaration and its
description.
docs/reference/gobject/tut_gsignal.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 30b961607a187c2e55cadc73db96ec99d3d8a44b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Jul 11 12:24:10 2017 +0100
Avoid a leak for arguments in va_list marshallers
We need to revers a check on whether the list of arguments needs
unboxing.
gobject/glib-genmarshal.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ea365530d2ddf88fec914a12899f1ece6d9962ba
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Jul 11 12:15:44 2017 +0100
Do not mix declarations and statements
Projects using glib-genmarshal may still wish to support C89.
gobject/glib-genmarshal.in | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
commit 9c66e65b29d5fd17dcfd77c4b010aa792b2e1d5a
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jul 5 19:26:26 2017 +0100
Remove unused marshallers-related files
We don't use gmarshal.list any more, and the generated
gmarshal.strings
file is not used after the Python port of glib-genmarshal.
https://bugzilla.gnome.org/show_bug.cgi?id=784528
gobject/Makefile.am | 6 ++----
gobject/glib-genmarshal.in | 2 +-
gobject/gmarshal.list | 32 --------------------------------
gobject/marshal-genstrings.pl | 9 ---------
win32/setup.py | 20 --------------------
5 files changed, 3 insertions(+), 66 deletions(-)
commit f7643a7df750684c97aaef8b3fbf66fcc2661e84
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jul 5 17:10:08 2017 +0100
Re-enable signal tests when cross-compiling
The glib-genmarshal tool has been rewritten in Python, which means we
can run it when cross-compiling.
https://bugzilla.gnome.org/show_bug.cgi?id=784528
gobject/tests/Makefile.am | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
commit 93f16a45abe81c3186c84a343a2e47493cf5d875
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jun 22 17:04:05 2017 +0100
Rewrite glib-genmarshal in Python
We're in the process or rewriting other tools in Python to reduce the
number of dependencies of GLib.
Additionally, making glib-genmarshal a Python script reduces the
complexity when cross-compiling, as we don't need a native build to
generate the marshallers.
https://bugzilla.gnome.org/show_bug.cgi?id=784528
configure.ac | 2 +
docs/reference/gobject/glib-genmarshal.xml | 107 ++-
gobject/Makefile.am | 19 +-
gobject/glib-genmarshal.c | 1136
----------------------------
gobject/glib-genmarshal.in | 1022
+++++++++++++++++++++++++
5 files changed, 1121 insertions(+), 1165 deletions(-)
commit 2502bfd8b0e9a8136aae833dc674a28a884f1de1
Author: Philip Withnall <withnall@endlessm.com>
Date: Mon Jul 10 11:35:11 2017 +0100
Re-normalise line endings of README.win32
Signed-off-by: Philip Withnall <withnall@endlessm.com>
README.win32 | 406
+++++++++++++++++++++++++++++------------------------------
1 file changed, 203 insertions(+), 203 deletions(-)
commit a88302683fd2b332ba665baac6d8be592d7e52aa
Author: Philip Withnall <withnall@endlessm.com>
Date: Mon Jul 10 11:31:52 2017 +0100
git: Add .gitattributes file with EOL settings for README.win32
Set it to always have CRLF line endings, since we want it to be
readable
on Windows by default. This should result in the line endings being
normalised to CRLF even after it’s edited by someone on Linux.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
.gitattributes | 1 +
1 file changed, 1 insertion(+)
commit a13113491855bf2803374bcfece824df0891c82a
Author: Philip Withnall <withnall@endlessm.com>
Date: Mon Jul 3 11:30:08 2017 +0100
build: Drop nmake/MSC build system for GLib
It hasn’t been seriously maintained for the best part of 10 years
and is
very outdated. The recommended way to build GLib on Windows is now
Visual Studio:
https://wiki.gnome.org/Projects/GTK%2B/Win32/MSVCCompilationOfGTKStack#GLib
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=722047
Makefile.am | 1 -
README.win32 | 183 +---------------------------
build/win32/Makefile.am | 4 -
build/win32/dirent/Makefile.am | 1 -
build/win32/dirent/makefile.msc | 16 ---
build/win32/make.msc | 237
------------------------------------
build/win32/module.defs | 124 -------------------
configure.ac | 5 -
gio/Makefile.am | 1 -
gio/makefile.msc | 260
----------------------------------------
gio/win32/makefile.msc | 35 ------
glib/.gitignore | 1 -
glib/Makefile.am | 2 -
glib/gnulib/Makefile.am | 3 -
glib/gnulib/makefile.msc | 18 ---
glib/makefile.msc.in | 143 ----------------------
glib/pcre/Makefile.am | 4 +-
glib/pcre/makefile.msc | 30 -----
glib/update-pcre/update.sh | 38 ------
gmodule/.gitignore | 1 -
gmodule/Makefile.am | 2 -
gmodule/makefile.msc.in | 37 ------
gobject/.gitignore | 1 -
gobject/Makefile.am | 2 -
gobject/makefile.msc.in | 83 -------------
gthread/.gitignore | 1 -
gthread/Makefile.am | 2 -
gthread/makefile.msc.in | 26 ----
makefile.msc | 28 -----
tests/.gitignore | 2 -
tests/Makefile.am | 4 -
tests/makefile.msc.in | 105 ----------------
win32-fixup.pl | 41 -------
33 files changed, 2 insertions(+), 1439 deletions(-)
commit 1d3210a8abeed853a943fe1620ccd4f24b76eb05
Author: Aleksander Morgado <aleksander@aleksander.es>
Date: Mon Jul 10 11:11:39 2017 +0200
configure: fix minor typo 'be build'->'be built'
https://bugzilla.gnome.org/show_bug.cgi?id=784739
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 28cc905cd02043a64135ccdf7f4e05d5672e4756
Author: Yosef Or Boczko <yoseforb@src.gnome.org>
Date: Sun Jul 9 20:47:55 2017 +0300
Updated Hebrew translation
po/he.po | 904
++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 459 insertions(+), 445 deletions(-)
commit 28cc6aeb19dd2b5ff6e01362dbee833636930eeb
Author: Matthias Clasen <mclasen@redhat.com>
Date: Fri Jul 7 19:11:51 2017 -0400
gsettings: Try harder to describe keys
If a key has no description, show the summary,
rather than "(null)". Since thats not helpful at all.
gio/gsettings-tool.c | 2 ++
1 file changed, 2 insertions(+)
commit 85e4a2591227940db712223d8e39ccd7ae75802f
Author: Matthias Clasen <mclasen@redhat.com>
Date: Sat Jul 1 20:31:51 2017 -0400
Avoid a race with the openuri portal
Same as the previous commit; use the new predictable request
object path to connect to the Response signal early.
gio/gopenuriportal.c | 67
++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 55 insertions(+), 12 deletions(-)
commit a95e2a4c64c74fa648e5ac5b6130c84ad73731ad
Author: Bastien Nocera <hadess@hadess.net>
Date: Wed Jul 5 22:52:54 2017 +0200
docs: Fix cut'n'paste error in g_resources_get_info() doc
https://bugzilla.gnome.org/show_bug.cgi?id=784581
gio/gresource.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 8e23a514b02c67104f03545dec58116f00087229
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun Jul 2 22:51:30 2017 +0200
unicode: Update test data files for unicode 10.0.0
https://bugzilla.gnome.org/show_bug.cgi?id=784456
tests/casefold.txt | 2 +-
tests/casemap.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 4e1567a079c13036320802f49ee8f78f78d0273a
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun Jul 2 22:47:09 2017 +0200
unicode: Update to unicode 10.0.0
https://bugzilla.gnome.org/show_bug.cgi?id=784456
glib/gscripttable.h | 78 ++--
glib/gunibreak.h | 1062
++++++++++++++++++++++++++++++------------------
glib/gunichartables.h | 1074
++++++++++++++++++++++++++++++++-----------------
glib/gunicode.h | 12 +-
glib/gunidecomp.h | 72 ++--
glib/guniprop.c | 6 +
glib/tests/unicode.c | 10 +
7 files changed, 1476 insertions(+), 838 deletions(-)
commit a74fe20064d0f5f1ad8f191b2f988c3d11776054
Author: Philip Withnall <withnall@endlessm.com>
Date: Wed Jul 5 16:35:58 2017 +0100
tests: Drop local timezone GTimeVal overflow check
We can’t reasonably control the local timezone in the test
environment, so drop some assertions which were assuming the local
timezone offset was not big enough to cause an overflow in the
GTimeVal
handling for GDateTime.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
glib/tests/gdatetime.c | 7 -------
1 file changed, 7 deletions(-)
commit 5a8b02cae6a630a19cc0c164f5f8a93eddb240ab
Author: Philip Withnall <withnall@endlessm.com>
Date: Tue Jul 4 10:21:38 2017 +0100
gdbusutils: Add an example to g_dbus_gvariant_to_gvalue() docs
Clarify that GVariants of type v are not magically unboxed.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=784433
gio/gdbusutils.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 9bc3d025f97ad1db456604f42bd014b7a9ac4048
Author: Jehan <jehan@girinstud.io>
Date: Sat Jul 1 17:03:29 2017 +0200
configure: close a parenthese in an error message.
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit f39024038fd009d94a5929f9bab656cb2f7097cc
Author: Matthias Clasen <mclasen@redhat.com>
Date: Wed Jun 28 15:49:40 2017 -0400
Disambiguate source names
This makes debugging more pleasant.
gio/gdbusconnection.c | 2 +-
gio/gdbusnameowning.c | 2 +-
gio/gdbusnamewatching.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit 79e4d4c6be616277d7d6ba2f830852967c42f6e3
Author: Emanuele Aina <emanuele.aina@collabora.com>
Date: Wed Jun 21 15:45:07 2017 +0200
gio: Mention the ALL_METADATA flag in g_file_copy()
The g_file_copy() documentation didn't mention if
G_FILE_COPY_ALL_METADATA was applicable or not, and users were led to
call g_file_copy_attributes() to specify it after the g_file_copy()
call, unless they checked the source (been there, done that).
https://bugzilla.gnome.org/show_bug.cgi?id=784037
gio/gfile.c | 4 ++++
1 file changed, 4 insertions(+)
commit fd329f4853f180eb92746f39fc96fd5d91394009
Author: Sebastian Dröge <sebastian@centricular.com>
Date: Wed Jun 21 09:52:06 2017 +0300
GKeyFile – Add array length annotations to to_data(), get_keys()
and get_groups()
https://bugzilla.gnome.org/show_bug.cgi?id=784020
glib/gkeyfile.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 1366ce7ee004f97886807b9fede205c0af8b1a17
Author: Philip Withnall <withnall@endlessm.com>
Date: Tue Jun 20 13:41:10 2017 +0100
gutf8: Clarify return value docs for g_utf8_find_next_char()
Make it clearer that it will only return NULL if @end is non-NULL. Add
a
test for this too.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=773842
glib/gutf8.c | 8 +++++++-
glib/tests/utf8-pointer.c | 9 +++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
commit 3e89b19c44d353edfafde876e12b56ddd29ef8a4
Author: Philip Withnall <withnall@endlessm.com>
Date: Fri Mar 17 12:15:15 2017 +0000
gutf8: Fix documentation for g_utf8_get_char_validated() length limits
If g_utf8_get_char_validated() encounters a nul byte in the middle
of a
string of given longer length, it returns -2, indicating a partial
gunichar. That is not the obvious behaviour, but since
g_utf8_get_char_validated() has been API for a long time, the
behaviour
cannot be changed.
Document it, and add some unit tests (for this behaviour and the other
behaviour of g_utf8_get_char_validated()).
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=780095
glib/gutf8.c | 4 ++++
glib/tests/utf8-validate.c | 53
++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
commit 428acd9b1486beba186c073577ea659eee44ae0a
Author: Philip Withnall <withnall@endlessm.com>
Date: Mon Jun 19 13:57:36 2017 +0100
tests: Fix overflows in find_maximum_supported_tv_sec()
The addition (highest_success + lowest_failure) could have overflowed,
and typically would do on 32-bit platforms where the real
highest_success should be G_MAXLONG. Fix that, and introduce special
handling of the corner case of (highest_success = G_MAXLONG).
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=783841
glib/tests/gdatetime.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
commit 30fed3b906f3408aa4fc9a7996fa03cf7b940ebe
Author: Philip Withnall <withnall@endlessm.com>
Date: Fri Jun 16 12:42:32 2017 +0100
tests: Fix GDateTime overflow tests on 32-bit architectures
On architectures where sizeof(glong) == 32 bits, there are no problems
with overflow when constructing a GDateTime from a GTimeVal. Adjust
the
test for this by basing it on the maximum supported tv_sec value
it can
calculate, rather than a fixed ‘known unsupported’ value.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=783841
glib/tests/gdatetime.c | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
commit 2db7aa479919dc7ae8742f52ad5d54191a7282fd
Author: Philip Withnall <withnall@endlessm.com>
Date: Fri Jun 16 12:31:58 2017 +0100
gdatetime: Fix a potential overflow in overflow calculations
I can’t remember whether glong (tv.tv_sec) needs to be explicitly
promoted to gint64 here, or whether C does it automatically. Safer to
make the cast explicit to avoid overflow issues on 32-bit platforms,
where glong is 32-bit.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=783841
glib/gdatetime.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 18f8b77c04be373fd4f65560519ab0e09596801e
Author: Philip Withnall <withnall@endlessm.com>
Date: Tue Jun 20 14:58:14 2017 +0100
gio: Use g_strerror() instead of strerror()
This marginally improves thread safety, and marginally improves
consistency.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=733821
gio/gdbusauthmechanismsha1.c | 12 ++++++------
gio/gdbusmessage.c | 2 +-
gio/gdbusserver.c | 2 +-
gio/gtestdbus.c | 4 ++--
gio/gunixconnection.c | 6 +++---
gio/tests/gdbus-peer.c | 2 +-
gio/tests/gsubprocess-testprog.c | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
commit c8e268bbce70ee05da5a94e424517168a14c7645
Author: Igor Pashev <pashev.igor@gmail.com>
Date: Tue Jun 20 13:38:00 2017 +0000
Fix detection and usage of strerror_r()
autoconf provides a macro for this situation, which saves us having to
manually work out whether strerror_r() returns a char* or an int.
https://bugzilla.gnome.org/show_bug.cgi?id=784000
configure.ac | 3 ++-
glib/gstrfuncs.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)