pool/pangomm
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 657622 from GNOME:Next

Browse Source 
- Update to version 2.43.1:
  + Attribute: Add several create_attr_*() methods.
  + FontDescription: Add set/get_variations().
  + Build:
    - Require C++17.
    - Replace the Visual Studio project files with MSVC NMake
      project files.
    - Use glibmm-2.60 instead of glibmm-2.56.
    - Require pango >= 1.41.0 because of
      FontDescription::set/get_variations().
    - Change the ABI to pangomm-2.44.
- Bump soname following upstream changes.
- Replace pkgconfig(glibmm-2.58) with pkgconfig(glibmm-2.60)
  BuildRequires.
- Drop pangomm-glibmm-fix.patch: Fixed upstream. Following this,
  also drop libtool and mm-common BuildRequires and autogen.sh
  call, no longer needed.

OBS-URL: https://build.opensuse.org/request/show/657622
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm?expand=0&rev=67
This commit is contained in:
Bjørn Lie
2018-12-13 15:17:10 +00:00
committed by Git OBS Bridge
parent faed8034fc
commit c31ac69f7c
6 changed files with 33 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
baselibs.conf
View File

@@ -1 +1 @@
libpangomm-2_42-1
libpangomm-2_44-1

3
pangomm-2.41.5.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5131830d5b37b181ca4fa8f641ad86faa985c0bb7dcc833c98672d294367b304
size 841780

3
pangomm-2.43.1.tar.xz Normal file
View File

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

52
pangomm-glibmm-fix.patch
View File

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

21
pangomm.changes
View File

@@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Dec 3 18:44:49 UTC 2018 - bjorn.lie@gmail.com
- Update to version 2.43.1:
+ Attribute: Add several create_attr_*() methods.
+ FontDescription: Add set/get_variations().
+ Build:
- Require C++17.
- Replace the Visual Studio project files with MSVC NMake
project files.
- Use glibmm-2.60 instead of glibmm-2.56.
- Require pango >= 1.41.0 because of
FontDescription::set/get_variations().
- Change the ABI to pangomm-2.44.
- Bump soname following upstream changes.
- Replace pkgconfig(glibmm-2.58) with pkgconfig(glibmm-2.60)
BuildRequires.
- Drop pangomm-glibmm-fix.patch: Fixed upstream. Following this,
also drop libtool and mm-common BuildRequires and autogen.sh
call, no longer needed.
-------------------------------------------------------------------
Tue Apr 17 10:47:34 UTC 2018 - dimstar@opensuse.org

22
pangomm.spec
View File

@@ -12,32 +12,29 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define base_ver 2.42
%define base_ver 2.44
# Update baselibs.conf when changing the version here
%define libname lib%{name}-2_42-1
%define libname lib%{name}-2_44-1
Name: pangomm
Version: 2.41.5
Version: 2.43.1
Release: 0
Summary: C++ interface for pango
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
Source0: http://download.gnome.org/sources/%{name}/2.41/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/2.43/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM pangomm-glibmm-fix.patch bjorn.lie@gmail.com -- 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.58) >= 2.55.1
BuildRequires: pkgconfig(pangocairo) >= 1.38.0
BuildRequires: pkgconfig(glibmm-2.60)
BuildRequires: pkgconfig(pangocairo) >= 1.31.0
Recommends: %{name}-doc = %{version}
%description
@@ -70,11 +67,8 @@ pangomm provides a C++ interface to the pango library.
%prep
%setup -q
%patch0 -p1
%build
NOCONFIGURE=1 ./autogen.sh
export CXXFLAGS="-std=c++17 %{optflags}"
%configure --disable-static
make %{?_smp_mflags}