From b4fb112337cdb4e9bd84a4fb51f862ae74fa3b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
Date: Sun, 20 Feb 2022 18:30:39 +0100
Subject: [PATCH] scotch: update to version 7.0.1

---
 mingw-w64-scotch/0005-mingw-fixes.patch | 26 +++++++++++++++++++++++++
 mingw-w64-scotch/Makefile.idx32.inc     |  6 +++---
 mingw-w64-scotch/Makefile.idx64.inc     |  6 +++---
 mingw-w64-scotch/PKGBUILD               | 18 +++++++++--------
 4 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 mingw-w64-scotch/0005-mingw-fixes.patch

diff --git a/mingw-w64-scotch/0005-mingw-fixes.patch b/mingw-w64-scotch/0005-mingw-fixes.patch
new file mode 100644
index 0000000000..bba423163c
--- /dev/null
+++ b/mingw-w64-scotch/0005-mingw-fixes.patch
@@ -0,0 +1,26 @@
+$ diff -urN src/libscotch/context.c.orig src/libscotch/context.c
+--- a/src/libscotch/context.c.orig	2022-02-14 18:14:58.000000000 +0100
++++ b/src/libscotch/context.c	2022-02-20 17:39:35.603086300 +0100
+@@ -47,7 +47,9 @@
+ **  The defines and includes.
+ */
+ 
++#ifndef _WIN32
+ #define CONTEXT
++#endif
+ 
+ #include "module.h"
+ #include "common.h"
+
+diff -urN src/libscotch/module.h.orig src/libscotch/module.h
+--- a/src/libscotch/module.h.orig	2022-02-14 18:14:58.000000000 +0100
++++ b/src/libscotch/module.h	2022-02-20 18:03:54.990997900 +0100
+@@ -68,7 +68,7 @@
+ #define SCOTCH_COPYRIGHT_STRING     "Copyright 1992-2022 IPB, Universite de Bordeaux, INRIA & CNRS, France"
+ #define SCOTCH_LICENSE_STRING       "This software is libre/free software under CeCILL-C -- see the user's manual for more information"
+ #ifdef SCOTCH_CODENAME
+-#define SCOTCH_VERSION_STRING       STRINGIFY (SCOTCH_VERSION) "." STRINGIFY (SCOTCH_RELEASE) "." STRINGIFY (SCOTCH_PATCHLEVEL) " (" SCOTCH_CODENAME ")"
++#define SCOTCH_VERSION_STRING       STRINGIFY (SCOTCH_VERSION) "." STRINGIFY (SCOTCH_RELEASE) "." STRINGIFY (SCOTCH_PATCHLEVEL) " (" STRINGIFY (SCOTCH_CODENAME) ")"
+ #else /* SCOTCH_CODENAME */
+ #define SCOTCH_VERSION_STRING       STRINGIFY (SCOTCH_VERSION) "." STRINGIFY (SCOTCH_RELEASE) "." STRINGIFY (SCOTCH_PATCHLEVEL)
+ #endif /* SCOTCH_CODENAME */
diff --git a/mingw-w64-scotch/Makefile.idx32.inc b/mingw-w64-scotch/Makefile.idx32.inc
index fa1bd462bb..e40d85372c 100644
--- a/mingw-w64-scotch/Makefile.idx32.inc
+++ b/mingw-w64-scotch/Makefile.idx32.inc
@@ -9,13 +9,13 @@ CAT		= cat
 CCS		= $(CC)
 CCP		= mpicc
 CCD		= $(CC)
-CFLAGS		+= -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Drestrict=__restrict -DCOMMON_PTHREAD -DSCOTCH_PTHREAD -DCOMMON_FILE_COMPRESS_GZ
+CFLAGS += -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Drestrict=__restrict -DCOMMON_PTHREAD -DSCOTCH_PTHREAD -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_OS_WINDOWS
 CLIBFLAGS	=
 LDFLAGS	= -lz -pthread
 CP		= cp
