From 62c67bcc35967a3628ff9c09f7c8c77144dd4b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 26 Sep 2012 01:17:07 +0900
Subject: Make gtk-doc not a hard dependency of gobject-introspection

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=684795
---
 configure.ac | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 28d6f146..775b50a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,7 +231,13 @@ GIREPO_CFLAGS="$GIREPO_CFLAGS $FFI_CFLAGS"
 GIREPO_CFLAGS="$GIREPO_CFLAGS $GCOV_CFLAGS"
 
 # gtk-doc
-GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
+# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
+# it on it's own line.
+m4_ifdef([GTK_DOC_CHECK], [
+GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+],[
+AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
+])
 
 # Checks for header files.
 AC_HEADER_STDC
-- 
cgit v1.2.1


From 448230b381a6ba0394962ca73f35af563b5de4c9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 16 Oct 2012 10:58:08 -0400
Subject: Drop calls to g_type_init()

And bump our GLib requirement.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 775b50a0..e488cea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.29.7])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.0])
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
 PKG_CHECK_MODULES(GIO, [gio-2.0])
-- 
cgit v1.2.1


From 75b61c34fad2a907becb2ab6367e6b9571091c64 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue, 14 Aug 2012 16:17:31 +0800
Subject: Update autotools for Visual C++ projects creation

-Add Makefile-msvcproj.am to fill in the cmph, girepository and
 g-ir-compiler projects
-Add various Makefile.am's under build/ to distribute the
 Visual C++-related files.

https://bugzilla.gnome.org/show_bug.cgi?id=681820
---
 configure.ac | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index e488cea9..ca783155 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,7 +300,12 @@ tests/doctool/Makefile
 docs/Makefile
 docs/reference/Makefile
 gobject-introspection-1.0.pc
-gobject-introspection-no-export-1.0.pc])
+gobject-introspection-no-export-1.0.pc
+config.h.win32
+build/Makefile
+build/win32/Makefile
+build/win32/vs9/Makefile
+build/win32/vs10/Makefile])
 AC_OUTPUT
 
 echo "
-- 
cgit v1.2.1


From 3c8927ddff09745cd30654fe99c68ed9bcae6118 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martinpitt@gnome.org>
Date: Mon, 19 Nov 2012 13:57:49 +0100
Subject: Bump version to 1.35.2

Our configure.ac still said 1.34.0, which is even older than the stable
gnome-3-6 branch. Bump it to 1.35.2 so that pygobject can depend on >= 1.34.2.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index ca783155..f6fd5a06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 34)
-m4_define(gi_micro_version, 0)
+m4_define(gi_minor_version, 35)
+m4_define(gi_micro_version, 2)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From e8f29e2531a9d2a88da944276ffd396e161deb20 Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Wed, 28 Nov 2012 10:36:19 +0100
Subject: tests: fix incremental build

Running make multiple times caused "mkdir" to complain
that it could not create those directories because they
where already there...

https://bugzilla.gnome.org/show_bug.cgi?id=689570
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f6fd5a06..74a44de6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AM_CONDITIONAL(OS_WIN32, [test "x$os_win32" = "xyes"])
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_MKDIR_P
 
 # Initialize libtool
 LT_PREREQ([2.2])
-- 
cgit v1.2.1


From 68a4a3eea119704817f540efa803e2197fe52838 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 1 Dec 2012 14:49:49 -0500
Subject: build: Use -Bsymbolic-functions by default if available

While we have much larger performance problems right now, using
-Bsymbolic-functions to avoid internal PLT indirection is an easy win.

This is the same code that both GLib and GTK+ have.

https://bugzilla.gnome.org/show_bug.cgi?id=689456
---
 configure.ac | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 74a44de6..b1e8ea9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,28 @@ AM_CONDITIONAL(WITH_GLIBSRC, test x"$GLIBSRC" != x)
 AC_SUBST(GLIBSRC)
 AC_MSG_RESULT([$GLIBSRC])
 
