diff --git a/0003-add-ukui-log4qt.patch b/0003-add-ukui-log4qt.patch new file mode 100644 index 0000000..b879751 --- /dev/null +++ b/0003-add-ukui-log4qt.patch @@ -0,0 +1,69 @@ +From 235bc6b01ac146485aff84d2db7fe9a81d8e7ff4 Mon Sep 17 00:00:00 2001 +From: peijiankang +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 + + int main(int argc, char *argv[]) + { ++ initUkuiLog4qt("ukui-menu"); + g_projectCodeName = KDKGetPrjCodeName().c_str(); + qRegisterMetaType>("QVector"); + #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 + diff --git a/ukui-menu-3.1.1 b/ukui-menu-3.1.1 new file mode 160000 index 0000000..235bc6b --- /dev/null +++ b/ukui-menu-3.1.1 @@ -0,0 +1 @@ +Subproject commit 235bc6b01ac146485aff84d2db7fe9a81d8e7ff4 diff --git a/ukui-menu.spec b/ukui-menu.spec index 67e5b55..b4ba38c 100644 --- a/ukui-menu.spec +++ b/ukui-menu.spec @@ -1,12 +1,13 @@ Name: ukui-menu Version: 3.1.1 -Release: 4 +Release: 5 Summary: Advanced ukui menu License: GPL-3.0-or-later URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-fix-uninstall-failed-issue.patch Patch02: 0002-fix-coredump-of-ukui-menu.patch +patch03: 0003-add-ukui-log4qt.patch BuildRequires: qt5-qtbase-devel BuildRequires: libqtxdg-devel @@ -20,11 +21,13 @@ BuildRequires: libX11-devel BuildRequires: qt5-qttools-devel BuildRequires: kf5-kwindowsystem-devel BuildRequires: uchardet-devel ukui-interface peony libpeony-dev +BuildRequires: libkysdk-waylandhelper-devel Requires: gsettings-qt Requires: qt5-qtx11extras Requires: bamf-daemon Requires: accountsservice +Requires: libkysdk-waylandhelper #BuildArch: noarch @@ -36,9 +39,7 @@ Requires: accountsservice The package contains executable file. %prep -%setup -q -%patch01 -p1 -%patch02 -p1 +%autosetup -n %{name}-%{version} -p1 %build mkdir build && cd build @@ -59,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ukui-menu/translations/ %changelog +* Wed Feb 15 2023 peijiankang - 3.1.1-5 +- add 0003-add-ukui-log4qt.patch + * Fri Feb 10 2023 peijiankang - 3.1.1-4 - fix coredump of ukui-menu