GNOME.org
 

[pangomm] Change ABI to pangomm-2.48; Use glibmm-2.68 instead of glibmm-2.66

commit 23c80fdc9d8107f36ee353095ed70c21843faf9b
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Dec 11 18:28:11 2020 +0100

    Change ABI to pangomm-2.48; Use glibmm-2.68 instead of glibmm-2.66
    
    So we can use the 2.44-2.46 version numbers for stable releases in
    the pangomm-1.4 ABI series.
    
    We've done similar ABI name changes before.

 MSVC_NMake/config-msvc.mak       |  4 ++--
 configure.ac                     | 10 +++++-----
 docs/reference/meson.build       |  2 +-
 meson.build                      |  8 ++++----
 pango/pangomm.h                  | 19 +++++++++++++++++--
 tools/Makefile.am                |  2 +-
 tools/extra_defs_gen/meson.build |  2 +-
 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 d6c1a68..fda4192 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
 PANGO_API_VERSION = 1.0
 PANGOMM_MAJOR_VERSION = 2
-PANGOMM_MINOR_VERSION = 44
+PANGOMM_MINOR_VERSION = 48
 
 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
 CAIROMM_MAJOR_VERSION = 1
 CAIROMM_MINOR_VERSION = 16
 
diff --git a/configure.ac b/configure.ac
index f6252db..97b897e 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([pangomm], [2.43.3],
+AC_INIT([pangomm], [2.47.1],
         [https://gitlab.gnome.org/GNOME/pangomm/issues/],
         [pangomm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -33,7 +33,7 @@ AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 MM_PREREQ([0.9.12])
-MM_INIT_MODULE([pangomm-2.44])
+MM_INIT_MODULE([pangomm-2.48])
 
 # Copy the mm-common .pl scripts into docs/,
 # and use them from there,
@@ -49,18 +49,18 @@ MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
 AC_DISABLE_STATIC
 LT_INIT([win32-dll])
 
-AC_SUBST([PANGOMM_MODULES], ['giomm-2.66 >= 2.65.1 cairomm-1.16 >= 1.15.1 pangocairo >= 1.45.1'])
+AC_SUBST([PANGOMM_MODULES], ['giomm-2.68 >= 2.67.1 cairomm-1.16 >= 1.15.1 pangocairo >= 1.45.1'])
 AC_SUBST([MSVC_TOOLSET_VER], [''])
 PKG_CHECK_MODULES([PANGOMM], [$PANGOMM_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])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.16.tag], [cairomm-1.16])
 
 AC_LANG([C++])
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 3e1e850..6155ec3 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -8,7 +8,7 @@
 tag_file_modules = [
   'mm-common-libstdc++',
   'sigc++-3.0',
-  'glibmm-2.66',
+  'glibmm-2.68',
   'cairomm-1.16',
 ]
 doxygen_tagfiles = ''
diff --git a/meson.build b/meson.build
index 5bdf299..1d6acbc 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # This file is part of pangomm.
 
 project('pangomm', 'cpp',
-  version: '2.43.3',
+  version: '2.47.1',
   license: 'LGPLv2.1+',
   default_options: [
     'cpp_std=c++17'
@@ -9,7 +9,7 @@ project('pangomm', 'cpp',
   meson_version: '>= 0.50.0', # required for python3.path()
 )
 
-pangomm_api_version = '2.44'
+pangomm_api_version = '2.48'
 pangomm_pcname = meson.project_name() + '-' + pangomm_api_version
 
 pangomm_version_array = meson.project_version().split('.')
@@ -96,14 +96,14 @@ install_pkgconfigdir = install_libdir / 'pkgconfig'
 # cairomm and glibmm recently gained Meson build support, so we look
 # for their pkg-config files on Visual Studio, too
 cairomm_req = '>= 1.15.1'
-glibmm_req = '>= 2.65.1'
+glibmm_req = '>= 2.67.1'
 
 # Pango supported pkg-config files on MSVC files for a good while,
 # so just use that
 pangocairo_req = '>= 1.45.1'
 pangocairo_dep = dependency('pangocairo', version: pangocairo_req)
 
-glibmm_req_minor_ver = '66'
+glibmm_req_minor_ver = '68'
 cairomm_req_minor_ver = '16'
 
 cairomm_dep = dependency('cairomm-1.@0@'.format(cairomm_req_minor_ver), version: cairomm_req)
diff --git a/pango/pangomm.h b/pango/pangomm.h
index 53c7c46..ca5afc1 100644
--- a/pango/pangomm.h
+++ b/pango/pangomm.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 pangomm-2.44`
+ * g++ program.cc -o program  `pkg-config --cflags --libs pangomm-2.48`
  * @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
+ * pangomm_dep = dependency('pangomm-2.48')
+ * program_name = 'program'
+ * cpp_sources = [ 'program.cc' ]
+ * executable(program_name,
+ *   cpp_sources,
+ *   dependencies: [ pangomm_dep ]
+ * )
+ * @endcode
+ *
  * Alternatively, if using autoconf, use the following in @c configure.ac:
  * @code
- * PKG_CHECK_MODULES([PANGOMM], [pangomm-2.44])
+ * PKG_CHECK_MODULES([PANGOMM], [pangomm-2.48])
  * @endcode
  * Then use the generated @c PANGOMM_CFLAGS and @c PANGOMM_LIBS variables in
  * the project @c Makefile.am files. For example:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8fa56bb..09741de 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,7 +29,7 @@ dist_gmmproc_m4_DATA = $(files_codegen_m4:%=m4/%)
 noinst_PROGRAMS  = extra_defs_gen/generate_extra_defs
 
 extra_defs_gen_generate_extra_defs_SOURCES = extra_defs_gen/generate_defs_pango.cc
-extra_defs_gen_generate_extra_defs_LDADD   = $(PANGOMM_LIBS) -lglibmm_generate_extra_defs-2.66
+extra_defs_gen_generate_extra_defs_LDADD   = $(PANGOMM_LIBS) -lglibmm_generate_extra_defs-2.68
 extra_defs_gen_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version
 
 AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(PANGOMM_CFLAGS)
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build
index 4693fd4..308235e 100644
--- a/tools/extra_defs_gen/meson.build
+++ b/tools/extra_defs_gen/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_defs_pango.cc',
diff --git a/untracked/README b/untracked/README
index 2eeaa8b..8ded395 100644
--- a/untracked/README
+++ b/untracked/README
@@ -31,6 +31,6 @@ mm-common-get may copy more files, but they are not used by pangomm.
 untracked/pango/pangomm/*.h
                         *.cc
                         private/*_p.h
-untracked/docs/reference/pangomm-2.44.devhelp2
-                         pangomm-2.44.tag
+untracked/docs/reference/pangomm-2.48.devhelp2
+                         pangomm-2.48.tag
                          html/*
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]