Update upstream source from tag 'upstream/2.0.7pre'

Update to upstream version '2.0.7pre'
with Debian dir a2ec7db1aec5f19fb8cfbe1c84a27b4779b604d0

1 files changed, 13 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ef1f78c..63613829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.0)
 cmake_policy(VERSION 3.0.0)
 project(hardinfo2)
 
-set(HARDINFO2_VERSION "2.0.5")
+set(HARDINFO2_VERSION "2.0.7")
 
 option(HARDINFO2_GTK3 "Build for GTK3 (0/off for GTK2)" 1)
 option(HARDINFO2_LIBSOUP3 "Build for libsoup-3.0(EXPERIMENTAL) (0/off for libsoup-2.4)" 0)
@@ -84,9 +84,7 @@ add_definitions("-Wformat")
 add_definitions("-Wformat-security")
 
 set(PACKAGE_LIBSOUP2_MINVERSION 2.42)
-#Actually needed for save settings, steal_pointer - FIXME
-set(PACKAGE_LIBGLIB2_MINVERSION 2.44)
-#set(PACKAGE_LIBGLIB2_MINVERSION 2.28)
+set(PACKAGE_LIBGLIB2_MINVERSION 2.24)
 
 ###################################DISTRO CHANGES###############################
 #Please add all distro relates stuff here
@@ -148,17 +146,19 @@ if(${distro}${disversion} MATCHES "Oracle6*")
     set(HARDINFO2_GTK3 0)
     #old deprecated version - but ok
     set(PACKAGE_LIBSOUP2_MINVERSION 2.34.3)
-    #save settings disabled, steal_pointer disabled
-    set(PACKAGE_LIBGLIB2_MINVERSION 2.28.8)
-    message("-- Low GLIB2 version 2.28.0")
+endif()
+
+#debian 7
+if(${distro}${disversion} MATCHES "DebianGNULinux7")
+    set(HARDINFO2_LIBSOUP3 0)
+    set(HARDINFO2_GTK3 0)
+    #old deprecated version - but ok
+    set(PACKAGE_LIBSOUP2_MINVERSION 2.34.3)
 endif()
 
 #debian 8
 if(${distro}${disversion} MATCHES "DebianGNULinux8")
     set(HARDINFO2_LIBSOUP3 0)
-    #save settings disabled, steal_pointer disabled
-    set(PACKAGE_LIBGLIB2_MINVERSION 2.42.1)
-    message("-- Low GLIB2 version 2.42.1")
 endif()
 
 #ubuntu 20.04
@@ -304,6 +304,7 @@ set(MODULE_benchmark_SOURCES_GTKANY
 	modules/benchmark/sha1.c
 	modules/benchmark/zlib.c
 	modules/benchmark/sysbench.c
+	modules/benchmark/iperf3.c
 )
 set(MODULE_benchmark_SOURCES_GTK2
 	modules/benchmark/drawing.c
@@ -520,7 +521,7 @@ endif()
 #RPM
 SET(CPACK_RPM_PACKAGE_MAINTAINER "hwspeedy <hardinfo2@bigbear.dk>")
 SET(CPACK_RPM_PACKAGE_DESCRIPTION "Hardinfo2 is a small application that displays information about your hardware and operating system.  It has online benchmarking to check your machine performance against other machines.")
-SET(CPACK_RPM_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils")
+SET(CPACK_RPM_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils, iperf3")
 SET(CPACK_RPM_PACKAGE_LICENSE "GPL2+")
 SET(CPACK_RPM_PACKAGE_HOMEPAGE "https://github.com/hardinfo2/hardinfo2")
 if(HARDINFO2_LIBSOUP3)
@@ -538,7 +539,7 @@ SET(CPACK_RPM_PACKAGE_DEPENDS "libjson-glib-1.0-0, zlib, ${PACKAGE_LS}, ${PACKAG
 #DEB
 SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "hwspeedy <hardinfo2@bigbear.dk>")
 SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Hardinfo2 is a small application that displays information about your hardware and operating system. It has online benchmarking to check your machine performance against other machines.")
-SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils")
+SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "sysbench, udisks2, mesa-utils, lsscsi, lm-sensors, xdg-utils, iperf3")
 SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/hardinfo2/hardinfo2")
 if(HARDINFO2_LIBSOUP3)
     SET(PACKAGE_LS "libsoup-3.0.0 (>=3.0)")