Update to 2.46.2
(cherry picked from commit 12a6c8c61f15c87512718c837b01360137274c6e)
This commit is contained in:
parent
63c025ee16
commit
317b6ce82a
@ -1,24 +0,0 @@
|
||||
From c72b2ed231a0dfaf0080b86f209edd4179cb48ce Mon Sep 17 00:00:00 2001
|
||||
From: wang--ge <wang__ge@126.com>
|
||||
Date: Thu, 6 Jan 2022 14:06:41 +0800
|
||||
Subject: [PATCH] fix undclared symbol pango_parse_markup due to pango updated
|
||||
|
||||
---
|
||||
untracked/pango/pangomm/attrlist.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/untracked/pango/pangomm/attrlist.cc b/untracked/pango/pangomm/attrlist.cc
|
||||
index 76c3341..cb5cbe4 100644
|
||||
--- a/untracked/pango/pangomm/attrlist.cc
|
||||
+++ b/untracked/pango/pangomm/attrlist.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include <pangomm/attrlist.h>
|
||||
#include <pangomm/private/attrlist_p.h>
|
||||
+#include <pango-1.0/pango/pango-markup.h>
|
||||
|
||||
|
||||
// -*- c++ -*-
|
||||
--
|
||||
2.30.0
|
||||
|
||||
Binary file not shown.
BIN
pangomm-2.46.2.tar.xz
Normal file
BIN
pangomm-2.46.2.tar.xz
Normal file
Binary file not shown.
43
pangomm.spec
43
pangomm.spec
@ -1,16 +1,24 @@
|
||||
%define apiver 1.4
|
||||
%global glibmm_version 2.48.0
|
||||
%global cairomm_version 1.2.2
|
||||
%global pango_version 1.45.1
|
||||
|
||||
Name: pangomm
|
||||
Version: 2.42.2
|
||||
Release: 2
|
||||
Version: 2.46.2
|
||||
Release: 1
|
||||
Summary: C++ bindings for pango
|
||||
License: LGPLv2+
|
||||
URL: http://www.gtkmm.org/
|
||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.42/%{name}-%{version}.tar.xz
|
||||
Patch0: 0001-fix-undeclared-symbol-pango_parse_markup-due-to-pango-updated.patch
|
||||
URL: https://www.gtkmm.org/
|
||||
Source0: https://download.gnome.org/sources/pangomm/2.46/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: gcc-c++ glibmm24-devel >= 2.48.0 cairomm-devel >= 1.2.2 libxslt
|
||||
BuildRequires: pango-devel >= 1.41.0 doxygen graphviz meson perl m4 mm-common
|
||||
BuildRequires: meson m4 gcc-c++ doxygen mm-common libxslt
|
||||
BuildRequires: pkgconfig(cairomm-1.0) >= %{cairomm_version}
|
||||
BuildRequires: glibmm24-devel >= %{glibmm_version}
|
||||
BuildRequires: pango-devel >= %{pango_version}
|
||||
|
||||
Requires: glibmm24 >= 2.48.0 cairomm >= 1.2.2 pango >= 1.41.0
|
||||
Requires: glibmm24%{?_isa} >= %{glibmm_version}
|
||||
Requires: cairomm%{?_isa} >= %{cairomm_version}
|
||||
Requires: pango%{?_isa} >= %{pango_version}
|
||||
|
||||
%description
|
||||
Pangomm provides a C++ interface to the Pango library.
|
||||
@ -36,14 +44,13 @@ This package contains some man help file and some other files for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
doxygen -u docs/reference/Doxyfile.in
|
||||
%build
|
||||
%meson -Dbuild-documentation=true
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%delete_la
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
@ -53,23 +60,21 @@ This package contains some man help file and some other files for %{name}.
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS NEWS README
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%{_libdir}/libpangomm-%{apiver}.so.1*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/pangomm-1.4
|
||||
%{_libdir}/*.so
|
||||
%{_includedir}/pangomm-%{apiver}
|
||||
%{_libdir}/libpangomm-%{apiver}.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/pangomm-1.4
|
||||
%{_libdir}/pangomm-%{apiver}
|
||||
|
||||
%files help
|
||||
%doc %{_docdir}/pangomm-1.4/
|
||||
%doc %{_docdir}/pangomm-%{apiver}/
|
||||
%{_datadir}/devhelp/
|
||||
|
||||
%changelog
|
||||
* Thu Jan 06 2022 Ge Wang <wangge20@huawei.com> - 2.42.2-2
|
||||
- Fix build error: pango_parse_markup was not declared in this scope
|
||||
- Add include file in attrlist.cc
|
||||
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 2.46.2-1
|
||||
- Update to 2.46.2
|
||||
|
||||
* Fri Jun 18 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 2.42.2-1
|
||||
- Upgrade to 2.42.2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user