summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Figueiredo2020-06-02 11:34:30 +0100
committerJoão Figueiredo2020-06-02 11:34:30 +0100
commitffbf713aefe5b6f40898ae0fd37b1c5281153ad9 (patch)
tree4dbfb49ed6ad02dbf7c3e43469257413757c3872
parent069987d92e2f89fcbcb4b4ec267438b06431170e (diff)
downloadaur-ffbf713aefe5b6f40898ae0fd37b1c5281153ad9.tar.gz
Fixed compiling. Thanks @Xwang!
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--knemo-gcc6.patch23
3 files changed, 22 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 898f9f2f4846..15f3f748ca57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = knemo
pkgdesc = The KDE Network Monitor
pkgver = 0.7.7.git20151003
- pkgrel = 5
+ pkgrel = 6
url = https://www.linux-apps.com/content/show.php?content=12956
arch = x86_64
license = GPL
@@ -23,7 +23,7 @@ pkgbase = knemo
source = git://git.kde.org/knemo.git#commit=f3afe2e4b6f091f21a64905965abafd2ef46826d
source = knemo-gcc6.patch
sha256sums = SKIP
- sha256sums = 5da88c3c60bf7ab924c85ee2c1159a12d4c376ad726eab784972abc36295a4fc
+ sha256sums = 840fe4f68ff6b9e801d98482a0b76f42764332d81071589ac3bc5632bfc49d92
pkgname = knemo
diff --git a/PKGBUILD b/PKGBUILD
index 9d71c433e385..8e9cc13b7f94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=knemo
pkgver=0.7.7.git20151003
-pkgrel=5
+pkgrel=6
pkgdesc="The KDE Network Monitor"
arch=('x86_64')
url="https://www.linux-apps.com/content/show.php?content=12956"
@@ -18,7 +18,7 @@ options=('libtool')
_commit=f3afe2e4b6f091f21a64905965abafd2ef46826d # frameworks
source=("git://git.kde.org/knemo.git#commit=$_commit" knemo-gcc6.patch)
sha256sums=('SKIP'
- '5da88c3c60bf7ab924c85ee2c1159a12d4c376ad726eab784972abc36295a4fc')
+ '840fe4f68ff6b9e801d98482a0b76f42764332d81071589ac3bc5632bfc49d92')
prepare() {
mkdir build
@@ -36,7 +36,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_TESTING=OFF
- make
+ make -j$(($(nproc) + 1))
}
package() {
diff --git a/knemo-gcc6.patch b/knemo-gcc6.patch
index f47428a2ad74..cb07b2ac0f05 100644
--- a/knemo-gcc6.patch
+++ b/knemo-gcc6.patch
@@ -1,20 +1,31 @@
---- knemo.orig/src/common/utils.cpp 2016-05-07 14:30:45.888889978 +0000
-+++ knemo/src/common/utils.cpp 2016-05-07 14:32:06.985290816 +0000
+--- knemo.orig/src/common/utils.cpp 2016-05-07 14:30:45.888889978 +0000
++++ knemo/src/common/utils.cpp 2016-05-07 14:32:06.985290816 +0000
@@ -41,6 +41,7 @@
#include <KSharedConfig>
#include <Plasma/Theme>
#include "data.h"
+#include "math.h"
#include "utils.h"
-
+
#ifdef __linux__
---- knemo.orig/src/knemod/trayicon.cpp 2015-10-03 17:22:07.000000000 +0000
-+++ knemo/src/knemo/src/knemod/trayicon.cpp 2016-05-07 14:42:30.796566437 +0000
+--- knemo.orig/src/knemod/trayicon.cpp 2015-10-03 17:22:07.000000000 +0000
++++ knemo/src/knemo/src/knemod/trayicon.cpp 2016-05-07 14:42:30.796566437 +0000
@@ -22,6 +22,7 @@
#include "global.h"
#include "interface.h"
#include "knemodaemon.h"
+#include "math.h"
#include "utils.h"
-
+
#ifdef __linux__
+--- knemo.orig/src/knemod/trayicon.h 2020-05-30 12:12:20.000000000 +0200
++++ knemo/src/knemod/trayicon.h 2020-05-30 11:57:03.000000000 +0200
+@@ -24,6 +24,8 @@
+
+ #include <KStatusNotifierItem>
+
++#include <QMap>
++
+ class Interface;
+
+ class TrayIcon : public KStatusNotifierItem