+dnl
+dnl Check for -Bsymbolic-functions linker flag used to avoid
+dnl intra-library PLT jumps, if available.
+dnl
+AC_ARG_ENABLE(Bsymbolic,
+              [AS_HELP_STRING([--disable-Bsymbolic],
+                              [avoid linking with -Bsymbolic])],,
+              [SAVED_LDFLAGS="${LDFLAGS}"
+               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+               LDFLAGS=-Wl,-Bsymbolic-functions
+               AC_TRY_LINK([], [int main (void) { return 0; }],
+                           AC_MSG_RESULT(yes)
+                           enable_Bsymbolic=yes,
+                           AC_MSG_RESULT(no)
+                           enable_Bsymbolic=no)
+               LDFLAGS="${SAVED_LDFLAGS}"])
+
+if test "x${enable_Bsymbolic}" = "xyes"; then
+  EXTRA_LINK_FLAGS=-Wl,-Bsymbolic-functions
+fi
 
+AC_SUBST(EXTRA_LINK_FLAGS)
 
 AC_CONFIG_FILES([
 Makefile
-- 
cgit v1.2.1


From 1114a687d8e1596aa67f986cfdb4891d19a8da1a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 18 Dec 2012 11:36:57 -0500
Subject: Release 1.35.3

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index b1e8ea9f..37380be6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 35)
-m4_define(gi_micro_version, 2)
+m4_define(gi_micro_version, 3)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From f5631640751b5a998b3616db78dd5dcd9ee62126 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 7 Jan 2013 12:57:17 -0500
Subject: Clean up cairo handling somewhat

I'm building on RHEL6 which doesn't have cairo-gobject.  Now, we
tried to support this in that 'make' would succeed, but 'make check'
would blow up.

This patch allows more of 'make check' to succeed - I just need to
figure out how to make the diff against the -expected.gir work.

What's more important though, is this will allow gjs to also #define
_GI_DISABLE_CAIRO.
---
 configure.ac | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 37380be6..96b36751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,24 +131,20 @@ PKG_CHECK_MODULES(GIO, [gio-2.0])
 PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], have_gio_unix=true, have_gio_unix=false)
 AM_CONDITIONAL(HAVE_GIO_UNIX, test x$have_gio_unix = xtrue)
 
-AC_ARG_ENABLE(tests,
-	AS_HELP_STRING([--disable-tests], [disable test libraries]),
-	enable_tests=$enableval,
-	enable_tests=maybe)
+# Prefer cairo-gobject if we have it
+AC_ARG_WITH(cairo,
+	    AS_HELP_STRING([--with-cairo], [Use cairo @<:@default=maybe@:>@]),
+	    [], [with_cairo=maybe])
 
