GNOME.org
 

[glibmm] Change the ABI to glibmm-2.68

commit 3ac399bcc946ef5e398cdf7eaf603f7430ca1f28
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Dec 11 18:21:32 2020 +0100

    Change the ABI to glibmm-2.68
    
    So we can use the 2.66 version numbers for stable releases in the
    glibmm-2.4 ABI series.
    
    We've done similar ABI name changes several times before.

 MSVC_NMake/config-msvc.mak        |  2 +-
 configure.ac                      | 10 +++++-----
 docs/Makefile_web.am_fragment     |  6 +++---
 glib/glibmm.h                     |  8 ++++----
 meson.build                       |  4 ++--
 tools/Makefile.am                 |  8 ++++----
 tools/test_scripts/testheaders.sh |  6 +++---
 untracked/README                  |  4 ++--
 8 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 3d23fdd3..d30d1770 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -7,7 +7,7 @@ BASE_INCLUDES = /I$(PREFIX)\include
 GLIB_API_VERSION = 2.0
 
 GLIBMM_MAJOR_VERSION = 2
-GLIBMM_MINOR_VERSION = 66
+GLIBMM_MINOR_VERSION = 68
 
 LIBSIGC_MAJOR_VERSION = 3
 LIBSIGC_MINOR_VERSION = 0
diff --git a/configure.ac b/configure.ac
index dbed094a..2258ebbf 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([glibmm], [2.65.3],
+AC_INIT([glibmm], [2.67.1],
         [https://gitlab.gnome.org/GNOME/glibmm/issues],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -31,8 +31,8 @@ AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 MM_PREREQ([0.9.12])
-MM_INIT_MODULE([glibmm-2.66])
-MM_INIT_MODULE([giomm-2.66])
+MM_INIT_MODULE([glibmm-2.68])
+MM_INIT_MODULE([giomm-2.68])
 
 # Copy the mm-common .pl scripts into docs/,
 # and use them from there,
@@ -83,9 +83,9 @@ AS_IF([test "x$enable_static" = xyes],
   AC_DEFINE([GIOMM_STATIC_LIB],  [1], [Define if giomm is built as a static library])
 ])
 
-glibreq='2.0 >= 2.61.2'
+glibreq='2.0 >= 2.63.0'
 
-GLIBMM_MODULES="sigc++-3.0 >= 2.99.5 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
+GLIBMM_MODULES="sigc++-3.0 >= 3.0.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
 GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
 test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
 
diff --git a/docs/Makefile_web.am_fragment b/docs/Makefile_web.am_fragment
index ee268e0d..b34d3062 100644
--- a/docs/Makefile_web.am_fragment
+++ b/docs/Makefile_web.am_fragment
@@ -1,8 +1,8 @@
 web_host = gtkmm.org
-web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.66/
-#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.66/
+web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.68/
+#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.68/
 web_path_docs = $(web_path_gtkmm)docs/
 rsync_args = -vz --rsh ssh
 
-gtkmm_docdir = $(datadir)/doc/glibmm-2.66/docs
+gtkmm_docdir = $(datadir)/doc/glibmm-2.68/docs
 
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 02f6d056..44e8cda1 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -63,7 +63,7 @@
  *
  * If your  source file is @c program.cc, you can compile it with:
  * @code
- * g++ program.cc -o program  `pkg-config --cflags --libs glibmm-2.66 giomm-2.66`
+ * g++ program.cc -o program  `pkg-config --cflags --libs glibmm-2.68 giomm-2.68`
  * @endcode
  * If your version of g++ is not C++17-compliant by default,
  * add the @c -std=c++17 option.
@@ -71,8 +71,8 @@
  * If you use <a href="https://mesonbuild.com/";>Meson</a>, include the following
  * in @c meson.build:
  * @code
- * glibmm_dep = dependency('glibmm-2.66')
- * giomm_dep = dependency('giomm-2.66')
+ * glibmm_dep = dependency('glibmm-2.68')
+ * giomm_dep = dependency('giomm-2.68')
  * program_name = 'program'
  * cpp_sources = [ 'program.cc' ]
  * executable(program_name,
@@ -83,7 +83,7 @@
  *
  * Alternatively, if using autoconf, use the following in @c configure.ac:
  * @code
- * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.66 giomm-2.66])
+ * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.68 giomm-2.68])
  * @endcode
  * Then use the generated @c GLIBMM_CFLAGS and @c GLIBMM_LIBS variables in the
  * project Makefile.am files. For example:
