diff --git a/0000-draw-mask-for-whole-screen-except-the-selection-area-15cc4fa9.patch b/0000-draw-mask-for-whole-screen-except-the-selection-area-15cc4fa9.patch new file mode 100644 index 0000000..c855878 --- /dev/null +++ b/0000-draw-mask-for-whole-screen-except-the-selection-area-15cc4fa9.patch @@ -0,0 +1,149 @@ +From 15cc4fa985c1d6adc78c68a90fe90ba3d219e221 Mon Sep 17 00:00:00 2001 +From: longcheng +Date: Tue, 22 Mar 2022 16:51:12 +0800 +Subject: [PATCH 0/4] draw mask for whole screen except the selection area + +--- + mate-screenshot/src/screenshot-utils.c | 79 ++++++++++---------------- + 1 file changed, 30 insertions(+), 49 deletions(-) + +diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c +index 8809571..a8eaea7 100644 +--- a/mate-screenshot/src/screenshot-utils.c ++++ b/mate-screenshot/src/screenshot-utils.c +@@ -213,6 +213,10 @@ select_area_button_press (GtkWidget *window, + data->button_pressed = TRUE; + data->rect.x = event->x_root; + data->rect.y = event->y_root; ++ data->rect.width = 0; ++ data->rect.height = 0; ++ ++ gtk_widget_queue_draw(window); + + return TRUE; + } +@@ -227,52 +231,10 @@ select_area_motion_notify (GtkWidget *window, + if (!data->button_pressed) + return TRUE; + +- draw_rect.width = ABS (data->rect.x - event->x_root); +- draw_rect.height = ABS (data->rect.y - event->y_root); +- draw_rect.x = MIN (data->rect.x, event->x_root); +- draw_rect.y = MIN (data->rect.y, event->y_root); +- +- if (draw_rect.width <= 0 || draw_rect.height <= 0) +- { +- gtk_window_move (GTK_WINDOW (window), -100, -100); +- gtk_window_resize (GTK_WINDOW (window), 10, 10); +- return TRUE; +- } +- +- gtk_window_move (GTK_WINDOW (window), draw_rect.x, draw_rect.y); +- gtk_window_resize (GTK_WINDOW (window), draw_rect.width, draw_rect.height); +- +- /* We (ab)use app-paintable to indicate if we have an RGBA window */ +- if (!gtk_widget_get_app_paintable (window)) +- { +- GdkWindow *gdkwindow = gtk_widget_get_window (window); +- +- /* Shape the window to make only the outline visible */ +- if (draw_rect.width > 2 && draw_rect.height > 2) +- { +- cairo_region_t *region, *region2; +- cairo_rectangle_int_t region_rect = { +- 0, 0, +- draw_rect.width - 2, draw_rect.height - 2 +- }; +- +- region = cairo_region_create_rectangle (®ion_rect); +- region_rect.x++; +- region_rect.y++; +- region_rect.width -= 2; +- region_rect.height -= 2; +- region2 = cairo_region_create_rectangle (®ion_rect); +- cairo_region_subtract (region, region2); +- +- gdk_window_shape_combine_region (gdkwindow, region, 0, 0); +- +- cairo_region_destroy (region); +- cairo_region_destroy (region2); +- } +- else +- gdk_window_shape_combine_region (gdkwindow, NULL, 0, 0); +- } ++ data->rect.width = event->x_root - data->rect.x; ++ data->rect.height = event->y_root - data->rect.y; + ++ gtk_widget_queue_draw(window); + return TRUE; + } + +@@ -316,18 +278,35 @@ static gboolean + draw (GtkWidget *window, cairo_t *cr, gpointer unused) + { + GtkStyleContext *style; ++ GdkRectangle *rect; + + style = gtk_widget_get_style_context (window); + + if (gtk_widget_get_app_paintable (window)) + { + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); +- cairo_set_source_rgba (cr, 0, 0, 0, 0); ++ cairo_set_source_rgba (cr, 0, 0, 0, 0.6); + cairo_paint (cr); + + gtk_style_context_save (style); + gtk_style_context_add_class (style, GTK_STYLE_CLASS_RUBBERBAND); + ++ cairo_save(cr); ++ rect = g_object_get_data(G_OBJECT(window), "selection-area"); ++ if (rect->width != 0 || rect->height != 0) { ++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); ++ cairo_set_source_rgba (cr, 0.0, 0, 0, 0.0); ++ cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height); ++ cairo_fill (cr); ++ ++ cairo_set_line_width (cr, 1.0); ++ cairo_set_source_rgb (cr, 255/255.0, 0/255.0, 0/255.0); ++ cairo_rectangle (cr, ++ rect->x + 0.5, rect->y + 0.5, ++ rect->width - 1, rect->height - 1); ++ cairo_stroke (cr); ++ } ++#if 0 + gtk_render_background (style, cr, + 0, 0, + gtk_widget_get_allocated_width (window), +@@ -336,7 +315,8 @@ draw (GtkWidget *window, cairo_t *cr, gpointer unused) + 0, 0, + gtk_widget_get_allocated_width (window), + gtk_widget_get_allocated_height (window)); +- ++#endif ++ cairo_restore(cr); + gtk_style_context_restore (style); + } + +@@ -358,8 +338,8 @@ create_select_window (void) + + g_signal_connect (window, "draw", G_CALLBACK (draw), NULL); + +- gtk_window_move (GTK_WINDOW (window), -100, -100); +- gtk_window_resize (GTK_WINDOW (window), 10, 10); ++ gtk_window_resize(GTK_WINDOW(window), gdk_screen_get_width(screen), gdk_screen_get_height(screen)); ++ gtk_window_move(GTK_WINDOW(window), 0, 0); + gtk_widget_show (window); + return window; + } +@@ -401,6 +381,7 @@ screenshot_select_area_async (SelectAreaCallback callback) + cb_data = g_slice_new0 (CallbackData); + cb_data->callback = callback; + ++ g_object_set_data(G_OBJECT(data.window), "selection-area", &data.rect); + g_signal_connect (data.window, "key-press-event", G_CALLBACK (select_area_key_press), &data); + g_signal_connect (data.window, "button-press-event", G_CALLBACK (select_area_button_press), &data); + g_signal_connect (data.window, "button-release-event", G_CALLBACK (select_area_button_release), &data); +-- +2.27.0 + diff --git a/0001-feature-mate-system-log-add-X-System-Server-category-51959949.patch b/0001-feature-mate-system-log-add-X-System-Server-category-51959949.patch new file mode 100644 index 0000000..38286bf --- /dev/null +++ b/0001-feature-mate-system-log-add-X-System-Server-category-51959949.patch @@ -0,0 +1,26 @@ +From 51959949da85a55bfa9e2e1be7123d6789f536ed Mon Sep 17 00:00:00 2001 +From: longcheng +Date: Tue, 22 Mar 2022 16:52:43 +0800 +Subject: [PATCH 1/4] feature[mate-system-log]: add X-System-Server category + into desktop file of mate-system-log + +--- + logview/data/mate-system-log.desktop.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in +index a1c020b..b3b2d8b 100644 +--- a/logview/data/mate-system-log.desktop.in.in ++++ b/logview/data/mate-system-log.desktop.in.in +@@ -7,7 +7,7 @@ Icon=mate-system-log + Terminal=false + Type=Application + StartupNotify=true +-Categories=GTK;System;Monitor; ++Categories=GTK;System;Monitor;X-System-Server; + # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! + Keywords=MATE;monitor;view;system;log;files;logviewer; + OnlyShowIn=MATE; +-- +2.27.0 + diff --git a/0002-Remove-the-system-log-viewer-from-the-start-menu-6a94dfb1.patch b/0002-Remove-the-system-log-viewer-from-the-start-menu-6a94dfb1.patch new file mode 100644 index 0000000..436952f --- /dev/null +++ b/0002-Remove-the-system-log-viewer-from-the-start-menu-6a94dfb1.patch @@ -0,0 +1,21 @@ +From 6a94dfb1244efbf1f5184b984fc6bbcb76fa6f84 Mon Sep 17 00:00:00 2001 +From: longcheng +Date: Tue, 22 Mar 2022 16:55:58 +0800 +Subject: [PATCH 2/4] Remove the system log viewer from the start menu + +--- + logview/data/mate-system-log.desktop.in.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in +index b3b2d8b..e6d592e 100644 +--- a/logview/data/mate-system-log.desktop.in.in ++++ b/logview/data/mate-system-log.desktop.in.in +@@ -16,3 +16,4 @@ X-MATE-Bugzilla-Bugzilla=MATE + X-MATE-Bugzilla-Product=mate-utils + X-MATE-Bugzilla-Component=logview + X-MATE-Bugzilla-Version=@VERSION@ ++X-KIRAN-NoDisplay=true +-- +2.27.0 + diff --git a/0003-change-chinese-translation-be748614.patch b/0003-change-chinese-translation-be748614.patch new file mode 100644 index 0000000..f2aee06 --- /dev/null +++ b/0003-change-chinese-translation-be748614.patch @@ -0,0 +1,158 @@ +From be7486149f4ca5ab71158cd71e5589d4ddc2d54a Mon Sep 17 00:00:00 2001 +From: longcheng +Date: Tue, 22 Mar 2022 17:00:35 +0800 +Subject: [PATCH 3/4] change-chinese-translation + +--- + po/zh_CN.po | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index fbe3537..0d6d09c 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -301,7 +301,7 @@ msgstr "缩小" + + #: baobab/src/baobab.c:928 + msgid "Save screenshot" +-msgstr "保存抓图" ++msgstr "保存截图" + + #: baobab/src/baobab.c:1114 + msgid "View as Rings Chart" +@@ -361,7 +361,7 @@ msgstr "无法创建像素图图像！" + + #: baobab/src/baobab-chart.c:1714 + msgid "Save Snapshot" +-msgstr "保存抓图" ++msgstr "保存截图" + + #: baobab/src/baobab-chart.c:1741 + msgid "_Image type:" +@@ -2970,7 +2970,7 @@ msgstr "" + #: mate-screenshot/src/mate-screenshot.c:519 + #: mate-screenshot/src/mate-screenshot.c:527 + msgid "Take Screenshot" +-msgstr "抓图" ++msgstr "截图工具" + + #: mate-screenshot/data/mate-screenshot.desktop.in:4 + msgid "Save images of your desktop or individual windows" +@@ -2988,7 +2988,7 @@ msgstr "" + + #: mate-screenshot/data/mate-screenshot.ui:9 + msgid "Save Screenshot" +-msgstr "保存抓图" ++msgstr "保存截图" + + #: mate-screenshot/data/mate-screenshot.ui:52 + msgid "C_opy to Clipboard" +@@ -3000,19 +3000,19 @@ msgstr "保存于文件夹(_F)：" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:5 + msgid "Screenshot delay" +-msgstr "抓图延迟" ++msgstr "截图延迟" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:6 + msgid "The number of seconds to wait before taking the screenshot." +-msgstr "抓图前等候的秒数。" ++msgstr "截图前等候的秒数。" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:10 + msgid "Screenshot directory" +-msgstr "抓图目录" ++msgstr "截图目录" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:11 + msgid "The directory the last screenshot was saved in." +-msgstr "上次用于保存屏幕抓图的目录。" ++msgstr "上次用于保存屏幕截图的目录。" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:15 + msgid "Include Border" +@@ -3020,7 +3020,7 @@ msgstr "包含边框" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:16 + msgid "Include the window manager border along with the screenshot" +-msgstr "在抓图中包含窗口管理器边框" ++msgstr "在截图中包含窗口管理器边框" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:20 + msgid "Include Pointer" +@@ -3028,7 +3028,7 @@ msgstr "包含指针" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:21 + msgid "Include the pointer in the screenshot" +-msgstr "在抓图中包含鼠标指针" ++msgstr "在截图中包含鼠标指针" + + #: mate-screenshot/data/org.mate.screenshot.gschema.xml.in:25 + msgid "Border Effect" +@@ -3095,11 +3095,11 @@ msgstr "特效" + + #: mate-screenshot/src/mate-screenshot.c:532 + msgid "Take _Screenshot" +-msgstr "抓图(_S)" ++msgstr "截图(_S)" + + #: mate-screenshot/src/mate-screenshot.c:651 + msgid "Error while saving screenshot" +-msgstr "保存抓图时出错" ++msgstr "保存截图时出错" + + #: mate-screenshot/src/mate-screenshot.c:654 + #, c-format +@@ -3108,7 +3108,7 @@ msgid "" + " Error was %s.\n" + " Please choose another location and retry." + msgstr "" +-"无法将抓图保存到 %s。\n" ++"无法将截图保存到 %s。\n" + "错误为 %s\n" + "请另选一个位置然后重试。" + +@@ -3118,7 +3118,7 @@ msgstr "屏幕截图已完成" + + #: mate-screenshot/src/mate-screenshot.c:851 + msgid "Unable to take a screenshot of the current window" +-msgstr "无法对当前窗口抓图" ++msgstr "无法对当前窗口截图" + + #: mate-screenshot/src/mate-screenshot.c:916 + #, c-format +@@ -3144,7 +3144,7 @@ msgstr "将抓取区域直接发送到剪贴板" + + #: mate-screenshot/src/mate-screenshot.c:1318 + msgid "Include the window border with the screenshot" +-msgstr "抓图中包含窗口边框" ++msgstr "截图中包含窗口边框" + + #: mate-screenshot/src/mate-screenshot.c:1319 + msgid "Remove the window border from the screenshot" +@@ -3152,7 +3152,7 @@ msgstr "去除屏幕截图的窗口边框" + + #: mate-screenshot/src/mate-screenshot.c:1320 + msgid "Take screenshot after specified delay [in seconds]" +-msgstr "在指定延迟后抓图[以秒计]" ++msgstr "在指定延迟后截图[以秒计]" + + #: mate-screenshot/src/mate-screenshot.c:1321 + msgid "Effect to add to the border (shadow, border or none)" +@@ -3221,11 +3221,11 @@ msgstr "" + msgid "" + "The child save process unexpectedly exited. We are unable to write the " + "screenshot to disk." +-msgstr "子保存进程意外退出。无法将屏幕抓图保存到磁盘。" ++msgstr "子保存进程意外退出。无法将屏幕截图保存到磁盘。" + + #: mate-screenshot/src/screenshot-save.c:225 + msgid "Unknown error saving screenshot to disk" +-msgstr "将抓图保存到磁盘出现未知错误" ++msgstr "将截图保存到磁盘出现未知错误" + + #: mate-screenshot/src/screenshot-xfer.c:72 + msgid "File already exists" +-- +2.27.0 + diff --git a/0004-fix-control-center-fix-mate-system-log-is-not-displa-9cfd8ed4.patch b/0004-fix-control-center-fix-mate-system-log-is-not-displa-9cfd8ed4.patch new file mode 100644 index 0000000..de4f8f0 --- /dev/null +++ b/0004-fix-control-center-fix-mate-system-log-is-not-displa-9cfd8ed4.patch @@ -0,0 +1,25 @@ +From 9cfd8ed4efc6cfcadd60858ae47b704e803b4e32 Mon Sep 17 00:00:00 2001 +From: longcheng +Date: Tue, 22 Mar 2022 17:03:05 +0800 +Subject: [PATCH 4/4] fix(control center): fix mate system log is not displayed + in + +--- + logview/data/mate-system-log.desktop.in.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in +index e6d592e..684b39c 100644 +--- a/logview/data/mate-system-log.desktop.in.in ++++ b/logview/data/mate-system-log.desktop.in.in +@@ -10,7 +10,6 @@ StartupNotify=true + Categories=GTK;System;Monitor;X-System-Server; + # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! + Keywords=MATE;monitor;view;system;log;files;logviewer; +-OnlyShowIn=MATE; + X-MATE-DocPath=mate-system-log/mate-system-log.xml + X-MATE-Bugzilla-Bugzilla=MATE + X-MATE-Bugzilla-Product=mate-utils +-- +2.27.0 + diff --git a/mate-utils-1.22.2.tar.xz b/mate-utils-1.22.2.tar.xz deleted file mode 100644 index ec10ff1..0000000 Binary files a/mate-utils-1.22.2.tar.xz and /dev/null differ diff --git a/mate-utils-1.24.0.tar.xz b/mate-utils-1.24.0.tar.xz new file mode 100644 index 0000000..f98388f Binary files /dev/null and b/mate-utils-1.24.0.tar.xz differ diff --git a/mate-utils.spec b/mate-utils.spec index 29f4c8a..297e2b7 100644 --- a/mate-utils.spec +++ b/mate-utils.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.22 +%global branch 1.24 # Settings used for build from snapshots. %{!?rel_build:%global commit d3538696e2b4e4372e9f526a0a4e2e4be08fc832} @@ -13,11 +13,11 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: mate-utils -Version: %{branch}.2 +Version: %{branch}.0 %if 0%{?rel_build} -Release: 3 +Release: 2 %else -Release: 0.10%{?git_rel} +Release: 0.11%{?git_rel} %endif Summary: MATE utility programs License: GPLv2+ and LGPLv2+ @@ -29,11 +29,20 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} +#kylin +Patch0: 0000-draw-mask-for-whole-screen-except-the-selection-area-15cc4fa9.patch +Patch1: 0001-feature-mate-system-log-add-X-System-Server-category-51959949.patch +Patch2: 0002-Remove-the-system-log-viewer-from-the-start-menu-6a94dfb1.patch +Patch3: 0003-change-chinese-translation-be748614.patch +Patch4: 0004-fix-control-center-fix-mate-system-log-is-not-displa-9cfd8ed4.patch +#end kylin + BuildRequires: desktop-file-utils BuildRequires: e2fsprogs-devel BuildRequires: hardlink BuildRequires: libcanberra-devel BuildRequires: libgtop2-devel +BuildRequires: libudisks2-devel BuildRequires: libX11-devel BuildRequires: libXmu-devel BuildRequires: mate-common @@ -42,7 +51,9 @@ BuildRequires: mesa-libGL-devel BuildRequires: popt-devel BuildRequires: usermode BuildRequires: yelp-tools +%if 0%{?fedora} && 0%{?fedora} >= 29 BuildRequires: gcc-c++ +%endif Requires: mate-dictionary = %{version}-%{release} Requires: mate-screenshot = %{version}-%{release} @@ -96,6 +107,12 @@ Requires: mate-desktop-libs %description -n mate-search-tool An application to search for files on your computer. +%package -n mate-disk-image-mounter +Summary: A disk image mounter tool for MATE Desktop +Requires: %{name}-common = %{version}-%{release} +%description -n mate-disk-image-mounter +An application to mount disk images. + %package -n mate-disk-usage-analyzer Summary: A disk usage analyzing tool for MATE Desktop Requires: %{name}-common = %{version}-%{release} @@ -120,6 +137,7 @@ NOCONFIGURE=1 ./autogen.sh # disable pt language for help in search tool sed -i s/"IGNORE_HELP_LINGUAS ="/"IGNORE_HELP_LINGUAS = pt"/g gsearchtool/help/Makefile.am +# pt translation fix NOCONFIGURE=1 ./autogen.sh %build @@ -194,7 +212,6 @@ desktop-file-install \ %{_sbindir}/mate-system-log %{_sysconfdir}/security/console.apps/mate-system-log %{_sysconfdir}/pam.d/mate-system-log -%{_datadir}/mate-utils/ %{_datadir}/glib-2.0/schemas/org.mate.system-log.gschema.xml %{_datadir}/applications/mate-system-log.desktop %{_mandir}/man1/mate-system-log.1.* @@ -206,7 +223,6 @@ desktop-file-install \ %{_bindir}/mate-panel-screenshot %{_datadir}/metainfo/mate-screenshot.appdata.xml %{_datadir}/applications/mate-screenshot.desktop -%{_datadir}/mate-screenshot %{_mandir}/man1/mate-screenshot.1.* %{_mandir}/man1/mate-panel-screenshot.1.gz %{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml @@ -234,21 +250,38 @@ desktop-file-install \ %{_datadir}/glib-2.0/schemas/org.mate.search-tool.gschema.xml %{_datadir}/pixmaps/mate-search-tool/ +%files -n mate-disk-image-mounter +%{_bindir}/mate-disk-image-mounter +%{_datadir}/applications/mate-disk-image-mounter.desktop + %files -n mate-disk-usage-analyzer -f mate-disk-usage-analyzer.lang %doc baobab/AUTHORS %doc baobab/README %{_bindir}/mate-disk-usage-analyzer %{_datadir}/metainfo/mate-disk-usage-analyzer.appdata.xml %{_datadir}/applications/mate-disk-usage-analyzer.desktop -%{_datadir}/mate-disk-usage-analyzer %{_mandir}/man1/mate-disk-usage-analyzer.1.* %{_datadir}/glib-2.0/schemas/org.mate.disk-usage-analyzer.gschema.xml %{_datadir}/icons/hicolor/*/apps/mate-disk-usage-analyzer.* %changelog -* Mon Dec 13 2021 heyitao - 1.22.2-3 -- Remove the dist tag in the version. +* Thu Jul 07 2022 longcheng - 1.24.0-2 +- KYOS-F: draw mask for whole screen except the selection area +- KYOS-F: add X-System-Server category for mate-system-log +- KYOS-F: add X-KIRAN-NoDisplay=true in mate-system-log.desktop.in.in +- KYOS-T: change chinese translation.(#28543) +- KYOS-F: fix mate system log is not displayed in the control panel (#48482) + +* Tue Feb 11 2020 Wolfgang Ulbrich - 1.24.0-1 +- update to 1.24.0 + +* Sun Feb 02 2020 Wolfgang Ulbrich - 1.23.2-1 +- update to 1.23.3 +- fix f32 mass rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.22.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild * Tue Sep 24 2019 Wolfgang Ulbrich - 1.22.2-2 - drop non needed build requires