[arch-commits] Commit in ukui-control-center/repos/community-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Mon Mar 23 10:58:09 UTC 2020
Date: Monday, March 23, 2020 @ 10:58:09
Author: felixonmars
Revision: 603706
archrelease: copy trunk to community-x86_64
Added:
ukui-control-center/repos/community-x86_64/PKGBUILD
(from rev 603705, ukui-control-center/trunk/PKGBUILD)
ukui-control-center/repos/community-x86_64/fix-build.patch
(from rev 603705, ukui-control-center/trunk/fix-build.patch)
Deleted:
ukui-control-center/repos/community-x86_64/PKGBUILD
ukui-control-center/repos/community-x86_64/fix-build.patch
-----------------+
PKGBUILD | 68 +++++++++++------------
fix-build.patch | 156 ++++++++++++++++++++++++------------------------------
2 files changed, 106 insertions(+), 118 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-23 10:57:48 UTC (rev 603705)
+++ PKGBUILD 2020-03-23 10:58:09 UTC (rev 603706)
@@ -1,34 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=ukui-control-center
-pkgver=2.0.1
-pkgrel=1
-pkgdesc="Utilities to configure the UKUI desktop"
-arch=('x86_64')
-license=('GPL')
-url="https://github.com/ukui/ukui-control-center"
-groups=('ukui')
-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=('c2633eff9a7f8b916c1cb9adbac71a1a7280950fc283b6c441c4245cde1233ae9f565af24e7304650ba220b5bdb142d2516e4ec1aa57199433fef05e43841153'
- '582ecdd847c28c4c82cbf0caea0553d7cfc92d2cf9dfe2df0d4e3e721ac4291da2486332a3a4ee4f14f306c2a0f2353c78cb3e8fdcbc405164c880c68d7ed09d')
-
-prepare() {
- cd ukui-control-center-$pkgver
- # https://github.com/ukui/ukui-control-center/issues/36
- patch -p1 -i ../fix-build.patch
-}
-
-build() {
- cd ukui-control-center-$pkgver
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd ukui-control-center-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: ukui-control-center/repos/community-x86_64/PKGBUILD (from rev 603705, ukui-control-center/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-23 10:58:09 UTC (rev 603706)
@@ -0,0 +1,34 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=ukui-control-center
+pkgver=2.0.1.1
+pkgrel=1
+pkgdesc="Utilities to configure the UKUI desktop"
+arch=('x86_64')
+license=('GPL')
+url="https://github.com/ukui/ukui-control-center"
+groups=('ukui')
+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=('7ef2437459ef774c757d3fcb98700770bf13845b8868aef3748b80c8ea908b205cc56ac80e49fefcec470113d5f48ef3f5bdbbf70769d3cce43f32b95a1b6c01'
+ '333ee4084e2c658392ef8d3a09132e59c5419030c10024ef9ea70784e1ace25668464d12089b9986e3bbeea1106ec21380a5881c0d4df40553a512bfb634b3c8')
+
+prepare() {
+ cd ukui-control-center-$pkgver
+ # https://github.com/ukui/ukui-control-center/issues/36
+ patch -p1 -i ../fix-build.patch
+}
+
+build() {
+ cd ukui-control-center-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd ukui-control-center-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: fix-build.patch
===================================================================
--- fix-build.patch 2020-03-23 10:57:48 UTC (rev 603705)
+++ fix-build.patch 2020-03-23 10:58:09 UTC (rev 603706)
@@ -1,84 +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/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
-+++ 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;
Copied: ukui-control-center/repos/community-x86_64/fix-build.patch (from rev 603705, ukui-control-center/trunk/fix-build.patch)
===================================================================
--- fix-build.patch (rev 0)
+++ fix-build.patch 2020-03-23 10:58:09 UTC (rev 603706)
@@ -0,0 +1,72 @@
+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;
More information about the arch-commits
mailing list