Commit 9eb59b44 authored by Kjell Ahlstedt's avatar Kjell Ahlstedt

Change the ABI to glibmm-2.62

So we can use the 2.60 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.
parent c095eeae
......@@ -7,7 +7,7 @@ BASE_INCLUDES = /I$(PREFIX)\include
GLIB_API_VERSION = 2.0
GLIBMM_MAJOR_VERSION = 2
GLIBMM_MINOR_VERSION = 60
GLIBMM_MINOR_VERSION = 62
LIBSIGC_MAJOR_VERSION = 3
LIBSIGC_MINOR_VERSION = 0
......
......@@ -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.59.1],
AC_INIT([glibmm], [2.61.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.60])
MM_INIT_MODULE([giomm-2.60])
MM_INIT_MODULE([glibmm-2.62])
MM_INIT_MODULE([giomm-2.62])
# Copy the mm-common .pl scripts into docs/,
# and use them from there,
......@@ -43,7 +43,7 @@ MM_CONFIG_DOCTOOL_DIR([docs])
AC_SUBST([LIBGLIBMM_SO_VERSION], [4:0:3])
AC_PROG_CXX
MM_AX_CXX_COMPILE_STDCXX([17], [noext],[mandatory])
MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
AC_DISABLE_STATIC
LT_INIT([win32-dll])
......@@ -82,7 +82,7 @@ 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.55.1'
glibreq='2.0 >= 2.59.2'
GLIBMM_MODULES="sigc++-3.0 >= 2.99.5 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
......
web_host = gtkmm.org
web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.60/
#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.60/
web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.62/
#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.62/
web_path_docs = $(web_path_gtkmm)docs/
rsync_args = -vz --rsh ssh
gtkmm_docdir = $(datadir)/doc/glibmm-2.60/docs
gtkmm_docdir = $(datadir)/doc/glibmm-2.62/docs
......@@ -64,12 +64,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.60 giomm-2.60`
* g++ program.cc -o program `pkg-config --cflags --libs glibmm-2.62 giomm-2.62`
* @endcode
*
* Alternatively, if using autoconf, use the following in @c configure.ac:
* @code
* PKG_CHECK_MODULES([GLIBMM], [glibmm-2.60 giomm-2.60])
* PKG_CHECK_MODULES([GLIBMM], [glibmm-2.62 giomm-2.62])
* @endcode
* Then use the generated @c GLIBMM_CFLAGS and @c GLIBMM_LIBS variables in the
* project Makefile.am files. For example:
......
......@@ -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.60.la
lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.62.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_60_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
extra_defs_gen_libglibmm_generate_extra_defs_2_60_la_LDFLAGS = $(extradefs_ldflags)
extra_defs_gen_libglibmm_generate_extra_defs_2_60_la_LIBADD = $(GLIBMM_LIBS)
extra_defs_gen_libglibmm_generate_extra_defs_2_62_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
extra_defs_gen_libglibmm_generate_extra_defs_2_62_la_LDFLAGS = $(extradefs_ldflags)
extra_defs_gen_libglibmm_generate_extra_defs_2_62_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)
......
......@@ -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 glibmm-2.60 gio # compile glibmm/gio/giomm/*.h
# tools/test_scripts/testheaders.sh glibmm-2.60 glib gio # compile glibmm/glib/glibmm/*.h and glibmm/gio/giomm/*.h
# tools/test_scripts/testheaders.sh -I glib -I gio glibmm-2.60 glib/glibmm/ustring.h # compile glibmm/glib/glibmm/ustring.h
# tools/test_scripts/testheaders.sh -I glib glibmm-2.62 gio # compile glibmm/gio/giomm/*.h
# tools/test_scripts/testheaders.sh glibmm-2.62 glib gio # compile glibmm/glib/glibmm/*.h and glibmm/gio/giomm/*.h
# tools/test_scripts/testheaders.sh -I glib -I gio glibmm-2.62 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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment