!34 add ukui-log4qt
From: @peijiankang Reviewed-by: @hua_yadong Signed-off-by: @hua_yadong
This commit is contained in:
commit
be09cde8b8
69
0003-add-ukui-log4qt.patch
Normal file
69
0003-add-ukui-log4qt.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
From 235bc6b01ac146485aff84d2db7fe9a81d8e7ff4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: peijiankang <peijiankang@kylinos.cn>
|
||||||
|
Date: Wed, 15 Feb 2023 17:45:51 +0800
|
||||||
|
Subject: [PATCH] add ukui-log4qt
|
||||||
|
|
||||||
|
---
|
||||||
|
debian/control | 7 ++++---
|
||||||
|
main.cpp | 2 ++
|
||||||
|
ukui-menu.pro | 2 +-
|
||||||
|
3 files changed, 7 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/debian/control b/debian/control
|
||||||
|
index 2e3fd51..00568da 100755
|
||||||
|
--- a/debian/control
|
||||||
|
+++ b/debian/control
|
||||||
|
@@ -19,7 +19,8 @@ Build-Depends: debhelper-compat (=12),
|
||||||
|
libx11-dev,
|
||||||
|
libukui-common0,
|
||||||
|
libukui-common-dev,
|
||||||
|
- libpeony-dev
|
||||||
|
+ libpeony-dev,
|
||||||
|
+ libkysdk-waylandhelper-dev
|
||||||
|
Standards-Version: 4.5.0
|
||||||
|
Rules-Requires-Root: no
|
||||||
|
Homepage: https://github.com/ukui/ukui-menu
|
||||||
|
@@ -33,9 +34,9 @@ Depends: ${shlibs:Depends},
|
||||||
|
accountsservice,
|
||||||
|
libgsettings-qt1,
|
||||||
|
libqt5x11extras5,
|
||||||
|
- bamfdaemon
|
||||||
|
+ bamfdaemon,
|
||||||
|
+ libkysdk-waylandhelper
|
||||||
|
Suggests:kylin-status-manager,
|
||||||
|
- kylin-daq
|
||||||
|
Description: Advanced ukui menu
|
||||||
|
UKUI menu provides start menu development library and advanced
|
||||||
|
graphical user interface.
|
||||||
|
diff --git a/main.cpp b/main.cpp
|
||||||
|
index ed52069..f30ac71 100755
|
||||||
|
--- a/main.cpp
|
||||||
|
+++ b/main.cpp
|
||||||
|
@@ -34,9 +34,11 @@
|
||||||
|
#define UKUI_PATH "/org/gnome/SessionManager"
|
||||||
|
#define UKUI_INTERFACE "org.gnome.SessionManager"
|
||||||
|
|
||||||
|
+#include <ukui-log4qt.h>
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
+ initUkuiLog4qt("ukui-menu");
|
||||||
|
g_projectCodeName = KDKGetPrjCodeName().c_str();
|
||||||
|
qRegisterMetaType<QVector<QStringList>>("QVector<QStringList>");
|
||||||
|
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
|
||||||
|
diff --git a/ukui-menu.pro b/ukui-menu.pro
|
||||||
|
index 5fc48ba..9cf7362 100755
|
||||||
|
--- a/ukui-menu.pro
|
||||||
|
+++ b/ukui-menu.pro
|
||||||
|
@@ -52,7 +52,7 @@ PKGCONFIG+=glib-2.0 gio-unix-2.0 gsettings-qt libbamf3 x11 xtst
|
||||||
|
|
||||||
|
CONFIG += no_keywords link_pkgconfig
|
||||||
|
|
||||||
|
-LIBS+=-pthread -luchardet -lukui-com4c -lukui-com4cxx -lpeony
|
||||||
|
+LIBS+=-pthread -luchardet -lukui-log4qt -lukui-com4c -lukui-com4cxx -lpeony
|
||||||
|
|
||||||
|
desktop_file.files = ukui-menu.desktop
|
||||||
|
desktop_file.path = /etc/xdg/autostart
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
1
ukui-menu-3.1.1
Submodule
1
ukui-menu-3.1.1
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 235bc6b01ac146485aff84d2db7fe9a81d8e7ff4
|
||||||
@ -1,12 +1,13 @@
|
|||||||
Name: ukui-menu
|
Name: ukui-menu
|
||||||
Version: 3.1.1
|
Version: 3.1.1
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: Advanced ukui menu
|
Summary: Advanced ukui menu
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-fix-uninstall-failed-issue.patch
|
Patch01: 0001-fix-uninstall-failed-issue.patch
|
||||||
Patch02: 0002-fix-coredump-of-ukui-menu.patch
|
Patch02: 0002-fix-coredump-of-ukui-menu.patch
|
||||||
|
patch03: 0003-add-ukui-log4qt.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
BuildRequires: libqtxdg-devel
|
BuildRequires: libqtxdg-devel
|
||||||
@ -20,11 +21,13 @@ BuildRequires: libX11-devel
|
|||||||
BuildRequires: qt5-qttools-devel
|
BuildRequires: qt5-qttools-devel
|
||||||
BuildRequires: kf5-kwindowsystem-devel
|
BuildRequires: kf5-kwindowsystem-devel
|
||||||
BuildRequires: uchardet-devel ukui-interface peony libpeony-dev
|
BuildRequires: uchardet-devel ukui-interface peony libpeony-dev
|
||||||
|
BuildRequires: libkysdk-waylandhelper-devel
|
||||||
|
|
||||||
Requires: gsettings-qt
|
Requires: gsettings-qt
|
||||||
Requires: qt5-qtx11extras
|
Requires: qt5-qtx11extras
|
||||||
Requires: bamf-daemon
|
Requires: bamf-daemon
|
||||||
Requires: accountsservice
|
Requires: accountsservice
|
||||||
|
Requires: libkysdk-waylandhelper
|
||||||
|
|
||||||
|
|
||||||
#BuildArch: noarch
|
#BuildArch: noarch
|
||||||
@ -36,9 +39,7 @@ Requires: accountsservice
|
|||||||
The package contains executable file.
|
The package contains executable file.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -n %{name}-%{version} -p1
|
||||||
%patch01 -p1
|
|
||||||
%patch02 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
@ -59,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/ukui-menu/translations/
|
%{_datadir}/ukui-menu/translations/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 15 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-5
|
||||||
|
- add 0003-add-ukui-log4qt.patch
|
||||||
|
|
||||||
* Fri Feb 10 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
|
* Fri Feb 10 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
|
||||||
- fix coredump of ukui-menu
|
- fix coredump of ukui-menu
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user