Date: Sunday, March 22, 2020 @ 18:08:40 Author: felixonmars Revision: 603589
upgpkg: ukui-control-center 2.0.1-1 Added: ukui-control-center/trunk/fix-build.patch Modified: ukui-control-center/trunk/PKGBUILD -----------------+ PKGBUILD | 28 ++++++++++-------- fix-build.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-22 18:05:09 UTC (rev 603588) +++ PKGBUILD 2020-03-22 18:08:40 UTC (rev 603589) @@ -1,30 +1,34 @@ # Maintainer: Felix Yan <[email protected]> pkgname=ukui-control-center -pkgver=1.1.7.1 -pkgrel=3 +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=('gtk3' 'mate-desktop' 'peony' 'ukui-indicators' 'ukui-media' 'ukui-menus' 'ukui-power-manager' 'ukui-screensaver' 'ukui-settings-daemon' 'upower') -makedepends=('mate-common' 'yelp-tools') -source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-control-center/archive/v$pkgver.tar.gz";) -sha512sums=('324cb1472cd22f6348d418fa5e626991d90ca9d06ab07ab83972b6cba62ee3f34d23bfdc25fe553a79b06e5c5d9c0c06a4952b45346eb06d8ac3d3b00c14c27a') +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 $pkgname-$pkgver - NOCONFIGURE=1 ./autogen.sh + cd ukui-control-center-$pkgver + # https://github.com/ukui/ukui-control-center/issues/36 + patch -p1 -i ../fix-build.patch } build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sysconfdir=/etc --sbindir=/usr/bin + cd ukui-control-center-$pkgver + qmake-qt5 PREFIX=/usr make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd ukui-control-center-$pkgver + make INSTALL_ROOT="$pkgdir" install } Added: fix-build.patch =================================================================== --- fix-build.patch (rev 0) +++ fix-build.patch 2020-03-22 18:08:40 UTC (rev 603589) @@ -0,0 +1,84 @@ +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;
