GNOME.org
 

[atkmm] Change ABI to atkmm-2.36; Use glibmm-2.68 instead of glibmm-2.66

commit f53fdd15bf1ea962541b805df554a0feefcd6340
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Dec 11 18:25:24 2020 +0100

    Change ABI to atkmm-2.36; Use glibmm-2.68 instead of glibmm-2.66
    
    So we can use the 2.30-2.34 version numbers for stable releases in
    the atkmm-1.6 ABI series.
    
    We've done similar ABI name changes before.

 MSVC_NMake/config-msvc.mak    |  4 ++--
 atk/atkmm.h                   | 19 +++++++++++++++++--
 codegen/Makefile.am           |  2 +-
 codegen/extradefs/meson.build |  2 +-
 configure.ac                  | 10 +++++-----
 doc/reference/meson.build     |  2 +-
 meson.build                   |  8 ++++----
 untracked/README              |  4 ++--
 8 files changed, 33 insertions(+), 18 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 3723108..68ddd51 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -6,14 +6,14 @@ BASE_INCLUDES =       /I$(PREFIX)\include
 # Please do not change anything beneath this line unless maintaining the NMake Makefiles
 ATK_API_VERSION = 1.0
 ATKMM_MAJOR_VERSION = 2
-ATKMM_MINOR_VERSION = 30
+ATKMM_MINOR_VERSION = 36
 
 GLIB_API_VERSION = 2.0
 
 LIBSIGC_MAJOR_VERSION = 3
 LIBSIGC_MINOR_VERSION = 0
 GLIBMM_MAJOR_VERSION = 2
-GLIBMM_MINOR_VERSION = 66
+GLIBMM_MINOR_VERSION = 68
 
 
 !if "$(CFG)" == "debug" || "$(CFG)" == "Debug"
diff --git a/atk/atkmm.h b/atk/atkmm.h
index 55ac124..a255fbe 100644
--- a/atk/atkmm.h
+++ b/atk/atkmm.h
@@ -37,11 +37,26 @@
  * compilation, but suffices for this simple example. Assuming that your
  * program source file is @c program.cc, compile it with:
  * @code
- * g++ program.cc -o program  `pkg-config --cflags --libs atkmm-2.30`
+ * g++ program.cc -o program  `pkg-config --cflags --libs atkmm-2.36`
  * @endcode
+ * If your version of g++ is not C++17-compliant by default,
+ * add the @c -std=c++17 option.
+ *
+ * If you use <a href="https://mesonbuild.com/";>Meson</a>, include the following
+ * in @c meson.build:
+ * @code
+ * atkmm_dep = dependency('atkmm-2.36')
+ * program_name = 'program'
+ * cpp_sources = [ 'program.cc' ]
+ * executable(program_name,
+ *   cpp_sources,
+ *   dependencies: [ atkmm_dep ]
+ * )
+ * @endcode
+ *
  * Alternatively, if using autoconf, use the following in @c configure.ac:
  * @code
- * PKG_CHECK_MODULES([ATKMM], [atkmm-2.30])
+ * PKG_CHECK_MODULES([ATKMM], [atkmm-2.36])
  * @endcode
  * Then use the generated @c ATKMM_CFLAGS and @c ATKMM_LIBS variables in
  * the project @c Makefile.am files. For example:
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 3c101c9..806950f 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -30,7 +30,7 @@ dist_noinst_SCRIPTS = generate_defs_and_docs.sh
 noinst_PROGRAMS  = extradefs/generate_extra_defs
 
 extradefs_generate_extra_defs_SOURCES = extradefs/generate_extra_defs_atk.cc
-extradefs_generate_extra_defs_LDADD   = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.66
+extradefs_generate_extra_defs_LDADD   = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.68
 extradefs_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version
 
 AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(ATKMM_CFLAGS)
