Skip to content

Commit

Permalink
Release 3.4.3
Browse files Browse the repository at this point in the history
compilation fixes for old ubuntu and provide patch for old qt versions
  • Loading branch information
arcan1s committed Jan 8, 2021
1 parent 8836592 commit de9d90d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions packages/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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() {
Expand Down
26 changes: 13 additions & 13 deletions patches/qt5.14-splitbehavior-and-qset.patch
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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<QString>(output.cbegin(), output.cend()).count(), output.count());
+ QCOMPARE(QSet<QString>::fromList(output).count(), output.count());
QVERIFY(output.contains(telemetryData));
}

2 changes: 1 addition & 1 deletion sources/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 1 addition & 1 deletion sources/awesome-widget/package/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion sources/desktop-panel/package/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down

0 comments on commit de9d90d

Please sign in to comment.