-AS_IF([test x${enable_tests} != xno], [
+AS_IF([test x${with_cairo} != xno], [
   PKG_CHECK_MODULES(CAIRO, [cairo cairo-gobject], have_cairo=yes, have_cairo=no)
-  AS_IF([test x$have_cairo != xyes], [
-    AS_IF([ test x$enable_tests = xmaybe ], [
-      enable_tests=no
-    ], [
-      AC_MSG_ERROR([Tests enabled but cairo not found; pass --disable-tests or install cairo])
-    ])
-  ], [
-    enable_tests=yes
+  AS_IF([ test x$have_cairo = xyes && test x$with_cairo = xmaybe ], [
+    have_cairo=no
+  ], [ test x$have_cairo = xno && test x$with_cairo = xyes ], [
+    AC_MSG_ERROR([cairo enabled but not found])
   ])
 ])
-AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests != xno)
+AM_CONDITIONAL(HAVE_CAIRO, test x$have_cairo = xyes)
 
 case "$host" in
   *-*-darwin*)
-- 
cgit v1.2.1


From fc2e46f7d3c90c117639fe86b0e42f34d97b704f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 7 Jan 2013 13:41:09 -0500
Subject: build: Fix previous commit

---
 configure.ac | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 96b36751..71223e05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,7 @@ AC_ARG_WITH(cairo,
 
 AS_IF([test x${with_cairo} != xno], [
   PKG_CHECK_MODULES(CAIRO, [cairo cairo-gobject], have_cairo=yes, have_cairo=no)
-  AS_IF([ test x$have_cairo = xyes && test x$with_cairo = xmaybe ], [
-    have_cairo=no
-  ], [ test x$have_cairo = xno && test x$with_cairo = xyes ], [
+  AS_IF([ test x$have_cairo = xno && test x$with_cairo = xyes ], [
     AC_MSG_ERROR([cairo enabled but not found])
   ])
 ])
-- 
cgit v1.2.1


From 99c1a8790d36a3307b699dfbf977e7f36fbf6e7a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 15 Jan 2013 10:22:43 -0500
Subject: Release 1.35.4

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 71223e05..f83b3b4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 35)
-m4_define(gi_micro_version, 3)
+m4_define(gi_micro_version, 4)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From 4fe47538d317b7824538fa5e42a6981e475c3607 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 15 Jan 2013 16:00:12 -0500
Subject: Post-release version bump

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f83b3b4b..fc39916b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 35)
-m4_define(gi_micro_version, 4)
+m4_define(gi_micro_version, 5)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From f2a530f575e4ad8dcff9406d136c6130202b3c4b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 11 Feb 2013 11:49:31 -0500
Subject: build: Enable g-ir-doctool if mako is found

Let's lift it out of the disabled-by-default ghetto.
---
 configure.ac | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index fc39916b..68fb3f25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,10 +262,16 @@ fi
 
 dnl Not enabled by default until 3.6 cycle when we can propose mako as
 dnl an external dependency
-AC_ARG_ENABLE(doctool,[  --enable-doctool           enable g-ir-doctool ], enable_doctool=$enableval,enable_doctool=no)
-if test x$enable_doctool != xno; then
-   AM_CHECK_PYMOD(mako,,,[AC_MSG_ERROR(Could not find python module: mako)])
-fi
+AC_ARG_ENABLE(doctool,[  --disable-doctool           disable g-ir-doctool ],,enable_doctool=auto)
+AS_IF([ test x$enable_doctool != xno], [
+   AM_CHECK_PYMOD(mako,,have_python_mako=yes,have_python_mako=no)
+])
+AS_IF([ test x$enable_doctool = xauto && test x$have_python_mako = xyes ],
+      [ enable_doctool=yes ],
+      [ test x$enable_doctool = xauto && test x$have_python_mako = xno ],
+      [ enable_doctool=no ],
+      [ test x$enable_doctool = xyes && test x$have_python_mako = xno ],
+      [ AC_MSG_ERROR([Python mako module not found]) ])
 AM_CONDITIONAL(BUILD_DOCTOOL, test x$enable_doctool != xno)
 
 # Glib documentation
-- 
cgit v1.2.1


From 86f7acf0f139a917e460db26872b5a4306fca8d2 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 3 Feb 2013 06:58:53 -0500
Subject: tests: Use Regress GIR for doctool

This makes us test a lot more functionality in the doc tool, and
removes the need to have a lot of different test libraries, and
different test infrastructure.
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 68fb3f25..c8e01731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,7 +318,6 @@ tests/offsets/Makefile
 tests/scanner/Makefile
 tests/repository/Makefile
 tests/warn/Makefile
-tests/doctool/Makefile
 docs/Makefile
 docs/reference/Makefile
 gobject-introspection-1.0.pc
-- 
cgit v1.2.1


From dd81e51bd155a7fd8ee0150b4ecb33d16f54ad91 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 19 Feb 2013 11:12:01 -0500
Subject: Release 1.35.8

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index c8e01731..83e86aec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 35)
-m4_define(gi_micro_version, 5)
+m4_define(gi_micro_version, 8)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From 81c65f22e124c7aa53686519776714c8fdbf8bc2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 19 Feb 2013 11:53:18 -0500
Subject: tests: Be compatible with both Automake 1.12 and 1.13

Revert to using the serial test driver, as that's the easiest path for
now, unless we generated a binary to run each warn test.

https://bugzilla.gnome.org/693539
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 83e86aec..5adffdd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability serial-tests])
 AM_MAINTAINER_MODE([enable])
 
 AM_SILENT_RULES([yes])
