GNOME.org
 

[glibmm] Change the ABI to glibmm-2.66

commit c817a5a9c2e38632de2e685a558f386aab8d7505
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Mar 17 14:46:43 2020 +0100

    Change the ABI to glibmm-2.66
    
    So we can use the 2.64 version numbers for stable releases in the
    glibmm-2.4 ABI series.
    We don't need to release a stable ABI-parallel glibmm until we need
    to release gtkmm 4.0, and that won't happen until GTK 4.0.0 happens.
    
    We've done similar ABI name changes several times before.

 MSVC_NMake/config-msvc.mak        | 2 +-
 configure.ac                      | 6 +++---
 docs/Makefile_web.am_fragment     | 6 +++---
 glib/glibmm.h                     | 4 ++--
 meson.build                       | 4 ++--
 tools/Makefile.am                 | 8 ++++----
 tools/test_scripts/testheaders.sh | 6 +++---
 untracked/README                  | 4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 2e309287..636ed398 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 = 64
+GLIBMM_MINOR_VERSION = 66
 
 LIBSIGC_MAJOR_VERSION = 3
 LIBSIGC_MINOR_VERSION = 0
diff --git a/configure.ac b/configure.ac
index 6ebc1e1f..fcadcd40 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.63.1],
+AC_INIT([glibmm], [2.65.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.64])
-MM_INIT_MODULE([giomm-2.64])
+MM_INIT_MODULE([glibmm-2.66])
+MM_INIT_MODULE([giomm-2.66])
 
 # Copy the mm-common .pl scripts into docs/,
 # and use them from there,
diff --git a/docs/Makefile_web.am_fragment b/docs/Makefile_web.am_fragment
index 19364c62..ee268e0d 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.64/
-#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.64/
+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_docs = $(web_path_gtkmm)docs/
 rsync_args = -vz --rsh ssh
 
-gtkmm_docdir = $(datadir)/doc/glibmm-2.64/docs
+gtkmm_docdir = $(datadir)/doc/glibmm-2.66/docs
 
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 93e3a4ff..7c17ebd0 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -63,12 +63,12 @@
  *
  * 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.64 giomm-2.64`
+ * g++ program.cc -o program  `pkg-config --cflags --libs glibmm-2.66 giomm-2.66`
  * @endcode
  *
  * Alternatively, if using autoconf, use the following in @c configure.ac:
  * @code
- * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.64 giomm-2.64])
+ * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.66 giomm-2.66])
  * @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 dfea7496..f8fe1ce4 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # This file is part of glibmm.
 
 project('glibmm', 'cpp',
-  version: '2.63.1',
+  version: '2.65.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.64'
+glibmm_api_version = '2.66'
 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 f304ee82..7de4724d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -34,16 +34,16 @@ dist_noinst_DATA    = README TODO
 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.64.la
+lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.66.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_64_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
-extra_defs_gen_libglibmm_generate_extra_defs_2_64_la_LDFLAGS = $(extradefs_ldflags)
-extra_defs_gen_libglibmm_generate_extra_defs_2_64_la_LIBADD  = $(GLIBMM_LIBS)
+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_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 f859c44a..cc92fa2f 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.64 gio # compile glibmm/gio/giomm/*.h
-#   tools/test_scripts/testheaders.sh giomm-2.64 glib gio    # compile glibmm/glib/glibmm/*.h and 
glibmm/gio/giomm/*.h
-#   tools/test_scripts/testheaders.sh -I glib glibmm-2.64 glib/glibmm/ustring.h # compile 
glibmm/glib/glibmm/ustring.h
+#   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
 
 # 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 34c4cdeb..6e4246ea 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.64.devhelp2
-                         glibmm-2.64.tag
+untracked/docs/reference/glibmm-2.66.devhelp2
+                         glibmm-2.66.tag
                          html/*
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]