From d8ef32b54e8e6e63536273c34e32936d8860975c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 02:20:17 +0700 Subject: [PATCH 1/8] New package: coin-or-sample-1.2.13 --- srcpkgs/coin-or-sample/template | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/coin-or-sample/template diff --git a/srcpkgs/coin-or-sample/template b/srcpkgs/coin-or-sample/template new file mode 100644 index 00000000000000..ff8ff9a6b56c34 --- /dev/null +++ b/srcpkgs/coin-or-sample/template @@ -0,0 +1,11 @@ +# Template file for 'coin-or-sample' +pkgname=coin-or-sample +version=1.2.13 +revision=1 +build_style=gnu-configure +short_desc="COIN-OR Sample Data" +maintainer="Đoàn Trần Công Danh " +license="EPL-2.0" +homepage="https://github.com/coin-or-tools/Data-Sample/" +distfiles="https://github.com/coin-or-tools/Data-Sample/archive/refs/tags/releases/${version}.tar.gz" +checksum=cb4c3713b2a2510d0b6387c24a68c88ba5eff27e2c392429653b1bdef50f06c9 From 190e999e3b2a6c84c7001f969b71eb04b82ce3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 01:59:43 +0700 Subject: [PATCH 2/8] New package: coin-or-utils-2.11.13 --- common/shlibs | 1 + srcpkgs/coin-or-utils-devel | 1 + srcpkgs/coin-or-utils/template | 37 ++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 120000 srcpkgs/coin-or-utils-devel create mode 100644 srcpkgs/coin-or-utils/template diff --git a/common/shlibs b/common/shlibs index a7063390d18801..9eeb212aa0a4ae 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2763,6 +2763,7 @@ libOsiCbc.so.3 CoinMP-1.8.3_1 libCgl.so.1 CoinMP-1.8.3_1 libCbc.so.3 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 +libCoinUtils.so.3 coin-or-utils-2.11.13_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.20.so.0 libixion-0.20.0_1 liborcus-parser-0.21.so.0 liborcus-0.21.0_1 diff --git a/srcpkgs/coin-or-utils-devel b/srcpkgs/coin-or-utils-devel new file mode 120000 index 00000000000000..7837380b9b4291 --- /dev/null +++ b/srcpkgs/coin-or-utils-devel @@ -0,0 +1 @@ +coin-or-utils \ No newline at end of file diff --git a/srcpkgs/coin-or-utils/template b/srcpkgs/coin-or-utils/template new file mode 100644 index 00000000000000..957e7d4fc85443 --- /dev/null +++ b/srcpkgs/coin-or-utils/template @@ -0,0 +1,37 @@ +# Template file for 'coin-or-utils' +pkgname=coin-or-utils +version=2.11.13 +revision=1 +build_style=gnu-configure +hostmakedepends="gcc-fortran pkg-config" +makedepends="blas-devel lapack-devel zlib-devel bzip2-devel" +short_desc="COIN-OR collection of utility classes" +maintainer="Đoàn Trần Công Danh " +license="EPL-2.0" +homepage="COIN-OR Utilities" +distfiles="https://github.com/coin-or/CoinUtils/archive/refs/tags/releases/${version}.tar.gz" +checksum=ddfea48e10209215748bc9f90a8c04abbb912b662c1aefaf280018d0a181ef79 + +pre_build() { + if [ "$CROSS_BUILD" ]; then + vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX + else + cat <<-\EOF >$XBPS_WRAPPERDIR/g++ + #!/bin/sh + exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@" + EOF + chmod +x $XBPS_WRAPPERDIR/g++ + fi +} + +coin-or-utils-devel_package() { + short_desc+=" - development files" + depends="${makedepends} + ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/coin/doc + } +} From 4232b2c7d969b74e3383ff350ae39694ef1778e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 15:44:51 +0700 Subject: [PATCH 3/8] New package: coin-or-osi-0.108.12 --- common/shlibs | 1 + srcpkgs/coin-or-osi-devel | 1 + srcpkgs/coin-or-osi/template | 38 ++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 120000 srcpkgs/coin-or-osi-devel create mode 100644 srcpkgs/coin-or-osi/template diff --git a/common/shlibs b/common/shlibs index 9eeb212aa0a4ae..6dc5770a384a02 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2764,6 +2764,7 @@ libCgl.so.1 CoinMP-1.8.3_1 libCbc.so.3 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libCoinUtils.so.3 coin-or-utils-2.11.13_1 +libOsi.so.1 coin-or-osi-0.108.12_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.20.so.0 libixion-0.20.0_1 liborcus-parser-0.21.so.0 liborcus-0.21.0_1 diff --git a/srcpkgs/coin-or-osi-devel b/srcpkgs/coin-or-osi-devel new file mode 120000 index 00000000000000..4e0f338afeac3e --- /dev/null +++ b/srcpkgs/coin-or-osi-devel @@ -0,0 +1 @@ +coin-or-osi \ No newline at end of file diff --git a/srcpkgs/coin-or-osi/template b/srcpkgs/coin-or-osi/template new file mode 100644 index 00000000000000..ffc36bd6d747f7 --- /dev/null +++ b/srcpkgs/coin-or-osi/template @@ -0,0 +1,38 @@ +# Template file for 'coin-or-osi' +pkgname=coin-or-osi +version=0.108.12 +revision=1 +build_style=gnu-configure +hostmakedepends="gcc-fortran pkg-config" +makedepends="coin-or-utils-devel" +short_desc="COIN-OR Open Solver Interface" +maintainer="Đoàn Trần Công Danh " +license="EPL-2.0" +homepage="https://github.com/coin-or/Osi" +distfiles="https://github.com/coin-or/Osi/archive/refs/tags/releases/${version}.tar.gz" +checksum=1d80d0b4275f2e1ceefc6dda66b8616e3a8c8b07a926ef4456db4a0d55249333 + +pre_build() { + if [ "$CROSS_BUILD" ]; then + vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX + else + cat <<-\EOF >$XBPS_WRAPPERDIR/g++ + #!/bin/sh + exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@" + EOF + chmod +x $XBPS_WRAPPERDIR/g++ + fi +} + +coin-or-osi-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/libOsiCommonTests*" + vmove "usr/lib/*.la" + vmove "usr/lib/*.so" + vmove usr/share/coin/doc + } +} From cd61598f15e15cf4d0f8508044963150cdcb5439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 18:56:46 +0700 Subject: [PATCH 4/8] Clp: update to 1.17.11. --- common/shlibs | 3 +++ srcpkgs/Clp/patches/disable-avx.patch | 37 +-------------------------- srcpkgs/Clp/template | 30 ++++++++++++++++------ 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/common/shlibs b/common/shlibs index 6dc5770a384a02..7105445a5b2628 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2765,6 +2765,9 @@ libCbc.so.3 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libCoinUtils.so.3 coin-or-utils-2.11.13_1 libOsi.so.1 coin-or-osi-0.108.12_1 +libClp.so.1 libClp-1.7.11_1 +libClpSolver.so.1 libClp-1.7.11_1 +libOsiClp.so.1 libClp-1.7.11_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.20.so.0 libixion-0.20.0_1 liborcus-parser-0.21.so.0 liborcus-0.21.0_1 diff --git a/srcpkgs/Clp/patches/disable-avx.patch b/srcpkgs/Clp/patches/disable-avx.patch index ce0ddfa6392090..4f39e42deb0321 100644 --- a/srcpkgs/Clp/patches/disable-avx.patch +++ b/srcpkgs/Clp/patches/disable-avx.patch @@ -1,27 +1,6 @@ -This disables AVX2 usage on x86_64 (by defining NO_AVX_HARDWARE) as well as -removes now-unused includes for AVX2/AVX512 instrinsics (the NEON header -was never used in the first place and the way it's included is completely -wrong anyway). - -We need it disabled on x86_64 because we're generic (and AVX is sandybridge -and newer, but the enabled code was for haswell and newer), and on other -arches it's disabled for obvious reasons. - --- a/Clp/src/ClpPackedMatrix.cpp +++ b/Clp/src/ClpPackedMatrix.cpp -@@ -6749,11 +6749,6 @@ ClpPackedMatrix3::ClpPackedMatrix3() - } - #ifdef _MSC_VER - #include --#elif defined(__arm__) --#include --#else --#include --//#include - #endif - /* Constructor from copy. */ - ClpPackedMatrix3::ClpPackedMatrix3(ClpSimplex *model, const CoinPackedMatrix *columnCopy) -@@ -6777,7 +6772,7 @@ ClpPackedMatrix3::ClpPackedMatrix3(ClpSimplex *model, const CoinPackedMatrix *co +@@ -6777,7 +6777,7 @@ ClpPackedMatrix3::ClpPackedMatrix3(ClpSi { //#undef COIN_AVX2 //#define COIN_AVX2 8 @@ -30,17 +9,3 @@ arches it's disabled for obvious reasons. #ifndef COIN_AVX2 #define COIN_AVX2 4 #else ---- a/Clp/src/ClpSimplexDual.cpp -+++ b/Clp/src/ClpSimplexDual.cpp -@@ -3556,11 +3556,6 @@ void moveAndZero(clpTempInfo *info, int type, void *extra) - #endif - #ifdef _MSC_VER - #include --#elif defined(__arm__) --#include --#else --#include --//#include - #endif - int ClpSimplexDual::dualColumn0(const CoinIndexedVector *rowArray, - const CoinIndexedVector *columnArray, diff --git a/srcpkgs/Clp/template b/srcpkgs/Clp/template index 5757706f8ca73e..ebe67e88c22b9c 100644 --- a/srcpkgs/Clp/template +++ b/srcpkgs/Clp/template @@ -1,15 +1,29 @@ # Template file for 'Clp' pkgname=Clp -version=1.17.3 -revision=2 +version=1.17.11 +revision=1 build_style=gnu-configure -depends="libClp>=${version}_${revision}" -short_desc="COIN LP Solver" -maintainer="Orphaned " -license="EPL-1.0" +hostmakedepends="gcc-fortran pkg-config" +makedepends="coin-or-osi-devel coin-or-utils-devel coin-or-sample" +depends="libClp>=${version}_${revision} coin-or-sample" +short_desc="COIN-OR linear programming solver" +maintainer="Đoàn Trần Công Danh " +license="EPL-2.0" homepage="https://github.com/coin-or/Clp" -distfiles="https://www.coin-or.org/Tarballs/Clp/Clp-${version}.tgz" -checksum=a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573 +distfiles="https://github.com/coin-or/Clp/archive/refs/tags/releases/${version}.tar.gz" +checksum=2c078e174dc1a7a308e091b6256fb34b4017897fc140ea707ba207b2913ea46d + +pre_build() { + if [ "$CROSS_BUILD" ]; then + vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX + else + cat <<-\EOF >$XBPS_WRAPPERDIR/g++ + #!/bin/sh + exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@" + EOF + chmod +x $XBPS_WRAPPERDIR/g++ + fi +} libClp-devel_package() { short_desc+=" - development files" From 5fda32660f0c708f596ad61441ec7976aa8bce72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 16:02:22 +0700 Subject: [PATCH 5/8] New package: coin-or-cgl-0.60.10 --- common/shlibs | 2 +- srcpkgs/coin-or-cgl-devel | 1 + srcpkgs/coin-or-cgl/template | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/coin-or-cgl-devel create mode 100644 srcpkgs/coin-or-cgl/template diff --git a/common/shlibs b/common/shlibs index 7105445a5b2628..5560c1d99b0bc8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2760,7 +2760,7 @@ libfreehand-0.1.so.1 libfreehand-0.1.1_1 libe-book-0.1.so.1 libe-book-0.1.2_1 libCoinMP.so.1 CoinMP-1.8.3_1 libOsiCbc.so.3 CoinMP-1.8.3_1 -libCgl.so.1 CoinMP-1.8.3_1 +libCgl.so.1 coin-or-cgl-0.60.10_1 libCbc.so.3 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libCoinUtils.so.3 coin-or-utils-2.11.13_1 diff --git a/srcpkgs/coin-or-cgl-devel b/srcpkgs/coin-or-cgl-devel new file mode 120000 index 00000000000000..8e84f13f80c7f8 --- /dev/null +++ b/srcpkgs/coin-or-cgl-devel @@ -0,0 +1 @@ +coin-or-cgl \ No newline at end of file diff --git a/srcpkgs/coin-or-cgl/template b/srcpkgs/coin-or-cgl/template new file mode 100644 index 00000000000000..a2951dc5099b2b --- /dev/null +++ b/srcpkgs/coin-or-cgl/template @@ -0,0 +1,36 @@ +# Template file for 'coin-or-cgl' +pkgname=coin-or-cgl +version=0.60.10 +revision=1 +build_style=gnu-configure +hostmakedepends="gcc-fortran pkg-config" +makedepends="coin-or-utils-devel coin-or-osi-devel libClp-devel" +short_desc="Coin OR Cut Generator Library" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-or-later" +homepage="https://github.com/coin-or/Cgl" +distfiles="https://github.com/coin-or/Cgl/archive/refs/tags/releases/${version}.tar.gz" +checksum=41b7ac9402db883d9c487eb7101e59eb513cefd726e6e7a669dc94664d9385e6 + +pre_build() { + if [ "$CROSS_BUILD" ]; then + vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX + else + cat <<-\EOF >$XBPS_WRAPPERDIR/g++ + #!/bin/sh + exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@" + EOF + chmod +x $XBPS_WRAPPERDIR/g++ + fi +} + +coin-or-cgl-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/coin/doc + } +} From 42fe735c86ad8c2dce77bce7ff0a974b2bda87bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 16:02:55 +0700 Subject: [PATCH 6/8] New package: coin-or-cbc-2.10.13 --- common/shlibs | 6 +++--- srcpkgs/coin-or-cbc-devel | 1 + srcpkgs/coin-or-cbc/template | 37 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/coin-or-cbc-devel create mode 100644 srcpkgs/coin-or-cbc/template diff --git a/common/shlibs b/common/shlibs index 5560c1d99b0bc8..f00b6659172ab5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2759,10 +2759,10 @@ libSwiften.so.0 swiften-4.0.3_2 libfreehand-0.1.so.1 libfreehand-0.1.1_1 libe-book-0.1.so.1 libe-book-0.1.2_1 libCoinMP.so.1 CoinMP-1.8.3_1 -libOsiCbc.so.3 CoinMP-1.8.3_1 +libOsiCbc.so.3 coin-or-cbc-2.10.13_1 libCgl.so.1 coin-or-cgl-0.60.10_1 -libCbc.so.3 CoinMP-1.8.3_1 -libCbcSolver.so.3 CoinMP-1.8.3_1 +libCbc.so.3 coin-or-cbc-2.10.13_1 +libCbcSolver.so.3 coin-or-cbc-2.10.13_1 libCoinUtils.so.3 coin-or-utils-2.11.13_1 libOsi.so.1 coin-or-osi-0.108.12_1 libClp.so.1 libClp-1.7.11_1 diff --git a/srcpkgs/coin-or-cbc-devel b/srcpkgs/coin-or-cbc-devel new file mode 120000 index 00000000000000..0db886fab27d9e --- /dev/null +++ b/srcpkgs/coin-or-cbc-devel @@ -0,0 +1 @@ +coin-or-cbc \ No newline at end of file diff --git a/srcpkgs/coin-or-cbc/template b/srcpkgs/coin-or-cbc/template new file mode 100644 index 00000000000000..267fc095bc5af6 --- /dev/null +++ b/srcpkgs/coin-or-cbc/template @@ -0,0 +1,37 @@ +# Template file for 'coin-or-cbc' +pkgname=coin-or-cbc +version=2.10.13 +revision=1 +build_style=gnu-configure +hostmakedepends="gcc-fortran pkg-config" +makedepends="coin-or-utils-devel coin-or-osi-devel coin-or-cgl-devel + libClp-devel" +short_desc="COIN-OR Branch-and-Cut solver" +maintainer="Đoàn Trần Công Danh " +license="EPL-2.0" +homepage="https://github.com/coin-or/Cbc" +distfiles="https://github.com/coin-or/Cbc/archive/refs/tags/releases/${version}.tar.gz" +checksum=62fde44dcf6f3d05c5cd291d7435cdd1b7e8acd3c78ec481dd39fe49cbc40399 + +pre_build() { + if [ "$CROSS_BUILD" ]; then + vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX + else + cat <<-\EOF >$XBPS_WRAPPERDIR/g++ + #!/bin/sh + exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@" + EOF + chmod +x $XBPS_WRAPPERDIR/g++ + fi +} + +coin-or-cbc-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/coin/doc + } +} From 59a8490fd2cf182c0b92efd7c929152af0662fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 16:50:43 +0700 Subject: [PATCH 7/8] CoinMP: split subprojects --- .../CoinMP/patches/implicit-function.patch | 10 ++++++++ srcpkgs/CoinMP/patches/mips.patch | 15 ------------ srcpkgs/CoinMP/template | 24 +++++++++++++++---- 3 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 srcpkgs/CoinMP/patches/implicit-function.patch delete mode 100644 srcpkgs/CoinMP/patches/mips.patch diff --git a/srcpkgs/CoinMP/patches/implicit-function.patch b/srcpkgs/CoinMP/patches/implicit-function.patch new file mode 100644 index 00000000000000..e5583dff34fb1b --- /dev/null +++ b/srcpkgs/CoinMP/patches/implicit-function.patch @@ -0,0 +1,10 @@ +--- a/CoinMP/src/CoinProblem.c ++++ b/CoinMP/src/CoinProblem.c +@@ -2,6 +2,7 @@ + /* CoinProblem.c */ + + ++#include + #include + #include + #include /* DBL_MAX */ diff --git a/srcpkgs/CoinMP/patches/mips.patch b/srcpkgs/CoinMP/patches/mips.patch deleted file mode 100644 index 425d1919c28e80..00000000000000 --- a/srcpkgs/CoinMP/patches/mips.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid `mips' as a parameter name. It is a reserved name for mips* targets. - ---- a/Cbc/src/CbcModel.hpp 2015-07-07 22:44:40.000000000 +0200 -+++ b/Cbc/src/CbcModel.hpp 2018-01-14 13:49:12.277278333 +0100 -@@ -2394,8 +2394,8 @@ - void redoWalkBack(); - //@} - -- void setMIPStart( const std::vector< std::pair< std::string, double > > &mips ) { -- this->mipStart_ = mips; -+ void setMIPStart( const std::vector< std::pair< std::string, double > > &start ) { -+ this->mipStart_ = start; - } - - const std::vector< std::pair< std::string, double > > &getMIPStart() { diff --git a/srcpkgs/CoinMP/template b/srcpkgs/CoinMP/template index 937476cfe7c6fa..b5b100cc8b173d 100644 --- a/srcpkgs/CoinMP/template +++ b/srcpkgs/CoinMP/template @@ -1,9 +1,12 @@ # Template file for 'CoinMP' pkgname=CoinMP version=1.8.4 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="doxygen graphviz pkg-config" +hostmakedepends="doxygen graphviz pkg-config gcc-fortran" +makedepends="coin-or-cbc-devel libClp-devel coin-or-cgl-devel + coin-or-osi-devel coin-or-utils-devel coin-or-sample" +depends="coin-or-sample" short_desc="Library that supports most of Coin CLP, CBC and CGL" maintainer="Orphaned " license="CPL-1.0" @@ -11,9 +14,20 @@ homepage="https://github.com/coin-or/CoinMP" distfiles="https://www.coin-or.org/download/source/CoinMP/CoinMP-${version}.tgz" checksum=3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d -post_configure() { - # remove erroneous cross base prefix from include paths - find -name Makefile -exec sed -i "{}" -e "s;-I${XBPS_CROSS_BASE};-I;g" \; +post_extract() { + rm -rf Cbc Cgl Clp CoinUtils Osi Data/Sample +} + +pre_build() { + if [ "$CROSS_BUILD" ]; then + vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX + else + cat <<-\EOF >$XBPS_WRAPPERDIR/g++ + #!/bin/sh + exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@" + EOF + chmod +x $XBPS_WRAPPERDIR/g++ + fi } post_install() { From 74abc06a3dc7cabfbe5b0226e8fc76de5747bc05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 2 Sep 2026 19:35:26 +0700 Subject: [PATCH 8/8] libogdf: update to 2025.10. --- srcpkgs/libogdf/patches/install-coin.patch | 11 +++++++ srcpkgs/libogdf/patches/libdir.patch | 32 ------------------- .../patches/no-march-native-werror.patch | 24 +++++++------- srcpkgs/libogdf/template | 12 ++++--- 4 files changed, 31 insertions(+), 48 deletions(-) create mode 100644 srcpkgs/libogdf/patches/install-coin.patch delete mode 100644 srcpkgs/libogdf/patches/libdir.patch diff --git a/srcpkgs/libogdf/patches/install-coin.patch b/srcpkgs/libogdf/patches/install-coin.patch new file mode 100644 index 00000000000000..125f5b1bf41114 --- /dev/null +++ b/srcpkgs/libogdf/patches/install-coin.patch @@ -0,0 +1,11 @@ +--- a/cmake/coin.cmake ++++ b/cmake/coin.cmake +@@ -23,7 +23,7 @@ add_library(COIN ${COIN_LIBRARY_TYPE} ${ + group_files(COIN_SOURCES "coin") + target_include_directories(COIN SYSTEM PUBLIC + $ +- $) ++ $) + target_compile_definitions(COIN PRIVATE + -DCLP_BUILD -DCOINUTILS_BUILD -DOSI_BUILD -D__OSI_CLP__ + -DCOMPILE_IN_CG -DCOMPILE_IN_CP -DCOMPILE_IN_LP -DCOMPILE_IN_TM diff --git a/srcpkgs/libogdf/patches/libdir.patch b/srcpkgs/libogdf/patches/libdir.patch deleted file mode 100644 index 511064d40f0412..00000000000000 --- a/srcpkgs/libogdf/patches/libdir.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: OGDF-snapshot/cmake/coin.cmake -=================================================================== ---- OGDF-snapshot.orig/cmake/coin.cmake -+++ OGDF-snapshot/cmake/coin.cmake -@@ -55,9 +55,9 @@ else() - endif() - - # installation --set(COIN_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of COIN library") -+set(COIN_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of COIN library") - set(COIN_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of COIN header files (creates subdirectory)") --set(COIN_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake") -+set(COIN_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake") - mark_as_advanced(COIN_INSTALL_LIBRARY_DIR COIN_INSTALL_INCLUDE_DIR COIN_INSTALL_CMAKE_DIR) - install(TARGETS COIN - EXPORT CoinTargets -Index: OGDF-snapshot/cmake/ogdf.cmake -=================================================================== ---- OGDF-snapshot.orig/cmake/ogdf.cmake -+++ OGDF-snapshot/cmake/ogdf.cmake -@@ -166,9 +166,9 @@ if(SHOW_STACKTRACE) - endif() - - # installation --set(OGDF_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of OGDF library") -+set(OGDF_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of OGDF library") - set(OGDF_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of OGDF header files (creates subdirectory)") --set(OGDF_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake") -+set(OGDF_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake") - mark_as_advanced(OGDF_INSTALL_LIBRARY_DIR OGDF_INSTALL_INCLUDE_DIR OGDF_INSTALL_CMAKE_DIR) - configure_file(cmake/ogdf-config.cmake "${PROJECT_BINARY_DIR}/ogdf-config.cmake" @ONLY) - install(TARGETS OGDF diff --git a/srcpkgs/libogdf/patches/no-march-native-werror.patch b/srcpkgs/libogdf/patches/no-march-native-werror.patch index bee7c0a475fbb2..ac31dd0c98af75 100644 --- a/srcpkgs/libogdf/patches/no-march-native-werror.patch +++ b/srcpkgs/libogdf/patches/no-march-native-werror.patch @@ -1,25 +1,27 @@ -Index: b/cmake/compiler-specifics.cmake -=================================================================== --- a/cmake/compiler-specifics.cmake +++ b/cmake/compiler-specifics.cmake -@@ -12,12 +12,6 @@ if(MSVC) - set(COIN_LIBRARY_TYPE STATIC) +@@ -39,17 +39,6 @@ if(MSVC) + endif() endif() --# use native arch (ie, activate things like SSE) --if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +-# use specified or native arch (ie, activate things like SSE) +-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") +- set(OGDF_ARCH "native" CACHE STRING "Target CPU (micro)architecture passed to the compiler via `-march`.") +- mark_as_advanced(OGDF_ARCH) +- - # cannot use add_definitions() here because it does not work with check-sse3.cmake -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${OGDF_ARCH}") +-else() +- unset(OGDF_ARCH CACHE) -endif() - # set default warning flags for OGDF and tests set(available_default_warning_flags "") set(available_default_warning_flags_debug "") -@@ -38,7 +32,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl +@@ -96,6 +85,5 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GN set(available_default_warning_flags_release "-Wno-error=unused-but-set-variable -Wno-error=strict-overflow") endif() set(available_default_warning_flags_release "${available_default_warning_flags_release} -Wno-error=unused-variable") - set(warnings_as_errors_flag "-Werror") - elseif(MSVC) - set(available_default_warning_flags "/W3 /wd4018 /wd4068 /wd4101 /wd4244 /wd4250 /wd4267 /wd4373 /wd4800 /wd4996") - # this has to be explained because MSVC is so cryptic: + set(warnings_not_as_errors_flag "-Wno-error") + endif() diff --git a/srcpkgs/libogdf/template b/srcpkgs/libogdf/template index c2eda4c833b860..c5021e81e028d2 100644 --- a/srcpkgs/libogdf/template +++ b/srcpkgs/libogdf/template @@ -1,29 +1,31 @@ # Template file for 'libogdf' pkgname=libogdf -version=2018.03.28 +version=2025.10 revision=1 archs="i686* x86_64*" build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="unzip" -makedepends="libClp-devel" short_desc="Open Graph Drawing Framework" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://ogdf.uos.de/" -distfiles="https://ogdf.uos.de/wp-content/uploads/2019/04/ogdf-snapshot-${version//./-}.zip" -checksum=347c3fa8dcdbb094f9c43008cbc2934bc5a64a532af4d3fe360a5fa54488440f +distfiles="https://ogdf.uos.de/wp-content/uploads/${version%.*}/${version#*.}/ogdf.v${version}.zip" +checksum=54f8fc9c2b44b3e4f34ca85be3ae77ce2a309337397662c1432a960367522ccb nocross="can't find cpuid.h headers" if [ "$XBPS_TARGET_LIBC" = musl ]; then broken="Non optional usage of broken mallinfo" fi +post_install() { + mv $DESTDIR/usr/include/coin $DESTDIR/usr/include/ogdf +} + libogdf-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/cmake } }