Update to 42.beta

This commit is contained in:
David King 2022-02-18 09:55:34 +00:00
parent aeffe6e8d6
commit 19ff9ae805
5 changed files with 27 additions and 23 deletions

1
.gitignore vendored
View File

@ -186,3 +186,4 @@ gnome-desktop-2.90.4.tar.bz2
/gnome-desktop-41.3.tar.xz
/gnome-desktop-42.alpha.tar.xz
/gnome-desktop-42.alpha.1.tar.xz
/gnome-desktop-42.beta.tar.xz

View File

@ -8,8 +8,8 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-desktop3
Version: 42~alpha.1
Release: 3%{?dist}
Version: 42~beta
Release: 1%{?dist}
Summary: Library with common API for various GNOME modules
License: GPLv2+ and LGPLv2+
@ -32,8 +32,6 @@ Source5: evince-defaults.list
# https://fedoraproject.org/wiki/Changes/Enhanced_Inscript_as_default_Indic_IM
Patch0: make-inscript2-default-for-indic-languages.patch
# https://fedoraproject.org/wiki/Changes/Ibus_table_cangjie_default_for_zh_hk
Patch1: make-table-cangjie5-default-for-zh-hk.patch
BuildRequires: gcc
BuildRequires: gettext
@ -174,6 +172,9 @@ cat %SOURCE5 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
%{_datadir}/installed-tests
%changelog
* Fri Feb 18 2022 David King <amigadave@amigadave.com> - 42~beta-1
- Update to 42.beta
* Tue Feb 01 2022 Mike FABIAN <mfabian@redhat.com> - 42~alpha-1-3
- Add patch for https://fedoraproject.org/wiki/Changes/Ibus_table_cangjie_default_for_zh_hk

View File

@ -1,7 +1,18 @@
diff -urN gnome-desktop-41.alpha.old/libgnome-desktop/default-input-sources.h gnome-desktop-41.alpha/libgnome-desktop/default-input-sources.h
--- gnome-desktop-41.alpha.old/libgnome-desktop/default-input-sources.h 2021-07-17 02:19:04.838858800 +0530
+++ gnome-desktop-41.alpha/libgnome-desktop/default-input-sources.h 2021-08-03 10:10:50.662648669 +0530
@@ -8,12 +8,12 @@
From 8735c467de6ca7e88f171deaaa882cb6b9336ed6 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
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 bb5f10f5..005907c2 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" },
@ -16,7 +27,7 @@ diff -urN gnome-desktop-41.alpha.old/libgnome-desktop/default-input-sources.h gn
{ "cat_ES", "xkb", "es+cat" },
{ "cs_CZ", "xkb", "cz" },
{ "de_CH", "xkb", "ch" },
@@ -30,28 +30,28 @@
@@ -30,28 +30,28 @@ static DefaultInputSource default_input_sources[] =
{ "fr_CH", "xkb", "ch+fr" },
{ "fr_FR", "xkb", "fr+oss" },
{ "gl_ES", "xkb", "es" },
@ -55,4 +66,7 @@ diff -urN gnome-desktop-41.alpha.old/libgnome-desktop/default-input-sources.h gn
+ { "te_IN", "ibus", "m17n:te:inscript2" },
{ "ur_IN", "ibus", "m17n:ur:phonetic" },
{ "zh_CN", "ibus", "libpinyin" },
{ "zh_HK", "ibus", "cangjie" },
{ "zh_HK", "ibus", "table:cangjie5" },
--
2.35.1

View File

@ -1,12 +0,0 @@
diff -ru gnome-desktop-42.alpha.1.orig/libgnome-desktop/default-input-sources.h gnome-desktop-42.alpha.1/libgnome-desktop/default-input-sources.h
--- gnome-desktop-42.alpha.1.orig/libgnome-desktop/default-input-sources.h 2022-02-01 10:52:57.637239201 +0100
+++ gnome-desktop-42.alpha.1/libgnome-desktop/default-input-sources.h 2022-02-01 10:54:16.276374221 +0100
@@ -54,7 +54,7 @@
{ "te_IN", "ibus", "m17n:te:inscript2" },
{ "ur_IN", "ibus", "m17n:ur:phonetic" },
{ "zh_CN", "ibus", "libpinyin" },
- { "zh_HK", "ibus", "cangjie" },
+ { "zh_HK", "ibus", "table:cangjie5" },
{ "zh_TW", "ibus", "libzhuyin" },
{ NULL, NULL, NULL }
};

View File

@ -1 +1 @@
SHA512 (gnome-desktop-42.alpha.1.tar.xz) = 32f17dbe965cd758cb731b16edd396aa3cdeb19a67c8ff4fdc72afe2a3fd0d1d4a5d63537a63a99dcc7678d2976ba555942101c0191865b65f60c05f569e811b
SHA512 (gnome-desktop-42.beta.tar.xz) = 5d2121894bd1038090496299c3b296dd2ecbdb31444007b7477cb7caf7bfc1e3100bfbaef5557f8627014cc3c9c8d0b699ac57a17dcff9c6ecd3fa07d717e795