diff options
| -rw-r--r-- | ChangeLog | 895 | ||||
| -rw-r--r-- | Makefile.in | 28 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | PKG-INFO | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 673 | ||||
| -rwxr-xr-x | config.guess | 192 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | config.sub | 31 | ||||
| -rwxr-xr-x | configure | 509 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | examples/Makefile.in | 3 | ||||
| -rw-r--r-- | gi/Makefile.in | 7 | ||||
| -rw-r--r-- | gi/_gobject/Makefile.in | 3 | ||||
| -rw-r--r-- | gi/overrides/Makefile.in | 3 | ||||
| -rw-r--r-- | gi/repository/Makefile.in | 3 | ||||
| -rw-r--r-- | ltmain.sh | 32 | ||||
| -rw-r--r-- | m4/libtool.m4 | 81 | ||||
| -rwxr-xr-x | missing | 4 | ||||
| -rw-r--r-- | pygtkcompat/Makefile.in | 3 | ||||
| -rw-r--r-- | tests/Makefile.in | 7 |
20 files changed, 1373 insertions, 1114 deletions
@@ -1,3 +1,31 @@ +commit 7bd599e066c4bad84156e132c732abe3e78fffef +Author: Garrett Regier <garrettregier@gmail.com> +Date: Tue Sep 22 00:10:35 2015 -0700 + + Release 3.16.0 + + NEWS | 2 ++ + configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit e2b8ba0584d1a3273dfa2fcb23616d1dc68fdb8e +Author: Simon Feltman <sfeltman@src.gnome.org> +Date: Wed Aug 19 21:04:37 2015 -0700 + + configure.ac: post-release version bump to 3.17.91 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6392b2727e7ed391683bebbf69fbc8b474e99a5f +Author: Simon Feltman <sfeltman@src.gnome.org> +Date: Wed Aug 19 21:02:44 2015 -0700 + + release 3.17.90 + + NEWS | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + commit 1da98892cf505b35ce0280db22e1e8ba31c095e0 Author: Simon Feltman <sfeltman@src.gnome.org> Date: Wed Aug 19 20:57:37 2015 -0700 @@ -2914,12 +2942,9 @@ Date: Mon Mar 24 18:04:27 2014 -0700 https://bugzilla.gnome.org/show_bug.cgi?id=726877 - tests/Makefile.am | 2 +- - tests/test_import_machinery.py | 58 - ++++++++++++++++++++++++++++++++++++++++++ - tests/test_overrides.py | 58 - ------------------------------------------ - 3 files changed, 59 insertions(+), 59 deletions(-) + tests/Makefile.am | 2 +- + tests/{test_overrides.py => test_import_machinery.py} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) commit a863e5ec0ac27de49a0ae261fd3a78745cfe84a0 Author: Simon Feltman <sfeltman@src.gnome.org> @@ -3518,22 +3543,22 @@ Date: Sat Oct 12 20:00:12 2013 -0700 https://bugzilla.gnome.org/show_bug.cgi?id=709700 - gi/Makefile.am | 2 + - gi/pygi-argument.c | 1 + - gi/pygi-array.c | 3 + - gi/pygi-cache.c | 72 +------ - gi/pygi-cache.h | 1 + - gi/pygi-marshal-cleanup.c | 48 ----- - gi/pygi-marshal-cleanup.h | 16 -- - gi/pygi-marshal-from-py.c | 288 -------------------------- - gi/pygi-marshal-from-py.h | 33 --- - gi/pygi-marshal-to-py.c | 120 ----------- - gi/pygi-marshal-to-py.h | 27 --- - gi/pygi-object.c | 2 +- - gi/pygi-struct-marshal.c | 516 - ++++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-struct-marshal.h | 73 +++++++ - 14 files changed, 607 insertions(+), 595 deletions(-) + gi/Makefile.am | 2 + + gi/pygi-argument.c | 1 + + gi/pygi-array.c | 3 + + gi/pygi-cache.c | 72 +-- + gi/pygi-cache.h | 1 + + gi/pygi-marshal-cleanup.c | 48 -- + gi/pygi-marshal-cleanup.h | 16 - + gi/pygi-marshal-from-py.c | 288 ------------ + gi/pygi-marshal-from-py.h | 33 -- + gi/pygi-marshal-to-py.c | 120 ----- + gi/pygi-marshal-to-py.h | 27 -- + gi/pygi-object.c | 2 +- + ...ygi-marshal-from-py.c => pygi-struct-marshal.c} | 500 + +++++++++++---------- + gi/pygi-struct-marshal.h | 73 +++ + 14 files changed, 352 insertions(+), 834 deletions(-) commit 4dcaa2b988239e01224994098c3e7cbe8b455fe0 Author: Simon Feltman <sfeltman@src.gnome.org> @@ -3988,18 +4013,15 @@ Date: Wed Jan 8 19:22:08 2014 -0800 https://bugzilla.gnome.org/show_bug.cgi?id=712197 - Makefile.am | 3 +- - configure.ac | 1 - - gi/Makefile.am | 1 - - gi/_glib/Makefile.am | 21 --- - gi/_glib/__init__.py | 20 --- - gi/_glib/option.py | 363 - ------------------------------------------------ - gi/_option.py | 363 - ++++++++++++++++++++++++++++++++++++++++++++++++ - gi/overrides/GLib.py | 2 +- - gi/overrides/GObject.py | 2 +- - 9 files changed, 367 insertions(+), 409 deletions(-) + Makefile.am | 3 ++- + configure.ac | 1 - + gi/Makefile.am | 1 - + gi/_glib/Makefile.am | 21 --------------------- + gi/_glib/__init__.py | 20 -------------------- + gi/{_glib/option.py => _option.py} | 2 +- + gi/overrides/GLib.py | 2 +- + gi/overrides/GObject.py | 2 +- + 8 files changed, 5 insertions(+), 47 deletions(-) commit ad565e5bbc9d12607c39be9479bc671a8f2de6e3 Author: Simon Feltman <sfeltman@src.gnome.org> @@ -4016,37 +4038,27 @@ Date: Wed Jan 8 18:57:58 2014 -0800 https://bugzilla.gnome.org/show_bug.cgi?id=712197 - gi/Makefile.am | 16 +- - gi/_glib/Makefile.am | 74 +------ - gi/_glib/__init__.py | 5 - - gi/_glib/glibmodule.c | 103 --------- - gi/_glib/option.py | 2 +- - gi/_glib/pyglib-private.h | 49 ----- - gi/_glib/pyglib-python-compat.h | 195 ----------------- - gi/_glib/pyglib.c | 475 - ---------------------------------------- - gi/_glib/pyglib.h | 77 ------- - gi/_glib/pygoptioncontext.c | 337 ---------------------------- - gi/_glib/pygoptioncontext.h | 39 ---- - gi/_glib/pygoptiongroup.c | 298 ------------------------- - gi/_glib/pygoptiongroup.h | 42 ---- - gi/_glib/pygspawn.c | 259 ---------------------- - gi/_glib/pygspawn.h | 32 --- - gi/gimodule.c | 9 + - gi/glibmodule.c | 77 +++++++ - gi/gobjectmodule.c | 5 +- - gi/overrides/GLib.py | 2 +- - gi/pyglib-private.h | 43 ++++ - gi/pyglib-python-compat.h | 195 +++++++++++++++++ - gi/pyglib.c | 402 ++++++++++++++++++++++++++++++++++ - gi/pyglib.h | 67 ++++++ - gi/pygoptioncontext.c | 337 ++++++++++++++++++++++++++++ - gi/pygoptioncontext.h | 39 ++++ - gi/pygoptiongroup.c | 298 +++++++++++++++++++++++++ - gi/pygoptiongroup.h | 42 ++++ - gi/pygspawn.c | 259 ++++++++++++++++++++++ - gi/pygspawn.h | 32 +++ - 29 files changed, 1819 insertions(+), 1991 deletions(-) + gi/Makefile.am | 16 +++++-- + gi/_glib/Makefile.am | 74 + +------------------------------- + gi/_glib/__init__.py | 5 --- + gi/_glib/option.py | 2 +- + gi/gimodule.c | 9 ++++ + gi/{_glib => }/glibmodule.c | 34 ++------------- + gi/gobjectmodule.c | 5 +-- + gi/overrides/GLib.py | 2 +- + gi/{_glib => }/pyglib-private.h | 14 ++---- + gi/{_glib => }/pyglib-python-compat.h | 0 + gi/{_glib => }/pyglib.c | 81 + ++--------------------------------- + gi/{_glib => }/pyglib.h | 10 ----- + gi/{_glib => }/pygoptioncontext.c | 0 + gi/{_glib => }/pygoptioncontext.h | 0 + gi/{_glib => }/pygoptiongroup.c | 0 + gi/{_glib => }/pygoptiongroup.h | 0 + gi/{_glib => }/pygspawn.c | 0 + gi/{_glib => }/pygspawn.h | 0 + 18 files changed, 40 insertions(+), 212 deletions(-) commit 2624bd2b4a465a2d234951dd5b855fe8a0d46e1c Author: Simon Feltman <sfeltman@src.gnome.org> @@ -4065,28 +4077,25 @@ Date: Thu Oct 31 03:13:53 2013 -0700 https://bugzilla.gnome.org/show_bug.cgi?id=712197 - Makefile.am | 5 +- - gi/__init__.py | 19 +- - gi/_constants.py | 49 +++++ - gi/_gobject/Makefile.am | 5 +- - gi/_gobject/__init__.py | 42 +---- - gi/_gobject/constants.py | 50 ----- - gi/_gobject/propertyhelper.py | 417 - ------------------------------------------ - gi/_gobject/signalhelper.py | 259 -------------------------- - gi/_propertyhelper.py | 417 - ++++++++++++++++++++++++++++++++++++++++++ - gi/_signalhelper.py | 258 ++++++++++++++++++++++++++ - gi/module.py | 16 +- - gi/overrides/GObject.py | 7 +- - gi/overrides/__init__.py | 2 +- - gi/types.py | 41 ++++- - pygtkcompat/pygtkcompat.py | 4 +- - tests/test_gi.py | 2 +- - tests/test_gobject.py | 4 +- - tests/test_properties.py | 2 +- - tests/test_signal.py | 2 +- - 19 files changed, 796 insertions(+), 805 deletions(-) + Makefile.am | 5 ++- + gi/__init__.py | 19 +++++----- + gi/{_gobject/constants.py => _constants.py} | 5 ++- + gi/_gobject/Makefile.am | 5 +-- + gi/_gobject/__init__.py | 42 + ++-------------------- + .../propertyhelper.py => _propertyhelper.py} | 4 +-- + gi/{_gobject/signalhelper.py => _signalhelper.py} | 5 ++- + gi/module.py | 16 ++++----- + gi/overrides/GObject.py | 7 ++-- + gi/overrides/__init__.py | 2 +- + gi/types.py | 41 + ++++++++++++++++----- + pygtkcompat/pygtkcompat.py | 4 +-- + tests/test_gi.py | 2 +- + tests/test_gobject.py | 4 ++- + tests/test_properties.py | 2 +- + tests/test_signal.py | 2 +- + 16 files changed, 78 insertions(+), 87 deletions(-) commit d3e8946dbb23197a2e9d7de351a7b9cd04d360b9 Author: Simon Feltman <sfeltman@src.gnome.org> @@ -4100,68 +4109,48 @@ Date: Thu Oct 31 02:22:03 2013 -0700 https://bugzilla.gnome.org/show_bug.cgi?id=712197 - gi/Makefile.am | 31 +- - gi/_glib/pyglib-python-compat.h | 62 +- - gi/_gobject/Makefile.am | 69 +- - gi/_gobject/__init__.py | 4 +- - gi/_gobject/constants.py | 3 +- - gi/_gobject/gobjectmodule.c | 2213 - ----------------------------------- - gi/_gobject/propertyhelper.py | 16 +- - gi/_gobject/pygboxed.c | 235 ---- - gi/_gobject/pygboxed.h | 27 - - gi/_gobject/pygenum.c | 371 ------ - gi/_gobject/pygenum.h | 27 - - gi/_gobject/pygflags.c | 497 -------- - gi/_gobject/pygflags.h | 27 - - gi/_gobject/pyginterface.c | 124 -- - gi/_gobject/pyginterface.h | 40 - - gi/_gobject/pygobject-private.h | 204 ---- - gi/_gobject/pygobject.c | 2473 - --------------------------------------- - gi/_gobject/pygobject.h | 636 ---------- - gi/_gobject/pygparamspec.c | 418 ------- - gi/_gobject/pygparamspec.h | 31 - - gi/_gobject/pygpointer.c | 198 ---- - gi/_gobject/pygpointer.h | 27 - - gi/_gobject/pygtype.c | 1927 ------------------------------ - gi/_gobject/pygtype.h | 28 - - gi/_gobject/signalhelper.py | 3 +- - gi/gimodule.c | 13 +- - gi/gobjectmodule.c | 2213 - +++++++++++++++++++++++++++++++++++ - gi/module.py | 4 +- - gi/pygboxed.c | 235 ++++ - gi/pygboxed.h | 27 + - gi/pygenum.c | 371 ++++++ - gi/pygenum.h | 27 + - gi/pygflags.c | 497 ++++++++ - gi/pygflags.h | 27 + - gi/pygi-argument.c | 3 +- - gi/pygi-boxed.c | 2 +- - gi/pygi-ccallback.c | 2 +- - gi/pygi-foreign.c | 2 +- - gi/pygi-info.c | 2 +- - gi/pygi-marshal-to-py.c | 3 +- - gi/pygi-private.h | 2 +- - gi/pygi-source.c | 3 +- - gi/pygi-struct.c | 2 +- - gi/pygi.h | 3 +- - gi/pyginterface.c | 124 ++ - gi/pyginterface.h | 40 + - gi/pygobject-private.h | 205 ++++ - gi/pygobject.c | 2473 - +++++++++++++++++++++++++++++++++++++++ - gi/pygobject.h | 636 ++++++++++ - gi/pygparamspec.c | 418 +++++++ - gi/pygparamspec.h | 33 + - gi/pygpointer.c | 198 ++++ - gi/pygpointer.h | 27 + - gi/pygtype.c | 1927 ++++++++++++++++++++++++++++++ - gi/pygtype.h | 28 + - gi/types.py | 3 +- - tests/Makefile.am | 2 +- - 57 files changed, 9594 insertions(+), 9649 deletions(-) + gi/Makefile.am | 31 ++++++++++++++-- + gi/_glib/pyglib-python-compat.h | 62 + +++++++++---------------------- + gi/_gobject/Makefile.am | 69 + +---------------------------------- + gi/_gobject/__init__.py | 4 +- + gi/_gobject/constants.py | 3 +- + gi/_gobject/propertyhelper.py | 16 +++++--- + gi/_gobject/signalhelper.py | 3 +- + gi/gimodule.c | 13 ++++--- + gi/{_gobject => }/gobjectmodule.c | 0 + gi/module.py | 4 +- + gi/{_gobject => }/pygboxed.c | 0 + gi/{_gobject => }/pygboxed.h | 0 + gi/{_gobject => }/pygenum.c | 0 + gi/{_gobject => }/pygenum.h | 0 + gi/{_gobject => }/pygflags.c | 0 + gi/{_gobject => }/pygflags.h | 0 + gi/pygi-argument.c | 3 +- + gi/pygi-boxed.c | 2 +- + gi/pygi-ccallback.c | 2 +- + gi/pygi-foreign.c | 2 +- + gi/pygi-info.c | 2 +- + gi/pygi-marshal-to-py.c | 3 +- + gi/pygi-private.h | 2 +- + gi/pygi-source.c | 3 +- + gi/pygi-struct.c | 2 +- + gi/pygi.h | 3 +- + gi/{_gobject => }/pyginterface.c | 0 + gi/{_gobject => }/pyginterface.h | 0 + gi/{_gobject => }/pygobject-private.h | 5 ++- + gi/{_gobject => }/pygobject.c | 0 + gi/{_gobject => }/pygobject.h | 0 + gi/{_gobject => }/pygparamspec.c | 0 + gi/{_gobject => }/pygparamspec.h | 2 + + gi/{_gobject => }/pygpointer.c | 0 + gi/{_gobject => }/pygpointer.h | 0 + gi/{_gobject => }/pygtype.c | 0 + gi/{_gobject => }/pygtype.h | 0 + gi/types.py | 3 +- + tests/Makefile.am | 2 +- + 39 files changed, 93 insertions(+), 148 deletions(-) commit a329f559002f2be0898309c9d81cdf2c34aef158 Author: Simon Feltman <sfeltman@src.gnome.org> @@ -4203,14 +4192,12 @@ Date: Mon Jan 13 08:19:02 2014 -0800 targets. Rename python.supp to python2.7.supp - tests/Makefile.am | 6 +- - tests/python.supp | 387 ---------------------------------------- - tests/python2.7.supp | 387 ++++++++++++++++++++++++++++++++++++++++ - tests/python3.3.supp | 471 - +++++++++++++++++++++++++++++++++++++++++++++++++ - tests/python3.3dm.supp | 471 - +++++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 1332 insertions(+), 390 deletions(-) + tests/Makefile.am | 6 +- + tests/{python.supp => python2.7.supp} | 0 + tests/{python.supp => python3.3.supp} | 118 +++++++++++++++++--- + tests/{python.supp => python3.3dm.supp} | 188 + +++++++++++++++++++++++--------- + 4 files changed, 240 insertions(+), 72 deletions(-) commit 5c6f8afed5f6aa05d65d64509a2c9b8041a66b05 Author: Simon Feltman <sfeltman@src.gnome.org> @@ -9975,12 +9962,9 @@ Date: Thu Jan 10 13:56:11 2013 +0100 As we want to add more tests for non-overridden API. - tests/Makefile.am | 2 +- - tests/test_gio.py | 121 - ++++++++++++++++++++++++++++++++++++++++++++ - tests/test_overrides_gio.py | 121 - -------------------------------------------- - 3 files changed, 122 insertions(+), 122 deletions(-) + tests/Makefile.am | 2 +- + tests/{test_overrides_gio.py => test_gio.py} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) commit 8117e6bce73581e89211371708ff7d5de7d870d4 Author: Martin Pitt <martinpitt@gnome.org> @@ -10628,12 +10612,9 @@ Date: Mon Nov 19 14:09:14 2012 +0100 See https://bugzilla.gnome.org/show_bug.cgi?id=688219 - tests/Makefile.am | 3 + - tests/compat_test_pygtk.py | 147 - +++++++++++++++++++++++++++++++++++++++++++++ - tests/test_pygtkcompat.py | 147 - --------------------------------------------- - 3 files changed, 150 insertions(+), 147 deletions(-) + tests/Makefile.am | 3 +++ + tests/{test_pygtkcompat.py => compat_test_pygtk.py} | 0 + 2 files changed, 3 insertions(+) commit 8180b8092f99b7c9f0dee1742418efdbd23ab330 Author: Simon Feltman <sfeltman@src.gnome.org> @@ -10653,16 +10634,15 @@ Date: Thu Nov 15 02:51:52 2012 -0800 https://bugzilla.gnome.org/show_bug.cgi?id=688219 - Makefile.am | 2 +- - configure.ac | 1 + - gi/pygtkcompat.py | 524 - +++------------------------------------------ - pygtkcompat/Makefile.am | 15 ++ - pygtkcompat/__init__.py | 20 ++ - pygtkcompat/pygtkcompat.py | 501 - +++++++++++++++++++++++++++++++++++++++++++ - tests/test_pygtkcompat.py | 6 +- - 7 files changed, 565 insertions(+), 504 deletions(-) + Makefile.am | 2 +- + configure.ac | 1 + + gi/pygtkcompat.py | 524 + ++----------------------------------- + pygtkcompat/Makefile.am | 15 ++ + pygtkcompat/__init__.py | 20 ++ + {gi => pygtkcompat}/pygtkcompat.py | 0 + tests/test_pygtkcompat.py | 6 +- + 7 files changed, 64 insertions(+), 504 deletions(-) commit f736694d09e9d0fca4769d9f1f34ec34e6354d87 Author: Martin Pitt <martinpitt@gnome.org> @@ -13541,15 +13521,15 @@ Date: Mon Sep 3 07:57:01 2012 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=683188 - tests/Makefile.am | 5 + - tests/test_overrides.py | 2198 - +---------------------------------------- - tests/test_overrides_gdk.py | 119 +++ - tests/test_overrides_gio.py | 114 +++ - tests/test_overrides_glib.py | 445 +++++++++ - tests/test_overrides_gtk.py | 1517 ++++++++++++++++++++++++++++ - tests/test_overrides_pango.py | 32 + - 7 files changed, 2234 insertions(+), 2196 deletions(-) + tests/Makefile.am | 5 + + tests/test_overrides.py | 2198 + +------------------- + tests/test_overrides_gdk.py | 119 ++ + tests/test_overrides_gio.py | 114 + + tests/test_overrides_glib.py | 445 ++++ + tests/{test_overrides.py => test_overrides_gtk.py} | 1229 +++-------- + tests/test_overrides_pango.py | 32 + + 7 files changed, 981 insertions(+), 3161 deletions(-) commit 1223358e2c558dd7ac3300126f989054ec5a5b3f Author: Martin Pitt <martinpitt@gnome.org> @@ -16093,23 +16073,23 @@ Date: Tue Feb 21 15:13:42 2012 +0100 Signed-off-by: Martin Pitt <martinpitt@gnome.org> - gi/Makefile.am | 2 + - gi/gimodule.c | 1 + - gi/module.py | 5 +++ - gi/pygi-argument.c | 12 +---- - gi/pygi-cache.c | 28 ++++++++++-- - gi/pygi-cache.h | 9 ++-- - gi/pygi-ccallback.c | 100 - ++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-ccallback.h | 41 +++++++++++++++++ - gi/pygi-closure.c | 50 ++++++++++++++++++++- - gi/pygi-invoke-state-struct.h | 2 + - gi/pygi-invoke.c | 73 ++++++++++++++++++++---------- - gi/pygi-invoke.h | 3 ++ - gi/pygi-private.h | 1 + - gi/pygi.h | 10 +++++ - tests/test_gi.py | 16 +++++++ - 15 files changed, 312 insertions(+), 41 deletions(-) + gi/Makefile.am | 2 + + gi/gimodule.c | 1 + + gi/module.py | 5 ++ + gi/pygi-argument.c | 12 +--- + gi/pygi-cache.c | 28 +++++++-- + gi/pygi-cache.h | 9 ++- + gi/pygi-ccallback.c | 100 + +++++++++++++++++++++++++++++++++ + gi/{pygi-invoke.h => pygi-ccallback.h} | 23 ++++---- + gi/pygi-closure.c | 50 ++++++++++++++++- + gi/pygi-invoke-state-struct.h | 2 + + gi/pygi-invoke.c | 73 ++++++++++++++++-------- + gi/pygi-invoke.h | 3 + + gi/pygi-private.h | 1 + + gi/pygi.h | 10 ++++ + tests/test_gi.py | 16 ++++++ + 15 files changed, 284 insertions(+), 51 deletions(-) commit db7e1d078db16b6f11dee51aa97525c451346632 Author: Alberto Mardegan <alberto.mardegan@canonical.com> @@ -18681,23 +18661,20 @@ Date: Fri Sep 2 18:39:51 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=658362 - gi/Makefile.am | 8 +- - gi/pygi-cache.c | 673 ++++++++++----------- - gi/pygi-cache.h | 62 +- - gi/pygi-invoke.c | 144 ++--- - gi/pygi-marshal-cleanup.c | 168 +++--- - gi/pygi-marshal-cleanup.h | 128 ++-- - gi/pygi-marshal-from-py.c | 1412 - +++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-marshal-from-py.h | 186 ++++++ - gi/pygi-marshal-in.c | 1412 - --------------------------------------------- - gi/pygi-marshal-in.h | 186 ------ - gi/pygi-marshal-out.c | 768 ------------------------ - gi/pygi-marshal-out.h | 144 ----- - gi/pygi-marshal-to-py.c | 768 ++++++++++++++++++++++++ - gi/pygi-marshal-to-py.h | 144 +++++ - 14 files changed, 3122 insertions(+), 3081 deletions(-) + gi/Makefile.am | 8 +- + gi/pygi-cache.c | 673 + ++++++++++++----------- + gi/pygi-cache.h | 62 ++- + gi/pygi-invoke.c | 144 ++--- + gi/pygi-marshal-cleanup.c | 168 +++--- + gi/pygi-marshal-cleanup.h | 128 ++--- + gi/{pygi-marshal-in.c => pygi-marshal-from-py.c} | 372 ++++++------- + gi/pygi-marshal-from-py.h | 186 +++++++ + gi/pygi-marshal-in.h | 186 ------- + gi/pygi-marshal-out.h | 144 ----- + gi/{pygi-marshal-out.c => pygi-marshal-to-py.c} | 278 +++++----- + gi/pygi-marshal-to-py.h | 144 +++++ + 12 files changed, 1267 insertions(+), 1226 deletions(-) commit 45b0fcff9e948c65a3903c32a3957802034c5e47 Author: Dieter Verfaillie <dieterv@optionexplicit.be> @@ -19861,107 +19838,57 @@ Date: Fri Jul 22 11:02:49 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=642048 - Makefile.am | 2 +- - configure.ac | 6 +- - gi/Makefile.am | 8 +- - gi/_glib/Makefile.am | 58 + - gi/_glib/__init__.py | 25 + - gi/_glib/glibmodule.c | 969 ++++++++++++++ - gi/_glib/option.py | 358 ++++++ - gi/_glib/pygiochannel.c | 764 ++++++++++++ - gi/_glib/pygiochannel.h | 29 + - gi/_glib/pyglib-private.h | 49 + - gi/_glib/pyglib-python-compat.h | 245 ++++ - gi/_glib/pyglib.c | 633 ++++++++++ - gi/_glib/pyglib.h | 83 ++ - gi/_glib/pygmaincontext.c | 126 ++ - gi/_glib/pygmaincontext.h | 40 + - gi/_glib/pygmainloop.c | 360 ++++++ - gi/_glib/pygmainloop.h | 36 + - gi/_glib/pygoptioncontext.c | 337 +++++ - gi/_glib/pygoptioncontext.h | 39 + - gi/_glib/pygoptiongroup.c | 298 +++++ - gi/_glib/pygoptiongroup.h | 42 + - gi/_glib/pygsource.c | 725 +++++++++++ - gi/_glib/pygsource.h | 39 + - gi/_glib/pygspawn.c | 264 ++++ - gi/_glib/pygspawn.h | 32 + - gi/_gobject/Makefile.am | 71 ++ - gi/_gobject/__init__.py | 117 ++ - gi/_gobject/constants.py | 83 ++ - gi/_gobject/ffi-marshaller.c | 194 +++ - gi/_gobject/ffi-marshaller.h | 31 + - gi/_gobject/gobjectmodule.c | 2638 - +++++++++++++++++++++++++++++++++++++++ - gi/_gobject/propertyhelper.py | 312 +++++ - gi/_gobject/pygboxed.c | 234 ++++ - gi/_gobject/pygboxed.h | 27 + - gi/_gobject/pygenum.c | 366 ++++++ - gi/_gobject/pygenum.h | 27 + - gi/_gobject/pygflags.c | 485 +++++++ - gi/_gobject/pygflags.h | 27 + - gi/_gobject/pyginterface.c | 122 ++ - gi/_gobject/pyginterface.h | 40 + - gi/_gobject/pygobject-private.h | 241 ++++ - gi/_gobject/pygobject.c | 2397 - +++++++++++++++++++++++++++++++++++ - gi/_gobject/pygobject.h | 667 ++++++++++ - gi/_gobject/pygparamspec.c | 404 ++++++ - gi/_gobject/pygparamspec.h | 31 + - gi/_gobject/pygpointer.c | 198 +++ - gi/_gobject/pygpointer.h | 27 + - gi/_gobject/pygtype.c | 1844 +++++++++++++++++++++++++++ - gi/_gobject/pygtype.h | 28 + - glib/Makefile.am | 61 - - glib/__init__.py | 25 - - glib/glibmodule.c | 969 -------------- - glib/option.py | 358 ------ - glib/pygiochannel.c | 764 ------------ - glib/pygiochannel.h | 29 - - glib/pyglib-private.h | 49 - - glib/pyglib-python-compat.h | 245 ---- - glib/pyglib.c | 633 ---------- - glib/pyglib.h | 83 -- - glib/pygmaincontext.c | 126 -- - glib/pygmaincontext.h | 40 - - glib/pygmainloop.c | 360 ------ - glib/pygmainloop.h | 36 - - glib/pygoptioncontext.c | 337 ----- - glib/pygoptioncontext.h | 39 - - glib/pygoptiongroup.c | 298 ----- - glib/pygoptiongroup.h | 42 - - glib/pygsource.c | 725 ----------- - glib/pygsource.h | 39 - - glib/pygspawn.c | 264 ---- - glib/pygspawn.h | 32 - - gobject/Makefile.am | 73 -- - gobject/__init__.py | 117 -- - gobject/constants.py | 83 -- - gobject/ffi-marshaller.c | 194 --- - gobject/ffi-marshaller.h | 31 - - gobject/gobjectmodule.c | 2638 - --------------------------------------- - gobject/propertyhelper.py | 312 ----- - gobject/pygboxed.c | 234 ---- - gobject/pygboxed.h | 27 - - gobject/pygenum.c | 366 ------ - gobject/pygenum.h | 27 - - gobject/pygflags.c | 485 ------- - gobject/pygflags.h | 27 - - gobject/pyginterface.c | 122 -- - gobject/pyginterface.h | 40 - - gobject/pygobject-private.h | 241 ---- - gobject/pygobject.c | 2397 - ----------------------------------- - gobject/pygobject.h | 667 ---------- - gobject/pygparamspec.c | 404 ------ - gobject/pygparamspec.h | 31 - - gobject/pygpointer.c | 198 --- - gobject/pygpointer.h | 27 - - gobject/pygtype.c | 1844 --------------------------- - gobject/pygtype.h | 28 - - tests/Makefile.am | 2 +- - 96 files changed, 16172 insertions(+), 16175 deletions(-) + Makefile.am | 2 +- + configure.ac | 6 +++--- + gi/Makefile.am | 8 +++++--- + {glib => gi/_glib}/Makefile.am | 5 +---- + {glib => gi/_glib}/__init__.py | 0 + {glib => gi/_glib}/glibmodule.c | 0 + {glib => gi/_glib}/option.py | 0 + {glib => gi/_glib}/pygiochannel.c | 0 + {glib => gi/_glib}/pygiochannel.h | 0 + {glib => gi/_glib}/pyglib-private.h | 0 + {glib => gi/_glib}/pyglib-python-compat.h | 0 + {glib => gi/_glib}/pyglib.c | 0 + {glib => gi/_glib}/pyglib.h | 0 + {glib => gi/_glib}/pygmaincontext.c | 0 + {glib => gi/_glib}/pygmaincontext.h | 0 + {glib => gi/_glib}/pygmainloop.c | 0 + {glib => gi/_glib}/pygmainloop.h | 0 + {glib => gi/_glib}/pygoptioncontext.c | 0 + {glib => gi/_glib}/pygoptioncontext.h | 0 + {glib => gi/_glib}/pygoptiongroup.c | 0 + {glib => gi/_glib}/pygoptiongroup.h | 0 + {glib => gi/_glib}/pygsource.c | 0 + {glib => gi/_glib}/pygsource.h | 0 + {glib => gi/_glib}/pygspawn.c | 0 + {glib => gi/_glib}/pygspawn.h | 0 + {gobject => gi/_gobject}/Makefile.am | 10 ++++------ + {gobject => gi/_gobject}/__init__.py | 0 + {gobject => gi/_gobject}/constants.py | 0 + {gobject => gi/_gobject}/ffi-marshaller.c | 0 + {gobject => gi/_gobject}/ffi-marshaller.h | 0 + {gobject => gi/_gobject}/gobjectmodule.c | 0 + {gobject => gi/_gobject}/propertyhelper.py | 0 + {gobject => gi/_gobject}/pygboxed.c | 0 + {gobject => gi/_gobject}/pygboxed.h | 0 + {gobject => gi/_gobject}/pygenum.c | 0 + {gobject => gi/_gobject}/pygenum.h | 0 + {gobject => gi/_gobject}/pygflags.c | 0 + {gobject => gi/_gobject}/pygflags.h | 0 + {gobject => gi/_gobject}/pyginterface.c | 0 + {gobject => gi/_gobject}/pyginterface.h | 0 + {gobject => gi/_gobject}/pygobject-private.h | 0 + {gobject => gi/_gobject}/pygobject.c | 0 + {gobject => gi/_gobject}/pygobject.h | 0 + {gobject => gi/_gobject}/pygparamspec.c | 0 + {gobject => gi/_gobject}/pygparamspec.h | 0 + {gobject => gi/_gobject}/pygpointer.c | 0 + {gobject => gi/_gobject}/pygpointer.h | 0 + {gobject => gi/_gobject}/pygtype.c | 0 + {gobject => gi/_gobject}/pygtype.h | 0 + tests/Makefile.am | 2 +- + 50 files changed, 15 insertions(+), 18 deletions(-) commit f0d2ddcf7e61c36f79a9adf8ccc53bf3db9349d3 Author: John (J5) Palmieri <johnp@redhat.com> @@ -19999,13 +19926,12 @@ Date: Mon Jul 18 18:28:50 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=642048 - Makefile.am | 2 +- - configure.ac | 4 ++-- - pygobject-2.0-uninstalled.pc.in | 18 ------------------ - pygobject-2.0.pc.in | 22 ---------------------- - pygobject-3.0-uninstalled.pc.in | 18 ++++++++++++++++++ - pygobject-3.0.pc.in | 22 ++++++++++++++++++++++ - 6 files changed, 43 insertions(+), 43 deletions(-) + Makefile.am | 2 +- + configure.ac | + 4 ++-- + pygobject-2.0-uninstalled.pc.in => pygobject-3.0-uninstalled.pc.in | 0 + pygobject-2.0.pc.in => pygobject-3.0.pc.in | 0 + 4 files changed, 3 insertions(+), 3 deletions(-) commit 5189b360ccddbbaee267ce857968fbf1aafdd07a Author: Martin Pitt <martin.pitt@ubuntu.com> @@ -20108,12 +20034,9 @@ Date: Mon Jul 18 10:59:45 2011 -0400 rename pygi-invoke-ng to pygi-invoke - gi/Makefile.am | 3 +- - gi/pygi-invoke-ng.c | 464 - ---------------------------------------------------- - gi/pygi-invoke.c | 464 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 466 insertions(+), 465 deletions(-) + gi/Makefile.am | 3 ++- + gi/{pygi-invoke-ng.c => pygi-invoke.c} | 0 + 2 files changed, 2 insertions(+), 1 deletion(-) commit 62d59fa2c2b31d7a3cac8996d58234d4b13bb19f Author: John (J5) Palmieri <johnp@redhat.com> @@ -20149,16 +20072,15 @@ Date: Mon Jul 18 10:35:10 2011 -0400 * update copy and paste copyright info to list the correct owner - gi/Makefile.am | 6 +- - gi/pygi-cache.c | 3 +- - gi/pygi-marshal-in.c | 1412 ++++++++++++++++++++++++++++++++ - gi/pygi-marshal-in.h | 186 +++++ - gi/pygi-marshal-out.c | 767 ++++++++++++++++++ - gi/pygi-marshal-out.h | 144 ++++ - gi/pygi-marshal.c | 2145 - ------------------------------------------------- - gi/pygi-marshal.h | 303 ------- - 8 files changed, 2515 insertions(+), 2451 deletions(-) + gi/Makefile.am | 6 +- + gi/pygi-cache.c | 3 +- + gi/{pygi-marshal.c => pygi-marshal-in.c} | 739 + +---------------------------- + gi/{pygi-marshal.h => pygi-marshal-in.h} | 117 ----- + gi/pygi-marshal-out.c | 767 + +++++++++++++++++++++++++++++++ + gi/pygi-marshal-out.h | 144 ++++++ + 6 files changed, 920 insertions(+), 856 deletions(-) commit 917ea2dfa2d097e563233145003a66b3e4423287 Author: Martin Pitt <martin.pitt@ubuntu.com> @@ -21571,10 +21493,10 @@ Date: Tue Mar 22 14:46:29 2011 -0400 [gi] revert pygi-argument.h and move the invoke-ng code to pygi-marshal.h - gi/pygi-argument.h | 268 +----------------------------------------- - gi/pygi-marshal.h | 336 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 337 insertions(+), 267 deletions(-) + gi/pygi-argument.h | 268 + +-------------------------------- + gi/{pygi-argument.h => pygi-marshal.h} | 0 + 2 files changed, 1 insertion(+), 267 deletions(-) commit 17cb714cfdaf45b6d7dd627b0189bd24e6578f74 Merge: 7332a1b 01596a9 @@ -21646,12 +21568,12 @@ Date: Mon Mar 21 19:03:29 2011 -0400 own, nonconflicting files * copy the old files out of master - gi/pygi-argument.c | 2101 +++------------------------ - gi/pygi-invoke-ng.c | 1179 ++++++++++++++++ - gi/pygi-invoke.c | 421 ++---- - gi/pygi-marshal.c | 3916 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 5389 insertions(+), 2228 deletions(-) + gi/pygi-argument.c | 2101 + +++----------------------------- + gi/{pygi-invoke.c => pygi-invoke-ng.c} | 0 + gi/pygi-invoke.c | 421 ++----- + gi/{pygi-argument.c => pygi-marshal.c} | 0 + 4 files changed, 294 insertions(+), 2228 deletions(-) commit 62b49dae97441953452d097cb1751df14302547a Author: John (J5) Palmieri <johnp@redhat.com> @@ -29258,81 +29180,47 @@ Date: Sun Jun 20 11:09:57 2010 -0300 For reasons outlined at: http://mail.gnome.org/archives/python-hackers-list/2010-June/msg00009.html - Makefile.am | 14 +- - configure.ac | 29 +- - demos/gtk-demo/demos/__init__.py | 0 - demos/gtk-demo/demos/appwindow.py | 411 +++++ - demos/gtk-demo/demos/assistant.py | 134 ++ - demos/gtk-demo/demos/builder.py | 57 + - demos/gtk-demo/demos/button_box.py | 121 ++ - demos/gtk-demo/demos/clipboard.py | 238 +++ - demos/gtk-demo/demos/colorselector.py | 121 ++ - demos/gtk-demo/demos/combobox.py | 282 ++++ - demos/gtk-demo/demos/data/alphatest.png | Bin 0 -> - 26529 bytes - demos/gtk-demo/demos/data/apple-red.png | Bin 0 -> 3545 bytes - demos/gtk-demo/demos/data/background.jpg | Bin 0 -> - 22219 bytes - demos/gtk-demo/demos/data/demo.ui | 258 ++++ - demos/gtk-demo/demos/data/floppybuddy.gif | Bin 0 -> 5216 bytes - demos/gtk-demo/demos/data/gnome-applets.png | Bin 0 -> 3090 bytes - demos/gtk-demo/demos/data/gnome-calendar.png | Bin 0 -> 2755 bytes - demos/gtk-demo/demos/data/gnome-foot.png | Bin 0 -> 2916 bytes - demos/gtk-demo/demos/data/gnome-fs-directory.png | Bin 0 -> 2044 bytes - demos/gtk-demo/demos/data/gnome-fs-regular.png | Bin 0 -> 1795 bytes - demos/gtk-demo/demos/data/gnome-gimp.png | Bin 0 -> 3410 bytes - demos/gtk-demo/demos/data/gnome-gmush.png | Bin 0 -> 3244 bytes - demos/gtk-demo/demos/data/gnome-gsame.png | Bin 0 -> 4263 bytes - demos/gtk-demo/demos/data/gnu-keys.png | Bin 0 -> 3852 bytes - demos/gtk-demo/demos/data/gtk-logo-rgb.gif | Bin 0 -> 6427 bytes - demos/gtk-demo/demos/test.py | 14 + - demos/gtk-demo/gtk-demo.py | 266 ++++ - examples/Makefile.am | 2 +- - examples/cairo-demo.py | 121 ++ - gi/Makefile.am | 4 +- - gi/demos/gtk-demo/demos/__init__.py | 0 - gi/demos/gtk-demo/demos/appwindow.py | 411 ----- - gi/demos/gtk-demo/demos/assistant.py | 134 -- - gi/demos/gtk-demo/demos/builder.py | 57 - - gi/demos/gtk-demo/demos/button_box.py | 121 -- - gi/demos/gtk-demo/demos/clipboard.py | 238 --- - gi/demos/gtk-demo/demos/colorselector.py | 121 -- - gi/demos/gtk-demo/demos/combobox.py | 282 ---- - gi/demos/gtk-demo/demos/data/alphatest.png | Bin 26529 -> - 0 bytes - gi/demos/gtk-demo/demos/data/apple-red.png | Bin 3545 -> 0 bytes - gi/demos/gtk-demo/demos/data/background.jpg | Bin 22219 -> - 0 bytes - gi/demos/gtk-demo/demos/data/demo.ui | 258 ---- - gi/demos/gtk-demo/demos/data/floppybuddy.gif | Bin 5216 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnome-applets.png | Bin 3090 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnome-calendar.png | Bin 2755 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnome-foot.png | Bin 2916 -> 0 bytes - .../gtk-demo/demos/data/gnome-fs-directory.png | Bin 2044 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnome-fs-regular.png | Bin 1795 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnome-gimp.png | Bin 3410 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnome-gmush.png | Bin 3244 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnome-gsame.png | Bin 4263 -> 0 bytes - gi/demos/gtk-demo/demos/data/gnu-keys.png | Bin 3852 -> 0 bytes - gi/demos/gtk-demo/demos/data/gtk-logo-rgb.gif | Bin 6427 -> 0 bytes - gi/demos/gtk-demo/demos/test.py | 14 - - gi/demos/gtk-demo/gtk-demo.py | 266 ---- - gi/examples/Makefile.am | 2 - - gi/examples/cairo-demo.py | 121 -- - gi/tests/test_everything.py | 270 ---- - gi/tests/test_gi.py | 1624 - -------------------- - gi/tests/test_overrides.py | 132 -- - pygi-Makefile.am | 28 - - pygi-configure.ac | 60 - - pygi.doap | 34 - - pygobject.doap | 16 +- - tests/Makefile.am | 23 +- - tests/test_everything.py | 270 ++++ - tests/test_gi.py | 1624 - ++++++++++++++++++++ - tests/test_overrides.py | 132 ++ - 68 files changed, 4124 insertions(+), 4186 deletions(-) + Makefile.am | 14 ++++- + configure.ac | 29 ++++++++-- + {gi/demos => demos}/gtk-demo/demos/__init__.py | 0 + {gi/demos => demos}/gtk-demo/demos/appwindow.py | 0 + {gi/demos => demos}/gtk-demo/demos/assistant.py | 0 + {gi/demos => demos}/gtk-demo/demos/builder.py | 0 + {gi/demos => demos}/gtk-demo/demos/button_box.py | 0 + {gi/demos => demos}/gtk-demo/demos/clipboard.py | 0 + .../gtk-demo/demos/colorselector.py | 0 + {gi/demos => demos}/gtk-demo/demos/combobox.py | 0 + .../gtk-demo/demos/data/alphatest.png | Bin + .../gtk-demo/demos/data/apple-red.png | Bin + .../gtk-demo/demos/data/background.jpg | Bin + {gi/demos => demos}/gtk-demo/demos/data/demo.ui | 0 + .../gtk-demo/demos/data/floppybuddy.gif | Bin + .../gtk-demo/demos/data/gnome-applets.png | Bin + .../gtk-demo/demos/data/gnome-calendar.png | Bin + .../gtk-demo/demos/data/gnome-foot.png | Bin + .../gtk-demo/demos/data/gnome-fs-directory.png | Bin + .../gtk-demo/demos/data/gnome-fs-regular.png | Bin + .../gtk-demo/demos/data/gnome-gimp.png | Bin + .../gtk-demo/demos/data/gnome-gmush.png | Bin + .../gtk-demo/demos/data/gnome-gsame.png | Bin + .../gtk-demo/demos/data/gnu-keys.png | Bin + .../gtk-demo/demos/data/gtk-logo-rgb.gif | Bin + {gi/demos => demos}/gtk-demo/demos/test.py | 0 + {gi/demos => demos}/gtk-demo/gtk-demo.py | 0 + examples/Makefile.am | 2 +- + {gi/examples => examples}/cairo-demo.py | 0 + gi/Makefile.am | 4 +- + gi/examples/Makefile.am | 2 - + pygi-Makefile.am | 28 ---------- + pygi-configure.ac | 60 + --------------------- + pygi.doap | 34 ------------ + pygobject.doap | 16 +++++- + tests/Makefile.am | 23 ++++++-- + {gi/tests => tests}/test_everything.py | 0 + {gi/tests => tests}/test_gi.py | 0 + {gi/tests => tests}/test_overrides.py | 0 + 39 files changed, 75 insertions(+), 137 deletions(-) commit 597bd64319d7966045b5b8613ca6fc85668c3f56 Merge: ec8d148 fa91dfd @@ -29347,86 +29235,45 @@ Date: Sun Jun 20 10:53:36 2010 -0300 Prepare pygi move - .gitignore | 40 - - HACKING | 26 - - Makefile.am | 28 - - autogen.sh | 166 -- - configure.ac | 60 - - demos/gtk-demo/demos/__init__.py | 0 - demos/gtk-demo/demos/appwindow.py | 411 ----- - demos/gtk-demo/demos/assistant.py | 134 -- - demos/gtk-demo/demos/builder.py | 57 - - demos/gtk-demo/demos/button_box.py | 121 -- - demos/gtk-demo/demos/clipboard.py | 238 --- - demos/gtk-demo/demos/colorselector.py | 121 -- - demos/gtk-demo/demos/combobox.py | 282 ---- - demos/gtk-demo/demos/data/alphatest.png | Bin 26529 -> - 0 bytes - demos/gtk-demo/demos/data/apple-red.png | Bin 3545 -> 0 bytes - demos/gtk-demo/demos/data/background.jpg | Bin 22219 -> - 0 bytes - demos/gtk-demo/demos/data/demo.ui | 258 ---- - demos/gtk-demo/demos/data/floppybuddy.gif | Bin 5216 -> 0 bytes - demos/gtk-demo/demos/data/gnome-applets.png | Bin 3090 -> 0 bytes - demos/gtk-demo/demos/data/gnome-calendar.png | Bin 2755 -> 0 bytes - demos/gtk-demo/demos/data/gnome-foot.png | Bin 2916 -> 0 bytes - demos/gtk-demo/demos/data/gnome-fs-directory.png | Bin 2044 -> 0 bytes - demos/gtk-demo/demos/data/gnome-fs-regular.png | Bin 1795 -> 0 bytes - demos/gtk-demo/demos/data/gnome-gimp.png | Bin 3410 -> 0 bytes - demos/gtk-demo/demos/data/gnome-gmush.png | Bin 3244 -> 0 bytes - demos/gtk-demo/demos/data/gnome-gsame.png | Bin 4263 -> 0 bytes - demos/gtk-demo/demos/data/gnu-keys.png | Bin 3852 -> 0 bytes - demos/gtk-demo/demos/data/gtk-logo-rgb.gif | Bin 6427 -> 0 bytes - demos/gtk-demo/demos/test.py | 14 - - demos/gtk-demo/gtk-demo.py | 266 ---- - examples/Makefile.am | 2 - - examples/cairo-demo.py | 121 -- - gi/.gitignore | 40 + - gi/HACKING | 26 + - gi/demos/gtk-demo/demos/__init__.py | 0 - gi/demos/gtk-demo/demos/appwindow.py | 411 +++++ - gi/demos/gtk-demo/demos/assistant.py | 134 ++ - gi/demos/gtk-demo/demos/builder.py | 57 + - gi/demos/gtk-demo/demos/button_box.py | 121 ++ - gi/demos/gtk-demo/demos/clipboard.py | 238 +++ - gi/demos/gtk-demo/demos/colorselector.py | 121 ++ - gi/demos/gtk-demo/demos/combobox.py | 282 ++++ - gi/demos/gtk-demo/demos/data/alphatest.png | Bin 0 -> - 26529 bytes - gi/demos/gtk-demo/demos/data/apple-red.png | Bin 0 -> 3545 bytes - gi/demos/gtk-demo/demos/data/background.jpg | Bin 0 -> - 22219 bytes - gi/demos/gtk-demo/demos/data/demo.ui | 258 ++++ - gi/demos/gtk-demo/demos/data/floppybuddy.gif | Bin 0 -> 5216 bytes - gi/demos/gtk-demo/demos/data/gnome-applets.png | Bin 0 -> 3090 bytes - gi/demos/gtk-demo/demos/data/gnome-calendar.png | Bin 0 -> 2755 bytes - gi/demos/gtk-demo/demos/data/gnome-foot.png | Bin 0 -> 2916 bytes - .../gtk-demo/demos/data/gnome-fs-directory.png | Bin 0 -> 2044 bytes - gi/demos/gtk-demo/demos/data/gnome-fs-regular.png | Bin 0 -> 1795 bytes - gi/demos/gtk-demo/demos/data/gnome-gimp.png | Bin 0 -> 3410 bytes - gi/demos/gtk-demo/demos/data/gnome-gmush.png | Bin 0 -> 3244 bytes - gi/demos/gtk-demo/demos/data/gnome-gsame.png | Bin 0 -> 4263 bytes - gi/demos/gtk-demo/demos/data/gnu-keys.png | Bin 0 -> 3852 bytes - gi/demos/gtk-demo/demos/data/gtk-logo-rgb.gif | Bin 0 -> 6427 bytes - gi/demos/gtk-demo/demos/test.py | 14 + - gi/demos/gtk-demo/gtk-demo.py | 266 ++++ - gi/examples/Makefile.am | 2 + - gi/examples/cairo-demo.py | 121 ++ - gi/tests/Makefile.am | 22 + - gi/tests/runtests.py | 21 + - gi/tests/test_everything.py | 270 ++++ - gi/tests/test_gi.py | 1624 - ++++++++++++++++++++ - gi/tests/test_overrides.py | 132 ++ - pygi-Makefile.am | 28 + - pygi-configure.ac | 60 + - tests/Makefile.am | 22 - - tests/runtests.py | 21 - - tests/test_everything.py | 270 ---- - tests/test_gi.py | 1624 - -------------------- - tests/test_overrides.py | 132 -- - 73 files changed, 4248 insertions(+), 4414 deletions(-) + autogen.sh | 166 + --------------------- + .gitignore => gi/.gitignore | 0 + HACKING => gi/HACKING | 0 + {demos => gi/demos}/gtk-demo/demos/__init__.py | 0 + {demos => gi/demos}/gtk-demo/demos/appwindow.py | 0 + {demos => gi/demos}/gtk-demo/demos/assistant.py | 0 + {demos => gi/demos}/gtk-demo/demos/builder.py | 0 + {demos => gi/demos}/gtk-demo/demos/button_box.py | 0 + {demos => gi/demos}/gtk-demo/demos/clipboard.py | 0 + .../demos}/gtk-demo/demos/colorselector.py | 0 + {demos => gi/demos}/gtk-demo/demos/combobox.py | 0 + .../demos}/gtk-demo/demos/data/alphatest.png | Bin + .../demos}/gtk-demo/demos/data/apple-red.png | Bin + .../demos}/gtk-demo/demos/data/background.jpg | Bin + {demos => gi/demos}/gtk-demo/demos/data/demo.ui | 0 + .../demos}/gtk-demo/demos/data/floppybuddy.gif | Bin + .../demos}/gtk-demo/demos/data/gnome-applets.png | Bin + .../demos}/gtk-demo/demos/data/gnome-calendar.png | Bin + .../demos}/gtk-demo/demos/data/gnome-foot.png | Bin + .../gtk-demo/demos/data/gnome-fs-directory.png | Bin + .../gtk-demo/demos/data/gnome-fs-regular.png | Bin + .../demos}/gtk-demo/demos/data/gnome-gimp.png | Bin + .../demos}/gtk-demo/demos/data/gnome-gmush.png | Bin + .../demos}/gtk-demo/demos/data/gnome-gsame.png | Bin + .../demos}/gtk-demo/demos/data/gnu-keys.png | Bin + .../demos}/gtk-demo/demos/data/gtk-logo-rgb.gif | Bin + {demos => gi/demos}/gtk-demo/demos/test.py | 0 + {demos => gi/demos}/gtk-demo/gtk-demo.py | 0 + {examples => gi/examples}/Makefile.am | 0 + {examples => gi/examples}/cairo-demo.py | 0 + {tests => gi/tests}/Makefile.am | 0 + {tests => gi/tests}/runtests.py | 0 + {tests => gi/tests}/test_everything.py | 0 + {tests => gi/tests}/test_gi.py | 0 + {tests => gi/tests}/test_overrides.py | 0 + Makefile.am => pygi-Makefile.am | 0 + configure.ac => pygi-configure.ac | 0 + 37 files changed, 166 deletions(-) commit ec8d148eccbb3714093f21b595ea77ae4c7c3bce Author: Johan Dahlin <johan@gnome.org> @@ -30935,15 +30782,14 @@ Date: Thu Apr 15 22:52:48 2010 +1200 largely unneeded. Just add the G_XXX constants to the module directly - gobject/Makefile.am | 16 +-------- - gobject/constants.py | 83 - ++++++++++++++++++++++++++++++++++++++++++++ - gobject/constants.py.in | 50 -------------------------- - gobject/generate-constants.c | 44 ----------------------- - gobject/gobjectmodule.c | 35 +++++++++++++++++++ - setup.py | 2 +- - tests/runtests.py | 3 +- - 7 files changed, 121 insertions(+), 112 deletions(-) + gobject/Makefile.am | 16 +---------- + gobject/{constants.py.in => constants.py} | 33 +++++++++++++++++++++++ + gobject/generate-constants.c | 44 + ------------------------------- + gobject/gobjectmodule.c | 35 ++++++++++++++++++++++++ + setup.py | 2 +- + tests/runtests.py | 3 +-- + 6 files changed, 71 insertions(+), 62 deletions(-) commit 6d7a3ab9ce352692d0faccbf106974d264fa953d Author: John Stowers <john.stowers@gmail.com> @@ -33459,12 +33305,9 @@ Date: Sat May 9 16:46:04 2009 +0300 Basically copied over from GLib source tree. - ChangeLog | 3606 - --------------------------------------------------- - ChangeLog.pre-2.18 | 3608 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 32 + - 3 files changed, 3640 insertions(+), 3606 deletions(-) + ChangeLog => ChangeLog.pre-2.18 | 2 ++ + Makefile.am | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+) commit 23556bdbcf9cf06db866901fb822dd78a9043648 Author: Gian Mario Tagliaretti <gianmt@gnome.org> diff --git a/Makefile.in b/Makefile.in index 82eaad6..861c43e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -271,6 +271,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -519,8 +520,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -589,7 +590,7 @@ install-nobase_pyexecPYTHON: $(nobase_pyexec_PYTHON) echo " $(MKDIR_P) '$(DESTDIR)$(pyexecdir)'"; \ $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" || exit 1; \ fi; \ - $(am__nobase_list) | while read dir files; do \ + $(am__nobase_list) | { while read dir files; do \ xfiles=; for p in $$files; do \ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f "$$b$$p"; then xfiles="$$xfiles $$b$$p"; dlist="$$dlist $$p"; \ @@ -600,11 +601,11 @@ install-nobase_pyexecPYTHON: $(nobase_pyexec_PYTHON) $(MKDIR_P) "$(DESTDIR)$(pyexecdir)/$$dir"; }; \ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(pyexecdir)/$$dir'"; \ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(pyexecdir)/$$dir" || exit $$?; }; \ - if test -n "$$dlist"; then \ - $(am__py_compile) --destdir "$(DESTDIR)" \ - --basedir "$(pyexecdir)" $$dlist; \ - else :; fi \ - done + done; \ + if test -n "$$dlist"; then \ + $(am__py_compile) --destdir "$(DESTDIR)" \ + --basedir "$(pyexecdir)" $$dlist; \ + else :; fi; } uninstall-nobase_pyexecPYTHON: @$(NORMAL_UNINSTALL) @@ -840,10 +841,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -885,9 +892,10 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1,3 +1,5 @@ +3.16.0 22-Sep-2015 + 3.17.90 19-Aug-2015 - Allow passing unicode lists to GStrv properties on Python 2 (Christoph Reiter) (#744745) @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.17.90 +Version: 3.18.0 Summary: Python bindings for GObject Home-page: http://www.pygtk.org/ Author: James Henstridge @@ -8,7 +8,7 @@ Author-email: james@daa.com.au Maintainer: Simon Feltman Maintainer-email: sfeltman@src.gnome.org License: GNU LGPL -Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.17/pygobject-3.17.90.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.18/pygobject-3.18.0.tar.gz Description: Python bindings for GLib and GObject Platform: POSIX, Windows Classifier: Development Status :: 5 - Production/Stable @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -20,221 +20,10 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html +# =========================================================================== # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # SYNOPSIS # # AX_CODE_COVERAGE() @@ -250,47 +39,87 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl # corresponds to the value of the --enable-code-coverage option, which # defaults to being disabled. # +# Test also for gcov program and create GCOV variable that could be +# substituted. +# # Note that all optimisation flags in CFLAGS must be disabled when code # coverage is enabled. # # Usage example: +# # configure.ac: -# AX_CODE_COVERAGE +# +# AX_CODE_COVERAGE # # Makefile.am: -# @CODE_COVERAGE_RULES@ -# my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) … -# my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) … # -# This results in a “check-code-coverage” rule being added to any Makefile.am -# which includes “@CODE_COVERAGE_RULES@” (assuming the module has been -# configured with --enable-code-coverage). Running `make check-code-coverage` -# in that directory will run the module’s test suite (`make check`) and build -# a code coverage report detailing the code which was touched, then print the -# URI for the report. +# @CODE_COVERAGE_RULES@ +# my_program_LIBS = ... $(CODE_COVERAGE_LDFLAGS) ... +# my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ... +# +# This results in a "check-code-coverage" rule being added to any +# Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module +# has been configured with --enable-code-coverage). Running `make +# check-code-coverage` in that directory will run the module's test suite +# (`make check`) and build a code coverage report detailing the code which +# was touched, then print the URI for the report. +# +# This code was derived from Makefile.decl in GLib, originally licenced +# under LGPLv2.1+. # # LICENSE # -# Copyright © 2012, 2014 Philip Withnall -# Copyright © 2012 Xan Lopez -# Copyright © 2012 Christian Persch -# Copyright © 2012 Paolo Borelli -# Copyright © 2012 Dan Winship +# Copyright (c) 2012 Philip Withnall +# Copyright (c) 2012 Xan Lopez +# Copyright (c) 2012 Christian Persch +# Copyright (c) 2012 Paolo Borelli +# Copyright (c) 2012 Dan Winship +# Copyright (c) 2015 Bastien ROUCARIES +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or (at +# your option) any later version. # -# Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+. -# This file is licenced under LGPLv2.1+. +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. -#serial 1 +#serial 5 AC_DEFUN([AX_CODE_COVERAGE],[ dnl Check for --enable-code-coverage + AC_REQUIRE([AC_PROG_SED]) + + # allow to override gcov location + AC_ARG_WITH([gcov], + [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov]) + AC_MSG_CHECKING([whether to build with code coverage support]) - AC_ARG_ENABLE([code-coverage], AS_HELP_STRING([--enable-code-coverage], [Whether to enable code coverage support]),, enable_code_coverage=no) + AC_ARG_ENABLE([code-coverage], + AS_HELP_STRING([--enable-code-coverage], + [Whether to enable code coverage support]),, + enable_code_coverage=no) + AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes]) AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage]) AC_MSG_RESULT($enable_code_coverage) AS_IF([ test "$enable_code_coverage" = "yes" ], [ + # check for gcov + AC_CHECK_TOOL([GCOV], + [$_AX_CODE_COVERAGE_GCOV_PROG_WITH], + [:]) + AS_IF([test "X$GCOV" = "X:"], + [AC_MSG_ERROR([gcov is needed to do coverage])]) + AC_SUBST([GCOV]) + dnl Check if gcc is being used AS_IF([ test "$GCC" = "no" ], [ AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage]) @@ -349,8 +178,11 @@ CODE_COVERAGE_RULES=' # - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage # reports to be created. (Default: # $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) # - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: empty) +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml # instance. (Default: empty) # - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore @@ -363,7 +195,9 @@ CODE_COVERAGE_RULES=' CODE_COVERAGE_DIRECTORY ?= $(top_builddir) CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage -CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) CODE_COVERAGE_GENHTML_OPTIONS ?= CODE_COVERAGE_IGNORE_PATTERN ?= @@ -672,7 +506,7 @@ See: http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html#ax_code_ # gnome-compiler-flags.m4 # -# serial 4 +# serial 2 # dnl GNOME_COMPILE_WARNINGS @@ -684,7 +518,7 @@ dnl the first argument to the macro, defaulting to 'yes'. dnl Additional warning/error flags can be passed as an optional second argument. dnl dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AU_DEFUN([GNOME_COMPILE_WARNINGS],[ +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** dnl More compiler warnings dnl ****************************** @@ -721,7 +555,6 @@ AU_DEFUN([GNOME_COMPILE_WARNINGS],[ -Werror=format-security \ -Werror=format=2 \ -Werror=missing-include-dirs \ - -Werror=return-type \ " dnl Additional warning or error flags provided by the module author to @@ -792,14 +625,11 @@ AU_DEFUN([GNOME_COMPILE_WARNINGS],[ WARN_CFLAGS="$tested_warning_flags $complCFLAGS" AC_SUBST(WARN_CFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-c. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) +]) dnl For C++, do basically the same thing. -AU_DEFUN([GNOME_CXX_WARNINGS],[ +AC_DEFUN([GNOME_CXX_WARNINGS],[ AC_ARG_ENABLE(cxx-warnings, AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] [Turn on compiler warnings.]),, @@ -850,10 +680,222 @@ AU_DEFUN([GNOME_CXX_WARNINGS],[ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" AC_SUBST(WARN_CXXFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-cxx. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR # Copyright (C) 2002-2013 Free Software Foundation, Inc. # @@ -867,10 +909,10 @@ See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_comp # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -886,7 +928,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1253,6 +1295,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -1361,7 +1409,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1369,7 +1458,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -1481,38 +1569,6 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -1589,6 +1645,53 @@ AC_DEFUN([_AM_IF_OPTION], # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- diff --git a/config.guess b/config.guess index 1f5c50c..b79252d 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ;; esac @@ -826,7 +826,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - *:MSYS*:*) + i*:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) + or32:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,26 +1260,16 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1371,6 +1361,154 @@ EOF exit ;; esac +eval $set_cc_for_build +cat >$dummy.c <<EOF +#ifdef _SEQUENT_ +# include <sys/types.h> +# include <sys/utsname.h> +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include <sys/param.h> +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + cat >&2 <<EOF $0: unable to guess system type diff --git a/config.h.in b/config.h.in index 3645a34..b27c9c2 100644 --- a/config.h.in +++ b/config.h.in @@ -37,9 +37,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Define shared library extension */ #undef OS_EXT @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-07-28' +timestamp='2013-08-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -265,7 +265,6 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -283,10 +282,8 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -298,7 +295,8 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -326,7 +324,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -383,7 +381,6 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -403,10 +400,8 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -418,7 +413,6 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ - | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -828,10 +822,6 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; msdos) basic_machine=i386-pc os=-msdos @@ -1016,7 +1006,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1377,14 +1367,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1602,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pygobject 3.17.90. +# Generated by GNU Autoconf 2.69 for pygobject 3.18.0. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.17.90' -PACKAGE_STRING='pygobject 3.17.90' +PACKAGE_VERSION='3.18.0' +PACKAGE_STRING='pygobject 3.18.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='https://wiki.gnome.org/Projects/PyGObject/' @@ -643,6 +643,7 @@ CODE_COVERAGE_LDFLAGS CODE_COVERAGE_CFLAGS GENHTML LCOV +GCOV CODE_COVERAGE_ENABLED CODE_COVERAGE_ENABLED_FALSE CODE_COVERAGE_ENABLED_TRUE @@ -830,6 +831,7 @@ enable_cairo with_common enable_compile_warnings enable_iso_c +with_gcov enable_code_coverage ' ac_precious_vars='build_alias @@ -1395,7 +1397,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pygobject 3.17.90 to adapt to many kinds of systems. +\`configure' configures pygobject 3.18.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1465,7 +1467,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pygobject 3.17.90:";; + short | recursive ) echo "Configuration of pygobject 3.18.0:";; esac cat <<\_ACEOF @@ -1506,6 +1508,7 @@ Optional Packages: few standard names such as "python3" or "python2" --without-common For package maintainers: do not install Python version independent files + --with-gcov=GCOV use given GCOV for coverage (GCOV=gcov). Some influential environment variables: CC C compiler command @@ -1603,7 +1606,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.17.90 +pygobject configure 3.18.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1881,7 +1884,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pygobject $as_me 3.17.90, which was +It was created by pygobject $as_me 3.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2240,14 +2243,14 @@ $as_echo "#define PYGOBJECT_MAJOR_VERSION 3" >>confdefs.h PYGOBJECT_MAJOR_VERSION=3 -$as_echo "#define PYGOBJECT_MINOR_VERSION 17" >>confdefs.h +$as_echo "#define PYGOBJECT_MINOR_VERSION 18" >>confdefs.h -PYGOBJECT_MINOR_VERSION=17 +PYGOBJECT_MINOR_VERSION=18 -$as_echo "#define PYGOBJECT_MICRO_VERSION 90" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 0" >>confdefs.h -PYGOBJECT_MICRO_VERSION=90 +PYGOBJECT_MICRO_VERSION=0 ac_config_headers="$ac_config_headers config.h" @@ -2291,7 +2294,7 @@ else fi AM_BACKSLASH='\' -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2767,7 +2770,7 @@ fi # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.17.90' + VERSION='3.18.0' cat >>confdefs.h <<_ACEOF @@ -2818,6 +2821,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" @@ -3876,6 +3920,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4724,7 +4827,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -5122,10 +5226,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5164,11 +5264,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6259,12 +6359,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - powerpc64le-*linux*) + powerpc64le-*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6283,10 +6390,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) + powerpcle-*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*linux*) + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8390,7 +8497,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -8868,6 +8975,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9089,7 +9199,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9266,6 +9376,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9719,7 +9830,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10556,17 +10667,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10683,7 +10783,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -10732,14 +10832,10 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10751,6 +10847,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -12317,6 +12425,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -12445,131 +12612,6 @@ else fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # option to specify python interpreter to use; this just sets $PYTHON, so that @@ -14308,7 +14350,6 @@ fi -Werror=format-security \ -Werror=format=2 \ -Werror=missing-include-dirs \ - -Werror=return-type \ " additional_flags="" @@ -14405,7 +14446,19 @@ $as_echo_n "checking for Gnome code coverage support... " >&6; } $as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 + + + # allow to override gcov location + +# Check whether --with-gcov was given. +if test "${with_gcov+set}" = set; then : + withval=$with_gcov; _AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov +else + _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 $as_echo_n "checking whether to build with code coverage support... " >&6; } # Check whether --enable-code-coverage was given. if test "${enable_code_coverage+set}" = set; then : @@ -14414,6 +14467,7 @@ else enable_code_coverage=no fi + if test x$enable_code_coverage = xyes; then CODE_COVERAGE_ENABLED_TRUE= CODE_COVERAGE_ENABLED_FALSE='#' @@ -14429,6 +14483,104 @@ $as_echo "$enable_code_coverage" >&6; } if test "$enable_code_coverage" = "yes" ; then : + # check for gcov + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy ${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GCOV+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GCOV"; then + ac_cv_prog_GCOV="$GCOV" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GCOV="${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GCOV=$ac_cv_prog_GCOV +if test -n "$GCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5 +$as_echo "$GCOV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_GCOV"; then + ac_ct_GCOV=$GCOV + # Extract the first word of "$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy $_AX_CODE_COVERAGE_GCOV_PROG_WITH; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_GCOV+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_GCOV"; then + ac_cv_prog_ac_ct_GCOV="$ac_ct_GCOV" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_GCOV="$_AX_CODE_COVERAGE_GCOV_PROG_WITH" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_GCOV=$ac_cv_prog_ac_ct_GCOV +if test -n "$ac_ct_GCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GCOV" >&5 +$as_echo "$ac_ct_GCOV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_GCOV" = x; then + GCOV=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + GCOV=$ac_ct_GCOV + fi +else + GCOV="$ac_cv_prog_GCOV" +fi + + if test "X$GCOV" = "X:"; then : + as_fn_error $? "gcov is needed to do coverage" "$LINENO" 5 +fi + + if test "$GCC" = "no" ; then : as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5 @@ -14574,8 +14726,11 @@ CODE_COVERAGE_RULES=' # - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage # reports to be created. (Default: # $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) # - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: empty) +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml # instance. (Default: empty) # - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore @@ -14588,7 +14743,9 @@ CODE_COVERAGE_RULES=' CODE_COVERAGE_DIRECTORY ?= $(top_builddir) CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage -CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) CODE_COVERAGE_GENHTML_OPTIONS ?= CODE_COVERAGE_IGNORE_PATTERN ?= @@ -15377,7 +15534,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pygobject $as_me 3.17.90, which was +This file was extended by pygobject $as_me 3.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15444,7 +15601,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pygobject config.status 3.17.90 +pygobject config.status 3.18.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 897b053..2c0cfbd 100644 --- a/configure.ac +++ b/configure.ac @@ -17,8 +17,8 @@ m4_define(python3_min_ver, 3.1) dnl the pygobject version number m4_define(pygobject_major_version, 3) -m4_define(pygobject_minor_version, 17) -m4_define(pygobject_micro_version, 90) +m4_define(pygobject_minor_version, 18) +m4_define(pygobject_micro_version, 0) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff --git a/examples/Makefile.in b/examples/Makefile.in index 0e8efae..5914b5d 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -147,6 +147,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff --git a/gi/Makefile.in b/gi/Makefile.in index 2506d6e..4212e55 100644 --- a/gi/Makefile.in +++ b/gi/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -711,14 +712,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/gi/_gobject/Makefile.in b/gi/_gobject/Makefile.in index fa96833..08d2390 100644 --- a/gi/_gobject/Makefile.in +++ b/gi/_gobject/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -180,6 +180,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff --git a/gi/overrides/Makefile.in b/gi/overrides/Makefile.in index d683f56..d0bbbf8 100644 --- a/gi/overrides/Makefile.in +++ b/gi/overrides/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -180,6 +180,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff --git a/gi/repository/Makefile.in b/gi/repository/Makefile.in index eb74e7c..2550220 100644 --- a/gi/repository/Makefile.in +++ b/gi/repository/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -180,6 +180,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 @@ -6124,7 +6124,10 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6444,19 +6447,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -7349,6 +7352,9 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index f12cfdf..d7c043f 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1324,12 +1324,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - powerpc64le-*linux*) + powerpc64le-*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1348,10 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) + powerpcle-*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*linux*) + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1694,7 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2518,17 +2526,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2645,7 +2642,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2675,14 +2672,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2694,6 +2687,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3253,10 +3258,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3295,11 +3296,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4047,7 +4048,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4111,7 +4112,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4346,7 +4347,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4588,6 +4589,9 @@ m4_if([$1], [CXX], [ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4650,6 +4654,9 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4871,7 +4878,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5048,6 +5055,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5352,7 +5360,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6232,9 +6240,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6396,7 +6401,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ give_advice () ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff --git a/pygtkcompat/Makefile.in b/pygtkcompat/Makefile.in index fc952c3..3a4d5b0 100644 --- a/pygtkcompat/Makefile.in +++ b/pygtkcompat/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -180,6 +180,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 71d191f..73ff774 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -223,6 +223,7 @@ EXEEXT = @EXEEXT@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -501,14 +502,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |