add fix

3 files changed, 40 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c41b7479ce14..6ac7a72981ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvclock
 	pkgdesc = A small utility which allows users to overclock NVIDIA based video cards.
 	pkgver = 0.8b4
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.linuxhardware.org/nvclock/
 	install = nvclock.install
 	arch = i686
@@ -14,10 +14,12 @@ pkgbase = nvclock
 	source = nvclock-0.8b4-buildfix.patch
 	source = nvclock-0.8b4-linkfix.patch
 	source = nvclock.desktop-use-gksu.patch
+	source = gcc10-build.patch
 	md5sums = 23f1b3ebf40f35d76d5fdac50f66ab11
 	md5sums = 1da24b50dd6a8c4704fa550a3e1a8b53
 	md5sums = b812646787ea44e693fd2288612f25ad
 	md5sums = 98fc1995721d0b0e8ff6d448869eee6d
+	md5sums = 096769701c5a1442fadd69d6f09962f5
 
 pkgname = nvclock
 
diff --git a/PKGBUILD b/PKGBUILD
index ac863cc81909..cb26d4d04694 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63680 2012-02-05 12:06:13Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Michal Wojdyla < micwoj9292 at gmail dot com >
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Markus Meissner <markus@meissna.de>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=nvclock
 pkgver=0.8b4
-pkgrel=3
+pkgrel=4
 pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.'
 arch=('i686' 'x86_64')
 url='http://www.linuxhardware.org/nvclock/'
@@ -17,24 +17,31 @@ options=('!makeflags')
 source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz"
         'nvclock-0.8b4-buildfix.patch'
         'nvclock-0.8b4-linkfix.patch'
-        'nvclock.desktop-use-gksu.patch')
+        'nvclock.desktop-use-gksu.patch'
+        'gcc10-build.patch')
 md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11'
          '1da24b50dd6a8c4704fa550a3e1a8b53'
          'b812646787ea44e693fd2288612f25ad'
-         '98fc1995721d0b0e8ff6d448869eee6d')
-
-build(){
+         '98fc1995721d0b0e8ff6d448869eee6d'
+         '096769701c5a1442fadd69d6f09962f5')
+         
+prepare(){
   cd "${srcdir}/${pkgname}${pkgver}"
 
   # build and link fixes from Fedora
   patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch"
   patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch"
-
+  
   # Make ".desktop" file use gksu(1).
   patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch"
-
   sed -i 's:${prefix}/man:${prefix}\/share\/man:' "${srcdir}/${pkgname}${pkgver}/Makefile.in"
+  
+  #Fix build with gcc 10
+  patch -Np1 -i "${srcdir}/gcc10-build.patch"
+}
 
+build(){
+  cd "${srcdir}/${pkgname}${pkgver}"
   ./configure --prefix=/usr --bindir=/usr/bin
   make
 }
diff --git a/gcc10-build.patch b/gcc10-build.patch
new file mode 100644
index 000000000000..c729e2494945
--- /dev/null
+++ b/gcc10-build.patch
@@ -0,0 +1,21 @@
+--- nvclock0.8b4/src/nvcontrol/nvcontrol.c  2007-12-30 14:12:43.000000000 +0000
++++ fix/nvclock0.8b4/src/nvcontrol/nvcontrol.c  2020-09-26 21:17:33.530984131 +0000
+@@ -71,7 +71,7 @@
+     {NULL, -1}
+ };
+
+-NVOptionList option_list[] = {
++NVOptionList *option_list = {
+     {"fsaa", 4, "Fullscene Antialiasing", NV_FSAA, 0, (NVOption*)&fsaa_list },
+     {"aniso", 5, "Anisotropic Filtering", NV_LOG_ANISO, 0, (NVOption*)&aniso_list },
+     {"intellisample", 13, "Intellisampling", NV_OPENGL_QUALITY_ENHANCHEMENTS, 0, (NVOption*)&isample_list },
+--- nvclock0.8b4/src/nvcontrol/nvcontrol.h  2006-07-15 09:47:09.000000000 +0000
++++ fix/nvclock0.8b4/src/nvcontrol/nvcontrol.h  2020-09-26 21:17:06.984982907 +0000
+@@ -42,7 +42,7 @@
+ } NVOptionList;
+
+ #define OPTION_LIST_SIZE 27
+-NVOptionList option_list[OPTION_LIST_SIZE];
++extern NVOptionList *option_list;
+ int init_nvcontrol();
+ NVOptionList *nvcontrol_lookup_option(int option);