Hello community, here is the log from the commit of package atkmm for openSUSE:Factory checked in at 2018-04-04 11:06:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atkmm (Old) and /work/SRC/openSUSE:Factory/.atkmm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "atkmm" Wed Apr 4 11:06:20 2018 rev:26 rq:593151 version:2.27.1 Changes: -------- --- /work/SRC/openSUSE:Factory/atkmm/atkmm.changes 2018-03-14 19:36:28.426666564 +0100 +++ /work/SRC/openSUSE:Factory/.atkmm.new/atkmm.changes 2018-04-04 11:06:43.897184416 +0200 @@ -1,0 +2,8 @@ +Sat Mar 31 11:52:54 UTC 2018 - [email protected] + +- Add atkmm-glibmm-bump.patch, fix build with new glibmm2. +- Following the above, add libtool and mm-common BuildRequires and + pass autogen.sh as the patch touches the buildsystem. +- Also replace pkgconfig(glibmm-2.56) with pkgconfig(glibmm-2.58). + +------------------------------------------------------------------- New: ---- atkmm-glibmm-bump.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atkmm.spec ++++++ --- /var/tmp/diff_new_pack.jLtZdQ/_old 2018-04-04 11:06:46.589086857 +0200 +++ /var/tmp/diff_new_pack.jLtZdQ/_new 2018-04-04 11:06:46.589086857 +0200 @@ -28,11 +28,15 @@ URL: https://www.gtkmm.org/ Source: http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM atkmm-glibmm-bump.patch [email protected] -- Fix build with new glibmm2 +Patch0: atkmm-glibmm-bump.patch BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: mm-common BuildRequires: pkgconfig BuildRequires: pkgconfig(atk) >= 1.18 -BuildRequires: pkgconfig(glibmm-2.56) >= 2.53.1.1 +BuildRequires: pkgconfig(glibmm-2.58) >= 2.53.1.1 Recommends: %{name}-doc = %{version} %description @@ -79,8 +83,10 @@ %prep %setup -q +%patch0 -p1 %build +NOCONFIGURE=1 ./autogen.sh %configure --disable-static make %{?_smp_mflags} ++++++ atkmm-glibmm-bump.patch ++++++ >From 67c7de95d50f96656171c7d7654a8c1bec20af9f Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt <[email protected]> Date: Mon, 26 Mar 2018 12:56:04 +0200 Subject: Use glibmm-2.58 instead of glibmm-2.56 We have changed the ABI name in glibmm. --- codegen/Makefile.am | 2 +- configure.ac | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codegen/Makefile.am b/codegen/Makefile.am index d46fbc4..2597de4 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.56 +extradefs_generate_extra_defs_LDADD = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.58 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 03fb934..b482c7a 100644 --- a/configure.ac +++ b/configure.ac @@ -51,18 +51,18 @@ MM_AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) AC_DISABLE_STATIC LT_INIT([win32-dll]) -AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.56 >= 2.53.1.1']) +AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.58 >= 2.53.1.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.56]) +MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.58]) 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.56.tag], [glibmm-2.56]) +MM_ARG_WITH_TAGFILE_DOC([glibmm-2.58.tag], [glibmm-2.58]) AC_LANG([C++]) MM_ARG_ENABLE_WARNINGS([ATKMM_WXXFLAGS], -- cgit v0.12
