diff --git a/0001-fix-uninstall-failed-issue.patch b/0001-fix-uninstall-failed-issue.patch new file mode 100644 index 0000000..a56caf6 --- /dev/null +++ b/0001-fix-uninstall-failed-issue.patch @@ -0,0 +1,1310 @@ +diff -ur ukui-menu-3.0.2/src/RightClickMenu/rightclickmenu.cpp ukui-menu-3.0.2~/src/RightClickMenu/rightclickmenu.cpp +--- ukui-menu-3.0.2/src/RightClickMenu/rightclickmenu.cpp 2019-05-27 15:48:18.000000000 +0800 ++++ ukui-menu-3.0.2~/src/RightClickMenu/rightclickmenu.cpp 2020-11-27 16:50:46.669322990 +0800 +@@ -19,6 +19,8 @@ + #include "rightclickmenu.h" + #include "src/UtilityFunction/utility.h" + #include ++#include ++#include + + RightClickMenu::RightClickMenu(QWidget *parent): + QWidget(parent) +@@ -176,7 +178,9 @@ + + void RightClickMenu::uninstallActionTriggerSlot() + { +- QString cmd=QString("dpkg -S "+m_desktopfp); ++ //QString cmd=QString("dpkg -S "+m_desktopfp); ++ //on openEuler or fedora ++ QString cmd=QString("rpm -qf "+m_desktopfp); + m_cmdProc->setReadChannel(QProcess::StandardOutput); + m_cmdProc->start("sh",QStringList()<<"-c"<waitForFinished(); +@@ -190,9 +194,37 @@ + QString packagestr=QString::fromLocal8Bit(m_cmdProc->readAllStandardOutput().data()); + QString packageName=packagestr.split(":").at(0); + // qDebug()<parent(),&event); + } + + void RightClickMenu::attributeActionTriggerSlot() +diff -ur ukui-menu-3.0.2/translations/ukui-menu_bo.ts ukui-menu-3.0.2~/translations/ukui-menu_bo.ts +--- ukui-menu-3.0.2/translations/ukui-menu_bo.ts 2019-05-27 15:48:18.000000000 +0800 ++++ ukui-menu-3.0.2~/translations/ukui-menu_bo.ts 2020-11-27 16:29:16.946121032 +0800 +@@ -2,416 +2,301 @@ + + + +- CommonUseWidget ++ FunctionClassifyButton + +- +- Form +- +- +- +- +- FullCommonUseWidget +- +- +- Form +- +- +- +- +- FullFunctionWidget +- +- +- Form +- +- +- +- +- +- Android ++ ++ Mobile + + + +- +- ++ + Internet + + + +- +- ++ + Social + + + +- +- ++ + Video + + + +- +- ++ + Development + + + +- +- ++ + Image + + + +- +- ++ + Game + + + +- +- ++ + Office + + + +- +- ++ + Education + + + +- +- ++ + System + + + +- +- ++ + Others + + + + +- FullLetterWidget +- +- +- Form +- +- +- +- +- FullSearchResultWidget +- +- +- Form +- +- +- +- +- FunctionButtonWidget +- +- +- Form +- +- ++ FunctionWidget + +- +- Android ++ ++ Mobile + + + +- ++ + Internet + + + +- ++ + Social + + + +- ++ + Video + + + +- ++ + Development + + + +- ++ + Image + + + +- ++ + Game + + + +- ++ + Office + + + +- ++ + Education + + + +- ++ + System + + + +- ++ + Others + + + + +- FunctionWidget ++ MainViewWidget + +- +- Form ++ ++ Search + + ++ ++ ++ PushButton + +- +- +- Android ++ ++ Mobile + + + +- +- ++ + Internet + + + +- +- ++ + Social + + + +- +- ++ + Video + + + +- +- ++ + Development + + + +- +- ++ + Image + + + +- +- ++ + Game + + + +- +- ++ + Office + + + +- +- ++ + Education + + + +- +- ++ + System + + + +- +- ++ + Others + + + + +- LetterButtonWidget +- +- +- Form +- +- +- +- +- LetterWidget +- +- +- Form +- +- +- +- +- MainViewWidget ++ RightClickMenu + +- +- Form ++ ++ infomation + + + +- +- Search ++ ++ Uninstall finished! + + +- +- +- MainWindow + +- +- MainWindow ++ ++ error + + +- +- +- RightClickMenu + +- +- ++ + Pin to all + + + +- +- ++ + Unpin from all + + + +- +- +- ++ ++ + Pin to taskbar + + + +- +- +- ++ ++ + Unpin from taskbar + + + +- +- ++ + Add to desktop shortcuts + + + +- +- ++ + Uninstall + + + +- +- Lock Screen ++ ++ Sleep + + + +- +- Switch User +- +- +- +- ++ + Log Out + + + +- ++ + Restart + + + +- ++ + Power Off + + + +- ++ + Personalize this list + + + + +- SearchResultWidget +- +- +- Form +- +- +- +- + SideBarWidget + +- +- Form +- +- +- +- +- ++ + All + + + +- +- ++ + Letter + + + +- +- ++ + Function + + + +- +- ++ + Computer + + + +- +- ++ + Personal + + + +- +- ++ + Settings + + + +- +- ++ + Recycle Bin + + + +- +- ++ + Power + + +diff -ur ukui-menu-3.0.2/translations/ukui-menu_tr.ts ukui-menu-3.0.2~/translations/ukui-menu_tr.ts +--- ukui-menu-3.0.2/translations/ukui-menu_tr.ts 2019-05-27 15:48:18.000000000 +0800 ++++ ukui-menu-3.0.2~/translations/ukui-menu_tr.ts 2020-11-27 16:29:16.949121048 +0800 +@@ -4,57 +4,57 @@ + + FunctionClassifyButton + +- ++ + Mobile + Mobil + + +- ++ + Internet + İnternet + + +- ++ + Social + Sosyal + + +- ++ + Video + Video + + +- ++ + Development + Programlama + + +- ++ + Image + Grafik + + +- ++ + Game + Oyunlar + + +- ++ + Office + Ofis Uygulamaları + + +- ++ + Education + Eğitim + + +- ++ + System + Sistem + + +- ++ + Others + Diğer + +@@ -62,57 +62,57 @@ + + FunctionWidget + +- ++ + Mobile + Mobil + + +- ++ + Internet + İnternet + + +- ++ + Social + Sosyal + + +- ++ + Video + Video + + +- ++ + Development + Programlama + + +- ++ + Image + Grafik + + +- ++ + Game + Oyunlar + + +- ++ + Office + Ofis Uygulamaları + + +- ++ + Education + Eğitim + + +- ++ + System + Sistem + + +- ++ + Others + Diğer + +@@ -120,7 +120,7 @@ + + MainViewWidget + +- ++ + Search + Ara + +@@ -128,57 +128,57 @@ + + PushButton + +- ++ + Mobile + Mobil + + +- ++ + Internet + İnternet + + +- ++ + Social + Sosyal + + +- ++ + Video + Video + + +- ++ + Development + Programlama + + +- ++ + Image + Grafik + + +- ++ + Game + Oyunlar + + +- ++ + Office + Ofis Uygulamaları + + +- ++ + Education + Eğitim + + +- ++ + System + Sistem + + +- ++ + Others + Diğer + +@@ -186,74 +186,86 @@ + + RightClickMenu + +- ++ ++ infomation ++ ++ ++ ++ ++ Uninstall finished! ++ ++ ++ ++ ++ error ++ ++ ++ ++ + Pin to all + Tümünü sabitle + + +- ++ + Unpin from all + Tüm sabitlemeleri kaldır + + +- +- ++ ++ + Pin to taskbar + Görev çubuğuna sabitle + + +- +- ++ ++ + Unpin from taskbar + Görev çubuğundan sabitlemeyi kaldır + + +- ++ + Add to desktop shortcuts + Masaüstü kısayollarına ekle + + +- ++ + Uninstall + Kaldır + + +- + Hibernate +- Beklemeye Al ++ Beklemeye Al + + +- ++ + Sleep + Uyku Modu + + +- + Lock Screen +- Ekranı Kilitle ++ Ekranı Kilitle + + +- + Switch User +- Kullanıcı Değiştir ++ Kullanıcı Değiştir + + +- ++ + Log Out + Çıkış + + +- ++ + Restart + Yeniden Başlat + + +- ++ + Power Off + Kapat + + +- ++ + Personalize this list + Bu listeyi özelleştirin + +@@ -261,42 +273,42 @@ + + SideBarWidget + +- ++ + All + Tümü + + +- ++ + Letter + Alfabetik + + +- ++ + Function + Kategori + + +- ++ + Computer + Bilgisayar + + +- ++ + Personal + Kişisel + + +- ++ + Settings + Ayarlar + + +- ++ + Recycle Bin + Çöp + + +- ++ + Power + Kapat + +二进制文件 ukui-menu-3.0.2/translations/ukui-menu_zh_CN.qm 和 ukui-menu-3.0.2~/translations/ukui-menu_zh_CN.qm 不同 +diff -ur ukui-menu-3.0.2/translations/ukui-menu_zh_CN.ts ukui-menu-3.0.2~/translations/ukui-menu_zh_CN.ts +--- ukui-menu-3.0.2/translations/ukui-menu_zh_CN.ts 2019-05-27 15:48:18.000000000 +0800 ++++ ukui-menu-3.0.2~/translations/ukui-menu_zh_CN.ts 2020-11-27 16:30:46.737593087 +0800 +@@ -4,57 +4,57 @@ + + FunctionClassifyButton + +- ++ + Mobile + 移动 + + +- ++ + Internet + 网络 + + +- ++ + Social + 社交 + + +- ++ + Video + 影音 + + +- ++ + Development + 开发 + + +- ++ + Image + 图像 + + +- ++ + Game + 游戏 + + +- ++ + Office + 办公 + + +- ++ + Education + 教育 + + +- ++ + System + 系统 + + +- ++ + Others + 其它 + +@@ -62,57 +62,57 @@ + + FunctionWidget + +- ++ + Mobile + 移动 + + +- ++ + Internet + 网络 + + +- ++ + Social + 社交 + + +- ++ + Video + 影音 + + +- ++ + Development + 开发 + + +- ++ + Image + 图像 + + +- ++ + Game + 游戏 + + +- ++ + Office + 办公 + + +- ++ + Education + 教育 + + +- ++ + System + 系统 + + +- ++ + Others + 其它 + +@@ -120,7 +120,7 @@ + + MainViewWidget + +- ++ + Search + 搜索 + +@@ -128,57 +128,57 @@ + + PushButton + +- ++ + Mobile + 移动 + + +- ++ + Internet + 网络 + + +- ++ + Social + 社交 + + +- ++ + Video + 影音 + + +- ++ + Development + 开发 + + +- ++ + Image + 图像 + + +- ++ + Game + 游戏 + + +- ++ + Office + 办公 + + +- ++ + Education + 教育 + + +- ++ + System + 系统 + + +- ++ + Others + 其它 + +@@ -186,74 +186,86 @@ + + RightClickMenu + +- ++ ++ infomation ++ 提示 ++ ++ ++ ++ Uninstall finished! ++ 卸载成功! ++ ++ ++ ++ error ++ 错误 ++ ++ ++ + Pin to all + 固定到“所有软件” + + +- ++ + Unpin from all + 从“所有软件”取消固定 + + +- +- ++ ++ + Pin to taskbar + 固定到任务栏 + + +- +- ++ ++ + Unpin from taskbar + 从任务栏取消固定 + + +- ++ + Add to desktop shortcuts + 添加到桌面快捷方式 + + +- ++ + Uninstall + 卸载 + + +- + Hibernate +- 休眠 ++ 休眠 + + +- ++ + Sleep + 睡眠 + + +- + Lock Screen +- 锁屏 ++ 锁屏 + + +- + Switch User +- 切换用户 ++ 切换用户 + + +- ++ + Log Out + 注销 + + +- ++ + Restart + 重启 + + +- ++ + Power Off + 关机 + + +- ++ + Personalize this list + 设置开始菜单显示列表 + +@@ -261,42 +273,42 @@ + + SideBarWidget + +- ++ + All + 所有软件 + + +- ++ + Letter + 字母排序 + + +- ++ + Function + 功能分类 + + +- ++ + Computer + 计算机 + + +- ++ + Personal + 个人 + + +- ++ + Settings + 设置 + + +- ++ + Recycle Bin + 回收站 + + +- ++ + Power + 电源 + diff --git a/ukui-menu.spec b/ukui-menu.spec index 21f2712..dba88fd 100644 --- a/ukui-menu.spec +++ b/ukui-menu.spec @@ -2,7 +2,7 @@ Name: ukui-menu Version: 3.0.2 -Release: 1 +Release: 2 Summary: Advanced ukui menu License: GPL-3.0 URL: http://www.ukui.org @@ -28,6 +28,8 @@ Requires: libXtst Requires: libX11 Requires: accountsservice +patch0: 0001-fix-uninstall-failed-issue.patch + #BuildArch: noarch %description @@ -38,6 +40,7 @@ Requires: accountsservice %prep %setup -q +%patch0 -p1 %build mkdir build && cd build @@ -59,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ukui-menu/translations/ %changelog +* Mon Oct 26 2020 douyan - 3.0.2-2 +- fix uninstalled failed issue + * Mon Oct 26 2020 douyan - 3.0.2-1 - update to upstream version 3.0.1-1+1026