Bump version to 5.6.2 and do only sequential

6 files changed, 13 insertions, 156 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3af09f8d6ae3..667979254d8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mumps-seq
 	pkgdesc = Sparse solver library using Gaussian elimination (sequential version)
-	pkgver = 5.6.1
-	pkgrel = 3
+	pkgver = 5.6.2
+	pkgrel = 1
 	url = http://mumps-solver.org
 	arch = i686
 	arch = x86_64
@@ -12,17 +12,12 @@ pkgbase = mumps-seq
 	provides = mumps
 	conflicts = mumps
 	conflicts = mumps-par
-	source = http://mumps-solver.org/MUMPS_5.6.1.tar.gz
+	conflicts = mumps-seq-shared
+	source = http://mumps-solver.org/MUMPS_5.6.2.tar.gz
 	source = Makefile.inc
-	source = shared-mumps.patch
-	source = shared-libseq.patch
-	source = shared-pord.patch
 	source = makefile_version.patch
-	sha512sums = 7d0f7e6e852a967ee93b7eac1a13b491d85e1c3fa39df8c5aed6f12069f0a4f8ee369c049fddba52f19f60ff579eff189e5546a7dd41a1de0a80d915398f0f53
+	sha512sums = 5ee2659ed963ca525fc253986504250d0529257d79f18534032b970985528670cbadea023ff596829936c1b18ec6ef8925c3a6c0451eb1ad50caa88b20706adf
 	sha512sums = d7f076defe93704bf503612d0844f71698e2ca84b50ce551748c3b1bc972a2232c735a1ba02c038bf3468fe1eeac0411e66ed436339cb50978a3e2679c813364
-	sha512sums = 8eb7e2325a392786b3d811bdd10cfa3f55519efd52587821af4a252d4218e0355e2276a66762a8f631dd9201c45ce6eda0f47dae4f324dd2418d093bd433bcfc
-	sha512sums = 6f5e35e5dcac1dd5e627414ab52882c72b20d9ed9086b2105388a989759f666b99c332458a30dffaa351ff5d628471adbd36d991ee9817b56fe394bbefd8b4b3
-	sha512sums = eef8996257e0088fbdfd44a13856558dfcc8a9561774064d5d2382609391d66ae47a3678b390d4b272f7ea77ee1b8796f0eb12def6f7be561b0c9bbdc3d50b32
-	sha512sums = 5f306ff374ae2782f92df0b1b27659e8ee8cccbe481e59c33fe9cff492a20fceec10fb5e4c1510c0e6342ad74c87cd2dbb58b607a9d40f8d2a1c6bc9177783e4
+	sha512sums = 9e34c49cf7773597aa7073de593ca58af376835fc5ada67d8782eb20ee84d6242f3eeaadbdf727c567d40b87e5fdbac9abd27d7652adbb0012bb2781afff8de7
 
 pkgname = mumps-seq
diff --git a/PKGBUILD b/PKGBUILD
index 1dd78b0c3899..622d16519c77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,25 @@
 # Contributor: Guillaume Dollé <dolle dot guillaume at gmail dot com >
 _pkgname=MUMPS
 pkgname=${_pkgname,,}-seq
-pkgver=5.6.1
-pkgrel=3
+pkgver=5.6.2
+pkgrel=1
 pkgdesc="Sparse solver library using Gaussian elimination (sequential version)"
 url="http://${_pkgname,,}-solver.org"
 license=('custom')
 depends=(gcc-libs lapack) # metis
 makedepends=(gcc-fortran)
 provides=(${_pkgname,,})
-conflicts=(${_pkgname,,} ${_pkgname,,}-par)
+conflicts=(${_pkgname,,} ${_pkgname,,}-par ${_pkgname,,}-seq-shared)
 arch=('i686' 'x86_64')
 source=(${url}/${_pkgname}_${pkgver}.tar.gz
   Makefile.inc
-  shared-mumps.patch
-  shared-libseq.patch
-  shared-pord.patch
   makefile_version.patch)
