diff options
-rw-r--r-- | MSVC_NMake/config-msvc.mak | 2 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | docs/Makefile_web.am_fragment | 6 | ||||
-rw-r--r-- | glib/glibmm.h | 4 | ||||
-rw-r--r-- | tools/Makefile.am | 8 | ||||
-rwxr-xr-x | tools/test_scripts/testheaders.sh | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak index 2a9eed11..15b6489e 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 = 60 +GLIBMM_MINOR_VERSION = 62 LIBSIGC_MAJOR_VERSION = 3 LIBSIGC_MINOR_VERSION = 0 diff --git a/configure.ac b/configure.ac index ed2fbc53..943039e6 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.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" diff --git a/docs/Makefile_web.am_fragment b/docs/Makefile_web.am_fragment index 89861973..435a98ea 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.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 diff --git a/glib/glibmm.h b/glib/glibmm.h index 63ba058d..20e7203a 100644 --- a/glib/glibmm.h +++ b/glib/glibmm.h @@ -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: diff --git a/tools/Makefile.am b/tools/Makefile.am index 6f8fdc80..0ea516e2 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.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) diff --git a/tools/test_scripts/testheaders.sh b/tools/test_scripts/testheaders.sh index d58fb86f..5cd88df1 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 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. |