diff --git a/codegen/extradefs/meson.build b/codegen/extradefs/meson.build
index 3dfe461..edec100 100644
--- a/codegen/extradefs/meson.build
+++ b/codegen/extradefs/meson.build
@@ -5,7 +5,7 @@
 # Output: m4_files, install_m4dir
 
 glibmm_generate_extra_defs_dep = cpp_compiler.find_library(
-  'glibmm_generate_extra_defs@0@-2.66'.format(msvc14x_toolset_ver),
+  'glibmm_generate_extra_defs@0@-2.68'.format(msvc14x_toolset_ver),
 )
 
 executable('generate_extra_defs', 'generate_extra_defs_atk.cc',
diff --git a/configure.ac b/configure.ac
index 2444557..039a172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 # pkg-config name as before and is meant to be binary compatible.  Thus for the
 # time being, the version number cannot be brought in line with ATK, since that
 # would break compatibility.
-AC_INIT([atkmm], [2.29.1], [https://gitlab.gnome.org/GNOME/atkmm/issues/],
+AC_INIT([atkmm], [2.35.1], [https://gitlab.gnome.org/GNOME/atkmm/issues/],
         [atkmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
 
@@ -36,7 +36,7 @@ AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 MM_PREREQ([0.9.12])
-MM_INIT_MODULE([atkmm-2.30])
+MM_INIT_MODULE([atkmm-2.36])
 
 # Copy the mm-common .pl scripts into doc/, and use them from there,
 # so we can dist them to avoid a tarball-build dependency.
@@ -52,18 +52,18 @@ MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
 AC_DISABLE_STATIC
 LT_INIT([win32-dll])
 
-AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.66 >= 2.65.1'])
+AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.68 >= 2.67.1'])
 PKG_CHECK_MODULES([ATKMM], [$ATKMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
-MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.66])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.68])
 
 MM_ARG_DISABLE_DEPRECATED_API
 
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
 MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm-2.66.tag], [glibmm-2.66])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.68.tag], [glibmm-2.68])
 
 AC_LANG([C++])
 MM_ARG_ENABLE_WARNINGS([ATKMM_WXXFLAGS],
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index fb913a0..a7d22f2 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -8,7 +8,7 @@
 tag_file_modules = [
   'mm-common-libstdc++',
   'sigc++-3.0',
-  'glibmm-2.66',
+  'glibmm-2.68',
 ]
 doxygen_tagfiles = ''
 docinstall_flags = []
diff --git a/meson.build b/meson.build
index ccfcac3..a5189dc 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # This file is part of atkmm.
 
 project('atkmm', 'cpp',
-  version: '2.29.1',
+  version: '2.35.1',
   license: 'LGPLv2.1+',
   default_options: [
     'cpp_std=c++17'
@@ -9,7 +9,7 @@ project('atkmm', 'cpp',
   meson_version: '>= 0.50.0', # required for python3.path()
 )
 
-atkmm_api_version = '2.30'
+atkmm_api_version = '2.36'
 atkmm_pcname = meson.project_name() + '-' + atkmm_api_version
 
 atkmm_version_array = meson.project_version().split('.')
@@ -95,7 +95,7 @@ install_pkgconfigdir = install_libdir / 'pkgconfig'
 
 # glibmm recently gained Meson build support, so we can try looking
 # for its pkg-config files on Visual Studio as well
-glibmm_req = '>= 2.65.1'
+glibmm_req = '>= 2.67.1'
 
 # Atk supported pkg-config files on MSVC files for a good while, so just use that
 atk_req = '>= 1.18.0'
@@ -103,7 +103,7 @@ atk_dep = dependency('atk', version: atk_req)
 
 # The -mm libraries do not yet have pkg-config files for MSVC builds,
 # so check for them manually
-glibmm_req_minor_ver = '66'
+glibmm_req_minor_ver = '68'
 
 glibmm_dep = dependency('glibmm-2.@0@'.format(glibmm_req_minor_ver), version: glibmm_req)
 
diff --git a/untracked/README b/untracked/README
index dcb6c0d..504416f 100644
--- a/untracked/README
+++ b/untracked/README
@@ -31,6 +31,6 @@ mm-common-get may copy more files, but they are not used by atkmm.
 untracked/atk/atkmm/*.h
                     *.cc
                     private/*_p.h
-untracked/doc/reference/atkmm-2.30.devhelp2
-                        atkmm-2.30.tag
+untracked/doc/reference/atkmm-2.36.devhelp2
+                        atkmm-2.36.tag
                         html/*
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]