Hello community, here is the log from the commit of package pangomm for openSUSE:Factory checked in at 2019-10-18 14:32:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pangomm (Old) and /work/SRC/openSUSE:Factory/.pangomm.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pangomm" Fri Oct 18 14:32:55 2019 rev:41 rq:736599 version:2.43.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pangomm/pangomm.changes 2018-12-21 08:21:21.205573693 +0100 +++ /work/SRC/openSUSE:Factory/.pangomm.new.2352/pangomm.changes 2019-10-18 14:32:56.664315811 +0200 @@ -1,0 +2,10 @@ +Mon Sep 9 19:09:42 UTC 2019 - Bjørn Lie <[email protected]> + +- Add pangomm-use-glibmm-262.patch: Forward port to use + glibmm-2.62. Following this, add libtool and mm-common + BuildRequires and pass autogen.sh, as patch touches buildsystem. +- Replace pkgconfig(glibmm-2.60) with pkgconfig(glibmm-2.62) and + gcc-c++ with the generic c++_compiler BuildRequires. +- Modernize spec. + +------------------------------------------------------------------- New: ---- pangomm-use-glibmm-262.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pangomm.spec ++++++ --- /var/tmp/diff_new_pack.i21GS8/_old 2019-10-18 14:32:57.364313988 +0200 +++ /var/tmp/diff_new_pack.i21GS8/_new 2019-10-18 14:32:57.372313967 +0200 @@ -1,7 +1,7 @@ # # spec file for package pangomm # -# 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.44 # Update baselibs.conf when changing the version here %define libname lib%{name}-2_44-1 + Name: pangomm Version: 2.43.1 Release: 0 @@ -28,12 +29,16 @@ URL: https://www.gtkmm.org Source0: https://download.gnome.org/sources/%{name}/2.43/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM pangomm-use-glibmm-262.patch -- Forward port to use glibmm-2.62 +Patch0: pangomm-use-glibmm-262.patch +BuildRequires: c++_compiler BuildRequires: fdupes -BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: mm-common BuildRequires: pkgconfig BuildRequires: pkgconfig(cairomm-1.16) >= 1.2.2 -BuildRequires: pkgconfig(glibmm-2.60) +BuildRequires: pkgconfig(glibmm-2.62) BuildRequires: pkgconfig(pangocairo) >= 1.31.0 Recommends: %{name}-doc = %{version} @@ -64,13 +69,17 @@ %description doc pangomm provides a C++ interface to the pango library. +This package contains the developer documentation. %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 ++++++ pangomm-use-glibmm-262.patch ++++++ >From 36a3b20a89f3fbed5fa38254883a12ba9486451b Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt <[email protected]> Date: Tue, 19 Mar 2019 14:59:39 +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 +- configure.ac | 6 +++--- tools/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak index df30385..4dee48e 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 CAIROMM_MAJOR_VERSION = 1 CAIROMM_MINOR_VERSION = 16 diff --git a/configure.ac b/configure.ac index 9a1cf50..9ae804a 100644 --- a/configure.ac +++ b/configure.ac @@ -49,17 +49,17 @@ MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) AC_DISABLE_STATIC LT_INIT([win32-dll]) -AC_SUBST([PANGOMM_MODULES], ['glibmm-2.60 >= 2.59.1 cairomm-1.16 >= 1.15.1 pangocairo >= 1.41.0']) +AC_SUBST([PANGOMM_MODULES], ['glibmm-2.62 >= 2.61.1 cairomm-1.16 >= 1.15.1 pangocairo >= 1.41.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.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]) 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 3282371..f6fbe7b 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.60 +extra_defs_gen_generate_extra_defs_LDADD = $(PANGOMM_LIBS) -lglibmm_generate_extra_defs-2.62 extra_defs_gen_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(PANGOMM_CFLAGS) -- 2.22.0
