Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
ebda958fd6
!13 update to version 44.0
From: @lwg99 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
2023-11-29 07:09:57 +00:00
lwg K
b082a64b5c update to version 44.0 2023-11-23 15:53:19 +08:00
openeuler-ci-bot
0ba1598a37
!11 Update to 43
From: @dwl301 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
2023-01-31 11:41:32 +00:00
dwl301
101a344ffe Update to 43 2023-01-31 19:05:35 +08:00
openeuler-ci-bot
74cf1feb90
!9 添加sw架构
From: @wuzx065891 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
2022-10-20 03:19:35 +00:00
wzx
526dd6ae36 Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
2022-10-20 10:41:47 +08:00
openeuler-ci-bot
00e5d35124
!8 Upgrade to 42.2
From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
2022-06-08 07:02:58 +00:00
zhang__3125
e7c1a0ed8b Upgrade to 42.2 2022-06-08 13:49:58 +08:00
openeuler-ci-bot
0354dbe28d
!7 Upgrade to 42.1
From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
2022-06-07 12:26:18 +00:00
zhang__3125
b94b07d9a5 Upgrade to 42.1 2022-06-07 18:36:03 +08:00
6 changed files with 95 additions and 29 deletions

View File

@ -0,0 +1,45 @@
diff -Naur gnome-desktop-3.38.6.org/libgnome-desktop/gnome-desktop-thumbnail-script.c gnome-desktop-3.38.6.sw/libgnome-desktop/gnome-desktop-thumbnail-script.c
--- gnome-desktop-3.38.6.org/libgnome-desktop/gnome-desktop-thumbnail-script.c 2022-08-19 15:09:31.100000000 +0000
+++ gnome-desktop-3.38.6.sw/libgnome-desktop/gnome-desktop-thumbnail-script.c 2022-08-19 15:11:51.660000000 +0000
@@ -152,7 +152,7 @@
}
/* From https://github.com/flatpak/flatpak/blob/master/common/flatpak-utils.c */
-#if !defined(__i386__) && !defined(__x86_64__) && !defined(__aarch64__) && !defined(__arm__)
+#if !defined(__i386__) && !defined(__x86_64__) && !defined(__aarch64__) && !defined(__arm__) && !defined(__sw_64__)
static const char *
flatpak_get_kernel_arch (void)
{
@@ -226,6 +226,8 @@
return "x86_64";
#elif defined(__aarch64__)
return "aarch64";
+#elif defined(__sw_64__)
+ return "sw_64";
#elif defined(__arm__)
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
return "arm";
@@ -243,6 +245,9 @@
#ifdef SCMP_ARCH_AARCH64
static const guint32 seccomp_aarch64_extra_arches[] = { SCMP_ARCH_ARM, 0 };
#endif
+#ifdef SCMP_ARCH_SW_64
+static const guint32 seccomp_sw_64_extra_arches[] = { SCMP_ARCH_SW_64, 0 };
+#endif
static inline void
cleanup_seccomp (void *p)
@@ -402,6 +407,13 @@
extra_arches = seccomp_aarch64_extra_arches;
}
#endif
+#ifdef SCMP_ARCH_SW_64
+ else if (strcmp (arch, "sw_64") == 0)
+ {
+ arch_id = SCMP_ARCH_SW_64;
+ extra_arches = seccomp_sw_64_extra_arches;
+ }
+#endif
/* We only really need to handle arches on multiarch systems.
* If only one arch is supported the default is fine */

Binary file not shown.

BIN
gnome-desktop-44.0.tar.xz Normal file

Binary file not shown.

View File

