[arch-commits] Commit in ukui-control-center/trunk (PKGBUILD fix-build.patch)

[Felix Yan]

    Date: Monday, July 13, 2020 @ 16:53:18
  Author: felixonmars
Revision: 663445

upgpkg: ukui-control-center 2.0.5-1

Modified:
  ukui-control-center/trunk/PKGBUILD
Deleted:
  ukui-control-center/trunk/fix-build.patch

-----------------+
 PKGBUILD        |   12 +++------
 fix-build.patch |   72 ------------------------------------------------------
 2 files changed, 5 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-13 16:51:56 UTC (rev 663444)
+++ PKGBUILD	2020-07-13 16:53:18 UTC (rev 663445)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=ukui-control-center
-pkgver=2.0.4
+pkgver=2.0.5
 pkgrel=1
 pkgdesc="Utilities to configure the UKUI desktop"
 arch=('x86_64')
@@ -11,15 +11,13 @@
 depends=('kconfig' 'kconfigwidgets' 'ki18n' 'kscreen' 'kwidgetsaddons' 'peony' 'ukui-interface'
          'ukui-panel' 'ukui-media' 'ukui-menus' 'ukui-power-manager' 'ukui-screensaver'
          'ukui-settings-daemon' 'upower')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-control-center/archive/v$pkgver.tar.gz"
-        fix-build.patch)
-sha512sums=('7b0c0c7525aec2b6965579bd97fd01002177cbe3e1fee0907feb01888bf649d373de10ee47d5fe4dbdeb7f5608f1ec3de6b6cf8ab17e0d21df526930fc9f3ca5'
-            '333ee4084e2c658392ef8d3a09132e59c5419030c10024ef9ea70784e1ace25668464d12089b9986e3bbeea1106ec21380a5881c0d4df40553a512bfb634b3c8')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-control-center/archive/v$pkgver.tar.gz")
+sha512sums=('d1e5e85b35f5ca3f0c315adda3a8ac98e1426a0d72da0057958d04aae22bafd5d33a7be8c44964c264817f319bd65375b5c23122f402911006cec119c09cc50d')
 
 prepare() {
   cd ukui-control-center-$pkgver
-  # https://github.com/ukui/ukui-control-center/issues/36
-  patch -p1 -i ../fix-build.patch
+  # QSysInfo::productVersion() returns "unknown" on Arch
+  #TODO: sed -i 's/productVersion/prettyProductName/' plugins/messages-task/about/about.cpp
 }
 
 build() {

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2020-07-13 16:51:56 UTC (rev 663444)
+++ fix-build.patch	2020-07-13 16:53:18 UTC (rev 663445)
@@ -1,72 +0,0 @@
-diff --git a/plugins/devices/shortcut/shortcut.cpp b/plugins/devices/shortcut/shortcut.cpp
-index 0aa8609..80bf602 100644
---- a/plugins/devices/shortcut/shortcut.cpp
-+++ b/plugins/devices/shortcut/shortcut.cpp
-@@ -191,7 +191,7 @@ void Shortcut::appendGeneralItems(){
-     for (KeyEntry * gkeyEntry: generalEntries){
-         if (showList.contains(gkeyEntry->keyStr)){
-             DefineShortcutItem * singleWidget = new DefineShortcutItem(gkeyEntry->keyStr, gkeyEntry->valueStr);
--            singleWidget->setUserData(Qt::UserRole, gkeyEntry);
-+            //singleWidget->setUserData(Qt::UserRole, gkeyEntry);
-
-             CustomLineEdit * line = singleWidget->lineeditComponent();
-             connect(line, &CustomLineEdit::shortcutCodeSignals, this, [=](QList<int> keyCode){
-@@ -216,7 +216,7 @@ void Shortcut::buildCustomItem(KeyEntry * nkeyEntry){
-     DefineShortcutItem * singleWidget = new DefineShortcutItem(nkeyEntry->nameStr, nkeyEntry->bindingStr);
-     singleWidget->setDeleteable(true);
-     singleWidget->setUpdateable(true);
--    singleWidget->setUserData(Qt::UserRole, nkeyEntry);
-+    //singleWidget->setUserData(Qt::UserRole, nkeyEntry);
-     connect(singleWidget, &DefineShortcutItem::updateShortcutSignal, [=]{
-         addDialog->setTitleText(QObject::tr("Update Shortcut"));
-         addDialog->setUpdateEnv(nkeyEntry->gsPath, nkeyEntry->nameStr, nkeyEntry->actionStr);
-@@ -337,7 +337,7 @@ void Shortcut::createNewShortcut(QString path, QString name, QString exec){
-                 DefineShortcutItem * widgetItem = dynamic_cast<DefineShortcutItem *>(ui->customListWidget->itemWidget(item));
-                 widgetItem->setShortcutName(name);
-                 KeyEntry * uKeyentry = customEntries.at(i);
--                widgetItem->setUserData(Qt::UserRole, uKeyentry);
-+                //widgetItem->setUserData(Qt::UserRole, uKeyentry);
-             }
-         }
-     }
-diff --git a/plugins/devices/shortcut/shortcut.h b/plugins/devices/shortcut/shortcut.h
-index f3d72fa..178266a 100644
---- a/plugins/devices/shortcut/shortcut.h
-+++ b/plugins/devices/shortcut/shortcut.h
-@@ -38,7 +38,7 @@ QT_END_NAMESPACE
-
- typedef struct _KeyEntry KeyEntry;
-
--struct _KeyEntry : QObjectUserData{
-+struct _KeyEntry{
- //    int keyval;
-     QString gsSchema;
-     QString keyStr;
-diff --git a/shell/utils/functionselect.h b/shell/utils/functionselect.h
-index 54efe44..3c2df92 100644
---- a/shell/utils/functionselect.h
-+++ b/shell/utils/functionselect.h
-@@ -20,12 +20,13 @@
- #ifndef FUNCTIONSELECT_H
- #define FUNCTIONSELECT_H
-
-+#include <QObject>
- #include <QList>
- #include <QStack>
- //#include <QStringList>
-
-
--typedef struct _FuncInfo : QObjectUserData
-+typedef struct _FuncInfo
- {
-     int type;
-     int index;
-@@ -34,7 +35,7 @@ typedef struct _FuncInfo : QObjectUserData
-     QString namei18nString;
- }FuncInfo;
-
--typedef struct _RecordFunc : QObjectUserData
-+typedef struct _RecordFunc
- {
-     int type;
-     QString namei18nString;