-- 
cgit v1.2.1


From 3e976212bfd34a675632c5a0aecc9f8070df8098 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 19 Feb 2013 17:56:32 -0500
Subject: tests: Be compatible with Automake 1.11, 1.12 and 1.13, and the
 future, hopefully

Automake only sees it as one test now, but eh, who cares.

https://bugzilla.gnome.org/show_bug.cgi?id=694198
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 5adffdd6..83e86aec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability serial-tests])
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability])
 AM_MAINTAINER_MODE([enable])
 
 AM_SILENT_RULES([yes])
-- 
cgit v1.2.1


From 8f7acc600b45ea5bf8ea1d6ce1fbedb5c6f9cfd5 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 5 Mar 2013 12:33:49 -0500
Subject: build: Bump version and GLib requirement in preparation for release

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 83e86aec..399d98d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 35)
-m4_define(gi_micro_version, 8)
+m4_define(gi_micro_version, 9)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
@@ -124,7 +124,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.9])
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
 PKG_CHECK_MODULES(GIO, [gio-2.0])
-- 
cgit v1.2.1


From 0e708e9fb76b53f41422360f502b873e88baac41 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 25 Mar 2013 20:26:05 -0400
Subject: Release 1.36.0

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 399d98d4..3537af1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 35)
-m4_define(gi_micro_version, 9)
+m4_define(gi_minor_version, 36)
+m4_define(gi_micro_version, 0)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
@@ -124,7 +124,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.9])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0])
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
 PKG_CHECK_MODULES(GIO, [gio-2.0])
-- 
cgit v1.2.1


From 0f207646c63c8ee919b3a99436a53b977aece094 Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Fri, 5 Apr 2013 17:55:39 +0200
Subject: remove ./configure summary

${enable_tests} was removed in f5631640751b5a998b3616db78dd5dcd9ee62126
so there's nothing left to report about...

https://bugzilla.gnome.org/show_bug.cgi?id=697669
---
 configure.ac | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 3537af1a..fad88bc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,10 +328,3 @@ build/win32/Makefile
 build/win32/vs9/Makefile
 build/win32/vs10/Makefile])
 AC_OUTPUT
-
-echo "
-    gobject-introspection $VERSION
-    ===============
-
-    tests: ${enable_tests}
-"
-- 
cgit v1.2.1


From eaca1e68664c35981949a9b852936c3fd4d0fc82 Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Mon, 22 Apr 2013 23:47:17 +0200
Subject: build: require Python 2.6 from now on

Nobody is really known to still use g-i with python 2.5, support
for 2.5 gets broken every now and then in the tree because nobody
is paying much attention any more so just drop it.

https://bugzilla.gnome.org/show_bug.cgi?id=698617
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index fad88bc4..14fc42fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,7 +247,7 @@ AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull])
 AC_CHECK_FUNCS([backtrace backtrace_symbols])
 
 # Python
-AM_PATH_PYTHON([2.5])
+AM_PATH_PYTHON([2.6])
 case "$host" in
 *-*-mingw*)
 	# Change backslashes to forward slashes in pyexecdir to avoid
-- 
cgit v1.2.1


