Hello community, here is the log from the commit of package pangomm for openSUSE:Factory checked in at 2018-04-05 15:33:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pangomm (Old) and /work/SRC/openSUSE:Factory/.pangomm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pangomm" Thu Apr 5 15:33:54 2018 rev:38 rq:593562 version:2.41.5 Changes: -------- --- /work/SRC/openSUSE:Factory/pangomm/pangomm.changes 2018-03-14 19:38:19.858708616 +0100 +++ /work/SRC/openSUSE:Factory/.pangomm.new/pangomm.changes 2018-04-05 15:33:58.607090428 +0200 @@ -1,0 +2,9 @@ +Tue Apr 3 19:51:16 UTC 2018 - [email protected] + +- Add pangomm-glibmm-fix.patch: Fix build with new glibmm, + following replace pkgconfig(glibmm-2.56) with + pkgconfig(glibmm-2.58) BuildRequires, and add libtool and + mm-common BuildRequires and pass autogen.sh as the patch touches + buildsystem. + +------------------------------------------------------------------- New: ---- pangomm-glibmm-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pangomm.spec ++++++ --- /var/tmp/diff_new_pack.lsE0D2/_old 2018-04-05 15:33:59.951041855 +0200 +++ /var/tmp/diff_new_pack.lsE0D2/_new 2018-04-05 15:33:59.955041711 +0200 @@ -26,13 +26,17 @@ License: LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ URL: https://www.gtkmm.org -Source: http://download.gnome.org/sources/%{name}/2.41/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/2.41/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM pangomm-glibmm-fix.patch [email protected] -- Fix build with new glibmm +Patch0: pangomm-glibmm-fix.patch BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: mm-common BuildRequires: pkgconfig BuildRequires: pkgconfig(cairomm-1.16) >= 1.2.2 -BuildRequires: pkgconfig(glibmm-2.56) >= 2.55.1 +BuildRequires: pkgconfig(glibmm-2.58) >= 2.55.1 BuildRequires: pkgconfig(pangocairo) >= 1.38.0 Recommends: %{name}-doc = %{version} @@ -66,8 +70,10 @@ %prep %setup -q +%patch0 -p1 %build +NOCONFIGURE=1 ./autogen.sh %configure --disable-static make %{?_smp_mflags} ++++++ pangomm-glibmm-fix.patch ++++++ >From 808b648aaf6618514bdf08cf538c3984d8593a3d Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt <[email protected]> Date: Mon, 26 Mar 2018 13:02:44 +0200 Subject: Use glibmm-2.58 instead of glibmm-2.56 We have changed the ABI name in glibmm. --- configure.ac | 6 +++--- tools/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7c0fd58..d4549d8 100644 --- a/configure.ac +++ b/configure.ac @@ -49,17 +49,17 @@ MM_AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) AC_DISABLE_STATIC LT_INIT([win32-dll]) -AC_SUBST([PANGOMM_MODULES], ['glibmm-2.56 >= 2.55.1 cairomm-1.16 >= 1.2.2 pangocairo >= 1.38.0']) +AC_SUBST([PANGOMM_MODULES], ['glibmm-2.58 >= 2.55.1 cairomm-1.16 >= 1.2.2 pangocairo >= 1.38.0']) PKG_CHECK_MODULES([PANGOMM], [$PANGOMM_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]) MM_ARG_WITH_TAGFILE_DOC([cairomm-1.16.tag], [cairomm-1.16]) AC_LANG([C++]) diff --git a/tools/Makefile.am b/tools/Makefile.am index af10a4d..0463d99 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -30,7 +30,7 @@ dist_noinst_DATA = README noinst_PROGRAMS = extra_defs_gen/generate_extra_defs extra_defs_gen_generate_extra_defs_SOURCES = extra_defs_gen/generate_defs_pango.cc -extra_defs_gen_generate_extra_defs_LDADD = $(PANGOMM_LIBS) -lglibmm_generate_extra_defs-2.56 +extra_defs_gen_generate_extra_defs_LDADD = $(PANGOMM_LIBS) -lglibmm_generate_extra_defs-2.58 extra_defs_gen_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(PANGOMM_CFLAGS) -- cgit v0.12