@ -6,12 +6,12 @@
%global po_package gnome-desktop-3.0
Name: gnome-desktop3
Version: 42.0
Version: 44.0
Release: 1
Summary: GNOME is designed to help you use your computer in control.
License: GPLv2+ and LGPLv2+
URL: https://gitlab.gnome.org/GNOME/gnome-desktop
Source0: https://download.gnome.org/sources/gnome-desktop/42/gnome-desktop-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-desktop/44/gnome-desktop-%{version}.tar.xz
Source1: gnome-mimeapps.list
Source2: totem-defaults.list
Source3: file-roller-defaults.list
@ -19,31 +19,31 @@ Source4: eog-defaults.list
Source5: evince-defaults.list
Patch0: make-inscript2-default-for-indic-languages.patch
Patch1: gnome-desktop-3.38.6-sw.patch
BuildRequires: gcc gettext itstool meson
BuildRequires: pkgconfig(libudev) pkgconfig(iso-codes)
BuildRequires: pkgconfig(gobject-introspection-1.0) gtk-doc >= 1.14
BuildRequires: pkgconfig(libseccomp) pkgconfig(xkeyboard-config)
BuildRequires: gcc gettext gtk-doc itstool meson
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version}
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
BuildRequires: pkgconfig(libudev) pkgconfig(iso-codes)
BuildRequires: pkgconfig(libseccomp) pkgconfig(xkeyboard-config)
Requires: shared-mime-info
Conflicts: shared-mime-info < 2.0-4
Requires: bubblewrap glib2 >= %{glib2_version}
Requires: shared-mime-info
Requires: bubblewrap
Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version}
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
Conflicts: gnome-shell < 3.33.4
Obsoletes: compat-gnome-desktop310 < 3.12
%if !0%{?flatpak}
Requires: bubblewrap
%endif
Provides: gnome-desktop4
Provides: gnome-desktop4%{?_isa} = %{version}-%{release}
%description
The gnome-desktop3 package has been designed from the ground up to help you have
@ -57,6 +57,10 @@ Requires: %{name} = %{version}-%{release}
Provides: %{name}-tests = %{version}-%{release}
Obsoletes: %{name}-tests < %{version}-%{release}
Provides: gnome-desktop4-devel
Provides: gnome-desktop4-devel%{?_isa} = %{version}-%{release}
%description devel
Development files for gnome-desktop.
@ -83,30 +87,47 @@ cat %SOURCE5 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
%files -f %{po_package}.lang
%doc AUTHORS NEWS README.md
%license COPYING COPYING.LIB
%{_datadir}/gnome/gnome-version.xml
%{_datadir}/applications/gnome-mimeapps.list
%{_libdir}/libgnome-desktop-3.so.19{,.*}
%{_libdir}/libgnome-bg-4.so.1{,.*}
%{_libdir}/libgnome-desktop-4.so.1{,.*}
%{_libdir}/libgnome-rr-4.so.1{,.*}
# LGPL
%{_libdir}/libgnome-desktop-3.so.20{,.*}
%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
%{_libdir}/girepository-1.0/Gnome*-4.0.typelib
%{_libexecdir}/gnome-desktop-debug/
%{_libdir}/libgnome-bg-4.so.2{,.*}
%{_libdir}/libgnome-desktop-4.so.2{,.*}
%{_libdir}/libgnome-rr-4.so.2{,.*}
%{_libdir}/girepository-1.0/Gnome*-4.0.typelib
%files devel
%{_libdir}/libgnome-desktop-3.so
%{_libdir}/libgnome-*-4.so
%{_libdir}/pkgconfig/gnome-desktop-3.0.pc
%{_libdir}/pkgconfig/gnome-*-4.pc
%{_includedir}/gnome-desktop-3.0
%{_includedir}/gnome-desktop-4.0
%{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
%{_datadir}/gir-1.0/Gnome*-4.0.gir
%dir %{_datadir}/gtk-doc/
%dir %{_datadir}/gtk-doc/html/
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%{_libdir}/libgnome-*-4.so
%{_libdir}/pkgconfig/gnome-*-4.pc
%{_includedir}/gnome-desktop-4.0
%{_datadir}/gir-1.0/Gnome*-4.0.gir
%{_libexecdir}/installed-tests/gnome-desktop
%{_datadir}/installed-tests
%changelog
* Thu Nov 23 2023 lwg <liweiganga@uniontech.com> - 44.0-1
- update to version 44.0
* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43-1
- Upgrade to 43
-* Thu Oct 20 2022 wuzx<wuzx1226@qq.com> - 42.2-2
-- add sw64 patch
* Wed Jun 8 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.2-1
- Upgrade to 42.2
* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.1-1
- Upgrade to 42.1
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.0-1
- Update to 42.0

View File

@ -1,4 +1,4 @@
version_control: github
src_repo: GNOME/gnome-desktop
tag_prefix: "^"
seperator: "."
separator: "."

View File

@ -1,4 +1,4 @@
From 8735c467de6ca7e88f171deaaa882cb6b9336ed6 Mon Sep 17 00:00:00 2001
From 334dd1e558ecced106f6c5ecacae687279904b54 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
@ -9,7 +9,7 @@ https://src.fedoraproject.org/rpms/gnome-desktop3/pull-request/6
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
index 1e02bce1..00072687 100644
--- a/libgnome-desktop/default-input-sources.h
+++ b/libgnome-desktop/default-input-sources.h
@@ -8,12 +8,12 @@ typedef struct
@ -27,7 +27,7 @@ index bb5f10f5..005907c2 100644
{ "cat_ES", "xkb", "es+cat" },
{ "cs_CZ", "xkb", "cz" },
{ "de_CH", "xkb", "ch" },
@@ -30,28 +30,28 @@ static DefaultInputSource default_input_sources[] =
@@ -31,28 +31,28 @@ static DefaultInputSource default_input_sources[] =
{ "fr_CH", "xkb", "ch+fr" },
{ "fr_FR", "xkb", "fr+oss" },
{ "gl_ES", "xkb", "es" },
@ -64,9 +64,9 @@ index bb5f10f5..005907c2 100644
- { "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" },
{ "zh_HK", "ibus", "table:cangjie5" },
--
2.35.1
--
2.40.0