-sha512sums=('7d0f7e6e852a967ee93b7eac1a13b491d85e1c3fa39df8c5aed6f12069f0a4f8ee369c049fddba52f19f60ff579eff189e5546a7dd41a1de0a80d915398f0f53'
-  'd7f076defe93704bf503612d0844f71698e2ca84b50ce551748c3b1bc972a2232c735a1ba02c038bf3468fe1eeac0411e66ed436339cb50978a3e2679c813364'
-  '8eb7e2325a392786b3d811bdd10cfa3f55519efd52587821af4a252d4218e0355e2276a66762a8f631dd9201c45ce6eda0f47dae4f324dd2418d093bd433bcfc'
-  '6f5e35e5dcac1dd5e627414ab52882c72b20d9ed9086b2105388a989759f666b99c332458a30dffaa351ff5d628471adbd36d991ee9817b56fe394bbefd8b4b3'
-  'eef8996257e0088fbdfd44a13856558dfcc8a9561774064d5d2382609391d66ae47a3678b390d4b272f7ea77ee1b8796f0eb12def6f7be561b0c9bbdc3d50b32'
-  '5f306ff374ae2782f92df0b1b27659e8ee8cccbe481e59c33fe9cff492a20fceec10fb5e4c1510c0e6342ad74c87cd2dbb58b607a9d40f8d2a1c6bc9177783e4')
+sha512sums=('5ee2659ed963ca525fc253986504250d0529257d79f18534032b970985528670cbadea023ff596829936c1b18ec6ef8925c3a6c0451eb1ad50caa88b20706adf'
+            'd7f076defe93704bf503612d0844f71698e2ca84b50ce551748c3b1bc972a2232c735a1ba02c038bf3468fe1eeac0411e66ed436339cb50978a3e2679c813364'
+            '9e34c49cf7773597aa7073de593ca58af376835fc5ada67d8782eb20ee84d6242f3eeaadbdf727c567d40b87e5fdbac9abd27d7652adbb0012bb2781afff8de7')
 
 prepare() {
   cd "${srcdir}"/${_pkgname}_${pkgver}
-  patch -p1 -i ../shared-mumps.patch
-  patch -p1 -i ../shared-libseq.patch
-  patch -p1 -i ../shared-pord.patch
   patch -p1 -i ../makefile_version.patch
   cp "${srcdir}"/Makefile.inc .
 }
diff --git a/makefile_version.patch b/makefile_version.patch
index cd3904060299..e038cd63b602 100644
--- a/makefile_version.patch
+++ b/makefile_version.patch
@@ -5,7 +5,7 @@ diff --color --unified --recursive --text ../MUMPS_5.6.1.orig/Makefile MUMPS_5.6
  #  This file is part of MUMPS 5.6.1, released
  #  on Tue Jul 11 07:51:28 UTC 2023
  #
-+export VERSION   = 5.6.1
++export VERSION   = 5.6.2
 +export SOVERSION = 5.6
  topdir = .
  libdir = $(topdir)/lib
