summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2006-07-17 16:54:10 +0000
committerMurray Cumming <murrayc@src.gnome.org>2006-07-17 16:54:10 +0000
commit95151b892e865a8b49b114f629e2a0b4a4429295 (patch)
tree7d0ffba6569e561829de27df5b8f2956116f8048
parent194b4e5c573a0e802d980886161a54f164569fac (diff)
downloadglibmm-95151b892e865a8b49b114f629e2a0b4a4429295.tar.gz
2.11.2:
2006-07-17 Murray Cumming <murrayc@murrayc.com> * configure.in: Reverted the previous patch slightly to unbreak glibmmconfig.h.
-rw-r--r--ChangeLog8
-rw-r--r--NEWS25
-rw-r--r--configure.in10
3 files changed, 32 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 62140254..065ff966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2.11.2:
+
+2006-07-17 Murray Cumming <murrayc@murrayc.com>
+
+ * configure.in: Reverted the previous patch slightly to unbreak glibmmconfig.h.
+
+2.11.1:
+
2006-07-16 Murray Cumming <murrayc@murrayc.com>
* configure.in: Quote GLIBMM_*_VERSION to avoid m4 warnings. Patch from
diff --git a/NEWS b/NEWS
index 5ecca0fb..df25dbee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,23 @@
-2.10.2:
+2.11.2:
+
+* Date: Fix implementation of Glib::Date::set_time_current() so
+ that it doesn't set the date to Dec 31, 1969.
+ (Jonathon Jongsma)
+* Value: Added init(const GValue*), so we can copy GValue instances
+ of any type at runtime. Needed by the new branch of libgdamm.
+ (Murray Cumming)
+* Added a #warning to warn about including X11/Xlib.h before a glibmm header,
+ which would break things. Bug #316726 from Mert Tugcu and Javeed Shaikh.
+ (Murray Cumming)
+* Build:
+ - Quote some m4 macros to avoid warnings. Bugs (with patches) #347076
+ and #347077
+ (Kevin McBride).
+ - Fix exporting of get/set_property() on mingw32-gcc.
+ (Cedric Gustin)
+
+
-* Added --enable-api-properties, --enable-api-vfuncs, and --enable-api-exceptions.
- When using these, the API, and any API generated by gmmproc, will be
- changed. This allows users of embedded platforms to reduce the code size of *mm
- libraries and *mm-using applications, at the small cost of losing some rarely-used
- API. Alternatives exist for that API, as show in the examples.
2.10.1
diff --git a/configure.in b/configure.in
index b6ff622a..c5d001b8 100644
--- a/configure.in
+++ b/configure.in
@@ -19,12 +19,12 @@ AC_PREREQ(2.50)
#########################################################################
GLIBMM_MAJOR_VERSION=2
GLIBMM_MINOR_VERSION=11
-GLIBMM_MICRO_VERSION=0
+GLIBMM_MICRO_VERSION=2
GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION
GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION
-AC_DEFINE([GLIBMM_MAJOR_VERSION], [$GLIBMM_MAJOR_VERSION], [Major Version])
-AC_DEFINE([GLIBMM_MINOR_VERSION], [$GLIBMM_MINOR_VERSION], [Minor Version])
-AC_DEFINE([GLIBMM_MICRO_VERSION], [$GLIBMM_MICRO_VERSION], [Micro Version])
+AC_DEFINE_UNQUOTED([GLIBMM_MAJOR_VERSION], $GLIBMM_MAJOR_VERSION, [Major Version])
+AC_DEFINE_UNQUOTED([GLIBMM_MINOR_VERSION], $GLIBMM_MINOR_VERSION, [Minor Version])
+AC_DEFINE_UNQUOTED([GLIBMM_MICRO_VERSION], $GLIBMM_MICRO_VERSION, [Micro Version])
AC_SUBST(GLIBMM_MAJOR_VERSION)
AC_SUBST(GLIBMM_MINOR_VERSION)
AC_SUBST(GLIBMM_MICRO_VERSION)
@@ -38,7 +38,7 @@ AC_SUBST(GLIBMM_RELEASE)
# ? :+1 : ? == just some internal changes, nothing breaks but might work
# better
# CURRENT : REVISION : AGE
-LIBGLIBMM_SO_VERSION=1:23:0
+LIBGLIBMM_SO_VERSION=1:24:0
AC_SUBST(LIBGLIBMM_SO_VERSION)
AC_CONFIG_AUX_DIR(scripts)