From 66bc2da7ade2035e79a5b2a2fccae5fd9d6576a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torleif=20Sk=C3=A5r?= <torleif.skaar@gmail.com>
Date: Wed, 21 May 2025 02:49:09 +0200
Subject: [PATCH] feat: v8.3.527

Additionally added patch to use -std=gnu17 as default for now
until issue is fixed upstream
---
 .SRCINFO                         | 10 ++++++----
 .gitignore                       |  1 +
 0001-set_std_gnu17_default.patch | 25 +++++++++++++++++++++++++
 PKGBUILD                         | 21 +++++++++++++++++----
 4 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 0001-set_std_gnu17_default.patch

diff --git a/.SRCINFO b/.SRCINFO
index ba2cbf347836..00551e589305 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = magic
 	pkgdesc = A VLSI layout system
-	pkgver = 8.3.526
-	pkgrel = 2
+	pkgver = 8.3.527
+	pkgrel = 1
 	url = http://opencircuitdesign.com/magic/
 	arch = i686
 	arch = x86_64
@@ -22,7 +22,9 @@ pkgbase = magic
 	optdepends = cairo: 2D accelerated graphics, alternative to OGL
 	optdepends = blt: to create a tree diagram of the cell hierarchy in a design
 	options = !ccache
-	source = magic-8.3.526::git+https://github.com/RTimothyEdwards/magic#tag=8.3.526
-	b2sums = 9afeea5369e29d18facbf464e23ec31bfef8f85798e02fe20f7dc852e028cc21ca2e7ce71eb3bfeaf04ba1445ef4b8b8f34fcd8d004c4919619f73a5b74d2c6f
+	source = magic-8.3.527::git+https://github.com/RTimothyEdwards/magic#tag=8.3.527
+	source = 0001-set_std_gnu17_default.patch
+	b2sums = 4c21ad8428f05e8d66f4d03d8abe4c059e31a00f72807fe95fcc4b361ee237193b499d5fa4dc41d5991bb6d27b8818e2e71b9ab2a774d17fb47eb21a0564c6ed
+	b2sums = 37eaa5bbaab691216ffc06485e6d5d934c74f63e74a876da5bedb0f9fd98f404abfbaa902b9fa979e276e38ba660b4049fbe3d6ff43b591e1d1d3fb2d128eb51
 
 pkgname = magic
diff --git a/.gitignore b/.gitignore
index 018a3de08144..7735b4612827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 !PKGBUILD
 !.SRCINFO
 !.gitignore
+!*.patch
diff --git a/0001-set_std_gnu17_default.patch b/0001-set_std_gnu17_default.patch
new file mode 100644
index 000000000000..0af7a5a8ee07
--- /dev/null
+++ b/0001-set_std_gnu17_default.patch
@@ -0,0 +1,25 @@
+From 67639fd226dae7335dd386a1246997d5229a9189 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Torleif=20Sk=C3=A5r?= <torleif.skaar AT gmail DOT com>
+Date: Wed, 21 May 2025 02:33:37 +0200
+Subject: [PATCH] configure: Set '-std=gnu17' as default due to issues with
+ default C23
+
+For more explanation, see:
+https://github.com/RTimothyEdwards/magic/issues/401
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ae0a0fc1..0f758e5e 100755
+--- a/configure
++++ b/configure
+@@ -9,4 +9,4 @@
+ # script itself.  It also sets up CFLAGS without the default optimizer
+ # flag (-O2).
+ 
+-( CFLAGS="-g"; export CFLAGS; cd scripts ; ./configure "$@" )
++( CFLAGS="-g -std=gnu17"; export CFLAGS; cd scripts ; ./configure "$@" )
+-- 
+2.49.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 515ec8715891..6187062dd17f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Kyle Keen <keenerd@gmail.com>
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 pkgname=magic
-pkgver=8.3.526
-pkgrel=2
+pkgver=8.3.527
+pkgrel=1
 pkgdesc="A VLSI layout system"
 _git_url="https://github.com/RTimothyEdwards/magic"
 url="http://opencircuitdesign.com/magic/"
@@ -33,11 +33,24 @@ optdepends=(
 )
 
 _archive="${pkgname}-${pkgver}"
-source=("${_archive}::git+${_git_url}#tag=${pkgver}")
-b2sums=('9afeea5369e29d18facbf464e23ec31bfef8f85798e02fe20f7dc852e028cc21ca2e7ce71eb3bfeaf04ba1445ef4b8b8f34fcd8d004c4919619f73a5b74d2c6f')
+source=(
+   "${_archive}::git+${_git_url}#tag=${pkgver}"
+   "0001-set_std_gnu17_default.patch"
+)
+
+b2sums=('4c21ad8428f05e8d66f4d03d8abe4c059e31a00f72807fe95fcc4b361ee237193b499d5fa4dc41d5991bb6d27b8818e2e71b9ab2a774d17fb47eb21a0564c6ed'
+        '37eaa5bbaab691216ffc06485e6d5d934c74f63e74a876da5bedb0f9fd98f404abfbaa902b9fa979e276e38ba660b4049fbe3d6ff43b591e1d1d3fb2d128eb51')
+
 
 options=(!ccache)
 
+prepare() {
+   cd "${_archive}"
+
+   # See upstream issue: https://github.com/RTimothyEdwards/magic/issues/401
+   # for more details about why we need to use C17 + GNU extensions
+   patch -Np1 < "../0001-set_std_gnu17_default.patch"
+}
 
 build() {
    cd "${_archive}"