!4 【编译失败处理】22.03:LTS:Next分支包编译失败
Merge pull request !4 from 王歌/openEuler-22.03-LTS-Next
This commit is contained in:
commit
63c025ee16
@ -0,0 +1,24 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -1,10 +1,11 @@
|
|||||||
Name: pangomm
|
Name: pangomm
|
||||||
Version: 2.42.2
|
Version: 2.42.2
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: C++ bindings for pango
|
Summary: C++ bindings for pango
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.gtkmm.org/
|
URL: http://www.gtkmm.org/
|
||||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.42/%{name}-%{version}.tar.xz
|
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
|
||||||
|
|
||||||
BuildRequires: gcc-c++ glibmm24-devel >= 2.48.0 cairomm-devel >= 1.2.2 libxslt
|
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: pango-devel >= 1.41.0 doxygen graphviz meson perl m4 mm-common
|
||||||
@ -66,6 +67,10 @@ This package contains some man help file and some other files for %{name}.
|
|||||||
%{_datadir}/devhelp/
|
%{_datadir}/devhelp/
|
||||||
|
|
||||||
%changelog
|
%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
|
||||||
|
|
||||||
* Fri Jun 18 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 2.42.2-1
|
* Fri Jun 18 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 2.42.2-1
|
||||||
- Upgrade to 2.42.2
|
- Upgrade to 2.42.2
|
||||||
- Use meson rebuild
|
- Use meson rebuild
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user