Accepting request 795243 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 795098 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/795243
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pangomm?expand=0&rev=42

pangomm-2.43.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00483967b4ed0869da09dc0617de45625b9ab846c7b07aa25dfc940a4fc540a4
-size 852616

pangomm-2.43.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:794df3cc06fba712d5d37282f01dd80c3a4fd93493dad75dc3e06f07cf2a36fa
+size 882252

pangomm-use-glibmm-262.patch

@@ -1,66 +0,0 @@
-From 36a3b20a89f3fbed5fa38254883a12ba9486451b Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
-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
-

pangomm.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Sun Mar 22 12:31:49 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 2.43.2:
+  + Coverage: Remove max(), to_bytes() and one create()
+  + Layout::get_lines(): Fix ownership of the GSList
+  + Remove deprecated API:
+    - AttrList: non-const operator bool()
+    - CairoFontMap: create_context()
+    - Color: non-const operator bool()
+    - Layout: get_iter(LayoutIter& iter)
+    - LayoutIter: assign_gobj()
+  + pango/src/color.hg: Fix call to _CLASS_BOXEDTYPE_STATIC
+  + Build:
+    - Use glibmm-2.66 instead of glibmm-2.60
+    - tools/gen_scripts: Update for non-source-dir builds
+    - Add support for building pangomm with Meson
+    - meson.build: Check if .git is a directory or file
+    - NMake Makefiles: Allow builds from a GIT checkout
+    - Visual Studio: Drop gendef.exe, use __declspec(dllexport)
+    - The fixed call to _CLASS_BOXEDTYPE_STATIC in color.hg is
+      necessary in order to use glibmm 2.65.1 or later, combined
+      with maintainer-mode in pangomm.
+- Drop upstream fixed patches:
+  + pangomm-use-glibmm-266.patch
+  + pangomm-use-glibmm-264.patch
+  + pangomm-use-glibmm-262.patch
+
+-------------------------------------------------------------------
+Sat Mar 21 15:24:51 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add pangomm-use-glibmm-266.patch: Forward port to use libmm-2.66.
+- Replace pkgconfig(glibmm-2.64) BuildRequires with
+  pkgconfig(glibmm-2.66).
+
+-------------------------------------------------------------------
+Thu Feb 20 17:06:57 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add pangomm-use-glibmm-264.patch: Forward port to use libmm-2.64.
+- Replace pkgconfig(glibmm-2.62) BuildRequires with
+  pkgconfig(glibmm-2.64).
+
 -------------------------------------------------------------------
 Mon Sep  9 19:09:42 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 

pangomm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pangomm
 #
-# 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
@@ -21,7 +21,7 @@
 %define libname  lib%{name}-2_44-1
 
 Name:           pangomm
-Version:        2.43.1
+Version:        2.43.2
 Release:        0
 Summary:        C++ interface for pango
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-only
@@ -29,8 +29,6 @@ Group:          Development/Libraries/C and C++
 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
@@ -38,7 +36,7 @@ BuildRequires:  libtool
 BuildRequires:  mm-common
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(cairomm-1.16) >= 1.2.2
-BuildRequires:  pkgconfig(glibmm-2.62)
+BuildRequires:  pkgconfig(glibmm-2.66)
 BuildRequires:  pkgconfig(pangocairo) >= 1.31.0
 Recommends:     %{name}-doc = %{version}