From de9d90df4a1a9fabebf839951e5e820ea3ed6d91 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Fri, 8 Jan 2021 15:48:20 +0300 Subject: [PATCH] Release 3.4.3 compilation fixes for old ubuntu and provide patch for old qt versions --- packages/PKGBUILD | 4 +-- patches/qt5.14-splitbehavior-and-qset.patch | 26 +++++++++---------- sources/CMakeLists.txt | 2 +- .../awesome-widget/package/metadata.desktop | 2 +- .../desktop-panel/package/metadata.desktop | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/PKGBUILD b/packages/PKGBUILD index 26e7ec5..75df22e 100644 --- a/packages/PKGBUILD +++ b/packages/PKGBUILD @@ -2,7 +2,7 @@ pkgname=plasma5-applet-awesome-widgets _pkgname=awesome-widgets -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=1 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=("catalyst: for GPU monitor" makedepends=('cmake' 'extra-cmake-modules' 'python') source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('df3ad1c626fdc1893f0f6e0b0fe636c2') +md5sums=('5953ba518191bb6fff83cdb8633c735c') backup=('etc/xdg/plasma-dataengine-extsysmon.conf') prepare() { diff --git a/patches/qt5.14-splitbehavior-and-qset.patch b/patches/qt5.14-splitbehavior-and-qset.patch index c210303..de2d300 100644 --- a/patches/qt5.14-splitbehavior-and-qset.patch +++ b/patches/qt5.14-splitbehavior-and-qset.patch @@ -1,16 +1,3 @@ -diff --git a/.docker/build-ubuntu.sh b/.docker/build-ubuntu.sh -index 9b5e97a..b953425 100755 ---- a/.docker/build-ubuntu.sh -+++ b/.docker/build-ubuntu.sh -@@ -6,7 +6,7 @@ rm -rf build-ubuntu - mkdir build-ubuntu - - # patches --git apply patches/qt5.14-splitbehavior-and-qset.patch -+#git apply patches/qt5.14-splitbehavior-and-qset.patch - - # build - cd build-ubuntu diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp index 7135db6..a2870ec 100644 --- a/sources/awdebug.cpp @@ -253,3 +240,16 @@ index aaca22f..e127a05 100644 // there are one more time... if ((metadata == "time") && (data.contains(':'))) { QStringList times = data.split(':'); +diff --git a/sources/test/testawtelemetryhandler.cpp b/sources/test/testawtelemetryhandler.cpp +index ffb0e79..b4181e0 100644 +--- a/sources/test/testawtelemetryhandler.cpp ++++ b/sources/test/testawtelemetryhandler.cpp +@@ -51,7 +51,7 @@ void TestAWTelemetryHandler::test_get() + QStringList output = plugin->get(telemetryGroup); + + QVERIFY(!output.isEmpty()); +- QCOMPARE(QSet(output.cbegin(), output.cend()).count(), output.count()); ++ QCOMPARE(QSet::fromList(output).count(), output.count()); + QVERIFY(output.contains(telemetryData)); + } + diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 771e8a9..663ab5e 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -16,7 +16,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com") set(PROJECT_LICENSE "GPL3") set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MINOR "4") -set(PROJECT_VERSION_PATCH "2") +set(PROJECT_VERSION_PATCH "3") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") # append git version if any set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "") diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop index 4d9ea66..461fcb4 100644 --- a/sources/awesome-widget/package/metadata.desktop +++ b/sources/awesome-widget/package/metadata.desktop @@ -19,7 +19,7 @@ X-Plasma-MainScript=ui/main.qml X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget -X-KDE-PluginInfo-Version=3.4.2 +X-KDE-PluginInfo-Version=3.4.3 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends= diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop index 241c30c..6ffb9c4 100644 --- a/sources/desktop-panel/package/metadata.desktop +++ b/sources/desktop-panel/package/metadata.desktop @@ -19,7 +19,7 @@ X-Plasma-MainScript=ui/main.qml X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel -X-KDE-PluginInfo-Version=3.4.2 +X-KDE-PluginInfo-Version=3.4.3 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=