-LEX		= flex -Pscotchyy -olex.yy.c
+FLEX = flex
 LN		= ln
 MKDIR		= mkdir
 MV		= mv
 RANLIB		= ranlib
-YACC		= bison -pscotchyy -y -b y
+BISON = bison
diff --git a/mingw-w64-scotch/Makefile.idx64.inc b/mingw-w64-scotch/Makefile.idx64.inc
index ec6ac947c9..37a148f403 100644
--- a/mingw-w64-scotch/Makefile.idx64.inc
+++ b/mingw-w64-scotch/Makefile.idx64.inc
@@ -9,13 +9,13 @@ CAT		= cat
 CCS		= $(CC)
 CCP		= mpicc
 CCD		= $(CC)
-CFLAGS		+= -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Drestrict=__restrict -DCOMMON_PTHREAD -DSCOTCH_PTHREAD -DCOMMON_FILE_COMPRESS_GZ -DINTSIZE64 -DIDXSIZE64
+CFLAGS += -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -Drestrict=__restrict -DCOMMON_PTHREAD -DSCOTCH_PTHREAD -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_OS_WINDOWS -DINTSIZE64 -DIDXSIZE64
 CLIBFLAGS	=
 LDFLAGS	= -lz -pthread
 CP		= cp
-LEX		= flex -Pscotchyy -olex.yy.c
+FLEX = flex
 LN		= ln
 MKDIR		= mkdir
 MV		= mv
 RANLIB		= ranlib
-YACC		= bison -pscotchyy -y -b y
+BISON = bison
diff --git a/mingw-w64-scotch/PKGBUILD b/mingw-w64-scotch/PKGBUILD
index 2a54622180..7fb6045bc3 100644
--- a/mingw-w64-scotch/PKGBUILD
+++ b/mingw-w64-scotch/PKGBUILD
@@ -5,27 +5,29 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-int64")
 pkgdesc='Graph partitioning and sparse matrix ordering package (mingw-w64)'
-pkgver=6.1.3
-pkgrel=2
+pkgver=7.0.1
+pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libsystre"
          "${MINGW_PACKAGE_PREFIX}-msmpi")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
-options=('strip' 'staticlibs')
+options=('!strip' 'staticlibs')
 license=('spdx:CECILL-C')
 url="https://www.labri.fr/perso/pelegrin/scotch/"
 source=("https://gitlab.inria.fr/scotch/scotch/-/archive/v${pkgver}/${_realname}-v${pkgver}.tar.gz"
         "Makefile.idx32.inc"
         "Makefile.idx64.inc"
         "0002-pipe-fix.patch"
-        "0004-dummysizes-regex.patch")
-sha256sums=('4e54f056199e6c23d46581d448fcfe2285987e5554a0aa527f7931684ef2809e'
-            '3165797bc28b2711097ce29ed007f25bcb1693b5af59592d33a00a55d1c99316'
-            'c5686b1f971b461c3f9e6ac2f80893d6cb6eadb91624a9b3467280f6e14a4c5e'
+        "0004-dummysizes-regex.patch"
+        "0005-mingw-fixes.patch")
+sha256sums=('0618e9bc33c02172ea7351600fce4fccd32fe00b3359c4aabb5e415f17c06fed'
+            '4221b69dcc53230ff4d6bc18e3982f6d39971a99fc17f4dab609fc19b99d8a30'
+            'c52bf0598332d8139a37606e7ea9376b7f841059047c0c977b205a763fc7e97a'
             '49d87533321504a9594d7bb4659fbced5afadd2fc0d73f0577b0b3ad47cc7d0f'
-            '92908a6598d333a35a3b76650c111a082304e9dfff7c9bc0667d6af62de47c14')
+            '92908a6598d333a35a3b76650c111a082304e9dfff7c9bc0667d6af62de47c14'
+            '5059eb16fcb8207f598ef3715ed45035f9e4c3c8c1905bbac969153192e84aad')
 
 prepare() {
   cd "${srcdir}/${_realname}-v${pkgver}"