Use latest commit from master branch and apply patches

4 files changed, 77 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84b3dba59a8b..97b2ad6c86e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gds3d-git
 	pkgdesc = An application used for rendering IC (chip) layouts in 3D
-	pkgver = r38.1f646a4
+	pkgver = r38.173da0c
 	pkgrel = 1
 	url = https://github.com/trilomix/GDS3D
 	arch = x86_64
@@ -10,7 +10,11 @@ pkgbase = gds3d-git
 	depends = libglvnd
 	provides = gds3d
 	conflicts = gds3d
-	source = git+https://github.com/trilomix/GDS3D#commit=1f646a43075d21be7654c1485e59d7c82272c74e
+	source = git+https://github.com/trilomix/GDS3D
+	source = 0001-linux-Rename-compiler-variables-to-CXX-and-CXXFLAGS.patch
+	source = 0002-linux-Build-using-std-c-11.patch
+	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = gds3d-git
diff --git a/0001-linux-Rename-compiler-variables-to-CXX-and-CXXFLAGS.patch b/0001-linux-Rename-compiler-variables-to-CXX-and-CXXFLAGS.patch
new file mode 100644
index 000000000000..cf23c0c97850
--- /dev/null
+++ b/0001-linux-Rename-compiler-variables-to-CXX-and-CXXFLAGS.patch
@@ -0,0 +1,38 @@
+From b97d1be87f75633f73a44dfd1a761b257901ebdc Mon Sep 17 00:00:00 2001
+From: Konrad Beckmann <konrad.beckmann@gmail.com>
+Date: Wed, 19 May 2021 19:57:55 +0200
+Subject: [PATCH 1/2] linux: Rename compiler variables to CXX and CXXFLAGS
+
+---
+ linux/Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/linux/Makefile b/linux/Makefile
+index f892b53..deef6d9 100644
+--- a/linux/Makefile
++++ b/linux/Makefile
+@@ -1,6 +1,6 @@
+ # Flags
+-CC=g++
+-CFLAGS=-c -w -O1 -I ../math/ -I ../gdsoglviewer/ -I ../libgdsto3d/
++CXX=g++
++CXXFLAGS=-c -w -O1 -I ../math/ -I ../gdsoglviewer/ -I ../libgdsto3d/
+ LDFLAGS=-L/usr/X11R6/lib64/ -lX11 -lGL -static-libgcc -static-libstdc++ -fopenmp
+ # Static linking of stdc++ available starting at GCC 4.5
+ 
+@@ -26,10 +26,10 @@ EXECUTABLE=./GDS3D
+ all: $(SOURCES) $(HEADERS) $(EXECUTABLE)
+ 	
+ $(EXECUTABLE): $(OBJECTS) 
+-	$(CC) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
+ 
+ .cpp.o:
+-	$(CC) $(CFLAGS) $< -o $@
++	$(CXX) $(CXXFLAGS) $< -o $@
+ 
+ clean: # Clean object files
+ 	rm -f $(OBJECTS) 
+-- 
+2.40.0
+
diff --git a/0002-linux-Build-using-std-c-11.patch b/0002-linux-Build-using-std-c-11.patch
new file mode 100644
index 000000000000..c2b6d02d031b
--- /dev/null
+++ b/0002-linux-Build-using-std-c-11.patch
@@ -0,0 +1,24 @@
+From 885b698ce2de29ac3669013984290a1c76813a2c Mon Sep 17 00:00:00 2001
+From: Konrad Beckmann <konrad.beckmann@gmail.com>
+Date: Wed, 19 May 2021 19:59:57 +0200
+Subject: [PATCH 2/2] linux: Build using -std=c++11
+
+---
+ linux/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux/Makefile b/linux/Makefile
+index deef6d9..63be183 100644
+--- a/linux/Makefile
++++ b/linux/Makefile
+@@ -1,6 +1,6 @@
+ # Flags
+ CXX=g++
+-CXXFLAGS=-c -w -O1 -I ../math/ -I ../gdsoglviewer/ -I ../libgdsto3d/
++CXXFLAGS=-std=c++11 -c -w -O1 -I ../math/ -I ../gdsoglviewer/ -I ../libgdsto3d/
+ LDFLAGS=-L/usr/X11R6/lib64/ -lX11 -lGL -static-libgcc -static-libstdc++ -fopenmp
+ # Static linking of stdc++ available starting at GCC 4.5
+ 
+-- 
+2.40.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 377909ba9ac1..9a63741344df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Konrad Beckmann <konrad.beckmann@gmail.com>
 
 pkgname=gds3d-git
-pkgver=r38.1f646a4
+pkgver=r38.173da0c
 pkgrel=1
 pkgdesc="An application used for rendering IC (chip) layouts in 3D"
 arch=('x86_64')
@@ -11,8 +11,8 @@ depends=('libx11' 'libglvnd')
 provides=('gds3d')
 conflicts=('gds3d')
 makedepends=('git')
-source=("git+https://github.com/trilomix/GDS3D#commit=1f646a43075d21be7654c1485e59d7c82272c74e")
-md5sums=('SKIP')
+source=("git+https://github.com/trilomix/GDS3D" "0001-linux-Rename-compiler-variables-to-CXX-and-CXXFLAGS.patch" "0002-linux-Build-using-std-c-11.patch")
+md5sums=('SKIP' 'SKIP' 'SKIP')
 
 _gitname="GDS3D"
 
@@ -21,6 +21,12 @@ pkgver() {
   printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "$srcdir/$_gitname/linux"
+  patch --forward --strip=2 --input="${srcdir}/0001-linux-Rename-compiler-variables-to-CXX-and-CXXFLAGS.patch"
+  patch --forward --strip=2 --input="${srcdir}/0002-linux-Build-using-std-c-11.patch"
+}
+
 build() {
   cd "$srcdir/$_gitname"
   make -C linux