summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpyros Stathopoulos2018-12-16 20:59:34 +0000
committerSpyros Stathopoulos2018-12-16 20:59:34 +0000
commit122a0964649515b58c26adc320c798d67e0aa144 (patch)
tree1818ea2f4ad688534b925e9959afa705a27de7cf
parentabd67a43ff4104ec637b338a134ff7e6e2634011 (diff)
downloadaur-122a0964649515b58c26adc320c798d67e0aa144.tar.gz
Update to 1.11.1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--nvidia.patch16
3 files changed, 6 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da3ab9cc44f1..c5d6210202c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = conky-lua-nv
pkgdesc = An advanced system monitor for X based on torsmo with lua and nvidia enabled
- pkgver = 1.11.0
+ pkgver = 1.11.1
pkgrel = 1
url = https://github.com/brndnmtthws/conky
install = conky-lua-nv.install
@@ -37,10 +37,8 @@ pkgbase = conky-lua-nv
replaces = conky
options = !strip
options = debug
- source = https://github.com/brndnmtthws/conky/archive/v1.11.0.tar.gz
- source = nvidia.patch
- sha1sums = 6c23fff734714cc5ca8907bba0e482e0d21eba02
- sha1sums = 446f20dfa900ec42ee842932dcf4c3d6dc2111dc
+ source = https://github.com/brndnmtthws/conky/archive/v1.11.1.tar.gz
+ sha1sums = 77284c5276271a51e2de649263b26d2e9eb9db97
pkgname = conky-lua-nv
diff --git a/PKGBUILD b/PKGBUILD
index 07d932138d09..f9f84ea0c58b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=conky-lua-nv
_pkgname=conky
-pkgver=1.11.0
+pkgver=1.11.1
pkgrel=1
pkgdesc="An advanced system monitor for X based on torsmo with lua and nvidia enabled"
arch=('i686' 'x86_64')
@@ -24,16 +24,13 @@ makedepends=('docbook2x' 'perl-xml-libxml' 'docbook-xml'
optdepends=('nvidia: for GT4xx and newer GPUs',
'nvidia-340xx: for G8x, G9x, GT2xx GPUS',
'nvidia-304xx: for GeForce 6/7 GPUs')
-source=("https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz"
- "nvidia.patch")
-sha1sums=('6c23fff734714cc5ca8907bba0e482e0d21eba02'
- '446f20dfa900ec42ee842932dcf4c3d6dc2111dc')
+source=("https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz")
+sha1sums=('77284c5276271a51e2de649263b26d2e9eb9db97')
options=('!strip' 'debug')
install='conky-lua-nv.install'
prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -p1 < '../nvidia.patch'
}
build() {
diff --git a/nvidia.patch b/nvidia.patch
deleted file mode 100644
index 94dd12fc4c32..000000000000
--- a/nvidia.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/nvidia.cc b/src/nvidia.cc
-index 16e76646..a2cfc043 100644
---- a/src/nvidia.cc
-+++ b/src/nvidia.cc
-@@ -91,7 +91,9 @@
- */
-
- #include "nvidia.h"
--#include <NVCtrl/NVCtrlLib.h>
-+#include <X11/Xlib.h>
-+#include "NVCtrl/NVCtrl.h"
-+#include "NVCtrl/NVCtrlLib.h"
- #include "conky.h"
- #include "logging.h"
- #include "temphelper.h"
-