From 1a916c7289a5877bf57912428d218f1d21636fd2 Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 18 Jan 2024 03:14:33 +0000 Subject: [PATCH] revert delete taboo words commit (cherry picked from commit 50eea9b8371250707f75ff6e5e87252659c9de57) --- delete-taboo-words.patch | 51 ---------------------------------------- gtk3.spec | 10 ++++---- 2 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 delete-taboo-words.patch diff --git a/delete-taboo-words.patch b/delete-taboo-words.patch deleted file mode 100644 index b3bceb2..0000000 --- a/delete-taboo-words.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 90b5761b806ed89908f1316fdd96fbaa2624a5f1 Mon Sep 17 00:00:00 2001 -From: wuchaochao -Date: Sat, 4 Jun 2022 19:00:27 +0800 -Subject: [PATCH] delete-taboo-words.patch - ---- - gtk/emoji/de.data | Bin 131243 -> 131243 bytes - gtk/emoji/en.data | Bin 101455 -> 101455 bytes - gtk/emoji/es.data | Bin 117567 -> 117567 bytes - gtk/emoji/fr.data | Bin 106235 -> 106235 bytes - 4 files changed, 0 insertions(+), 0 deletions(-) - -diff --git a/gtk/emoji/de.data b/gtk/emoji/de.data -index 48adfca7f1dbff1f2d0934492be9f8e5ad00b1c7..c4705381ee9cf83fd770c85a9a9cda1c1bae1a5f 100644 -GIT binary patch -delta 23 -ecmZ48$g#SSqhSkU#v@k8{G|Nk?YWN_?c@M+HVHHU - -delta 23 -ecmZ48$g#SSqhSkU#v@km{Nntw?YWN_?c@M-!U - -delta 40 -wcmX>= %{atk_version} pkgconfig(atk-bridge-2.0) @@ -33,7 +32,7 @@ BuildRequires: pkgconfig(xi) pkgconfig(xrandr) pkgconfig(xinerama) pkgconfig(xco BuildRequires: pkgconfig(xkbcommon) pkgconfig(epoxy) >= %{epoxy_version} BuildRequires: wayland-devel >= %{wayland_version} wayland-protocols-devel >= %{wayland_protocols_version} BuildRequires: pkgconfig(colord) -BuildRequires: gettext gtk-doc libtool desktop-file-utils libXcursor-devel meson git +BuildRequires: gettext gtk-doc libtool desktop-file-utils libXcursor-devel meson %if 0%{?openEuler} BuildRequires: cups-devel %endif @@ -110,7 +109,7 @@ This package contains man pages and other related documents for gtk3. #Build sections %prep -%autosetup -n gtk+-%{version} -p1 -S git +%autosetup -n gtk+-%{version} -p1 %build export CFLAGS='-fno-strict-aliasing %optflags' @@ -267,6 +266,9 @@ gtk-query-immodules-3.0-64 --update-cache &>/dev/null || : %{_mandir}/man1/gtk3-widget-factory.1* %changelog +* Thu Jan 18 2024 zhangpan - 3.24.30-10 +- revert delete taboo words commit + * Tue Jan 16 2024 yangchenguang - 3.24.30-9 - revert last commit not issue patch file -- Gitee