Imported Upstream version 2.64.1

diff --git a/NEWS b/NEWS
index fa45fb0..40991b3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2.64.1: (stable):
+
+Glib:
+* Add missing #includes
+  (Kjell Ahlstedt) Issue #69 (Kalev Lember)
+
+
 2.64.0 (stable):
 
 Glib:

diff --git a/configure.ac b/configure.ac
index 8cc53c8..3a067c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([glibmm], [2.64.0],
+AC_INIT([glibmm], [2.64.1],
         [https://gitlab.gnome.org/GNOME/glibmm/issues],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])

diff --git a/glib/glibmm/random.h b/glib/glibmm/random.h
index 83d2caa..e4dd444 100644 (file)
--- a/glib/glibmm/random.h
+++ b/glib/glibmm/random.h
@@ -19,6 +19,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glibmmconfig.h>
 #include <glib.h>
 
 extern "C" {

diff --git a/glib/glibmm/timer.h b/glib/glibmm/timer.h
index 43fff37..cbb5b44 100644 (file)
--- a/glib/glibmm/timer.h
+++ b/glib/glibmm/timer.h
@@ -19,6 +19,8 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glibmmconfig.h>
+
 extern "C" {
 using GTimer = struct _GTimer;
 }

diff --git a/glib/src/miscutils.hg b/glib/src/miscutils.hg
index 4ec3137..f474254 100644 (file)
--- a/glib/src/miscutils.hg
+++ b/glib/src/miscutils.hg
@@ -18,6 +18,7 @@ _DEFS(glibmm,glib)
 
 #include <glibmm/arrayhandle.h>
 #include <glibmm/ustring.h>
+#include <glibmm/utility.h>
 
 namespace Glib
 {

diff --git a/glib/src/module.hg b/glib/src/module.hg
index e0e23aa..9101665 100644 (file)
--- a/glib/src/module.hg
+++ b/glib/src/module.hg
@@ -16,6 +16,7 @@
 
 _DEFS(glibmm,glib)
 
+#include <glibmmconfig.h>
 #include <string>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

diff --git a/glib/src/uriutils.hg b/glib/src/uriutils.hg
index 7078a7d..e82f52c 100644 (file)
--- a/glib/src/uriutils.hg
+++ b/glib/src/uriutils.hg
@@ -16,6 +16,7 @@
 
 _DEFS(glibmm,glib)
 
+#include <glibmmconfig.h>
 #include <string>
 
 namespace Glib

diff --git a/glib/src/variantiter.hg b/glib/src/variantiter.hg
index a35c2e5..e8ae5b1 100644 (file)
--- a/glib/src/variantiter.hg
+++ b/glib/src/variantiter.hg
@@ -14,7 +14,9 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glibmmconfig.h>
 #include <glib.h>
+
 _DEFS(glibmm,glib)
 
 namespace Glib

diff --git a/meson.build b/meson.build
index 2e6be38..a25f06a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # This file is part of glibmm.
 
 project('glibmm', 'cpp',
-  version: '2.64.0',
+  version: '2.64.1',
   license: 'LGPLv2.1+',
   default_options: [
     'cpp_std=c++11'