Hello community, here is the log from the commit of package atkmm for openSUSE:Factory checked in at 2019-10-18 14:31:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atkmm (Old) and /work/SRC/openSUSE:Factory/.atkmm.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "atkmm" Fri Oct 18 14:31:38 2019 rev:29 rq:736493 version:2.29.1 Changes: -------- --- /work/SRC/openSUSE:Factory/atkmm/atkmm.changes 2018-12-21 08:21:17.701576974 +0100 +++ /work/SRC/openSUSE:Factory/.atkmm.new.2352/atkmm.changes 2019-10-18 14:31:39.788516022 +0200 @@ -1,0 +2,8 @@ +Mon Sep 9 18:36:22 UTC 2019 - Bjørn Lie <[email protected]> + +- Add atkmm-use-glibmm-262.patch: Forward port to use new glibmm2. + Following this, add libtool and mm-common BuildRequires and pass + autogen.sh as the patch touches the buildsystem. Also replace + pkgconfig(glibmm-2.60) with pkgconfig(glibmm-2.62) BuildRequires. + +------------------------------------------------------------------- New: ---- atkmm-use-glibmm-262.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atkmm.spec ++++++ --- /var/tmp/diff_new_pack.xQyD8K/_old 2019-10-18 14:31:40.372514502 +0200 +++ /var/tmp/diff_new_pack.xQyD8K/_new 2019-10-18 14:31:40.376514491 +0200 @@ -1,7 +1,7 @@ # # spec file for package atkmm # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,6 +19,7 @@ %define base_ver 2.30 # Update baselibs.conf when changing the version here %define libname lib%{name}-2_30-1 + Name: atkmm Version: 2.29.1 Release: 0 @@ -28,12 +29,16 @@ URL: https://www.gtkmm.org/ Source0: https://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM atkmm-use-glibmm-262.patch -- Forward port to use new glibmm2 +Patch0: atkmm-use-glibmm-262.patch BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: mm-common BuildRequires: pkgconfig BuildRequires: pkgconfig(atk) >= 1.18 -BuildRequires: pkgconfig(glibmm-2.60) +BuildRequires: pkgconfig(glibmm-2.62) Recommends: %{name}-doc = %{version} %description @@ -79,11 +84,14 @@ C++ bindings. %prep -%setup -q +%autosetup -p1 %build -%configure --disable-static -make %{?_smp_mflags} +NOCONFIGURE=1 ./autogen.sh +%configure \ + --disable-static \ + %{nil} +%make_build %install %make_install ++++++ atkmm-use-glibmm-262.patch ++++++ >From 3bef761f5f1fddc88df49841bdd0467738d95998 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt <[email protected]> Date: Tue, 19 Mar 2019 14:55:45 +0100 Subject: [PATCH] Use glibmm-2.62 instead of glibmm-2.60 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 62d2a22..a75a73a 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 = 60 +GLIBMM_MINOR_VERSION = 62 !if "$(CFG)" == "debug" || "$(CFG)" == "Debug" diff --git a/codegen/Makefile.am b/codegen/Makefile.am index 4c2815f..2c20d2c 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.60 +extradefs_generate_extra_defs_LDADD = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.62 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 289505c..2452c50 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.60 >= 2.59.1']) +AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.62 >= 2.61.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.60]) +MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.62]) 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.60.tag], [glibmm-2.60]) +MM_ARG_WITH_TAGFILE_DOC([glibmm-2.62.tag], [glibmm-2.62]) AC_LANG([C++]) MM_ARG_ENABLE_WARNINGS([ATKMM_WXXFLAGS], -- 2.22.0