diff --git a/meson.build b/meson.build
index fd253a60..03643754 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # This file is part of glibmm.
 
 project('glibmm', 'cpp',
-  version: '2.65.3',
+  version: '2.67.1',
   license: 'LGPLv2.1+',
   default_options: [
     'cpp_std=c++17'
@@ -9,7 +9,7 @@ project('glibmm', 'cpp',
   meson_version: '>= 0.50.0', # required for python3.path()
 )
 
-glibmm_api_version = '2.66'
+glibmm_api_version = '2.68'
 glibmm_pcname = meson.project_name() + '-' + glibmm_api_version
 giomm_pcname = 'giomm-' + glibmm_api_version
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3ad3674c..2f37b02c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -33,16 +33,16 @@ dist_gmmproc_pm_DATA = $(files_codegen_pm:%=pm/%)
 dist_noinst_SCRIPTS = enum.pl
 
 noinst_PROGRAMS = extra_defs_gen/generate_defs_glib extra_defs_gen/generate_defs_gio
-lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.66.la
+lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.68.la
 
 extradefs_includedir      = $(includedir)/$(GLIBMM_MODULE_NAME)/glibmm_generate_extra_defs
 extradefs_include_HEADERS = extra_defs_gen/generate_extra_defs.h
 
 extradefs_ldflags = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
 
-extra_defs_gen_libglibmm_generate_extra_defs_2_66_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
-extra_defs_gen_libglibmm_generate_extra_defs_2_66_la_LDFLAGS = $(extradefs_ldflags)
-extra_defs_gen_libglibmm_generate_extra_defs_2_66_la_LIBADD  = $(GLIBMM_LIBS)
+extra_defs_gen_libglibmm_generate_extra_defs_2_68_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
+extra_defs_gen_libglibmm_generate_extra_defs_2_68_la_LDFLAGS = $(extradefs_ldflags)
+extra_defs_gen_libglibmm_generate_extra_defs_2_68_la_LIBADD  = $(GLIBMM_LIBS)
 
 extra_defs_gen_generate_defs_glib_SOURCES = extra_defs_gen/generate_defs_glib.cc
 extra_defs_gen_generate_defs_glib_LDADD   = $(GLIBMM_LIBS) $(lib_LTLIBRARIES)
diff --git a/tools/test_scripts/testheaders.sh b/tools/test_scripts/testheaders.sh
index cc92fa2f..b5f54411 100755
--- a/tools/test_scripts/testheaders.sh
+++ b/tools/test_scripts/testheaders.sh
@@ -5,9 +5,9 @@
 # files that it depends on.
 
 # Example: In glibmm, go to directory glibmm, and run
-#   tools/test_scripts/testheaders.sh -I glib giomm-2.66 gio # compile glibmm/gio/giomm/*.h
-#   tools/test_scripts/testheaders.sh giomm-2.66 glib gio    # compile glibmm/glib/glibmm/*.h and 
glibmm/gio/giomm/*.h
-#   tools/test_scripts/testheaders.sh -I glib glibmm-2.66 glib/glibmm/ustring.h # compile 
glibmm/glib/glibmm/ustring.h
+#   tools/test_scripts/testheaders.sh -I glib giomm-2.68 gio # compile glibmm/gio/giomm/*.h
+#   tools/test_scripts/testheaders.sh giomm-2.68 glib gio    # compile glibmm/glib/glibmm/*.h and 
glibmm/gio/giomm/*.h
+#   tools/test_scripts/testheaders.sh -I glib glibmm-2.68 glib/glibmm/ustring.h # compile 
glibmm/glib/glibmm/ustring.h
 
 # Usage: testheaders.sh [-I<dir>]... <pkg> [<dir> | <file>]...
 # -I<dir> is added to the g++ command.
diff --git a/untracked/README b/untracked/README
index 6e4246ea..60967dff 100644
--- a/untracked/README
+++ b/untracked/README
@@ -34,6 +34,6 @@ untracked/gio/giomm/*.h
 untracked/glib/glibmm/*.h
                       *.cc
                       private/*_p.h
-untracked/docs/reference/glibmm-2.66.devhelp2
-                         glibmm-2.66.tag
+untracked/docs/reference/glibmm-2.68.devhelp2
+                         glibmm-2.68.tag
                          html/*
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]