diff --git a/0001-fix-gucharmap-let-text-select-view-show-all-when-sta.patch b/0001-fix-gucharmap-let-text-select-view-show-all-when-sta.patch new file mode 100644 index 0000000000000000000000000000000000000000..b8e95766f2f8c0865931c167aae4f764ecbb45d1 --- /dev/null +++ b/0001-fix-gucharmap-let-text-select-view-show-all-when-sta.patch @@ -0,0 +1,30 @@ +From 9f27ff96c8b57b568b0e87d0973e40e460966ea4 Mon Sep 17 00:00:00 2001 +From: wangxiaoqing +Date: Mon, 18 Jul 2022 21:50:51 -0400 +Subject: [PATCH] fix(gucharmap): let text select view show all when start +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 解决文字菜单栏默认无法全部显示的问题 + Fixes #23463 +--- + gucharmap/gucharmap-charmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gucharmap/gucharmap-charmap.c b/gucharmap/gucharmap-charmap.c +index c9b7cc3..8972630 100644 +--- a/gucharmap/gucharmap-charmap.c ++++ b/gucharmap/gucharmap-charmap.c +@@ -1429,7 +1429,7 @@ gucharmap_charmap_init (GucharmapCharmap *charmap) + + gtk_container_add (GTK_CONTAINER (scrolled_window), view); + gtk_widget_show (view); +- gtk_paned_pack1 (GTK_PANED (charmap), scrolled_window, FALSE, FALSE); ++ gtk_paned_pack1 (GTK_PANED (charmap), scrolled_window, TRUE, FALSE); + gtk_widget_show (scrolled_window); + + /* Right pane */ +-- +2.33.0 + diff --git a/gucharmap-13.0.4.tar.bz2 b/gucharmap-13.0.4.tar.bz2 deleted file mode 100644 index 5f105fd4fa24f43593f44877bee8600b50c0b370..0000000000000000000000000000000000000000 Binary files a/gucharmap-13.0.4.tar.bz2 and /dev/null differ diff --git a/gucharmap-14.0.3.tar.bz2 b/gucharmap-14.0.3.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..94ea94ed3ec30bc3702f386946f470f07a9a16f0 Binary files /dev/null and b/gucharmap-14.0.3.tar.bz2 differ diff --git a/gucharmap-gcc11.patch b/gucharmap-gcc11.patch deleted file mode 100644 index 3243dee05455abfadcf93604fbc09d0f88dbcf0d..0000000000000000000000000000000000000000 --- a/gucharmap-gcc11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gucharmap/gucharmap-type-builtins.c.template b/gucharmap/gucharmap-type-builtins.c.template -index fb78d12..38e6f85 100644 ---- a/gucharmap/gucharmap-type-builtins.c.template -+++ b/gucharmap/gucharmap-type-builtins.c.template -@@ -13,7 +13,7 @@ - GType - @enum_name@_get_type (void) - { -- static volatile gsize g_define_type_id__volatile = 0; -+ static gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const G@Type@Value values[] = { diff --git a/gucharmap.spec b/gucharmap.spec index e56b92d4127cd84e57757ea3f9ea02fad42e667a..8b2a7480456dfe350ea60e3fc42a0693425bdff9 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -3,15 +3,21 @@ %define gtk3_version 3.15.9 Name: gucharmap -Version: 13.0.4 -Release: 2%{?dist} +Version: 14.0.3 +Release: 2 Summary: Unicode character picker and font browser +# semver X, Y and Y+1 +%global ver_major %(echo %{version} | cut -d. -f1) +%global ver_minor %(echo %{version} | cut -d. -f2) +%global ver_minor_next %(echo $((%{ver_minor}+1))) + License: GPLv3+ and GFDL and MIT # GPL for the source code, GFDL for the docs, MIT for Unicode data URL: https://wiki.gnome.org/Apps/Gucharmap Source: https://gitlab.gnome.org/GNOME/gucharmap/-/archive/%{version}/gucharmap-%{version}.tar.bz2 -Patch0: %{name}-gcc11.patch + +Patch0: 0001-fix-gucharmap-let-text-select-view-show-all-when-sta.patch BuildRequires: appdata-tools BuildRequires: glib2-devel >= %{glib2_version} @@ -21,8 +27,8 @@ BuildRequires: gettext BuildRequires: meson BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/desktop-file-validate -BuildRequires: unicode-ucd -BuildRequires: unicode-ucd-unihan +BuildRequires: (unicode-ucd >= 14.0 with unicode-ucd < 14.1) +BuildRequires: (unicode-ucd-unihan >= 14.0 with unicode-ucd-unihan < 14.1) BuildRequires: vala BuildRequires: perl(Env) @@ -96,6 +102,52 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gucharmap.desktop %{_datadir}/vala/vapi/gucharmap-2.90.vapi %changelog +* Wed Jul 06 2022 longcheng - 14.0.3-2 +- KYOS-B: remove %{?dist} +- KYOS-F: let text select view show all when start, Related #23463 + +* Sun Mar 27 2022 Alexander Ploumistos - 14.0.3-1 +- Update to 14.0.3 (#2068937) + +* Sat Feb 12 2022 Alexander Ploumistos - 14.0.2-1 +- Update to 14.0.2 (#2053859) + +* Thu Jan 20 2022 Fedora Release Engineering - 14.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Oct 30 2021 Alexander Ploumistos - 14.0.1-2 +- Reimplement UCD version check with boolean deps + +* Sat Oct 30 2021 Alexander Ploumistos - 14.0.1-1 +- Update to 14.0.1 (#2018738) +- Remove UCD version check (implemented upstream) + +* Sat Oct 16 2021 Alexander Ploumistos - 14.0.0-2 +- Rebuild against Unicode Character Database v14 +- Add version to unicode-ucd deps + +* Tue Sep 14 2021 Alexander Ploumistos - 14.0.0-1 +- Update to 14.0.0 (#2004196) + +* Thu Jul 22 2021 Fedora Release Engineering - 13.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jun 05 2021 Alexander Ploumistos - 13.0.8-1 +- Update to 13.0.8 (#1968127) + +* Fri Apr 30 2021 Alexander Ploumistos - 13.0.7-1 +- Update to 13.0.7 (#1955706) + +* Sat Mar 20 2021 Alexander Ploumistos - 13.0.6-1 +- Update to 13.0.6 +- Drop gcc11 patch + +* Tue Jan 26 2021 Fedora Release Engineering - 13.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Jan 09 2021 Alexander Ploumistos - 13.0.5-1 +- Update to 13.0.5 + * Sat Nov 14 2020 Jeff Law - 13.0.4-2 - Fix bogus volatile caught by gcc-11