From 212a6a5e9fcaa40cc245f415a48015c3c38f6d3f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 28 May 2013 14:46:05 -0400
Subject: Release 1.37.1

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 14fc42fe..4a899c8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 36)
-m4_define(gi_micro_version, 0)
+m4_define(gi_minor_version, 37)
+m4_define(gi_micro_version, 1)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From 6b4ab34d2a3f77c09aa12a75240b083cee43bbeb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 10 Jul 2013 12:40:45 -0400
Subject: Release 1.37.4

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 4a899c8f..d9e3131c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 37)
-m4_define(gi_micro_version, 1)
+m4_define(gi_micro_version, 4)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From 85d02d59f101f9eb37829b16a81890ef9801824a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 20 Aug 2013 14:53:28 -0400
Subject: Release 1.37.6

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index d9e3131c..5b1e746f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 37)
-m4_define(gi_micro_version, 4)
+m4_define(gi_micro_version, 6)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From f513b39cf60bd50e49dedcccde94641987fe4290 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 24 Sep 2013 15:55:02 +0200
Subject: Release 1.38.0

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 5b1e746f..a73b8606 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 37)
-m4_define(gi_micro_version, 6)
+m4_define(gi_minor_version, 38)
+m4_define(gi_micro_version, 0)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From e67a2068e208b6c4ceabdd791e58b96030e42001 Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Thu, 2 May 2013 17:12:09 +0200
Subject: build: actually require libffi >= 3.0.0

as documented in README...
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a73b8606..d85a131d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,7 +167,7 @@ AC_SUBST(CAIRO_GIR_PACKAGE)
 PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gio-2.0])
 
 dnl libffi
-PKG_CHECK_MODULES(FFI, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
+PKG_CHECK_MODULES(FFI, [libffi >= 3.0.0 ], have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
 FFI_PC_CFLAGS=""
 FFI_PC_LIBS=""
 FFI_PC_PACKAGES=""
-- 
cgit v1.2.1


From df5b4d906dc8450b9537fd849e2837df14b2a47e Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Wed, 11 Sep 2013 17:03:04 +0200
Subject: build: remove m4/as-compiler-flag.m4

no longer used since b2fd4f54883cd701a0c280655c93e20b04897ed2
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index d85a131d..591b8bff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,7 +312,6 @@ AC_SUBST(EXTRA_LINK_FLAGS)
 
 AC_CONFIG_FILES([
 Makefile
-m4/Makefile
 tests/Makefile
 tests/offsets/Makefile
 tests/scanner/Makefile
-- 
cgit v1.2.1


From 00be8a1fb7538c556028a04f7707eee6160387a5 Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Thu, 19 Sep 2013 12:39:23 +0200
Subject: build: use AC_LINK_IFELSE instead of AC_TRY_LINK

AC_TRY_LINK is obsolete...
---
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 591b8bff..054328f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,11 +297,11 @@ AC_ARG_ENABLE(Bsymbolic,
               [SAVED_LDFLAGS="${LDFLAGS}"
                AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
                LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_TRY_LINK([], [int main (void) { return 0; }],
-                           AC_MSG_RESULT(yes)
-                           enable_Bsymbolic=yes,
-                           AC_MSG_RESULT(no)
-                           enable_Bsymbolic=no)
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main (void) { return 0; }]])],
+                              [AC_MSG_RESULT(yes)
+                               enable_Bsymbolic=yes],
+                              [AC_MSG_RESULT(no)
+                               enable_Bsymbolic=no])
                LDFLAGS="${SAVED_LDFLAGS}"])
 
 if test "x${enable_Bsymbolic}" = "xyes"; then
-- 
cgit v1.2.1


From 3c01854fe58c845956bc8f08e9bd9fd9929b6f8d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 9 Oct 2013 14:48:30 -0400
Subject: trivial: Post-release version bump

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 054328f4..1f78408f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 38)
+m4_define(gi_minor_version, 39)
 m4_define(gi_micro_version, 0)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
-- 
cgit v1.2.1


From a737daa16e458e87f189c2535f11f4bd2dde8f1a Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Thu, 10 Oct 2013 22:21:18 +0200
Subject: docs: fix up reference docs a bit

      - require GTK-Doc 1.19
      - remove sgml mode
      - automatically generate gi.types (needs GTK-Doc 1.19)
      - fix https://bugzilla.gnome.org/show_bug.cgi?id=700025
