Imported Upstream version 2.46.4

diff --git a/MSVC_Net2013/glibmm-build-defines.props b/MSVC_Net2013/glibmm-build-defines.props
index a10404f..5cbde3c 100644 (file)
--- a/MSVC_Net2013/glibmm-build-defines.props
+++ b/MSVC_Net2013/glibmm-build-defines.props
@@ -16,7 +16,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>.\glibmm;..;..\glib;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\glibmm;..;..\glib;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>

diff --git a/NEWS b/NEWS
index aaade50..1a131f5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+2.46.4:
+
+Glib:
+* Fix definition of VARIANT_TYPE_DICT_ENTRY to match header declaration
+  (Aurelien Jacobs) Bug #761046
+
+Build:
+* MSVC builds: Look for includes in include/gio-win32-2.0.
+  (Chun-wei Fan) Bug #761046
+* glibmmconfig.h.in: Fix Visual Studio 2013 builds.
+  (Chun-wei Fan) Bug #760612
+* Glib::ustring: fix -Wmisleading-indentation gcc 6 warning in public header.
+  (Aurelien Jacobs) Bug #760641.
+
+
 2.46.3:
 
 Gio:

diff --git a/configure.ac b/configure.ac
index 53ea832..fbf28ac 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.46.3],
+AC_INIT([glibmm], [2.46.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])

diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index fa3411b..34505bb 100644 (file)
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -990,7 +990,8 @@ const ustring_Iterator<T> ustring_Iterator<T>::operator++(int)
 template <class T> inline
 ustring_Iterator<T>& ustring_Iterator<T>::operator--()
 {
-  do --pos_; while((static_cast<unsigned char>(*pos_) & 0xC0u) == 0x80);
+  while ((static_cast<unsigned char>(*--pos_) & 0xC0u) == 0x80)
+    ;
   return *this;
 }
 

diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in
index 241aea3..a36c293 100644 (file)
--- a/glib/glibmmconfig.h.in
+++ b/glib/glibmmconfig.h.in
@@ -113,12 +113,25 @@
 # define GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED 1
 # pragma warning (disable: 4786 4355 4800 4181)
 
-#if (_MSC_VER < 1900) && !defined (noexcept)
+#if (_MSC_VER < 1900)
+/* The C++-11 keywords noexcept and thread_local are supported on
+ * Visual Studio 2013 via Microsoft-specific extensions, but are
+ * supported directly in Visual Studio 2015
+ */
+
 #define _ALLOW_KEYWORD_MACROS 1
+
+#ifndef noexcept
 #define noexcept _NOEXCEPT
 #endif
+
+#ifndef thread_local
+#define thread_local __declspec (thread)
 #endif
 
+#endif /* _MSC_VER < 1900 */
+#endif /* GLIBMM_MSC */
+
 /* Dummy macro definition for compatibility with old code that expects
  * it to be defined.  Remove after grace period. */
 #define GLIBMM_USING_STD(Symbol)

diff --git a/glib/src/varianttype.ccg b/glib/src/varianttype.ccg
index 5a3702f..d75306b 100644 (file)
--- a/glib/src/varianttype.ccg
+++ b/glib/src/varianttype.ccg
@@ -106,7 +106,7 @@ const VariantType VARIANT_TYPE_ARRAY(G_VARIANT_TYPE_ARRAY);
 
 const VariantType VARIANT_TYPE_TUPLE(G_VARIANT_TYPE_TUPLE);
 
-const VariantType VARIANT_TYPE_DICTENTRY(G_VARIANT_TYPE_DICT_ENTRY);
+const VariantType VARIANT_TYPE_DICT_ENTRY(G_VARIANT_TYPE_DICT_ENTRY);
 
 const VariantType VARIANT_TYPE_DICTIONARY(G_VARIANT_TYPE_DICTIONARY);