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

[Felix Yan]

    Date: Monday, March 23, 2020 @ 10:57:48
  Author: felixonmars
Revision: 603705

upgpkg: ukui-control-center 2.0.1.1-1

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

-----------------+
 PKGBUILD        |    6 +++---
 fix-build.patch |   26 +++++++-------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-23 10:57:25 UTC (rev 603704)
+++ PKGBUILD	2020-03-23 10:57:48 UTC (rev 603705)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=ukui-control-center
-pkgver=2.0.1
+pkgver=2.0.1.1
 pkgrel=1
 pkgdesc="Utilities to configure the UKUI desktop"
 arch=('x86_64')
@@ -13,8 +13,8 @@
          '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=('c2633eff9a7f8b916c1cb9adbac71a1a7280950fc283b6c441c4245cde1233ae9f565af24e7304650ba220b5bdb142d2516e4ec1aa57199433fef05e43841153'
-            '582ecdd847c28c4c82cbf0caea0553d7cfc92d2cf9dfe2df0d4e3e721ac4291da2486332a3a4ee4f14f306c2a0f2353c78cb3e8fdcbc405164c880c68d7ed09d')
+sha512sums=('7ef2437459ef774c757d3fcb98700770bf13845b8868aef3748b80c8ea908b205cc56ac80e49fefcec470113d5f48ef3f5bdbbf70769d3cce43f32b95a1b6c01'
+            '333ee4084e2c658392ef8d3a09132e59c5419030c10024ef9ea70784e1ace25668464d12089b9986e3bbeea1106ec21380a5881c0d4df40553a512bfb634b3c8')
 
 prepare() {
   cd ukui-control-center-$pkgver

Modified: fix-build.patch
===================================================================
--- fix-build.patch	2020-03-23 10:57:25 UTC (rev 603704)
+++ fix-build.patch	2020-03-23 10:57:48 UTC (rev 603705)
@@ -8,7 +8,7 @@
              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){
@@ -34,26 +34,14 @@
 --- 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/plugins/time-language/datetime/worldMap/zoneinfo.h b/plugins/time-language/datetime/worldMap/zoneinfo.h
-index 0f1b720..98637c9 100644
---- a/plugins/time-language/datetime/worldMap/zoneinfo.h
-+++ b/plugins/time-language/datetime/worldMap/zoneinfo.h
-@@ -1,6 +1,7 @@
- #ifndef ZONEINFO_H
- #define ZONEINFO_H
- 
-+#include <QFile>
- #include <QString>
- #include <QList>
- 
 diff --git a/shell/utils/functionselect.h b/shell/utils/functionselect.h
 index 54efe44..3c2df92 100644
 --- a/shell/utils/functionselect.h
@@ -61,13 +49,13 @@
 @@ -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
  {
@@ -76,7 +64,7 @@
 @@ -34,7 +35,7 @@ typedef struct _FuncInfo : QObjectUserData
      QString namei18nString;
  }FuncInfo;
- 
+
 -typedef struct _RecordFunc : QObjectUserData
 +typedef struct _RecordFunc
  {