Star0
0
Code
Code
Issues
Pull Requests1
Discussion
Wiki
Analysis
Star0
0
Open
【代码同步】将master分支内容同步至24.03-LTS-Next分支 #17
AtomGit-BotAdd on Apr 16, 2025
【代码同步】将master分支内容同步至24.03-LTS-Next分支 #17
Open
AtomGit-BotAdd on Apr 16, 2025
Merged fromrefs/pull/17/headintoopenEuler-24.03-LTS-Next
Total: 9 files changed+67-573
R0000-draw-mask-for-whole-screen-except-the-selection-area-15cc4fa9.patch→0001-draw-mask-for-whole-screen-except-the-selection-area.patch+10-10
@@ -1,17 +1,17 @@
1-From 15cc4fa985c1d6adc78c68a90fe90ba3d219e221 Mon Sep 17 00:00:00 20011+From b39a9110809392815555b187731e7f74b1d2bc8e Mon Sep 17 00:00:00 2001
2From: longcheng <longcheng@kylinos.com.cn>2From: longcheng <longcheng@kylinos.com.cn>
3Date: Tue, 22 Mar 2022 16:51:12 +08003Date: Tue, 22 Mar 2022 16:51:12 +0800
4-Subject: [PATCH 0/4] draw mask for whole screen except the selection area4+Subject: [PATCH] draw mask for whole screen except the selection area
5 5 
6---6---
7 mate-screenshot/src/screenshot-utils.c | 79 ++++++++++----------------7 mate-screenshot/src/screenshot-utils.c | 79 ++++++++++----------------
8 1 file changed, 30 insertions(+), 49 deletions(-)8 1 file changed, 30 insertions(+), 49 deletions(-)
9 9 
10diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c10diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c
11-index 8809571..a8eaea7 10064411+index 6ee457c..1239aaa 100644
12--- a/mate-screenshot/src/screenshot-utils.c12--- a/mate-screenshot/src/screenshot-utils.c
13+++ b/mate-screenshot/src/screenshot-utils.c13+++ b/mate-screenshot/src/screenshot-utils.c
14-@@ -213,6 +213,10 @@ select_area_button_press (GtkWidget *window,14+@@ -216,6 +216,10 @@ select_area_button_press (GtkWidget *window,
15 data->button_pressed = TRUE;15 data->button_pressed = TRUE;
16 data->rect.x = event->x_root;16 data->rect.x = event->x_root;
17 data->rect.y = event->y_root;17 data->rect.y = event->y_root;
@@ -22,7 +22,7 @@ index 8809571..a8eaea7 100644
22 22
23 return TRUE;23 return TRUE;
24 }24 }
25-@@ -227,52 +231,10 @@ select_area_motion_notify (GtkWidget *window,25+@@ -230,52 +234,10 @@ select_area_motion_notify (GtkWidget *window,
26 if (!data->button_pressed)26 if (!data->button_pressed)
27 return TRUE;27 return TRUE;
28 28
@@ -78,7 +78,7 @@ index 8809571..a8eaea7 100644
78 return TRUE;78 return TRUE;
79 }79 }
80 80
81-@@ -316,18 +278,35 @@ static gboolean81+@@ -318,18 +280,35 @@ static gboolean
82 draw (GtkWidget *window, cairo_t *cr, gpointer unused)82 draw (GtkWidget *window, cairo_t *cr, gpointer unused)
83 {83 {
84 GtkStyleContext *style;84 GtkStyleContext *style;
@@ -115,7 +115,7 @@ index 8809571..a8eaea7 100644
115 gtk_render_background (style, cr,115 gtk_render_background (style, cr,
116 0, 0,116 0, 0,
117 gtk_widget_get_allocated_width (window),117 gtk_widget_get_allocated_width (window),
118-@@ -336,7 +315,8 @@ draw (GtkWidget *window, cairo_t *cr, gpointer unused)118+@@ -338,7 +317,8 @@ draw (GtkWidget *window, cairo_t *cr, gpointer unused)
119 0, 0,119 0, 0,
120 gtk_widget_get_allocated_width (window),120 gtk_widget_get_allocated_width (window),
121 gtk_widget_get_allocated_height (window));121 gtk_widget_get_allocated_height (window));
@@ -125,7 +125,7 @@ index 8809571..a8eaea7 100644
125 gtk_style_context_restore (style);125 gtk_style_context_restore (style);
126 }126 }
127 127
128-@@ -358,8 +338,8 @@ create_select_window (void)128+@@ -360,8 +340,8 @@ create_select_window (void)
129 129
130 g_signal_connect (window, "draw", G_CALLBACK (draw), NULL);130 g_signal_connect (window, "draw", G_CALLBACK (draw), NULL);
131 131
@@ -136,7 +136,7 @@ index 8809571..a8eaea7 100644
136 gtk_widget_show (window);136 gtk_widget_show (window);
137 return window;137 return window;
138 }138 }
139-@@ -401,6 +381,7 @@ screenshot_select_area_async (SelectAreaCallback callback)139+@@ -403,6 +383,7 @@ screenshot_select_area_async (SelectAreaCallback callback)
140 cb_data = g_slice_new0 (CallbackData);140 cb_data = g_slice_new0 (CallbackData);
141 cb_data->callback = callback;141 cb_data->callback = callback;
142 142
@@ -145,5 +145,5 @@ index 8809571..a8eaea7 100644
145 g_signal_connect (data.window, "button-press-event", G_CALLBACK (select_area_button_press), &data);145 g_signal_connect (data.window, "button-press-event", G_CALLBACK (select_area_button_press), &data);
146 g_signal_connect (data.window, "button-release-event", G_CALLBACK (select_area_button_release), &data);146 g_signal_connect (data.window, "button-release-event", G_CALLBACK (select_area_button_release), &data);
147-- 147--
148-2.27.0148+2.33.0
149 149 
D0001-feature-mate-system-log-add-X-System-Server-category-51959949.patch+0-26
@@ -1,26 +0,0 @@
1-From 51959949da85a55bfa9e2e1be7123d6789f536ed Mon Sep 17 00:00:00 2001
2-From: longcheng <longcheng@kylinos.com.cn>
3-Date: Tue, 22 Mar 2022 16:52:43 +0800
4-Subject: [PATCH 1/4] feature[mate-system-log]: add X-System-Server category
5- into desktop file of mate-system-log
6- 
7----
8- logview/data/mate-system-log.desktop.in.in | 2 +-
9- 1 file changed, 1 insertion(+), 1 deletion(-)
10- 
11-diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in
12-index a1c020b..b3b2d8b 100644
13---- a/logview/data/mate-system-log.desktop.in.in
14-+++ b/logview/data/mate-system-log.desktop.in.in
15-@@ -7,7 +7,7 @@ Icon=mate-system-log
16- Terminal=false
17- Type=Application
18- StartupNotify=true
19--Categories=GTK;System;Monitor;
20-+Categories=GTK;System;Monitor;X-System-Server;
21- # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
22- Keywords=MATE;monitor;view;system;log;files;logviewer;
23- OnlyShowIn=MATE;
24---
25-2.27.0
26- 
D0002-Remove-the-system-log-viewer-from-the-start-menu-6a94dfb1.patch+0-21
@@ -1,21 +0,0 @@
1-From 6a94dfb1244efbf1f5184b984fc6bbcb76fa6f84 Mon Sep 17 00:00:00 2001
2-From: longcheng <longcheng@kylinos.com.cn>
3-Date: Tue, 22 Mar 2022 16:55:58 +0800
4-Subject: [PATCH 2/4] Remove the system log viewer from the start menu
5- 
6----
7- logview/data/mate-system-log.desktop.in.in | 1 +
8- 1 file changed, 1 insertion(+)
9- 
10-diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in
11-index b3b2d8b..e6d592e 100644
12---- a/logview/data/mate-system-log.desktop.in.in
13-+++ b/logview/data/mate-system-log.desktop.in.in
14-@@ -16,3 +16,4 @@ X-MATE-Bugzilla-Bugzilla=MATE
15- X-MATE-Bugzilla-Product=mate-utils
16- X-MATE-Bugzilla-Component=logview
17- X-MATE-Bugzilla-Version=@VERSION@
18-+X-KIRAN-NoDisplay=true
19---
20-2.27.0
21- 
R0004-fix-control-center-fix-mate-system-log-is-not-displa-9cfd8ed4.patch→0002-fix-mate-system-log-is-not-display-and-add-X-System-.patch+16-9
@@ -1,25 +1,32 @@
1-From 9cfd8ed4efc6cfcadd60858ae47b704e803b4e32 Mon Sep 17 00:00:00 20011+From b4abb9924e05d3499cc0f098acf25122280363f9 Mon Sep 17 00:00:00 2001
2From: longcheng <longcheng@kylinos.com.cn>2From: longcheng <longcheng@kylinos.com.cn>
3Date: Tue, 22 Mar 2022 17:03:05 +08003Date: Tue, 22 Mar 2022 17:03:05 +0800
4-Subject: [PATCH 4/4] fix(control center): fix mate system log is not displayed4+Subject: [PATCH] fix mate system log is not display and add X-System-Server
5- in5+ category into desktop
6 6 
7---7---
8- logview/data/mate-system-log.desktop.in.in | 1 -8+ logview/data/mate-system-log.desktop.in.in | 4 ++--
9- 1 file changed, 1 deletion(-)9+ 1 file changed, 2 insertions(+), 2 deletions(-)
10 10 
11diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in11diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in
12-index e6d592e..684b39c 10064412+index a1c020b..684b39c 100644
13--- a/logview/data/mate-system-log.desktop.in.in13--- a/logview/data/mate-system-log.desktop.in.in
14+++ b/logview/data/mate-system-log.desktop.in.in14+++ b/logview/data/mate-system-log.desktop.in.in
15-@@ -10,7 +10,6 @@ StartupNotify=true15+@@ -7,12 +7,12 @@ Icon=mate-system-log
16- Categories=GTK;System;Monitor;X-System-Server;16+ Terminal=false
17+ Type=Application
18+ StartupNotify=true
19+-Categories=GTK;System;Monitor;
20++Categories=GTK;System;Monitor;X-System-Server;
17 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!21 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
18 Keywords=MATE;monitor;view;system;log;files;logviewer;22 Keywords=MATE;monitor;view;system;log;files;logviewer;
19-OnlyShowIn=MATE;23-OnlyShowIn=MATE;
20 X-MATE-DocPath=mate-system-log/mate-system-log.xml24 X-MATE-DocPath=mate-system-log/mate-system-log.xml
21 X-MATE-Bugzilla-Bugzilla=MATE25 X-MATE-Bugzilla-Bugzilla=MATE
22 X-MATE-Bugzilla-Product=mate-utils26 X-MATE-Bugzilla-Product=mate-utils
27+ X-MATE-Bugzilla-Component=logview
28+ X-MATE-Bugzilla-Version=@VERSION@
29++X-KIRAN-NoDisplay=true
23-- 30--
24-2.27.031+2.33.0
25 32 
D0003-change-chinese-translation-be748614.patch+0-158
@@ -1,158 +0,0 @@
1-From be7486149f4ca5ab71158cd71e5589d4ddc2d54a Mon Sep 17 00:00:00 2001
2-From: longcheng <longcheng@kylinos.com.cn>
3-Date: Tue, 22 Mar 2022 17:00:35 +0800
4-Subject: [PATCH 3/4] change-chinese-translation
5- 
6----
7- po/zh_CN.po | 36 ++++++++++++++++++------------------
8- 1 file changed, 18 insertions(+), 18 deletions(-)
9- 
10-diff --git a/po/zh_CN.po b/po/zh_CN.po
11-index fbe3537..0d6d09c 100644
12---- a/po/zh_CN.po
13-+++ b/po/zh_CN.po
14-@@ -301,7 +301,7 @@ msgstr "缩小"
15-
16- #: baobab/src/baobab.c:928
17- msgid "Save screenshot"
18--msgstr "保存抓图"
19-+msgstr "保存截图"
20-
21- #: baobab/src/baobab.c:1114
22- msgid "View as Rings Chart"
23-@@ -361,7 +361,7 @@ msgstr "无法创建像素图图像！"
24-
25- #: baobab/src/baobab-chart.c:1714
26- msgid "Save Snapshot"
27--msgstr "保存抓图"
28-+msgstr "保存截图"
29-
30- #: baobab/src/baobab-chart.c:1741
31- msgid "_Image type:"
32-@@ -2970,7 +2970,7 @@ msgstr ""
33- #: mate-screenshot/src/mate-screenshot.c:519
34- #: mate-screenshot/src/mate-screenshot.c:527
35- msgid "Take Screenshot"
36--msgstr "抓图"
37-+msgstr "截图工具"
38-
39- #: mate-screenshot/data/mate-screenshot.desktop.in:4
40- msgid "Save images of your desktop or individual windows"
41-@@ -2988,7 +2988,7 @@ msgstr ""
42-
43- #: mate-screenshot/data/mate-screenshot.ui:9
44- msgid "Save Screenshot"
45--msgstr "保存抓图"
46-+msgstr "保存截图"
47-
48- #: mate-screenshot/data/mate-screenshot.ui:52
49- msgid "C_opy to Clipboard"
50-@@ -3000,19 +3000,19 @@ msgstr "保存于文件夹(_F)："
51-
52- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:5
53- msgid "Screenshot delay"
54--msgstr "抓图延迟"
55-+msgstr "截图延迟"
56-
57- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:6
58- msgid "The number of seconds to wait before taking the screenshot."
59--msgstr "抓图前等候的秒数。"
60-+msgstr "截图前等候的秒数。"
61-
62- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:10
63- msgid "Screenshot directory"
64--msgstr "抓图目录"
65-+msgstr "截图目录"
66-
67- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:11
68- msgid "The directory the last screenshot was saved in."
69--msgstr "上次用于保存屏幕抓图的目录。"
70-+msgstr "上次用于保存屏幕截图的目录。"
71-
72- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:15
73- msgid "Include Border"
74-@@ -3020,7 +3020,7 @@ msgstr "包含边框"
75-
76- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:16
77- msgid "Include the window manager border along with the screenshot"
78--msgstr "在抓图中包含窗口管理器边框"
79-+msgstr "在截图中包含窗口管理器边框"
80-
81- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:20
82- msgid "Include Pointer"
83-@@ -3028,7 +3028,7 @@ msgstr "包含指针"
84-
85- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:21
86- msgid "Include the pointer in the screenshot"
87--msgstr "在抓图中包含鼠标指针"
88-+msgstr "在截图中包含鼠标指针"
89-
90- #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:25
91- msgid "Border Effect"
92-@@ -3095,11 +3095,11 @@ msgstr "特效"
93-
94- #: mate-screenshot/src/mate-screenshot.c:532
95- msgid "Take _Screenshot"
96--msgstr "抓图(_S)"
97-+msgstr "截图(_S)"
98-
99- #: mate-screenshot/src/mate-screenshot.c:651
100- msgid "Error while saving screenshot"
101--msgstr "保存抓图时出错"
102-+msgstr "保存截图时出错"
103-
104- #: mate-screenshot/src/mate-screenshot.c:654
105- #, c-format
106-@@ -3108,7 +3108,7 @@ msgid ""
107- " Error was %s.\n"
108- " Please choose another location and retry."
109- msgstr ""
110--"无法将抓图保存到 %s。\n"
111-+"无法将截图保存到 %s。\n"
112- "错误为 %s\n"
113- "请另选一个位置然后重试。"
114-
115-@@ -3118,7 +3118,7 @@ msgstr "屏幕截图已完成"
116-
117- #: mate-screenshot/src/mate-screenshot.c:851
118- msgid "Unable to take a screenshot of the current window"
119--msgstr "无法对当前窗口抓图"
120-+msgstr "无法对当前窗口截图"
121-
122- #: mate-screenshot/src/mate-screenshot.c:916
123- #, c-format
124-@@ -3144,7 +3144,7 @@ msgstr "将抓取区域直接发送到剪贴板"
125-
126- #: mate-screenshot/src/mate-screenshot.c:1318
127- msgid "Include the window border with the screenshot"
128--msgstr "抓图中包含窗口边框"
129-+msgstr "截图中包含窗口边框"
130-
131- #: mate-screenshot/src/mate-screenshot.c:1319
132- msgid "Remove the window border from the screenshot"
133-@@ -3152,7 +3152,7 @@ msgstr "去除屏幕截图的窗口边框"
134-
135- #: mate-screenshot/src/mate-screenshot.c:1320
136- msgid "Take screenshot after specified delay [in seconds]"
137--msgstr "在指定延迟后抓图[以秒计]"
138-+msgstr "在指定延迟后截图[以秒计]"
139-
140- #: mate-screenshot/src/mate-screenshot.c:1321
141- msgid "Effect to add to the border (shadow, border or none)"
142-@@ -3221,11 +3221,11 @@ msgstr ""
143- msgid ""
144- "The child save process unexpectedly exited. We are unable to write the "
145- "screenshot to disk."
146--msgstr "子保存进程意外退出。无法将屏幕抓图保存到磁盘。"
147-+msgstr "子保存进程意外退出。无法将屏幕截图保存到磁盘。"
148-
149- #: mate-screenshot/src/screenshot-save.c:225
150- msgid "Unknown error saving screenshot to disk"
151--msgstr "将抓图保存到磁盘出现未知错误"
152-+msgstr "将截图保存到磁盘出现未知错误"
153-
154- #: mate-screenshot/src/screenshot-xfer.c:72
155- msgid "File already exists"
156---
157-2.27.0
158- 
D0005-mate-dictionary-fix-memory-leak.patch+0-21
@@ -1,21 +0,0 @@
1-diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c
2-index 49a35e9..8033d24 100644
3---- a/mate-dictionary/libgdict/gdict-defbox.c
4-+++ b/mate-dictionary/libgdict/gdict-defbox.c
5-@@ -200,6 +200,8 @@ gdict_defbox_dispose (GObject *gobject)
6- priv->regular_cursor = NULL;
7- }
8-
9-+ g_clear_pointer (&priv->word, g_free);
10-+
11- G_OBJECT_CLASS (gdict_defbox_parent_class)->dispose (gobject);
12- }
13-
14-@@ -2548,6 +2550,7 @@ gdict_defbox_lookup (GdictDefbox *defbox,
15- G_CALLBACK (error_cb),
16- defbox);
17-
18-+ g_free (priv->word);
19- priv->word = g_strdup (word);
20- g_object_notify (G_OBJECT (defbox), "word");
21-
Rmate-utils-1.24.0.tar.xz→mate-utils-1.28.0.tar.xz+0-0
Binary files do not support preview
Mmate-utils.spec+37-328
@@ -1,56 +1,35 @@
1-# Conditional for release and snapshot builds. Uncomment for release-builds.
2-%global rel_build 1
3- 
4-# This is needed, because src-url contains branched part of versioning-scheme.
5-%global branch 1.24
6- 
7-# Settings used for build from snapshots.
8-%{!?rel_build:%global commit d3538696e2b4e4372e9f526a0a4e2e4be08fc832}
9-%{!?rel_build:%global commit_date 20150629}
10-%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
11-%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}}
12-%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}}
13-%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
14- 
15Name: mate-utils1Name: mate-utils
16-Version: %{branch}.02+Version: 1.28.0
17-%if 0%{?rel_build}3+Release: 1
18-Release: 4
19-%else
20-Release: 0.11%{?git_rel}
21-%endif
22Summary: MATE utility programs4Summary: MATE utility programs
23License: GPLv2+ and LGPLv2+5License: GPLv2+ and LGPLv2+
24URL: http://mate-desktop.org6URL: http://mate-desktop.org
25 7 
26# for downloading the tarball use 'spectool -g -R mate-utils.spec'8# for downloading the tarball use 'spectool -g -R mate-utils.spec'
27# Source for release-builds.9# Source for release-builds.
28-%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}10+Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz
29-# Source for snapshot-builds.
30-%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
31 11 
32-Patch0: 0000-draw-mask-for-whole-screen-except-the-selection-area-15cc4fa9.patch12+Patch0: 0001-draw-mask-for-whole-screen-except-the-selection-area.patch
33-Patch1: 0001-feature-mate-system-log-add-X-System-Server-category-51959949.patch13+Patch1: 0002-fix-mate-system-log-is-not-display-and-add-X-System-.patch
34-Patch2: 0002-Remove-the-system-log-viewer-from-the-start-menu-6a94dfb1.patch14+ 
35-Patch3: 0003-change-chinese-translation-be748614.patch15+BuildRequires: desktop-file-utils
36-Patch4: 0004-fix-control-center-fix-mate-system-log-is-not-displa-9cfd8ed4.patch16+BuildRequires: e2fsprogs-devel
37-Patch5: 0005-mate-dictionary-fix-memory-leak.patch17+BuildRequires: gtk-layer-shell-devel
18+BuildRequires: hardlink
19+BuildRequires: libcanberra-devel
20+BuildRequires: libgtop2-devel
21+BuildRequires: libudisks2-devel
22+BuildRequires: libX11-devel
23+BuildRequires: libXmu-devel
24+BuildRequires: make
25+BuildRequires: mate-common
26+BuildRequires: mate-desktop-devel
27+BuildRequires: mate-panel-devel
28+BuildRequires: mesa-libGL-devel
29+BuildRequires: popt-devel
30+BuildRequires: usermode
31+BuildRequires: yelp-tools
38 32 
39-BuildRequires: desktop-file-utils
40-BuildRequires: e2fsprogs-devel
41-BuildRequires: hardlink
42-BuildRequires: libcanberra-devel
43-BuildRequires: libgtop2-devel
44-BuildRequires: libudisks2-devel
45-BuildRequires: libX11-devel
46-BuildRequires: libXmu-devel
47-BuildRequires: mate-common
48-BuildRequires: mate-panel-devel
49-BuildRequires: mesa-libGL-devel
50-BuildRequires: popt-devel
51-BuildRequires: usermode
52-BuildRequires: yelp-tools
53-BuildRequires: gcc-c++
54 33 
55Requires: mate-dictionary = %{version}-%{release}34Requires: mate-dictionary = %{version}-%{release}
56Requires: mate-screenshot = %{version}-%{release}35Requires: mate-screenshot = %{version}-%{release}
@@ -118,19 +97,9 @@ An application to help analyze disk usage.
118 97 
119 98 
120%prep99%prep
121-%if 0%{?rel_build}
122%autosetup -p1100%autosetup -p1
123-%else
124-%autosetup -n %{name}-%{commit} -p1
125-%endif
126 101 
127-%if 0%{?rel_build}
128-#NOCONFIGURE=1 ./autogen.sh
129-%else # 0%{?rel_build}
130-# for snapshots
131-# needed for git snapshots
132NOCONFIGURE=1 ./autogen.sh102NOCONFIGURE=1 ./autogen.sh
133-%endif # 0%{?rel_build}
134 103 
135# disable pt language for help in search tool104# disable pt language for help in search tool
136sed -i s/"IGNORE_HELP_LINGUAS ="/"IGNORE_HELP_LINGUAS = pt"/g gsearchtool/help/Makefile.am105sed -i s/"IGNORE_HELP_LINGUAS ="/"IGNORE_HELP_LINGUAS = pt"/g gsearchtool/help/Makefile.am
@@ -142,6 +111,8 @@ NOCONFIGURE=1 ./autogen.sh
142 --disable-static \111 --disable-static \
143 --disable-schemas-compile \112 --disable-schemas-compile \
144 --enable-gdict-applet \113 --enable-gdict-applet \
114+ --enable-in-process \
115+ --enable-wayland \
145 --enable-gtk-doc-html \116 --enable-gtk-doc-html \
146 --enable-ipv6=yes \117 --enable-ipv6=yes \
147 --enable-maintainer-flags=no \118 --enable-maintainer-flags=no \
@@ -164,13 +135,13 @@ EOF
164mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps135mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
165cat <<EOF >%{buildroot}%{_sysconfdir}/security/console.apps/mate-system-log136cat <<EOF >%{buildroot}%{_sysconfdir}/security/console.apps/mate-system-log
166USER=root137USER=root
167-PROGRAM=/usr/sbin/mate-system-log138+PROGRAM=%{_libexecdir}/mate-system-log
168SESSION=true139SESSION=true
169FALLBACK=true140FALLBACK=true
170EOF141EOF
171 142 
172-mkdir -p %{buildroot}%{_sbindir}143+mkdir -p %{buildroot}%{_libexecdir}
173-mv %{buildroot}%{_bindir}/mate-system-log %{buildroot}%{_sbindir}144+mv %{buildroot}%{_bindir}/mate-system-log %{buildroot}%{_libexecdir}
174ln -s %{_bindir}/consolehelper %{buildroot}%{_bindir}/mate-system-log145ln -s %{_bindir}/consolehelper %{buildroot}%{_bindir}/mate-system-log
175 146 
176rm -fv %{buildroot}%{_libdir}/*.la147rm -fv %{buildroot}%{_libdir}/*.la
@@ -192,11 +163,11 @@ desktop-file-install \
192 163 
193 164 
194%files165%files
195-# empty166+%{_libdir}/mate-utils
196 167 
197%files common -f %{name}.lang168%files common -f %{name}.lang
198%doc COPYING COPYING.libs169%doc COPYING COPYING.libs
199-%doc NEWS README170+%doc NEWS README.md
200 171 
201%files devel172%files devel
202%{_libdir}/libmatedict.so173%{_libdir}/libmatedict.so
@@ -206,7 +177,7 @@ desktop-file-install \
206 177 
207%files -n mate-system-log -f mate-system-log.lang178%files -n mate-system-log -f mate-system-log.lang
208%{_bindir}/mate-system-log179%{_bindir}/mate-system-log
209-%{_sbindir}/mate-system-log180+%{_libexecdir}/mate-system-log
210%{_sysconfdir}/security/console.apps/mate-system-log181%{_sysconfdir}/security/console.apps/mate-system-log
211%{_sysconfdir}/pam.d/mate-system-log182%{_sysconfdir}/pam.d/mate-system-log
212%{_datadir}/glib-2.0/schemas/org.mate.system-log.gschema.xml183%{_datadir}/glib-2.0/schemas/org.mate.system-log.gschema.xml
@@ -226,18 +197,17 @@ desktop-file-install \
226 197 
227%files -n mate-dictionary -f mate-dictionary.lang198%files -n mate-dictionary -f mate-dictionary.lang
228%doc mate-dictionary/AUTHORS199%doc mate-dictionary/AUTHORS
229-%doc mate-dictionary/README200+%doc mate-dictionary/README.md
230%{_bindir}/mate-dictionary201%{_bindir}/mate-dictionary
231%{_datadir}/metainfo/mate-dictionary.appdata.xml202%{_datadir}/metainfo/mate-dictionary.appdata.xml
232%{_datadir}/applications/mate-dictionary.desktop203%{_datadir}/applications/mate-dictionary.desktop
233%{_datadir}/mate-dict/204%{_datadir}/mate-dict/
234%{_datadir}/mate-dictionary/205%{_datadir}/mate-dictionary/
235-%{_libexecdir}/mate-dictionary-applet
236%{_libdir}/libmatedict.so.*206%{_libdir}/libmatedict.so.*
207+%{_libdir}/mate-utils/libmate-dictionary-applet.so*
237%{_mandir}/man1/mate-dictionary.1.*208%{_mandir}/man1/mate-dictionary.1.*
238%{_datadir}/glib-2.0/schemas/org.mate.dictionary.gschema.xml209%{_datadir}/glib-2.0/schemas/org.mate.dictionary.gschema.xml
239%{_datadir}/mate-panel/applets/org.mate.DictionaryApplet.mate-panel-applet210%{_datadir}/mate-panel/applets/org.mate.DictionaryApplet.mate-panel-applet
240-%{_datadir}/dbus-1/services/org.mate.panel.applet.DictionaryAppletFactory.service
241 211 
242%files -n mate-search-tool -f mate-search-tool.lang212%files -n mate-search-tool -f mate-search-tool.lang
243%{_bindir}/mate-search-tool213%{_bindir}/mate-search-tool
@@ -253,7 +223,7 @@ desktop-file-install \
253 223 
254%files -n mate-disk-usage-analyzer -f mate-disk-usage-analyzer.lang224%files -n mate-disk-usage-analyzer -f mate-disk-usage-analyzer.lang
255%doc baobab/AUTHORS225%doc baobab/AUTHORS
256-%doc baobab/README226+%doc baobab/README.md
257%{_bindir}/mate-disk-usage-analyzer227%{_bindir}/mate-disk-usage-analyzer
258%{_datadir}/metainfo/mate-disk-usage-analyzer.appdata.xml228%{_datadir}/metainfo/mate-disk-usage-analyzer.appdata.xml
259%{_datadir}/applications/mate-disk-usage-analyzer.desktop229%{_datadir}/applications/mate-disk-usage-analyzer.desktop
@@ -263,268 +233,7 @@ desktop-file-install \
263 233 
264 234 
265%changelog235%changelog
266-* Thu Jul 28 2022 longcheng <longcheng@kylinos.com.cn> - 1.24.0-4236+* Wed Feb 19 2025 yuanxing <yuanxing@kylinsec.com.cn> - 1.28.0-1
267-- KYOS-B: fix build error in openEuler
268- 
269-* Thu Jul 7 2022 yinyongkang <yinyongkang@kylinos.cn> - 1.24.0-3
270-- mate-dictionary: fix memory leak
271- 
272-* Thu Jul 07 2022 longcheng <longcheng@kylinos.com.cn> - 1.24.0-2
273-- KYOS-F: draw mask for whole screen except the selection area
274-- KYOS-F: add X-System-Server category for mate-system-log
275-- KYOS-F: add X-KIRAN-NoDisplay=true in mate-system-log.desktop.in.in
276-- KYOS-T: change chinese translation.(#28543)
277-- KYOS-F: fix mate system log is not displayed in the control panel (#48482)
278- 
279-* Tue Feb 11 2020 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.0-1
280-- update to 1.24.0
281- 
282-* Sun Feb 02 2020 Wolfgang Ulbrich <fedora@raveit.de> - 1.23.2-1
283-- update to 1.23.3
284-- fix f32 mass rebuild
285- 
286-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.2-3
287-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
288- 
289-* Tue Sep 24 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-2
290-- drop non needed build requires
291- 
292-* Tue Sep 24 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-1
293-- update to 1.22.2
294- 
295-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-2
296-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
297- 
298-* Thu Apr 25 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.1-1
299-- update to 1.22.1
300- 
301-* Mon Mar 04 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.0-1
302-- update to 1.22.0
303- 
304-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.2-2
305-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
306- 
307-* Wed Dec 26 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.2-1
308-- update to 1.20.2 release
309- 
310-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.1-2
311-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
312- 
313-* Tue Jun 19 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.1-1
314-- update to 1.20.1 release
315- 
316-* Sun Feb 11 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.0-1
317-- update to 1.20.0 release
318-- drop GSettings Schema rpm scriplet
319-- switch to using autosetup
320- 
321-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-2
322-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
323- 
324-* Mon Jan 01 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.19.1-1
325-- update 1.19.1 release
326-- add style class for logviewer
327- 
328-* Sat Aug 26 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.19.0-1
329-- update to 1.19.0
330- 
331-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-4
332-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
333- 
334-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-3
335-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
336- 
337-* Tue Jun 13 2017 Kalev Lember <klember@redhat.com> - 1.18.2-2
338-- Rebuilt for libgtop2 soname bump
339- 
340-* Sat May 06 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.2-1
341-- update to 1.18.2
342-- fix a runtime warning with mate-screenshot
343- 
344-* Tue Apr 04 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.1-1
345-- update to 1.18.1
346- 
347-* Tue Mar 14 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.0-1
348-- update to 1.18.0 release
349- 
350-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-2
351-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
352- 
353-* Tue Dec 06 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.0-1
354-- update 1.17.0 release
355- 
356-* Thu Sep 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
357-- update to 1.16.0 release
358- 
359-* Fri Sep 02 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.1-1
360-- update to 1.15.1 release
361- 
362-* Thu Jun 09 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.0-1
363-- update to 1.15.0 release
364-- switch to gtk+3
365- 
366-* Thu Apr 07 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
367-- update to 1.14.0
368- 
369-* Sun Feb 07 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.0-1
370-- update to 1.13.0 release
371- 
372-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
373-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
374- 
375-* Fri Nov 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.0-1
376-- update to 1.12.0 release
377- 
378-* Thu Oct 22 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.11.0-1
379-- update to 1.11.0 release
380- 
381-* Wed Sep 02 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.3.1
382-- update to 1.10.3 release
383- 
384-* Sat Jul 11 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2-1
385-- update to 1.10.2 release
386-- remove upstreamed patches
387- 
388-* Fri Jul 03 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2-0.1.git20150629.d353869
389-- fix help
390- 
391-* Thu Jun 18 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1-1
392-- update to 1.10.1 release
393-- remove upstreamed patches
394- 
395-* Wed Jun 17 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-2
396-- fix translations in gsettings
397- 
398-* Thu May 07 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-1
399-- update to 1.10.0 release
400-- add patch to fix f23 build
401- 
402-* Mon Apr 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.90-1
403-- update to 1.9.90 release
404- 
405-* Fri Jan 23 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.1-1
406-- update to 1.9.1 release
407- 
408-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-2
409-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
410- 
411-* Sat Jul 12 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.0-1
412-- update to 1.9.0 release
413- 
414-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-3
415-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
416- 
417-* Wed Apr 30 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.0-2
418-- rebuild for libgtop2 soname bump
419- 
420-* Wed Mar 05 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-1
421-- Update to 1.8.0
422- 
423-* Wed Feb 19 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.90-1
424-- update to 1.7.90
425-- add --disbale-maintainer-flags configure flag
426- 
427-* Tue Feb 11 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-2
428-- fix build on ARM
429-- remove --disable-scrollkeeper configure flag
430-- add --with-gnome --all-name for find language
431-- remove usage of hardlink, no need anymore
432-- fix usage of desktop-file-install
433-- re-work configure flags
434-- add BR yelp-tools
435- 
436-* Sun Feb 09 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.0-1
437-- Update to 1.7.0
438- 
439-* Mon Jan 6 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.1-1
440-- update to 1.6.1 release
441-- use modern 'make install' macro
442-- removed upstreamed patches
443-- add gtk-doc dir to -devel subpackage
444-- mate-disk-usage-analyzer icons are renamed, moved to hicolor dir
445- 
446-* Tue Oct 22 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.0-10
447-- add runtime require mate-desktop-libs for mate-system-log, rhbz (#1016935)
448- 
449-* Tue Oct 22 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.0-9
450-- screenshot: do not segfault when taking a window picture with no delay
451-- fix rhbz (#1022082)
452-
453-* Thu Sep 05 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.6.0-8
454-- Files and libs duplicated in mate-dictionary and mate-utils (#1003196)
455-- drop mate-dictionary-devel
456-- add -common subpkg (for licenses, translations)
457-- make main empty metapackage, that pulls all subpkgs
458-- only mate-system log uses usermode (consolehelper)
459- 
460-* Thu Aug 08 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.0-7
461-- runtime require mate-desktop-libs for mate-search-tool
462-- and main package, fix rhbz #988278
463- 
464-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-6
465-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
466- 
467-* Thu Jul 11 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.0-5
468-- add upstream patch to fix rhbz #975199
469- 
470-* Tue Jul 02 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.0-4
471-- add mate-dictionary binary to subpackage, rhbz #980434
472-- add mate-dictionary applet dbus file to subpackage, rhbz #980434
473-- move baobab docs to mate-disk-usage-analyzer subpackage
474-- add missing copying files to some subpackages
475-- move baobab icons to mate-disk-usage-analyzer subpackage
476-- add baobab icons to main packackes
477-- add rpm spriptlets for mate-disk-usage-analyzer
478-- remove mime-types spriptlets,
479-- because there are not mime-types in desktop files
480-- remove icon-cache sriptlets from most subpackages,
481-- only needed for main and mate-disk-usage-analyzer package
482-- remove glib-compile-schemas from all %%post sections
483-- remove BR gsettings-desktop-schemas-devel
484-- remove BR glib2-devel, already called by mate-common
485-- add -devel subpackage for mate-dictionary
486-- add mate-search-tool binary to main package
487-- add /usr/share/mate-dictionary directory to main package
488- 
489-* Sat Jun 15 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-3
490-- Update gtk-update-icon-cache scriptlet
491- 
492-* Sat Jun 15 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-2
493-- Split all the packages up in to sub packages (882184)
494-- Update source URL
495-- Remove useless convert files
496-- Own dirs we're supposed to own
497- 
498-* Sat Apr 13 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-1
499-- Update to latest 1.6.0 stable release.
500- 
501-* Mon Feb 18 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.0-1
502-- Update to latest upstream release
503- 
504-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-8
505-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
506- 
507-* Tue Jan 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.4.0-7
508-- gdict_applet option (don't build by default)
509-- minor cleanup
510- 
511-* Fri Dec 07 2012 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-6
512-- revert -5 changes (#884886)
513- 
514-* Thu Nov 08 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-4
515-- rebuild for 1.5.0
516-- drop gdict-applet till upstream fixes it
517- 
518-* Mon Nov 05 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-3
519-- sort out lang file mess
520-- link identical immages in help to save space
521-- fix directory ownership of help files
522-- add build requires mate-conf-devel
523-- add build requires desktop-file-utils
524- 
525-* Sun Nov 04 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-2
526-- add build requires popt-devel
527- 
528-* Tue Oct 23 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-1
529- Initial build237- Initial build
530- 238+- KYOS-B: draw mask for whole screen except the selection area
239+- KYOS-B: fix mate system log is not display and add X-System-Server category into desktop
Amate-utils.yaml+4-0
@@ -0,0 +1,4 @@
1+version_control: github
2+src_repo: mate-desktop/mate-utils
3+tag_prefix: ^v
4+seperator: .