diff --git a/shared-libseq.patch b/shared-libseq.patch
deleted file mode 100644
index 174306671490..000000000000
--- a/shared-libseq.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --color --unified --recursive --text ../MUMPS_5.6.1.orig/libseq/Makefile MUMPS_5.6.1/libseq/Makefile
---- ../MUMPS_5.6.1.orig/libseq/Makefile	2023-07-11 02:51:34.000000000 -0500
-+++ MUMPS_5.6.1/libseq/Makefile	2023-07-25 18:20:38.313444572 -0500
-@@ -19,7 +19,9 @@
- 	$(MAKE) FPIC="$(FPIC_OPT)" libmpiseq$(PLAT)$(LIBEXT_SHARED)
- 
- libmpiseq$(PLAT)$(LIBEXT_SHARED): mpi.o mpic.o elapse.o
--	$(FC) -shared mpi.o mpic.o elapse.o -o libmpiseq$(PLAT)$(LIBEXT_SHARED)
-+	$(FC) -shared -Wl,-soname,libmpiseq$(PLAT)-$(SOVERSION).so mpi.o mpic.o elapse.o -o libmpiseq$(PLAT)-$(VERSION)$(LIBEXT_SHARED)
-+	ln -s libmpiseq$(PLAT)-$(VERSION)$(LIBEXT_SHARED) libmpiseq$(PLAT)-$(SOVERSION)$(LIBEXT_SHARED)
-+	ln -s libmpiseq$(PLAT)-$(VERSION)$(LIBEXT_SHARED) $@
- 
- .f.o:
- 	$(FC) $(OPTF) $(FPIC)              -c $*.f $(OUTF)$*.o
-@@ -27,4 +29,4 @@
- 	$(CC) $(OPTC) $(FPIC) $(CDEFS) -I. -c $*.c $(OUTC)$*.o
- 
- clean:
--	$(RM) *.o *$(LIBEXT)
-+	$(RM) *.o *$(LIBEXT) *$(LIBEXT_SHARED)
-diff --color --unified --recursive --text ../MUMPS_5.6.1.orig/Makefile MUMPS_5.6.1/Makefile
---- ../MUMPS_5.6.1.orig/Makefile	2023-07-11 02:51:28.000000000 -0500
-+++ MUMPS_5.6.1/Makefile	2023-07-25 18:20:57.523676013 -0500
-@@ -77,7 +77,7 @@
- sharedlibseq:
- 
- libseqneeded:
--	(cd libseq; $(MAKE))
-+	(cd libseq; $(MAKE) FPIC="$(FPIC_OPT)" )
- 	(cp libseq/lib* $(libdir))
- 
- libseqneededsharedlibseq:
diff --git a/shared-mumps.patch b/shared-mumps.patch
deleted file mode 100644
index f3aac7644bf1..000000000000
--- a/shared-mumps.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --color --unified --recursive --text ../MUMPS_5.6.1.orig/src/Makefile MUMPS_5.6.1/src/Makefile
---- ../MUMPS_5.6.1.orig/src/Makefile	2023-07-11 02:51:28.000000000 -0500
-+++ MUMPS_5.6.1/src/Makefile	2023-07-25 16:59:38.589415644 -0500
-@@ -14,19 +14,19 @@
- all: $(incdir)/mumps_int_def.h libcommon s d c z
- 
- libcommon: $(incdir)/mumps_int_def.h
--	$(MAKE) $(libdir)/libmumps_common$(PLAT)$(LIBEXT)
-+	$(MAKE) FPIC=$(FPIC_OPT) $(libdir)/libmumps_common$(PLAT)$(LIBEXT) $(libdir)/libmumps_common$(PLAT)$(LIBEXT_SHARED)
- 
- s: $(incdir)/mumps_int_def.h libcommon
--	$(MAKE) ARITH=s $(libdir)/libsmumps$(PLAT)$(LIBEXT)
-+	$(MAKE) FPIC=$(FPIC_OPT) ARITH=s $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(libdir)/libsmumps$(PLAT)$(LIBEXT_SHARED)
- 
- d: $(incdir)/mumps_int_def.h libcommon
--	$(MAKE) ARITH=d $(libdir)/libdmumps$(PLAT)$(LIBEXT)
-+	$(MAKE) FPIC=$(FPIC_OPT) ARITH=d $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(libdir)/libdmumps$(PLAT)$(LIBEXT_SHARED)
- 
- c: $(incdir)/mumps_int_def.h libcommon
--	$(MAKE) ARITH=c $(libdir)/libcmumps$(PLAT)$(LIBEXT)
-+	$(MAKE) FPIC=$(FPIC_OPT) ARITH=c $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(libdir)/libcmumps$(PLAT)$(LIBEXT_SHARED)
- 
- z: $(incdir)/mumps_int_def.h libcommon
--	$(MAKE) ARITH=z $(libdir)/libzmumps$(PLAT)$(LIBEXT)
-+	$(MAKE) FPIC=$(FPIC_OPT) ARITH=z $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(libdir)/libzmumps$(PLAT)$(LIBEXT_SHARED)
- 
- 
- # Rules for shared libraries
-@@ -214,14 +214,14 @@
- 	$(RANLIB) $@
- 
- $(libdir)/libmumps_common$(PLAT)$(LIBEXT_SHARED):      $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
--	$(FC) $(OPTL) -shared $^ -Wl,$(SONAME),libmumps_common$(PLAT)$(LIBEXT_SHARED) -L$(libdir) $(RPATH_OPT) $(LORDERINGS) $(LIBS) $(LIBOTHERS) -o $@ 
-+	$(FC) $(OPTL) -shared $^ -Wl,$(SONAME),libmumps_common$(PLAT)-$(SOVERSION)$(LIBEXT_SHARED) -L$(libdir) $(RPATH_OPT) $(LORDERINGS) $(LIBS) $(LIBOTHERS) -o $(libdir)/libmumps_common$(PLAT)-$(VERSION)$(LIBEXT_SHARED)
- 
- $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT):    $(OBJS_MOD) $(OBJS_OTHER)
- 	$(AR)$@ $?
- 	$(RANLIB) $@
- 
- $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT_SHARED):    $(OBJS_MOD) $(OBJS_OTHER) $(libdir)/libmumps_common$(PLAT)$(LIBEXT_SHARED)
--	$(FC) $(OPTL) -shared $(OBJS_MOD) $(OBJS_OTHER) -L$(libdir) $(LORDERINGS) $(LIBS) $(LIBOTHERS) -lmumps_common$(PLAT) -o $@ $(RPATH_OPT)
-+	$(FC) $(OPTL) -shared -Wl,-soname,lib$(ARITH)mumps$(PLAT)-$(SOVERSION)$(LIBEXT_SHARED) $(OBJS_MOD) $(OBJS_OTHER) -L$(libdir) $(LORDERINGS) $(LIBS) $(LIBOTHERS) -lmumps_common$(PLAT) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-$(VERSION)$(LIBEXT_SHARED) $(RPATH_OPT)
- 
- 
- # Dependencies between modules:
diff --git a/shared-pord.patch b/shared-pord.patch
deleted file mode 100644
index ffdb11cea042..000000000000
--- a/shared-pord.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --color --unified --recursive --text ../MUMPS_5.6.1.orig/Makefile MUMPS_5.6.1/Makefile
---- ../MUMPS_5.6.1.orig/Makefile	2023-07-11 02:51:28.000000000 -0500
-+++ MUMPS_5.6.1/Makefile	2023-07-25 17:05:48.953703275 -0500
-@@ -88,19 +88,19 @@
- $(libdir)/libpord$(PLAT)$(LIBEXT):
- 	if [ "$(LPORDDIR)" != "" ] ; then \
- 	  cd $(LPORDDIR); \
--	  $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT="$(LIBEXT)" LIBEXT_SHARED="$(LIBEXT_SHARED)" libpord$(LIBEXT); \
-+	  $(MAKE) FPIC="$(FPIC_OPT)" CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT="$(LIBEXT)" LIBEXT_SHARED="$(LIBEXT_SHARED)" libpord$(PLAT)$(LIBEXT); \
- 	fi;
- 	if [ "$(LPORDDIR)" != "" ] ; then \
--	  cp $(LPORDDIR)/libpord$(LIBEXT) $@; \
-+	  cp $(LPORDDIR)/libpord$(PLAT)$(LIBEXT) $@; \
- 	fi;
- 
- $(libdir)/libpord$(PLAT)$(LIBEXT_SHARED):
- 	if [ "$(LPORDDIR)" != "" ] ; then \
- 	  cd $(LPORDDIR); \
--	  $(MAKE) PLAT="$(PLAT)" FPIC="$(FPIC_OPT)" CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT="$(LIBEXT)" LIBEXT_SHARED="$(LIBEXT_SHARED)" libpord$(LIBEXT_SHARED); \
-+	  $(MAKE) PLAT="$(PLAT)" FPIC="$(FPIC_OPT)" CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT="$(LIBEXT)" LIBEXT_SHARED="$(LIBEXT_SHARED)" libpord$(PLAT)$(LIBEXT_SHARED); \
- 	fi;
- 	if [ "$(LPORDDIR)" != "" ] ; then \
--	  cp $(LPORDDIR)/libpord$(LIBEXT_SHARED) $@; \
-+	  cp -P $(LPORDDIR)/libpord$(PLAT)*$(LIBEXT_SHARED) $(libdir); \
- 	fi;
- 
- 
-diff --color --unified --recursive --text ../MUMPS_5.6.1.orig/PORD/lib/Makefile MUMPS_5.6.1/PORD/lib/Makefile
---- ../MUMPS_5.6.1.orig/PORD/lib/Makefile	2023-07-11 02:51:28.000000000 -0500
-+++ MUMPS_5.6.1/PORD/lib/Makefile	2023-07-25 17:03:51.695610490 -0500
-@@ -1,7 +1,7 @@
- 
- # To compile directly, uncomment the line below.
- # include ../Make.in
--# # include $(BUILDDIR)/Makefile.inc
-+include ../../Makefile.inc
- #
- # Otherwise, adequate variables for CC, CFLAGS, AR and
- # RANLIB must be passed to make.
-@@ -29,10 +29,10 @@
- 	$(RANLIB) $@
- 
- libpord$(PLAT)$(LIBEXT_SHARED):$(OBJS)
--	$(CC) -shared $(OBJS) -o libpord$(PLAT)$(LIBEXT_SHARED)
-+	$(CC) -shared $(OBJS) -Wl,$(SONAME),libpord$(PLAT)-$(SOVERSION)$(LIBEXT_SHARED) -o libpord$(PLAT)-$(VERSION)$(LIBEXT_SHARED) -Wl,-z,defs
- 
- clean:
- 	rm -f *.o
- 
- realclean:
--	rm -f *.o libpord$(PLAT)$(LIBEXT) libpord$(PLAT)$(LIBEXT_SHARED)
-+	rm -f *.o libpord$(PLAT)$(LIBEXT) libpord$(PLAT)*$(LIBEXT_SHARED)