Hello community, here is the log from the commit of package atkmm for openSUSE:Factory checked in at 2020-04-23 18:30:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atkmm (Old) and /work/SRC/openSUSE:Factory/.atkmm.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "atkmm" Thu Apr 23 18:30:32 2020 rev:30 rq:795160 version:2.29.1 Changes: -------- --- /work/SRC/openSUSE:Factory/atkmm/atkmm.changes 2019-10-18 14:31:39.788516022 +0200 +++ /work/SRC/openSUSE:Factory/.atkmm.new.2738/atkmm.changes 2020-04-23 18:30:42.364118548 +0200 @@ -1,0 +2,14 @@ +Sun Mar 22 13:10:44 UTC 2020 - Bjørn Lie <[email protected]> + +- Add atkmm-use-glibmm-266.patch: Forward port to use new glibmm2. +- Replace pkgconfig(glibmm-2.64) BuildRequires with + pkgconfig(glibmm-2.66). + +------------------------------------------------------------------- +Thu Feb 20 17:03:04 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Add atkmm-use-glibmm-264.patch: Forward port to use new glibmm2. +- Replace pkgconfig(glibmm-2.62) BuildRequires with + pkgconfig(glibmm-2.64). + +------------------------------------------------------------------- New: ---- atkmm-use-glibmm-264.patch atkmm-use-glibmm-266.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atkmm.spec ++++++ --- /var/tmp/diff_new_pack.qj95j5/_old 2020-04-23 18:30:42.936119642 +0200 +++ /var/tmp/diff_new_pack.qj95j5/_new 2020-04-23 18:30:42.940119650 +0200 @@ -1,7 +1,7 @@ # # spec file for package atkmm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,10 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM atkmm-use-glibmm-262.patch -- Forward port to use new glibmm2 Patch0: atkmm-use-glibmm-262.patch +# PATCH-FIX-UPSTREAM atkmm-use-glibmm-264.patch -- Forward port to use new glibmm2 +Patch1: atkmm-use-glibmm-264.patch +# PATCH-FIX-UPSTREAM atkmm-use-glibmm-264.patch -- Forward port to use new glibmm2 +Patch2: atkmm-use-glibmm-266.patch BuildRequires: fdupes BuildRequires: gcc-c++ @@ -38,7 +42,7 @@ BuildRequires: mm-common BuildRequires: pkgconfig BuildRequires: pkgconfig(atk) >= 1.18 -BuildRequires: pkgconfig(glibmm-2.62) +BuildRequires: pkgconfig(glibmm-2.66) Recommends: %{name}-doc = %{version} %description ++++++ atkmm-use-glibmm-264.patch ++++++ >From 354f0e79be110cbfa33597ac055ea2195907ca4d Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt <[email protected]> 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 ++++++ atkmm-use-glibmm-266.patch ++++++ >From 1239868aa418746d6595725c18fc31c21985e09a Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt <[email protected]> Date: Tue, 17 Mar 2020 16:33:49 +0100 Subject: [PATCH] Use glibmm-2.66 instead of glibmm-2.64 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 db911fb..ff5a62b 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 = 64 +GLIBMM_MINOR_VERSION = 66 !if "$(CFG)" == "debug" || "$(CFG)" == "Debug" diff --git a/codegen/Makefile.am b/codegen/Makefile.am index df23df0..3c101c9 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.64 +extradefs_generate_extra_defs_LDADD = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.66 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 970186f..f3bfbd6 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.64 >= 2.63.1']) +AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.66 >= 2.65.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.64]) +MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.66]) 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.64.tag], [glibmm-2.64]) +MM_ARG_WITH_TAGFILE_DOC([glibmm-2.66.tag], [glibmm-2.66]) AC_LANG([C++]) MM_ARG_ENABLE_WARNINGS([ATKMM_WXXFLAGS], -- 2.24.1