[WIP] - rearange sections a bit
[WIP] - add gi-building, gi-programming sections
[WIP] - mark missing docs with TODO, which is only marginaly
        better than nothing but at least can be grepped :)

https://bugzilla.gnome.org/show_bug.cgi?id=571648
---
 configure.ac | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 1f78408f..07bdb46c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,10 @@ AM_MAINTAINER_MODE([enable])
 
 AM_SILENT_RULES([yes])
 
+# Used in docs/reference/version.xml
+GI_VERSION=gi_version
+AC_SUBST(GI_VERSION)
+
 # Check for Win32
 AC_CANONICAL_HOST
 case "$host" in
@@ -229,7 +233,7 @@ GIREPO_CFLAGS="$GIREPO_CFLAGS $GCOV_CFLAGS"
 # gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
 # it on it's own line.
 m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+GTK_DOC_CHECK([1.19], [--flavour no-tmpl])
 ],[
 AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
 ])
@@ -319,6 +323,7 @@ tests/repository/Makefile
 tests/warn/Makefile
 docs/Makefile
 docs/reference/Makefile
+docs/reference/version.xml
 gobject-introspection-1.0.pc
 gobject-introspection-no-export-1.0.pc
 config.h.win32
-- 
cgit v1.2.1


From 9b46f283e25f6ce06f0e8926120db5fac3ddf418 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 8 Dec 2013 13:51:32 +0100
Subject: Post-release version bump to match glib

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 07bdb46c..3394ece0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 39)
-m4_define(gi_micro_version, 0)
+m4_define(gi_micro_version, 2)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From f27aff293b8f811dbea6311d06be42eec2d980d8 Mon Sep 17 00:00:00 2001
From: Simon Feltman <sfeltman@src.gnome.org>
Date: Wed, 18 Dec 2013 18:30:54 -0800
Subject: tests: Use Python unittest module parameterization for
 annotationparser

Add Python unittest module parameterization support to gi-tester through the
use of a "TESTARGS" variable. Use the Automake test harness along with
gi-tester for running the Python annotationparser tests.
Add tests/scanner/annotationparser/Makefile.am and localize testing
rules and EXTRA_DIST setup to this file. Specific Python tests can now be
run as follows:

cd tests/scanner/annotationparser
make check TESTS=test_patterns.py TESTARGS=TestTagValueStability

https://bugzilla.gnome.org/show_bug.cgi?id=720713
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 3394ece0..f60d3f47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,7 @@ Makefile
 tests/Makefile
 tests/offsets/Makefile
 tests/scanner/Makefile
+tests/scanner/annotationparser/Makefile
 tests/repository/Makefile
 tests/warn/Makefile
 docs/Makefile
-- 
cgit v1.2.1


From 512111b007a684886f287b5b0fdff678969971d2 Mon Sep 17 00:00:00 2001
From: Simon Feltman <sfeltman@src.gnome.org>
Date: Sat, 4 Jan 2014 12:14:41 -0800
Subject: tests: Update GI to use parallel test harness

There was some dependence on the serial test harness in the recent tests
that were added. Update GI to use the parallel test harness to avoid
incompatibilities.

https://bugzilla.gnome.org/show_bug.cgi?id=721477
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f60d3f47..a01d630f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability parallel-tests])
 AM_MAINTAINER_MODE([enable])
 
 AM_SILENT_RULES([yes])
-- 
cgit v1.2.1


From 9776c2abbcc51cc76a10d38469654e0c15327b5a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 25 Jan 2014 09:50:45 -0500
Subject: Release 1.39.3

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a01d630f..7081a465 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 39)
-m4_define(gi_micro_version, 2)
+m4_define(gi_micro_version, 3)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1


From 89e84d06dffbc732bac26a105244b7270c42e3ec Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 19 Feb 2014 11:27:45 -0500
Subject: Release 1.3.90

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 7081a465..5e893eff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 1)
 m4_define(gi_minor_version, 39)
-m4_define(gi_micro_version, 3)
+m4_define(gi_micro_version, 90)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
-- 
cgit v1.2.1