File atkmm-use-glibmm-264.patch of Package atkmm

Overview Repositories Revisions Requests Users Attributes Meta

File atkmm-use-glibmm-264.patch of Package atkmm (Revision 66290800de0e32ffe2945086f9fce35c)

Currently displaying revision 66290800de0e32ffe2945086f9fce35c , Show latest

From 354f0e79be110cbfa33597ac055ea2195907ca4d Mon Sep 17 00:00:00 2001
From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
Date: Wed, 18 Sep 2019 19:13:49 +0200
Subject: [PATCH] Use glibmm-2.64 instead of glibmm-2.62

We have changed the ABI name in glibmm.
---
 MSVC_NMake/config-msvc.mak | 2 +-
 codegen/Makefile.am        | 2 +-
 configure.ac               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index a75a73a..5a23f8b 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -13,7 +13,7 @@ GLIB_API_VERSION = 2.0
 LIBSIGC_MAJOR_VERSION = 3
 LIBSIGC_MINOR_VERSION = 0
 GLIBMM_MAJOR_VERSION = 2
-GLIBMM_MINOR_VERSION = 62
+GLIBMM_MINOR_VERSION = 64
 
 
 !if "$(CFG)" == "debug" || "$(CFG)" == "Debug"
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 2c20d2c..df23df0 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -30,7 +30,7 @@ dist_noinst_SCRIPTS = generate_defs_and_docs.sh
 noinst_PROGRAMS  = extradefs/generate_extra_defs
 
 extradefs_generate_extra_defs_SOURCES = extradefs/generate_extra_defs_atk.cc
-extradefs_generate_extra_defs_LDADD   = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.62
+extradefs_generate_extra_defs_LDADD   = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.64
 extradefs_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version
 
 AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(ATKMM_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 2452c50..970186f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,18 +51,18 @@ MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
 AC_DISABLE_STATIC
 LT_INIT([win32-dll])
 
-AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.62 >= 2.61.1'])
+AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.64 >= 2.63.1'])
 PKG_CHECK_MODULES([ATKMM], [$ATKMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
-MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.62])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.64])
 
 MM_ARG_DISABLE_DEPRECATED_API
 
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
 MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm-2.62.tag], [glibmm-2.62])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.64.tag], [glibmm-2.64])
 
 AC_LANG([C++])
 MM_ARG_ENABLE_WARNINGS([ATKMM_WXXFLAGS],
-- 
2.24.1

Places

File atkmm-use-glibmm-264.patch of Package atkmm (Revision 66290800de0e32ffe2945086f9fce35c)

Places