[glibmm] Change the ABI to glibmm-2.52.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Change the ABI to glibmm-2.52.
- Date: Mon, 14 Nov 2016 09:43:43 +0000 (UTC)
commit 0ccfdd0cb8502eeee8a2962305764733c3a43e0f
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Nov 10 12:17:31 2016 +0100
Change the ABI to glibmm-2.52.
This installs in parallel with glibmm-2.4.
There is now corresponding ABI-breaking glib version,
but there is for gtk+ (and therefore gtkmm), so this seems like a
good time to do this for glibmm too.
configure.ac | 6 +++---
docs/Makefile_web.am_fragment | 6 +++---
glib/glibmm.h | 4 ++--
glib/glibmm.pc.in | 2 +-
tools/Makefile.am | 8 ++++----
tools/test_scripts/testheaders.sh | 6 +++---
6 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 671c13e..5e06253 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.50.0],
+AC_INIT([glibmm], [2.51.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
[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.10])
-MM_INIT_MODULE([glibmm-2.4])
-MM_INIT_MODULE([giomm-2.4])
+MM_INIT_MODULE([glibmm-2.52])
+MM_INIT_MODULE([giomm-2.52])
# 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 9ac3ad8..e3bdb00 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.4/
-#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.4/
+web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.52/
+#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.52/
web_path_docs = $(web_path_gtkmm)docs/
rsync_args = -vz --rsh ssh
-gtkmm_docdir = $(datadir)/doc/glibmm-2.4/docs
+gtkmm_docdir = $(datadir)/doc/glibmm-2.52/docs
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 80b27b5..b82b143 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -65,12 +65,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.4 giomm-2.4`
+ * g++ program.cc -o program `pkg-config --cflags --libs glibmm-2.52 giomm-2.52`
* @endcode
*
* Alternatively, if using autoconf, use the following in @c configure.ac:
* @code
- * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.4 giomm-2.4])
+ * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.52 giomm-2.52])
* @endcode
* Then use the generated @c GLIBMM_CFLAGS and @c GLIBMM_LIBS variables in the
* project Makefile.am files. For example:
diff --git a/glib/glibmm.pc.in b/glib/glibmm.pc.in
index b08f62d..25e6c16 100644
--- a/glib/glibmm.pc.in
+++ b/glib/glibmm.pc.in
@@ -16,6 +16,6 @@ Name: glibmm
Description: C++ wrapper for GLib
Version: @PACKAGE_VERSION@
URL: http://www.gtkmm.org/
-Requires: gobject-2.0 sigc++-2.0
+Requires: gobject-2.0 sigc++-3.0
Libs: -L${libdir} -lglibmm-@GLIBMM_API_VERSION@
Cflags: -I${includedir}/@GLIBMM_MODULE_NAME@ -I${libdir}/@GLIBMM_MODULE_NAME@/include
diff --git a/tools/Makefile.am b/tools/Makefile.am
index af53de8..e0f6818 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.4.la
+lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.52.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_4_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
-extra_defs_gen_libglibmm_generate_extra_defs_2_4_la_LDFLAGS = $(extradefs_ldflags)
-extra_defs_gen_libglibmm_generate_extra_defs_2_4_la_LIBADD = $(GLIBMM_LIBS)
+extra_defs_gen_libglibmm_generate_extra_defs_2_52_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
+extra_defs_gen_libglibmm_generate_extra_defs_2_52_la_LDFLAGS = $(extradefs_ldflags)
+extra_defs_gen_libglibmm_generate_extra_defs_2_52_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 150ada4..1c9e274 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.4 gio # compile glibmm/gio/giomm/*.h
-# tools/test_scripts/testheaders.sh glibmm-2.4 glib gio # compile glibmm/glib/glibmm/*.h and
glibmm/gio/giomm/*.h
-# tools/test_scripts/testheaders.sh -I glib -I gio glibmm-2.4 glib/glibmm/ustring.h # compile
glibmm/glib/glibmm/ustring.h
+# tools/test_scripts/testheaders.sh -I glib glibmm-2.52 gio # compile glibmm/gio/giomm/*.h
+# tools/test_scripts/testheaders.sh glibmm-2.52 glib gio # compile glibmm/glib/glibmm/*.h and
glibmm/gio/giomm/*.h
+# tools/test_scripts/testheaders.sh -I glib -I gio glibmm-2.52 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.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]