From d17bb8f8bde117ac5dbc671140ddb3c25cc5eb0d Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Sun, 28 May 2023 10:54:00 +0200
Subject: [PATCH] coin-or-mp: updated URL and source, deleted unused patches

---
 coin-or-mp/.signature           |  8 +++-----
 coin-or-mp/Pkgfile              | 17 +++++++----------
 coin-or-mp/ubsan.patch.0        | 11 -----------
 coin-or-mp/werror-undef.patch.0 | 11 -----------
 4 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 coin-or-mp/ubsan.patch.0
 delete mode 100644 coin-or-mp/werror-undef.patch.0

diff --git a/coin-or-mp/.signature b/coin-or-mp/.signature
index 9f2afa134..73d747ccb 100644
--- a/coin-or-mp/.signature
+++ b/coin-or-mp/.signature
@@ -1,8 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+Gpl9iPVogUpcc3gav/WSCp8LZj0dwKcB5oOccjzPZSC57SomBrp2IK82BIPOOBN5O/jYNvWXRp3Pm+mNxWpgU=
-SHA256 (Pkgfile) = 781b5a66ab68d7060e357534d60ced83194127fffd297db8f7b7750ca263f465
+RWSagIOpLGJF3yHPxxxh3AWcW1hw0WfmYOLMCWUFPPlb6vZaO6e+9bXrweOhgX/mL0F/8uKsd5T6XPV986BO0VwvLGJXt4BEkAU=
+SHA256 (Pkgfile) = 2a8e4110ed7b9a082b2e24d683ff351db82f2627b49ca142f3983e1812f397c6
 SHA256 (.footprint) = e02597100d1f451c7b32752cd15a4527c688df69b753265c086c2f55348832bb
-SHA256 (CoinMP-1.8.4.tgz) = 3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d
-SHA256 (werror-undef.patch.0) = 0d390fdd164d24b0e8e8ad8784a78ad0f7d5352cbf9946099ac92eda3a92c3a6
-SHA256 (ubsan.patch.0) = 79dbcc2e2d8f750b1b587bbf4167444bebf408a1ba0ca3ecd711097d75140cbe
+SHA256 (coin-or-mp-1.8.4.tar.gz) = ec03a5110d9d79da950669e3400f3b81c4391747b14821d8997f9f8755873150
 SHA256 (libtool.patch) = 20e4294f3d1f8006bd3fa502e3219b65be67f928e93e8853bf56d1911baa46f7
diff --git a/coin-or-mp/Pkgfile b/coin-or-mp/Pkgfile
index 9bb511335..8257b2aea 100644
--- a/coin-or-mp/Pkgfile
+++ b/coin-or-mp/Pkgfile
@@ -1,21 +1,18 @@
 # Description: C-API library that supports most of the functionality of CLP (Coin LP), CBC (Coin Branch-and-Cut), and CGL (Cut Generation Library) projects
-# URL: https://projects.coin-or.org/CoinMP
+# URL: https://github.com/coin-or/CoinMP
 # Maintainer: Tim Biermann, tbier at posteo dot de
 # Depends on: coin-or-cbc
 
 name=coin-or-mp
 version=1.8.4
-release=5
-source=(https://www.coin-or.org/download/source/CoinMP/CoinMP-$version.tgz
-  werror-undef.patch.0
-  ubsan.patch.0
+release=6
+source=(https://github.com/coin-or/CoinMP/archive/refs/tags/releases/$version.tar.gz
   libtool.patch)
+renames=($name-$version.tar.gz SKIP SKIP SKIP)
 
 build() {
-  cd CoinMP-$version
+  cd CoinMP-releases-$version/CoinMP
 
-  patch -Np0 -i $SRC/werror-undef.patch.0
-  patch -Np0 -i $SRC/ubsan.patch.0
   patch -Np1 -i $SRC/libtool.patch
 
   COIN_SKIP_PROJECTS="Sample" \
@@ -34,8 +31,8 @@ build() {
   make DESTDIR=$PKG install-exec
 
   mkdir -p $PKG/usr/{include/coin,lib/pkgconfig}
-  install -c -m 644 CoinMP/src/CoinMP.h $PKG/usr/include/coin/CoinMP.h
-  install -c -m 644 CoinMP/coinmp.pc $PKG/usr/lib/pkgconfig/coinmp.pc
+  install -c -m 644 src/CoinMP.h $PKG/usr/include/coin/CoinMP.h
+  install -c -m 644 coinmp.pc $PKG/usr/lib/pkgconfig/coinmp.pc
 
   rm -fr $PKG/usr/share
 }
diff --git a/coin-or-mp/ubsan.patch.0 b/coin-or-mp/ubsan.patch.0
deleted file mode 100644
index 157332986..000000000
--- a/coin-or-mp/ubsan.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- Clp/src/ClpParameters.hpp
-+++ Clp/src/ClpParameters.hpp
-@@ -81,7 +81,7 @@
- template <class T> inline void
- ClpDisjointCopyN( const T * array, const int size, T * newArray)
- {
--     memcpy(reinterpret_cast<void *> (newArray), array, size * sizeof(T));
-+     if (size != 0) memcpy(reinterpret_cast<void *> (newArray), array, size * sizeof(T));
- }
- /// And set
- template <class T> inline void
diff --git a/coin-or-mp/werror-undef.patch.0 b/coin-or-mp/werror-undef.patch.0
deleted file mode 100644
index a9b80f280..000000000
--- a/coin-or-mp/werror-undef.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- CoinUtils/src/config_coinutils_default.h	2014-06-06 14:28:06.872113540 +0100
-+++ CoinUtils/src/config_coinutils_default.h	2014-06-06 14:28:29.400294129 +0100
-@@ -26,7 +26,7 @@
-   all of this inside the guard for MSC_VER >= 1200. If you're reading this
-   and have been developing in MSVS long enough to know, fix it.  -- lh, 100915 --
- */
--#if _MSC_VER >= 1200
-+#if defined _MSC_VER && _MSC_VER >= 1200
- # include <BaseTsd.h>
- # define COIN_INT64_T INT64
- # define COIN_UINT64_T UINT64