!47 添加gitlab-ci脚本 & 修复一些崩溃问题
From: @tangjie02 Reviewed-by: @liubuguiii Signed-off-by: @liubuguiii
This commit is contained in:
commit
68aa9077e3
@ -0,0 +1,47 @@
|
||||
From 6da7f67dbc6e4d1226a96768256db1c903cf7e95 Mon Sep 17 00:00:00 2001
|
||||
From: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||
Date: Thu, 11 Aug 2022 15:27:59 +0800
|
||||
Subject: [PATCH 1/2] fix(coredump): Fix the coredump problem caused by
|
||||
RecentFilesListBox::load
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 修复由RecentFilesListBox::load回调函数导致的崩溃问题
|
||||
|
||||
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||
---
|
||||
src/menu/recent-files-list-box.cpp | 10 +++-------
|
||||
1 file changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/menu/recent-files-list-box.cpp b/src/menu/recent-files-list-box.cpp
|
||||
index 86ffd60..3ae481e 100644
|
||||
--- a/src/menu/recent-files-list-box.cpp
|
||||
+++ b/src/menu/recent-files-list-box.cpp
|
||||
@@ -26,12 +26,7 @@ RecentFilesListBox::RecentFilesListBox() : filter_pattern("*")
|
||||
get_style_context()->add_class("menu-recent-list");
|
||||
|
||||
/* 最近访问文件列表发生变化时重新加载 */
|
||||
- Gtk::RecentManager::get_default()->signal_changed().connect(
|
||||
- [this]() {
|
||||
- KLOG_DEBUG("The recent files are changed.");
|
||||
- this->load();
|
||||
- });
|
||||
-
|
||||
+ Gtk::RecentManager::get_default()->signal_changed().connect(sigc::mem_fun(this, &RecentFilesListBox::load));
|
||||
load();
|
||||
}
|
||||
|
||||
@@ -180,7 +175,8 @@ Gtk::Widget *RecentFilesListBox::create_recent_item(const Glib::RefPtr<Gtk::Rece
|
||||
widget->set_tooltip_text(item->get_display_name());
|
||||
widget->get_style_context()->add_class("row-box");
|
||||
widget->signal_button_press_event().connect_notify(
|
||||
- [widget, context_menu, this](const GdkEventButton *button_event) -> void {
|
||||
+ [widget, context_menu, this](const GdkEventButton *button_event) -> void
|
||||
+ {
|
||||
const GdkEvent *event = (const GdkEvent *)button_event;
|
||||
if (gdk_event_triggers_context_menu(event))
|
||||
{
|
||||
--
|
||||
2.33.0
|
||||
|
||||
33
0002-feature-gitlab-Add-.gitlab-ci.yml.patch
Normal file
33
0002-feature-gitlab-Add-.gitlab-ci.yml.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From c3c06ad8ea3758d496ceff5526fabfe9e5585c27 Mon Sep 17 00:00:00 2001
|
||||
From: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||
Date: Thu, 25 Aug 2022 09:16:58 +0800
|
||||
Subject: [PATCH 2/2] feature(gitlab): Add .gitlab-ci.yml
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 添加ci配置文件
|
||||
|
||||
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||
---
|
||||
.gitlab-ci.yml | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
create mode 100644 .gitlab-ci.yml
|
||||
|
||||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
||||
new file mode 100644
|
||||
index 0000000..66ea6e7
|
||||
--- /dev/null
|
||||
+++ b/.gitlab-ci.yml
|
||||
@@ -0,0 +1,8 @@
|
||||
+variables:
|
||||
+ RPM_BUILD_REQUIRES: 'cmake make gcc-c++ gtkmm30-devel gettext libwnck3-devel kiran-cc-daemon-devel libX11-devel libxcb-devel libXcomposite-devel mate-desktop-devel cairomm-devel kiran-log-gtk3-devel libdbusmenu-devel libxml2-devel fmt-devel kiran-panel kiran-panel-libs kiran-panel-devel json-glib-devel'
|
||||
+
|
||||
+include:
|
||||
+ - project: 'os/gitlab-ci'
|
||||
+ ref: main
|
||||
+ file: '/cmake/cxx.gitlab-ci.yml'
|
||||
+
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: kiran-menu
|
||||
Version: 2.3.0
|
||||
Release: 7
|
||||
Release: 8
|
||||
Summary: Applets for mate panel from Kiran Desktop
|
||||
|
||||
License: MulanPSL-2.0
|
||||
@ -12,6 +12,8 @@ Patch1002: 0002-fix-tray-Fix-the-problem-that-fcitx-doesn-t-show-in-.patch
|
||||
Patch1003: 0001-fix-menu-fix-the-grab-problem-when-popup-menu-on-sea.patch
|
||||
Patch1004: 0001-fix-connect-Fix-some-possible-crash-problems-caused-.patch
|
||||
Patch1005: 0002-fix-coredump-Fix-the-coredump-problem-caused-by-null.patch
|
||||
Patch1006: 0001-fix-coredump-Fix-the-coredump-problem-caused-by-Rece.patch
|
||||
Patch1007: 0002-feature-gitlab-Add-.gitlab-ci.yml.patch
|
||||
|
||||
|
||||
BuildRequires: cmake > 3.0
|
||||
@ -92,6 +94,9 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 25 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.3.0-8
|
||||
- KYOS-B: Fix the coredump problem caused by RecentFilesListBox::load
|
||||
|
||||
* Wed Aug 24 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.3.0-7
|
||||
- KYOS-F: Add mate-search-tool to requires list
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user