!77 [sync] PR-72: revert delete taboo words commit
From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
303c23dda7
@ -1,44 +0,0 @@
|
||||
From 95f4eb47477b438a10de95d77c88578ad745d481 Mon Sep 17 00:00:00 2001
|
||||
From: zhujunhao <zhujunhao8@huawei.com>
|
||||
Date: Wed, 25 Aug 2021 17:18:59 +0800
|
||||
Subject: [PATCH] delete sensitive keyword
|
||||
|
||||
---
|
||||
gtk/emoji/emoji.data | Bin 55307 -> 55308 bytes
|
||||
gtk/emoji/emoji.json | 4 ++--
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gtk/emoji/emoji.data b/gtk/emoji/emoji.data
|
||||
index 15d093d933e9f685b945b6ff8671136458a16481..481d9b33d62b5bbab26fa12d5becce28435aabaa 100644
|
||||
GIT binary patch
|
||||
delta 43
|
||||
kcmeC)z}&NedBdE|d<rOF^Qz7N#MmH0o7bI+<z?go04p^N)c^nh
|
||||
|
||||
delta 41
|
||||
xcmeC#z}&rodBdE|eBr6ZC8<Su3c-mPiA9N<S8e_$#^#-0oL`o|dEKd4UI2J}5+eWr
|
||||
|
||||
diff --git a/gtk/emoji/emoji.json b/gtk/emoji/emoji.json
|
||||
index 72144df..29e1fd6 100644
|
||||
--- a/gtk/emoji/emoji.json
|
||||
+++ b/gtk/emoji/emoji.json
|
||||
@@ -14589,7 +14589,7 @@
|
||||
"no": 2432,
|
||||
"code": "1F1EA 1F1ED",
|
||||
"char": "🇪🇭",
|
||||
- "name": "Western Sahara"
|
||||
+ "name": " "
|
||||
},
|
||||
{
|
||||
"no": 2433,
|
||||
@@ -15687,7 +15687,7 @@
|
||||
"no": 2615,
|
||||
"code": "1F1FD 1F1F0",
|
||||
"char": "🇽🇰",
|
||||
- "name": "Kosovo"
|
||||
+ "name": " "
|
||||
},
|
||||
{
|
||||
"no": 2616,
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
#Basic Information
|
||||
Name: gtk3
|
||||
Version: 3.24.21
|
||||
Release: 4
|
||||
Release: 5
|
||||
Summary: GTK+ graphical user interface library
|
||||
License: LGPLv2+
|
||||
URL: http://www.gtk.org
|
||||
@ -49,7 +49,6 @@ Obsoletes: gtk-solidity-engine < 0.4.1-9
|
||||
Obsoletes: oxygen-gtk3 < 2:1.4.1
|
||||
|
||||
Patch0: gtk3-B.3.24.21-translate-information-to-chinese.patch
|
||||
Patch9000: delete-sensitive-keyword.patch
|
||||
|
||||
%description
|
||||
GTK+ is an object-oriented widget toolkit written in the programming language C;
|
||||
@ -100,8 +99,7 @@ This package contains man pages and other related documents for gtk3.
|
||||
|
||||
#Build sections
|
||||
%prep
|
||||
%autosetup -n gtk+-%{version} -p1 -S git
|
||||
rm testsuite/gtk/gtkresources.c
|
||||
%autosetup -n gtk+-%{version} -p1
|
||||
cd po
|
||||
rm -f zh_CN.gmo
|
||||
msgfmt zh_CN.po -o zh_CN.gmo
|
||||
@ -264,6 +262,9 @@ gtk-query-immodules-3.0-64 --update-cache &>/dev/null || :
|
||||
%{_mandir}/man1/gtk3-widget-factory.1*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 18 2024 zhangpan <zhangpan103@h-partners.com> - 3.24.21-5
|
||||
- revert delete taboo words commit
|
||||
|
||||
* Thu Jun 15 2023 zhangpan <zhangpan103@h-partners.com> - 3.24.21-4
|
||||
- delete taboo words
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user