summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2017-08-25 12:08:48 +0200
committerMurray Cumming <murrayc@murrayc.com>2017-08-25 12:08:48 +0200
commit9a8e7872c0ef806e98d5407acf6412427ab19d74 (patch)
treea090f0148a0c10d49707eda013b47a7e7e044287
parent3348f6e71861ad381fea6dceb46ce541ebe81e85 (diff)
1.15.5v1.15.5
-rw-r--r--NEWS8
-rw-r--r--configure.ac2
2 files changed, 9 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 69ee55a..d2388fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+1.15.5 (unstable)
+(Distros should probably not package this yet.)
+
+* enums.h: Guard the FT-specific include and the enum with an ifdef.
+ (John Ralls) Bug #100894.
+* Build: configure.ac: Require C++14, because libsigc++-3.0 does.
+ (John Ralls) Bug #100884
+
1.15.4 (unstable):
(Distros should probably not package this yet.)
diff --git a/configure.ac b/configure.ac
index 73e6266..e8793ed 100644
--- 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([cairomm], [1.15.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=cairomm],
+AC_INIT([cairomm], [1.15.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=cairomm],
[cairomm], [http://www.cairographics.org/cairomm/])
AC_PREREQ([2.62])