Date: Monday, March 30, 2020 @ 15:04:53 Author: felixonmars Revision: 607005
archrelease: copy trunk to community-x86_64 Added: ukui-control-center/repos/community-x86_64/PKGBUILD (from rev 607004, ukui-control-center/trunk/PKGBUILD) ukui-control-center/repos/community-x86_64/fix-build.patch (from rev 607004, 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 | 74 +++++++++++++-------------- fix-build.patch | 144 +++++++++++++++++++++++++++--------------------------- 2 files changed, 109 insertions(+), 109 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-30 15:04:34 UTC (rev 607004) +++ PKGBUILD 2020-03-30 15:04:53 UTC (rev 607005) @@ -1,37 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=ukui-control-center -pkgver=2.0.1.1 -pkgrel=2 -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 - - install -Dm644 registeredQDbus/conf/com.control.center.qt.systemdbus.service -t "$pkgdir"/usr/share/dbus-1/system-services/ - install -Dm644 registeredQDbus/conf/com.control.center.qt.systemdbus.conf -t "$pkgdir"/usr/share/dbus-1/system.d/ -} Copied: ukui-control-center/repos/community-x86_64/PKGBUILD (from rev 607004, ukui-control-center/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-30 15:04:53 UTC (rev 607005) @@ -0,0 +1,37 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=ukui-control-center +pkgver=2.0.2 +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=('223f952a7cfdafaf1105b078af542c1774198500c645b7bc7611069ee16e75b08e3be377a88fdb3e0fff440348f63d3269c85fc0c0ad19fc99de9e0c5b56b3e5' + '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 + + install -Dm644 registeredQDbus/conf/com.control.center.qt.systemdbus.service -t "$pkgdir"/usr/share/dbus-1/system-services/ + install -Dm644 registeredQDbus/conf/com.control.center.qt.systemdbus.conf -t "$pkgdir"/usr/share/dbus-1/system.d/ +} Deleted: fix-build.patch =================================================================== --- fix-build.patch 2020-03-30 15:04:34 UTC (rev 607004) +++ fix-build.patch 2020-03-30 15:04:53 UTC (rev 607005) @@ -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; Copied: ukui-control-center/repos/community-x86_64/fix-build.patch (from rev 607004, ukui-control-center/trunk/fix-build.patch) =================================================================== --- fix-build.patch (rev 0) +++ fix-build.patch 2020-03-30 15:04:53 UTC (rev 607005) @@ -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;