release 3.1.2

3 files changed, 9 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1abc218e3b2c..134909141d3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Apr 16 15:33:54 UTC 2016
+# Sun May  8 21:25:38 UTC 2016
 pkgbase = plasma5-applet-awesome-widgets
 	pkgdesc = Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)
-	pkgver = 3.1.1
-	pkgrel = 3
+	pkgver = 3.1.2
+	pkgrel = 1
 	url = https://arcanis.me/projects/awesome-widgets
 	install = plasma5-applet-awesome-widgets.install
 	arch = i686
@@ -19,10 +19,8 @@ pkgbase = plasma5-applet-awesome-widgets
 	optdepends = mpd: for music player monitor
 	optdepends = nvidia-utils: for GPU monitor
 	backup = etc/xdg/plasma-dataengine-extsysmon.conf
-	source = https://github.com/arcan1s/awesome-widgets/releases/download/V.3.1.1/awesome-widgets-3.1.1-src.tar.xz
-	source = total-memory-fix.patch
-	md5sums = 1a4dc1d912b663dfd24d00712ab68f07
-	md5sums = f48d4e4f99fc03e5c04c7de231acb682
+	source = https://github.com/arcan1s/awesome-widgets/releases/download/V.3.1.2/awesome-widgets-3.1.2-src.tar.xz
+	md5sums = 99514bf6d1a5ca8660dd0210ee58af28
 
 pkgname = plasma5-applet-awesome-widgets
 
diff --git a/PKGBUILD b/PKGBUILD
index a92abdfc951b..fcd3b8048c58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=3.1.1
-pkgrel=3
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
 url="https://arcanis.me/projects/awesome-widgets"
@@ -15,20 +15,14 @@ optdepends=("catalyst: for GPU monitor"
             "mpd: for music player monitor"
             "nvidia-utils: 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
-        "total-memory-fix.patch")
+source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('1a4dc1d912b663dfd24d00712ab68f07'
-         'f48d4e4f99fc03e5c04c7de231acb682')
+md5sums=('99514bf6d1a5ca8660dd0210ee58af28')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 prepare() {
   rm -rf "${srcdir}/build"
   mkdir "${srcdir}/build"
-
-  # fix total memory calculations
-  cd "${_pkgname}"
-  patch -p2 -i "${srcdir}/total-memory-fix.patch"
 }
 
 build () {
diff --git a/total-memory-fix.patch b/total-memory-fix.patch
deleted file mode 100644
index 60f02f19a9d8..000000000000
--- a/total-memory-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp
-index 7a1887b..9f39e2f 100644
---- a/sources/awesome-widget/plugin/awkeysaggregator.cpp
-+++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp
-@@ -34,8 +34,8 @@ AWKeysAggregator::AWKeysAggregator(QObject *parent)
-     // default formaters
-     // memory
-     m_formater[QString("mem")] = Float;
--    m_formater[QString("memtotmb")] = IntegerFive;
--    m_formater[QString("memtotgb")] = Float;
-+    m_formater[QString("memtotmb")] = MemMBFormat;
-+    m_formater[QString("memtotgb")] = MemGBFormat;
-     // network
-     m_formater[QString("down")] = NetSmartFormat;
-     m_formater[QString("downkb")] = Integer;
-@@ -45,8 +45,8 @@ AWKeysAggregator::AWKeysAggregator(QObject *parent)
-     m_formater[QString("upunits")] = NetSmartUnits;
-     // swap
-     m_formater[QString("swap")] = Float;
--    m_formater[QString("swaptotmb")] = IntegerFive;
--    m_formater[QString("swaptotgb")] = Float;
-+    m_formater[QString("swaptotmb")] = MemMBFormat;
-+    m_formater[QString("swaptotgb")] = MemGBFormat;
- }
- 
- 
-@@ -338,8 +338,8 @@ QStringList AWKeysAggregator::registerSource(const QString &source,
-             m_map[source] = key;
-             m_formater[key] = Float;
-             // additional keys
--            m_formater[QString("hddtotmb%1").arg(index)] = IntegerFive;
--            m_formater[QString("hddtotgb%1").arg(index)] = Float;
-+            m_formater[QString("hddtotmb%1").arg(index)] = MemMBFormat;
-+            m_formater[QString("hddtotgb%1").arg(index)] = MemGBFormat;
-         }
-     } else if (source.contains(mountFreeRegExp)) {
-         // free space