Initial release

3 files changed, 80 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b3c3d246233..c26d21e6bf8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,29 @@
 pkgbase = xfce4-multiload-ng-plugin
-	pkgdesc = A modern graphical system monitor, Xfce version
-	pkgver = 1.4.2
+	pkgdesc = Modern graphical system monitor, XFCE4 panel plugin
+	pkgver = 1.5.2
 	pkgrel = 1
 	url = https://udda.github.io/multiload-ng/
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = intltool
-	depends = xfce4-panel
-	depends = libxfce4util
-	depends = libxfce4ui
-	depends = gtk2
+	depends = gtk3
 	depends = cairo
-	depends = libgtop
-	source = https://github.com/udda/multiload-ng/archive/v1.4.2.tar.gz
-	md5sums = 3c17d8483bc874b20c877a7d7897ab5e
+	depends = libxfce4util>=4.16.0
+	depends = xfce4-panel>=4.16.0
+	depends = multiload-ng-common
+	conflicts = xfce4-multiload-ng-plugin-gtk2
+	conflicts = xfce4-multiload-ng-plugin-gtk2-git
+	conflicts = xfce4-multiload-ng-plugin-gtk3
+	conflicts = xfce4-multiload-ng-plugin-gtk3-git
+	replaces = xfce4-multiload-ng-plugin-gtk2
+	replaces = xfce4-multiload-ng-plugin-gtk2-git
+	replaces = xfce4-multiload-ng-plugin-gtk3
+	replaces = xfce4-multiload-ng-plugin-gtk3-git
+	source = https://github.com/udda/multiload-ng/archive/v1.5.2.tar.gz
+	source = build-fix.patch
+	md5sums = bdb9344d696324bd4db04a8bce6d7ec0
+	md5sums = 898eb6c7df5df2ef641cd83836627559
 
 pkgname = xfce4-multiload-ng-plugin
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d827ddeaf57..518ca0a45582 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,37 @@
-# Maintainer: PhotonX <photon89 [at] gmail.com>.
-# Contributor: craigacgomez
+# Maintainer: Michael Kogan <michael.kogan at gmx dot net>
+# Co-maintainer: Mario Cianciolo <mr.udda at gmail dot com>
 
-pkgname=xfce4-multiload-ng-plugin
-_pkgname=multiload-ng
-pkgver=1.4.2
+# This file is automatically generated from multiload-ng source.
+
+pkgname='xfce4-multiload-ng-plugin'
+pkgdesc='Modern graphical system monitor, XFCE4 panel plugin'
+pkgver=1.5.2
 pkgrel=1
-pkgdesc='A modern graphical system monitor, Xfce version'
+
+makedepends=('intltool')
+depends=('gtk3' 'cairo' 'libxfce4util>=4.16.0' 'xfce4-panel>=4.16.0' 'multiload-ng-common')
+
+conflicts=('xfce4-multiload-ng-plugin-gtk2' 'xfce4-multiload-ng-plugin-gtk2-git' 'xfce4-multiload-ng-plugin-gtk3' 'xfce4-multiload-ng-plugin-gtk3-git')
+replaces=('xfce4-multiload-ng-plugin-gtk2' 'xfce4-multiload-ng-plugin-gtk2-git' 'xfce4-multiload-ng-plugin-gtk3' 'xfce4-multiload-ng-plugin-gtk3-git')
+
+source=("https://github.com/udda/multiload-ng/archive/v$pkgver.tar.gz" "build-fix.patch")
+md5sums=('bdb9344d696324bd4db04a8bce6d7ec0'
+         '898eb6c7df5df2ef641cd83836627559')
+
 arch=('i686' 'x86_64')
 url='https://udda.github.io/multiload-ng/'
 license=('GPL2')
-depends=('xfce4-panel' 'libxfce4util' 'libxfce4ui' 'gtk2' 'cairo' 'libgtop')
-makedepends=('intltool')
-source=("https://github.com/udda/multiload-ng/archive/v$pkgver.tar.gz")
-md5sums=('3c17d8483bc874b20c877a7d7897ab5e')
 
 build() {
-	cd "$_pkgname-$pkgver"
-	 ./autogen.sh
-	 ./configure --prefix=/usr --with-gtk=2.0
-	 make
+    cd "multiload-ng-$pkgver"
+    patch -p1 -i $srcdir/build-fix.patch
+    ./autogen.sh
+    ./configure --prefix=/usr --with-gtk=3.0 --disable-deprecations --without-awn --without-indicator --without-lxpanel --without-mate --without-standalone --without-systray --with-xfce4
+    make
 } 
 
 package() {
-	cd "$_pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
\ No newline at end of file
+    cd "multiload-ng-$pkgver"
+    make DESTDIR="$pkgdir" install
+    rm -r "$pkgdir/usr/share/locale"
+}
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 000000000000..503ae6702228
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,35 @@
+diff -Naur a/common/multiload-config.c b/common/multiload-config.c
+--- a/common/multiload-config.c	2016-12-05 17:13:59.000000000 +0100
++++ b/common/multiload-config.c	2020-07-30 21:18:03.568945194 +0200
+@@ -26,6 +26,8 @@
+ #include "graph-data.h"
+ #include "multiload-config.h"
+ 
++GraphType graph_types[GRAPH_MAX];
++
+ guint multiload_config_get_num_colors(guint id)
+ {
+ 	g_assert_cmpuint (graph_types[id].num_colors, <=, MAX_COLORS);
+diff -Naur a/common/multiload-config.h b/common/multiload-config.h
+--- a/common/multiload-config.h	2016-12-05 17:13:59.000000000 +0100
++++ b/common/multiload-config.h	2020-07-30 21:18:21.685273529 +0200
+@@ -56,7 +56,7 @@
+ 
+ 
+ // global variable
+-GraphType graph_types[GRAPH_MAX];
++extern GraphType graph_types[GRAPH_MAX];
+ 
+ 
+ G_GNUC_INTERNAL guint
+diff -Naur a/xfce4/plugin.c b/xfce4/plugin.c
+--- a/xfce4/plugin.c    2016-12-05 18:13:59.000000000 +0200
++++ b/xfce4/plugin.c    2020-12-24 22:50:53.839435971 +0200
+@@ -25,6 +25,7 @@
+
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/xfce-panel-macros.h>
+
+ #include "common/multiload.h"
+ #include "common/ui.h"
\ No newline at end of file