From 00e96537bcd46e6072d726a88add32d6ef8f44b2 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Nov 2025 08:52:49 +0000 Subject: [PATCH] import CS gnome-desktop3-44.1-1.el10 --- .gitignore | 2 +- gnome-desktop3.spec | 10 +-- ...nscript2-default-for-indic-languages.patch | 72 ------------------- sources | 2 +- 4 files changed, 7 insertions(+), 79 deletions(-) delete mode 100644 make-inscript2-default-for-indic-languages.patch diff --git a/.gitignore b/.gitignore index bdc770b..acdc665 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gnome-desktop-44.0.tar.xz +gnome-desktop-44.1.tar.xz diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec index c34b24d..a2b5f8e 100644 --- a/gnome-desktop3.spec +++ b/gnome-desktop3.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 18; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -18,7 +18,7 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-desktop3 -Version: 44.0 +Version: 44.1 Release: %autorelease Summary: Library with common API for various GNOME modules @@ -40,9 +40,6 @@ Source4: loupe-defaults.list # for i in `grep MimeType= /usr/share/applications/org.gnome.Evince.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do echo $i=org.gnome.Evince.desktop\; >> evince-defaults.list ; done Source5: evince-defaults.list -# https://fedoraproject.org/wiki/Changes/Enhanced_Inscript_as_default_Indic_IM -Patch: make-inscript2-default-for-indic-languages.patch - BuildRequires: gcc BuildRequires: gettext BuildRequires: gtk-doc @@ -184,6 +181,9 @@ cat %SOURCE5 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list %changelog ## START: Generated by rpmautospec +* Fri Apr 18 2025 nmontero - 44.1-1 +- Update to 44.1 + * Fri Mar 14 2025 Michael Catanzaro - 44.0-18 - Drop live user mode patchset diff --git a/make-inscript2-default-for-indic-languages.patch b/make-inscript2-default-for-indic-languages.patch deleted file mode 100644 index 56e39bd..0000000 --- a/make-inscript2-default-for-indic-languages.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 334dd1e558ecced106f6c5ecacae687279904b54 Mon Sep 17 00:00:00 2001 -From: David King -Date: Fri, 18 Feb 2022 09:52:46 +0000 -Subject: [PATCH] Use inscript as default Indic IM - -https://src.fedoraproject.org/rpms/gnome-desktop3/pull-request/6 ---- - libgnome-desktop/default-input-sources.h | 26 ++++++++++++------------ - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/libgnome-desktop/default-input-sources.h b/libgnome-desktop/default-input-sources.h -index 1e02bce1..00072687 100644 ---- a/libgnome-desktop/default-input-sources.h -+++ b/libgnome-desktop/default-input-sources.h -@@ -8,12 +8,12 @@ typedef struct - static DefaultInputSource default_input_sources[] = - { - { "ar_DZ", "xkb", "ara+azerty" }, -- { "as_IN", "ibus", "m17n:as:phonetic" }, -+ { "as_IN", "ibus", "m17n:as:inscript2" }, - { "ast_ES", "xkb", "es+ast" }, - { "az_AZ", "xkb", "az" }, - { "be_BY", "xkb", "by" }, - { "bg_BG", "xkb", "bg+phonetic" }, -- { "bn_IN", "ibus", "m17n:bn:inscript" }, -+ { "bn_IN", "ibus", "m17n:bn:inscript2" }, - { "cat_ES", "xkb", "es+cat" }, - { "cs_CZ", "xkb", "cz" }, - { "de_CH", "xkb", "ch" }, -@@ -31,28 +31,28 @@ static DefaultInputSource default_input_sources[] = - { "fr_CH", "xkb", "ch+fr" }, - { "fr_FR", "xkb", "fr+oss" }, - { "gl_ES", "xkb", "es" }, -- { "gu_IN", "ibus", "m17n:gu:inscript" }, -+ { "gu_IN", "ibus", "m17n:gu:inscript2" }, - { "he_IL", "xkb", "il" }, -- { "hi_IN", "ibus", "m17n:hi:inscript" }, -+ { "hi_IN", "ibus", "m17n:hi:inscript2" }, - { "id_ID", "xkb", "us" }, - { "it_IT", "xkb", "it" }, - { "ja_JP", "ibus", "anthy" }, -- { "kn_IN", "ibus", "m17n:kn:kgp" }, -+ { "kn_IN", "ibus", "m17n:kn:inscript2" }, - { "ko_KR", "ibus", "hangul" }, -- { "mai_IN", "ibus", "m17n:mai:inscript" }, -- { "ml_IN", "ibus", "m17n:ml:inscript" }, -- { "mr_IN", "ibus", "m17n:mr:inscript" }, -+ { "mai_IN", "ibus", "m17n:mai:inscript2" }, -+ { "ml_IN", "ibus", "m17n:ml:inscript2" }, -+ { "mr_IN", "ibus", "m17n:mr:inscript2" }, - { "nl_NL", "xkb", "us+altgr-intl" }, -- { "or_IN", "ibus", "m17n:or:inscript" }, -- { "pa_IN", "ibus", "m17n:pa:inscript" }, -+ { "or_IN", "ibus", "m17n:or:inscript2" }, -+ { "pa_IN", "ibus", "m17n:pa:inscript2-guru" }, - { "pl_PL", "xkb", "pl" }, - { "pt_BR", "xkb", "br" }, - { "pt_PT", "xkb", "pt" }, - { "ru_RU", "xkb", "ru" }, -- { "sd_IN", "ibus", "m17n:sd:inscript" }, -+ { "sd_IN", "ibus", "m17n:sd:inscript2-deva" }, - { "sk_SK", "xkb", "sk" }, -- { "ta_IN", "ibus", "m17n:ta:tamil99" }, -- { "te_IN", "ibus", "m17n:te:inscript" }, -+ { "ta_IN", "ibus", "m17n:ta:inscript2" }, -+ { "te_IN", "ibus", "m17n:te:inscript2" }, - { "tr_TR", "xkb", "tr" }, - { "ur_IN", "ibus", "m17n:ur:phonetic" }, - { "zh_CN", "ibus", "libpinyin" }, --- -2.40.0 - diff --git a/sources b/sources index 38f3c79..8df4bbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-desktop-44.0.tar.xz) = 707e96ffe1bbe27c448dd007b5a005e06ea3bba945c1c6708c61b8cec204cef6f5ed540f8ba0f5e566c2fdbc825fc6f9f0440706e0aea132490ca6d48823e180 +SHA512 (gnome-desktop-44.1.tar.xz) = a939793a6870693f132cabb6dd5f06d0f2744cf97a9dc4b7a2b04c9a5aa09aa56f2f6d7630199a42d0d4e539ae724b54b91d4f9fe9ea2f785d854c58b2d8dd5f