January 2023 - crux-commits

ports/contrib (3.7): [notify] libetonyek: pulled patches from libreoffice, new dependency boost-1.80
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 5f8ce065be071367bf82773752d6f10de38c493f Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 18:05:41 2023 +0100 [notify] libetonyek: pulled patches from libreoffice, new dependency boost-1.80 diff --git a/libetonyek/.signature b/libetonyek/.signature index aee5c9d47..18f9efdca 100644 --- a/libetonyek/.signature +++ b/libetonyek/.signature @@ -1,5 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34R3euPY7LlJA+RWm8k45GCdY6adGa7j1oSBYWHyewqpOf+umTjgXbXphvLdMvO95I0by88r/qoCVK1otkX5ZAo= -SHA256 (Pkgfile) = 37ae1e802585de2af098a9f6aeb18332cfb284f2f8ce87844bbdcfd195a07743 +RWSagIOpLGJF36EaeuK0D2C9vEcHnK/QN71F+y3mZvefLSTKFnYfZvfRl9MunxGbKZDeG9uxTY5sEHUcfxYmjoYV1FQ15AZABQQ= +SHA256 (Pkgfile) = 317c4bbe5270ce99d4d23778be1865ff5a7a401569355d42ebf475c9b4a7ffd6 SHA256 (.footprint) = 57ee578ffca9a5b5be3eedf3917c93dddd88357e5a4e5859a8e7b32d0634f111 SHA256 (libetonyek-0.1.10.tar.xz) = b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a +SHA256 (0001-allow-0-size-message.patch.1) = 805673f9d4dec4f6533c9811cd88ddf8b379ca281f417ebe5bbea4f93ce67fb5 +SHA256 (libetonyek-bundled-soname.patch.0) = 48d1167d8cd3f16d355d253ee6c4f4b25e0c581b77d6cafcd62f013d3431d584 +SHA256 (rpath.patch) = 4d3f2c888edb1f693c34456f674bafe38b158f735ce96e6b16cbdde66feddb1a +SHA256 (ubsan.patch) = d5dd14bef090b35074b1393e6921cacbc5be0a1677f6c6a4620a3e3f7cf3fa51 +SHA256 (warnings.patch) = 5c02ff9e82e91d51239e0efed9274b6abe83b57908d6ef6ed055cb65768a691e diff --git a/libetonyek/0001-allow-0-size-message.patch.1 b/libetonyek/0001-allow-0-size-message.patch.1 new file mode 100644 index 000000000..62e584b81 --- /dev/null +++ b/libetonyek/0001-allow-0-size-message.patch.1 @@ -0,0 +1,30 @@ +From 54762245feee35ce6885f7443da8f8443fccd5b5 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon(a)redhat.com> +Date: Wed, 26 May 2021 20:39:41 +0200 +Subject: [PATCH] allow 0-size message + +It likely means the input is broken, but there is no need to reject it. +Let's just produce a dummy, empty message. + +Change-Id: I03a1e9827f21f6a0ce69d7e16dfcf2e9a0f2d44f +--- + src/lib/IWAMessage.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lib/IWAMessage.cpp b/src/lib/IWAMessage.cpp +index c01b1b6..9456444 100644 +--- a/src/lib/IWAMessage.cpp ++++ b/src/lib/IWAMessage.cpp +@@ -42,7 +42,8 @@ IWAMessage::IWAMessage(const RVNGInputStreamPtr_t &input, unsigned long length) + : m_input(input) + , m_fields() + { +- assert(length > 0); ++ if (length == 0) ++ return; + + parse(length); + } +-- +2.31.1 + diff --git a/libetonyek/Pkgfile b/libetonyek/Pkgfile index 5e7c4a422..1367b658d 100644 --- a/libetonyek/Pkgfile +++ b/libetonyek/Pkgfile @@ -1,17 +1,38 @@ # Description: Library and a set of tools for reading and converting Apple Keynote presentations # URL: https://wiki.documentfoundation.org/DLP/Libraries/libetonyek # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: glm liblangtag librevenge mdds +# Depends on: boost-1.80 glm liblangtag librevenge mdds name=libetonyek version=0.1.10 -release=2 -source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz) +release=3 +source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz + 0001-allow-0-size-message.patch.1 + libetonyek-bundled-soname.patch.0 + rpath.patch + ubsan.patch + warnings.patch) build() { cd $name-$version + + patch -Np1 -i $SRC/0001-allow-0-size-message.patch.1 + patch -Np0 -i $SRC/libetonyek-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch + patch -Np0 -i $SRC/ubsan.patch + patch -Np0 -i $SRC/warnings.patch + + # boost 1.81.0 breaks libetonyek + CXXFLAGS="-I/usr/opt/boost-1.80/include $CFLAGS" + CPPFLAGS="-I/usr/opt/boost-1.80/include $CFLAGS" + + autoreconf -fvi + ./configure --prefix=/usr \ - --with-mdds=2.0 \ + --with-pic \ + --with-mdds=2.1 \ + --disable-static \ + --disable-werror \ --without-docs make make DESTDIR=$PKG install diff --git a/libetonyek/boost.patch b/libetonyek/boost.patch new file mode 100644 index 000000000..3553afb8b --- /dev/null +++ b/libetonyek/boost.patch @@ -0,0 +1,36 @@ +diff -Naur libetonyek-0.1.10.orig/configure.ac libetonyek-0.1.10/configure.ac +--- libetonyek-0.1.10.orig/configure.ac 2023-01-28 15:58:44.501436820 +0100 ++++ libetonyek-0.1.10/configure.ac 2023-01-28 16:39:38.681363319 +0100 +@@ -102,7 +102,7 @@ + boost/none.hpp \ + boost/numeric/conversion/cast.hpp \ + boost/optional.hpp \ +- boost/spirit/include/phoenix.hpp \ ++ boost/phoenix.hpp \ + boost/spirit/include/qi.hpp \ + boost/variant/recursive_variant.hpp \ + boost/variant/variant.hpp \ +diff -Naur libetonyek-0.1.10.orig/src/lib/contexts/KEY1DivElement.cpp libetonyek-0.1.10/src/lib/contexts/KEY1DivElement.cpp +--- libetonyek-0.1.10.orig/src/lib/contexts/KEY1DivElement.cpp 2023-01-28 15:58:44.474769901 +0100 ++++ libetonyek-0.1.10/src/lib/contexts/KEY1DivElement.cpp 2023-01-28 16:39:07.884404770 +0100 +@@ -8,7 +8,7 @@ + */ + + #include <boost/spirit/include/qi.hpp> +-#include <boost/spirit/include/phoenix.hpp> ++#include <boost/phoenix.hpp> + #include <memory> + + #include "KEY1DivElement.h" +diff -Naur libetonyek-0.1.10.orig/src/lib/contexts/KEY1StringConverter.cpp libetonyek-0.1.10/src/lib/contexts/KEY1StringConverter.cpp +--- libetonyek-0.1.10.orig/src/lib/contexts/KEY1StringConverter.cpp 2023-01-28 15:58:44.478103266 +0100 ++++ libetonyek-0.1.10/src/lib/contexts/KEY1StringConverter.cpp 2023-01-28 16:39:23.404551864 +0100 +@@ -11,7 +11,7 @@ + + #include <boost/fusion/include/std_pair.hpp> + #include <boost/spirit/include/qi.hpp> +-#include <boost/spirit/include/phoenix.hpp> ++#include <boost/phoenix.hpp> + + #include "KEY1StringConverter.h" + diff --git a/libetonyek/libetonyek-bundled-soname.patch.0 b/libetonyek/libetonyek-bundled-soname.patch.0 new file mode 100644 index 000000000..15a58fa83 --- /dev/null +++ b/libetonyek/libetonyek-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2016-01-12 19:21:24.000000000 +0100 ++++ src/lib/Makefile.in 2016-03-02 18:19:52.214551270 +0100 +@@ -538,7 +538,7 @@ + $(XML_CFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS) $(am__append_1) + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@ + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@ +-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \ + EtonyekDocument.cpp + diff --git a/libetonyek/rpath.patch b/libetonyek/rpath.patch new file mode 100644 index 000000000..3a6280597 --- /dev/null +++ b/libetonyek/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -14451,6 +14451,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/libetonyek/ubsan.patch b/libetonyek/ubsan.patch new file mode 100644 index 000000000..260e9f33d --- /dev/null +++ b/libetonyek/ubsan.patch @@ -0,0 +1,11 @@ +--- src/lib/libetonyek_xml.cpp ++++ src/lib/libetonyek_xml.cpp +@@ -35,7 +35,7 @@ + unsigned long bytesRead = 0; + const unsigned char *const bytes = input->read((unsigned long)len, bytesRead); + +- std::memcpy(buffer, bytes, static_cast<size_t>(bytesRead)); ++ if (bytesRead != 0) std::memcpy(buffer, bytes, static_cast<size_t>(bytesRead)); + return static_cast<int>(bytesRead); + } + catch (...) diff --git a/libetonyek/warnings.patch b/libetonyek/warnings.patch new file mode 100644 index 000000000..841d70cb6 --- /dev/null +++ b/libetonyek/warnings.patch @@ -0,0 +1,11 @@ +--- src/lib/IWORKXMLContext.cpp ++++ src/lib/IWORKXMLContext.cpp +@@ -18,7 +18,7 @@ + { + } + +-void IWORKXMLContext::CDATA(const char */*value*/) ++void IWORKXMLContext::CDATA(const char * /*value*/) + { + ETONYEK_DEBUG_MSG(("IWORKXMLContext::cData: find unexpected CDATA block\n")); + }

1 0

ports/contrib (3.7): libmspub: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 3ef2e2b4c8fa4f0a8aaecf4e2f97aa730ffe730f Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:46:50 2023 +0100 libmspub: pulled patches from libreoffice diff --git a/libmspub/.signature b/libmspub/.signature index c41ef8c7c..fcb0783a1 100644 --- a/libmspub/.signature +++ b/libmspub/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zRerLxiD3FFLD2jtuE5NALN6BvQJTHWqOOzi/PuyPgNszyl2uSGfOwdlKXQd5S2LdF9gvr0wc6p3EzGKPYZZww= -SHA256 (Pkgfile) = c2ffd1ac75b63ea6068f23129493d34991d621b6e41bf74f623040838a62855b +RWSagIOpLGJF3/4B+uIF3XLxFQ35h9jefbk0HLRUrFPVP5mpUPR5X2kRTVkGIHlLWkS4B0a+6ngPaiHZyR8LA+A3oQvUnzUQqwA= +SHA256 (Pkgfile) = 763159ee28fc746e80e2e63a70517d9769341ba4a3d8bb65fe2ad709ad892a2f SHA256 (.footprint) = c8c4c6a874318cd6b040da6b4a816e690a7aa8b0c2631a40a5643face3b2cbb7 SHA256 (libmspub-0.1.4.tar.xz) = ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba SHA256 (missing_include.patch) = 7fcc8f5a2cdfc91b7c8d4fdc2e30c7be5dacc7c450eab2b083d1539970d04e6e +SHA256 (ubsan.patch) = 3cebc78bd752ad6c5e36e25d8db4e05c95317eacc2fb4e30bee0491ef52d45db diff --git a/libmspub/Pkgfile b/libmspub/Pkgfile index 896baf8a3..125abbb9b 100644 --- a/libmspub/Pkgfile +++ b/libmspub/Pkgfile @@ -5,13 +5,17 @@ name=libmspub version=0.1.4 -release=1 +release=2 source=(https://dev-www.libreoffice.org/src/libmspub/$name-$version.tar.xz - missing_include.patch) + missing_include.patch + ubsan.patch) build() { cd $name-$version + patch -Np1 -i $SRC/missing_include.patch + patch -Np0 -i $SRC/ubsan.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/libmspub/ubsan.patch b/libmspub/ubsan.patch new file mode 100644 index 000000000..b58249e18 --- /dev/null +++ b/libmspub/ubsan.patch @@ -0,0 +1,12 @@ +--- src/lib/MSPUBContentChunkType.h ++++ src/lib/MSPUBContentChunkType.h +@@ -27,7 +27,8 @@ + CELLS = 0x63, + FONT = 0x6C, + IMAGE_2K, //these don't exist in Pub 2k3 so their value in the enum is not used. +- IMAGE_2K_DATA ++ IMAGE_2K_DATA, ++ MSPUBContentChunkType_dummy=0xFF // MSPUBParser.cpp:2359:9: runtime error: load of value 138, which is not a valid value for type 'libmspub::MSPUBContentChunkType' + }; + } // namespace libmspub +

1 0

ports/contrib (3.7): libmwaw: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit ee6734ec91f2e84d919fd1218a485b18544d83b5 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:46:34 2023 +0100 libmwaw: pulled patches from libreoffice diff --git a/libmwaw/.footprint b/libmwaw/.footprint index aa6fc2383..6d016e141 100644 --- a/libmwaw/.footprint +++ b/libmwaw/.footprint @@ -10,12 +10,12 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/libmwaw-0.3/ drwxr-xr-x root/root usr/include/libmwaw-0.3/libmwaw/ --rw-r--r-- root/root usr/include/libmwaw-0.3/libmwaw/libmwaw.hxx -rw-r--r-- root/root usr/include/libmwaw-0.3/libmwaw/MWAWDocument.hxx +-rw-r--r-- root/root usr/include/libmwaw-0.3/libmwaw/libmwaw.hxx drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libmwaw-0.3-lo.so.3 -> libmwaw-0.3-lo.so.3.0.21 +-rwxr-xr-x root/root usr/lib/libmwaw-0.3-lo.so.3.0.21 -rwxr-xr-x root/root usr/lib/libmwaw-0.3.la --rwxr-xr-x root/root usr/lib/libmwaw-0.3.so.3.0.21 -lrwxrwxrwx root/root usr/lib/libmwaw-0.3.so.3 -> libmwaw-0.3.so.3.0.21 -lrwxrwxrwx root/root usr/lib/libmwaw-0.3.so -> libmwaw-0.3.so.3.0.21 +lrwxrwxrwx root/root usr/lib/libmwaw-0.3.so -> libmwaw-0.3-lo.so.3.0.21 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libmwaw-0.3.pc diff --git a/libmwaw/.signature b/libmwaw/.signature index add2ea3e6..2bb292f70 100644 --- a/libmwaw/.signature +++ b/libmwaw/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zNjxA/0I3+LrstcQ4XYIM0KXcBdsBdUbhD54u5dshCKmM8pcydmmPO8U+ouockENp55+VqF6MsQRpUULRoJbQo= -SHA256 (Pkgfile) = 48a1a2b076bbd68fab590e52af7bbf7aadf62e22988fd2ae54a16280f2307504 -SHA256 (.footprint) = 1a20535503d820057c3dde822a1954fe0a45738cbbb63da70cfa740ee1510c4c +RWSagIOpLGJF3wiZxNctN2xwLzfzuFnW8SQd5xUegaJc5+QHUenr5bS36Y0sSD7KyunZkfyJnyx9mDSsCibhxXtHFY/1KthNiA0= +SHA256 (Pkgfile) = 343b903bf0107eed9c3c2b1b38f5a63e1658d964031d9ee6608992f4efe57bb3 +SHA256 (.footprint) = 8ec1d113a69f19a41db4c8632eeb6bf0baab7d639d113dde66c7532d70502fad SHA256 (libmwaw-0.3.21.tar.xz) = e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c +SHA256 (libmwaw-bundled-soname.patch.0) = d7d85506d123eb64acb4e658fb5a61767d5ad78b71994fa0a7850804fa4c2843 +SHA256 (rpath.patch) = b4453ed227905aec35f5502b820a127066b2ae13ed26680eada0f9527117da84 diff --git a/libmwaw/Pkgfile b/libmwaw/Pkgfile index 84c392f16..7deaad84b 100644 --- a/libmwaw/Pkgfile +++ b/libmwaw/Pkgfile @@ -5,13 +5,20 @@ name=libmwaw version=0.3.21 -release=1 -source=(https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz) +release=2 +source=(https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz + libmwaw-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/libmwaw-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install + rm -fr $PKG/usr/share } diff --git a/libmwaw/libmwaw-bundled-soname.patch.0 b/libmwaw/libmwaw-bundled-soname.patch.0 new file mode 100644 index 000000000..31f5c75cb --- /dev/null +++ b/libmwaw/libmwaw-bundled-soname.patch.0 @@ -0,0 +1,14 @@ +--- src/lib/Makefile.in.orig 2015-08-07 14:04:47.646611627 +0200 ++++ src/lib/Makefile.in 2015-08-07 14:25:49.888589996 +0200 +@@ -418,8 +418,8 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) \ + $(ZLIB_CFLAGS) $(am__append_1) + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(ZLIB_LIBS) @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_SOURCES = \ + libmwaw_internal.cxx \ + libmwaw_internal.hxx \ + diff --git a/libmwaw/rpath.patch b/libmwaw/rpath.patch new file mode 100644 index 000000000..a73d8ae22 --- /dev/null +++ b/libmwaw/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -15353,6 +15353,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)

1 0

ports/contrib (3.7): liblangtag: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 6440246e49ecf837a7a87d8336c3ef0618185383 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:46:20 2023 +0100 liblangtag: pulled patches from libreoffice diff --git a/liblangtag/.footprint b/liblangtag/.footprint index 2d15ead75..569f0092e 100644 --- a/liblangtag/.footprint +++ b/liblangtag/.footprint @@ -32,10 +32,10 @@ drwxr-xr-x root/root usr/include/liblangtag/ -rw-r--r-- root/root usr/include/liblangtag/lt-variant.h -rw-r--r-- root/root usr/include/liblangtag/lt-xml.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/liblangtag-lo.so.1 -> liblangtag-lo.so.1.4.1 +-rwxr-xr-x root/root usr/lib/liblangtag-lo.so.1.4.1 -rwxr-xr-x root/root usr/lib/liblangtag.la -lrwxrwxrwx root/root usr/lib/liblangtag.so -> liblangtag.so.1.4.1 -lrwxrwxrwx root/root usr/lib/liblangtag.so.1 -> liblangtag.so.1.4.1 --rwxr-xr-x root/root usr/lib/liblangtag.so.1.4.1 +lrwxrwxrwx root/root usr/lib/liblangtag.so -> liblangtag-lo.so.1.4.1 drwxr-xr-x root/root usr/lib/liblangtag/ -rwxr-xr-x root/root usr/lib/liblangtag/liblangtag-ext-ldml-t.la -rwxr-xr-x root/root usr/lib/liblangtag/liblangtag-ext-ldml-t.so diff --git a/liblangtag/.signature b/liblangtag/.signature index 4f838f49f..49d1d87ef 100644 --- a/liblangtag/.signature +++ b/liblangtag/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37S8YmToOdUvgc9p/a1GUIJiIfdBCYSSUcfCQTakbh8IPvkPfl/qcS31/9IrcPGoI8lKDJhNvtwNU8ovAlnSGAQ= -SHA256 (Pkgfile) = e974a11cb539b30bc9f1c63b7e74551dbe4b83bbf650289d84b36aae7ffe34bc -SHA256 (.footprint) = 894adecf42dabe4fc00f2deb1a33195dba5a6cf71a6cfac0eed35747da765f94 +RWSagIOpLGJF3+Q5fkIANnwUqwniv5HWRMlLBGOTmli7xmwhh7BlnbXStroIw6xsEVHX75rl5KvQbYlFm4zc1LlHp2p51CZuNgU= +SHA256 (Pkgfile) = e51c695f31fc9fa6b2738c3c6b0ff15aabe93bfd7c509d64af721e654ffaa6a4 +SHA256 (.footprint) = ad246042a0bc407e233801442d67aeca954acf035f74fdc40e6fb6d8a70a1c17 SHA256 (liblangtag-0.6.4.tar.bz2) = 5701062c17d3e73ddaa49956cbfa5d47d2f8221988dec561c0af2118c1c8a564 +SHA256 (langtag-libtool-rpath.patch.0) = 09c5a1e0c921c951dcf42b41fcb3f0924cb5aaaa58621f3febc2e6e2555a7253 +SHA256 (liblangtag-bundled-soname.patch.0) = 1853ec446330302aa8612c66eeab79483cc4510c2a17d0e5b8958b710289c08f diff --git a/liblangtag/Pkgfile b/liblangtag/Pkgfile index 86fdc77cc..d17877737 100644 --- a/liblangtag/Pkgfile +++ b/liblangtag/Pkgfile @@ -5,13 +5,20 @@ name=liblangtag version=0.6.4 -release=1 -source=(https://bitbucket.org/tagoh/liblangtag/downloads/$name-$version.tar.bz2) +release=2 +source=(https://bitbucket.org/tagoh/liblangtag/downloads/$name-$version.tar.bz2 + langtag-libtool-rpath.patch.0 + liblangtag-bundled-soname.patch.0) build() { cd $name-$version + + patch -Np0 -i $SRC/langtag-libtool-rpath.patch.0 + patch -Np0 -i $SRC/liblangtag-bundled-soname.patch.0 + ./configure --prefix=/usr make make DESTDIR=$PKG install + rm -r $PKG/usr/share/gtk-doc } diff --git a/liblangtag/langtag-libtool-rpath.patch.0 b/liblangtag/langtag-libtool-rpath.patch.0 new file mode 100644 index 000000000..368832b8b --- /dev/null +++ b/liblangtag/langtag-libtool-rpath.patch.0 @@ -0,0 +1,23 @@ +Prevent libtool from adding annoying stuff to RPATH + +--- configure ++++ configure +@@ -10730,6 +10730,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd*) +--- data/Makefile.in ++++ data/Makefile.in +@@ -859,7 +859,7 @@ + @CROSS_COMPILING_TRUE@language-subtag-registry.xml: language-subtag-registry reg2xml.c Makefile + @CROSS_COMPILING_TRUE@ @echo Warning: Unable to rebuild $@ when cross-compiling + @CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@language-subtag-registry.xml: language-subtag-registry reg2xml$(EXEEXT) Makefile +-@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ $(AM_V_GEN) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || $(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \ ++@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ $(AM_V_GEN) $(LIBO_TUNNEL_LIBRARY_PATH) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || $(LIBO_TUNNEL_LIBRARY_PATH) $(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \ + @CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ head -1 $@.tmp | grep -E '^<\?xml version'>/dev/null 2>&1 && mv $@.tmp $@ || (echo "E: $@ isn't an expected result"; rm $@.tmp) + @CROSS_COMPILING_FALSE@@REBUILD_DATA_FALSE@language-subtag-registry.xml: + @CROSS_COMPILING_FALSE@@REBUILD_DATA_FALSE@ @echo Warning: the rebuild of $@ is explicitly disabled. diff --git a/liblangtag/liblangtag-bundled-soname.patch.0 b/liblangtag/liblangtag-bundled-soname.patch.0 new file mode 100644 index 000000000..4780d7a12 --- /dev/null +++ b/liblangtag/liblangtag-bundled-soname.patch.0 @@ -0,0 +1,10 @@ +--- liblangtag/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200 ++++ liblangtag/Makefile.in 2015-08-07 11:58:11.818741799 +0200 +@@ -638,6 +638,7 @@ + liblangtag_la_LDFLAGS = \ + $(LDFLAGS) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ -release lo \ + $(NULL) + + all: $(BUILT_SOURCES)

1 0

ports/contrib (3.7): lpsolve: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit dae20cc4c8e5298e229a072c2d53aa28fcca9993 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:46:13 2023 +0100 lpsolve: pulled patches from libreoffice diff --git a/lpsolve/.signature b/lpsolve/.signature index 3e464134b..6022a7ab4 100644 --- a/lpsolve/.signature +++ b/lpsolve/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33c5KYui1B2MMN/bWshQqzxi5DGZo3FB2wixvWRHsElEM2H+gOig7clZhL4ZPmPCPJfzNK80Vz+2fLA3+lrXGA8= -SHA256 (Pkgfile) = 0c5a5b2a55b3e5e56079a37bac636056d4d0b0782726b3c2d4e908952003e25f +RWSagIOpLGJF3wzZ4/Nz6v0h8Xq04lCPgZZ/zj3c1gCUi1ABGtNMzPG76MWnvCuwi4nb6vGZLaitmp59YChdlGg9R1vKGbvDqgk= +SHA256 (Pkgfile) = 93bff3316b268126a070b02e6215cb6f59caa5e94fd937307525da024ffd0790 SHA256 (.footprint) = b8cd5cff2918f0486c1bca11e7de996153b71a9452c465d604eed5c40281c1ae SHA256 (lp_solve_5.5.2.11_source.tar.gz) = 6d4abff5cc6aaa933ae8e6c17a226df0fc0b671c438f69715d41d09fe81f902f +SHA256 (lpsolve-ubsan.patch.0) = a369b0dbb1e664dd223bfd303f65f2456e3ab3e78b96152b71d5e41190ef42e1 diff --git a/lpsolve/Pkgfile b/lpsolve/Pkgfile index f1eeff15e..e1ecd7516 100644 --- a/lpsolve/Pkgfile +++ b/lpsolve/Pkgfile @@ -4,12 +4,15 @@ name=lpsolve version=5.5.2.11 -release=2 -source=(https://downloads.sourceforge.net/project/lpsolve/lpsolve/$version/lp_solve_"$version"_source.tar.gz) +release=3 +source=(https://downloads.sourceforge.net/project/lpsolve/lpsolve/$version/lp_solve_"$version"_source.tar.gz + lpsolve-ubsan.patch.0) build() { cd lp_solve_${version:0:3} + patch -Np0 -i $SRC/lpsolve-ubsan.patch.0 + sed -e "s|^$opts=$.*|\1'$CFLAGS'|" -i lpsolve55/ccc lp_solve/ccc ( cd lpsolve55 diff --git a/lpsolve/lpsolve-ubsan.patch.0 b/lpsolve/lpsolve-ubsan.patch.0 new file mode 100644 index 000000000..7a5e308c6 --- /dev/null +++ b/lpsolve/lpsolve-ubsan.patch.0 @@ -0,0 +1,22 @@ +--- lp_presolve.c ++++ lp_presolve.c +@@ -168,7 +168,7 @@ + if(isprimal) { + if(psdata->primalundo != NULL) + mat = psdata->primalundo->tracker; +- solution = lp->full_solution + lp->presolve_undo->orig_rows; ++ solution = lp->full_solution == NULL ? NULL : lp->full_solution + lp->presolve_undo->orig_rows; + slacks = lp->full_solution; + } + else { +--- lp_pricePSE.c ++++ lp_pricePSE.c +@@ -145,7 +147,7 @@ + + /* Store the active/current pricing type */ + if(isdual == AUTOMATIC) +- isdual = (MYBOOL) lp->edgeVector[0]; ++ isdual = lp->edgeVector[0] != 0.0; + else + lp->edgeVector[0] = isdual; +

1 0

ports/contrib (3.7): coin-or-mp: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit df571c07016b1060299f9d6aff9cd2db4e6de2c7 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:41:04 2023 +0100 coin-or-mp: pulled patches from libreoffice diff --git a/coin-or-mp/.signature b/coin-or-mp/.signature index 104e97cc7..9f2afa134 100644 --- a/coin-or-mp/.signature +++ b/coin-or-mp/.signature @@ -1,5 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3702twmUKVkfDG/Kw0cCG9YrvkzTFfkeHsRMyJH/dk/j5VZkUc2jkF4rHh4+WbaHgwqoAd3Qb1ILzn52405YhQ4= -SHA256 (Pkgfile) = d4d6494d8fde3ab7d48ec9926a73c2af87cace8a7c6622551667bc777355adfd +RWSagIOpLGJF3+Gpl9iPVogUpcc3gav/WSCp8LZj0dwKcB5oOccjzPZSC57SomBrp2IK82BIPOOBN5O/jYNvWXRp3Pm+mNxWpgU= +SHA256 (Pkgfile) = 781b5a66ab68d7060e357534d60ced83194127fffd297db8f7b7750ca263f465 SHA256 (.footprint) = e02597100d1f451c7b32752cd15a4527c688df69b753265c086c2f55348832bb SHA256 (CoinMP-1.8.4.tgz) = 3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d +SHA256 (werror-undef.patch.0) = 0d390fdd164d24b0e8e8ad8784a78ad0f7d5352cbf9946099ac92eda3a92c3a6 +SHA256 (ubsan.patch.0) = 79dbcc2e2d8f750b1b587bbf4167444bebf408a1ba0ca3ecd711097d75140cbe +SHA256 (libtool.patch) = 20e4294f3d1f8006bd3fa502e3219b65be67f928e93e8853bf56d1911baa46f7 diff --git a/coin-or-mp/Pkgfile b/coin-or-mp/Pkgfile index 8c49e47c4..9bb511335 100644 --- a/coin-or-mp/Pkgfile +++ b/coin-or-mp/Pkgfile @@ -5,11 +5,19 @@ name=coin-or-mp version=1.8.4 -release=4 -source=(https://www.coin-or.org/download/source/CoinMP/CoinMP-$version.tgz) +release=5 +source=(https://www.coin-or.org/download/source/CoinMP/CoinMP-$version.tgz + werror-undef.patch.0 + ubsan.patch.0 + libtool.patch) build() { cd CoinMP-$version + + 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" \ ./configure --prefix=/usr \ --with-osi-lib="$(pkg-config --libs osi)" \ @@ -24,8 +32,10 @@ build() { --with-coinutils-incdir="/usr/include/coin/" make 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 + rm -fr $PKG/usr/share } diff --git a/coin-or-mp/libtool.patch b/coin-or-mp/libtool.patch new file mode 100644 index 000000000..5763367c5 --- /dev/null +++ b/coin-or-mp/libtool.patch @@ -0,0 +1,27 @@ +--- CoinMP/ltmain.sh ++++ CoinMP/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/coin-or-mp/ubsan.patch.0 b/coin-or-mp/ubsan.patch.0 new file mode 100644 index 000000000..157332986 --- /dev/null +++ b/coin-or-mp/ubsan.patch.0 @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..a9b80f280 --- /dev/null +++ b/coin-or-mp/werror-undef.patch.0 @@ -0,0 +1,11 @@ +--- 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

1 0

ports/contrib (3.7): coin-or-cbc: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit ea3aa9aea886eaf69b5fe87610cf18d0ac06571d Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:40:18 2023 +0100 coin-or-cbc: pulled patches from libreoffice diff --git a/coin-or-cbc/.signature b/coin-or-cbc/.signature index 09d333c61..ec2960937 100644 --- a/coin-or-cbc/.signature +++ b/coin-or-cbc/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36dBIsF/JFgI6kNkxZcCDKwS+glXseDY1Iv8wYVFGwcWX0FNqg69AVnyMiSOjd5GaVOU6aRXiQkvFg04H9mh+wU= -SHA256 (Pkgfile) = 7a36fe9ec54e06e7c2c6a1d4c3028cf337d401d457f80c53288a2ea729264024 +RWSagIOpLGJF37sJ/k3j0Lc72U79duLwiB+yyH+o5S4xUqfsqX3gnu8BN4AQ91t6M981Lx7kbYivjVB9bwvCiUFxtSnkxhYCewQ= +SHA256 (Pkgfile) = 7e61a0d7ddce90922fd3ecbccf66b92743ad17bdda006f6eb74a2d26f6017e19 SHA256 (.footprint) = ef3262dff818eb16e24e342b419fefb256a21ceef74d4a3485cf9475524b3895 SHA256 (coin-or-cbc-2.10.8.tar.gz) = 8525abb541ee1b8e6ff03b00411b66e98bbc58f95be1aefd49d2bca571be2eaf +SHA256 (libtool.patch) = ac19ee9b8092f0c5a2ebd19febc7e9808e2c96fec7fceabc743d08f8e2eb128f +SHA256 (rpath.patch) = 31f1854bb5d8cd84186d86eab668afb905111c55adf22dbc0a509c2b614b5118 diff --git a/coin-or-cbc/Pkgfile b/coin-or-cbc/Pkgfile index 2e65fc1f1..1a33b1c8b 100644 --- a/coin-or-cbc/Pkgfile +++ b/coin-or-cbc/Pkgfile @@ -5,11 +5,17 @@ name=coin-or-cbc version=2.10.8 -release=1 -source=(https://github.com/coin-or/Cbc/archive/releases/$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/coin-or/Cbc/archive/releases/$version/$name-$version.tar.gz + libtool.patch + rpath.patch) build() { cd Cbc-releases-$version + + patch -Np1 -i $SRC/libtool.patch + patch -Np1 -i $SRC/rpath.patch + COIN_SKIP_PROJECTS="Sample" \ ./configure --prefix=/usr \ --with-osi-lib="$(pkg-config --libs osi)" \ @@ -23,7 +29,9 @@ build() { --enable-dependency-linking \ --enable-cbc-parallel make + PKG_CONFIG_LIBDIR="$PKG"/usr/lib/pkgconfig/ \ make DESTDIR=$PKG install + rm -fr $PKG/usr/share/coin/doc } diff --git a/coin-or-cbc/libtool.patch b/coin-or-cbc/libtool.patch new file mode 100644 index 000000000..24c6e590b --- /dev/null +++ b/coin-or-cbc/libtool.patch @@ -0,0 +1,27 @@ +--- Cbc/ltmain.sh ++++ Cbc/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/coin-or-cbc/rpath.patch b/coin-or-cbc/rpath.patch new file mode 100644 index 000000000..d75511b9d --- /dev/null +++ b/coin-or-cbc/rpath.patch @@ -0,0 +1,10 @@ +--- Cbc/configure ++++ Cbc/configure +@@ -12484,6 +12484,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support

1 0

ports/contrib (3.7): coin-or-cgl: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit c2476f69fca0a04ed8196e0c0026ee5ac97b0a8d Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:37:07 2023 +0100 coin-or-cgl: pulled patches from libreoffice diff --git a/coin-or-cgl/.signature b/coin-or-cgl/.signature index ddde77391..dc2727847 100644 --- a/coin-or-cgl/.signature +++ b/coin-or-cgl/.signature @@ -1,5 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+IAUSk2evIuBe1bz1rLmn8/zKTqyaume0zdBA/P0yTrt2MYFUAHARQlWOL6tpm/UnjAkS/0KEF+5vijH53ADAk= -SHA256 (Pkgfile) = 05ea5b7dca829b7dc2feafd8dfec8b3ffae9c046f4aa96bbafefd2cf4bbbded3 +RWSagIOpLGJF3/Bq20IFxmhIKqEPB4HHilplle+ReRUCwXiihJoVUVCbiQm8FIz7efDduqkvXAEolSBsB/X6zyG7TvbaqkdVgAw= +SHA256 (Pkgfile) = 08a36ec4388227b8209425a6acab61d464cbd9ff29afd8ffb584103a86aaf37d SHA256 (.footprint) = 4213d1e609b786a24adfbc8cf4938487c491e2a51ed5e6d495f7eb7359145f07 SHA256 (coin-or-cgl-0.60.6.tar.gz) = 9e2c51ffad816ab408763d6b931e2a3060482ee4bf1983148969de96d4b2c9ce +SHA256 (configure-exit.patch) = 6305b5cc7b1742028da597435e3bb3d4a8dca3e8d522c67001556f1d5c89636d +SHA256 (libtool.patch) = 19e6e14f0686b110cfc61fbcbd8f261b8d91234b1245fbc715ca0f3e1304fa10 +SHA256 (rpath.patch) = e30053c93cc9b9baf030127772bbbc8732e6d64cfec8632bf0f78c54bacbad7f diff --git a/coin-or-cgl/Pkgfile b/coin-or-cgl/Pkgfile index 6717b7a4a..0d397c80d 100644 --- a/coin-or-cgl/Pkgfile +++ b/coin-or-cgl/Pkgfile @@ -5,11 +5,19 @@ name=coin-or-cgl version=0.60.6 -release=1 -source=(https://github.com/coin-or/Cgl/archive/releases/$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/coin-or/Cgl/archive/releases/$version/$name-$version.tar.gz + configure-exit.patch + libtool.patch + rpath.patch) build() { cd Cgl-releases-$version/Cgl + + patch -Np1 -i $SRC/configure-exit.patch + patch -Np1 -i $SRC/libtool.patch + patch -Np1 -i $SRC/rpath.patch + COIN_SKIP_PROJECTS="Sample" \ ./configure --prefix=/usr \ --with-osi-lib="$(pkg-config --libs osi)" \ @@ -20,7 +28,9 @@ build() { --with-coinutils-incdir="/usr/include/coin/" \ --enable-dependency-linking make + PKG_CONFIG_LIBDIR="$PKG"/usr/lib/pkgconfig/ \ make DESTDIR="$PKG" install + rm -fr $PKG/usr/share/coin/doc } diff --git a/coin-or-cgl/configure-exit.patch b/coin-or-cgl/configure-exit.patch new file mode 100644 index 000000000..23144036f --- /dev/null +++ b/coin-or-cgl/configure-exit.patch @@ -0,0 +1,11 @@ +--- Cgl/configure ++++ Cgl/configure +@@ -3501,8 +3501,6 @@ + fi + for ac_declaration in \ + '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' diff --git a/coin-or-cgl/libtool.patch b/coin-or-cgl/libtool.patch new file mode 100644 index 000000000..8c1d7c095 --- /dev/null +++ b/coin-or-cgl/libtool.patch @@ -0,0 +1,27 @@ +--- Cgl/ltmain.sh ++++ Cgl/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/coin-or-cgl/rpath.patch b/coin-or-cgl/rpath.patch new file mode 100644 index 000000000..decc82cbb --- /dev/null +++ b/coin-or-cgl/rpath.patch @@ -0,0 +1,10 @@ +--- Cgl/configure ++++ Cgl/configure +@@ -12455,6 +12455,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support

1 0

ports/contrib (3.7): coin-or-clp: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 54a988bbec5c3567ec6b573e7f110bf733aab1e2 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:34:21 2023 +0100 coin-or-clp: pulled patches from libreoffice diff --git a/coin-or-clp/.signature b/coin-or-clp/.signature index 794c860e8..ef1117052 100644 --- a/coin-or-clp/.signature +++ b/coin-or-clp/.signature @@ -1,5 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35ZIwoYG0BnSDSauwMepC7ZOKX6AtwU8sYS7jfu5G0SjwnT3H0wCt2XZ5yVdJzYoGPQMtMppkAwhpjO5/TJLMgE= -SHA256 (Pkgfile) = 4ee21f1fea6fabc2e9f8320470b0cb2d32b21758ae874081dc26c7a7a3b4e4d2 +RWSagIOpLGJF3/mrJrRXfQ/HiHZHF7V7PiBak7hdne9wzAJUPLgK/mfcVtgcwohx8zwBV0rdusvK79PNkCeNuCw5mwOJucOipAY= +SHA256 (Pkgfile) = 67c6faf3082db548efb0eb2730e3ef6270df44e48814e7be4ef3a291e507453b SHA256 (.footprint) = 186e9e60f8aa1e1cfd29ecb9c5df2a2a355ff0b2a477c80e9785385f889cab54 SHA256 (coin-or-clp-1.17.7.tar.gz) = c4c2c0e014220ce8b6294f3be0f3a595a37bef58a14bf9bac406016e9e73b0f5 +SHA256 (configure-exit.patch) = 79e506c72d85ab12fdbd1eb9866f5fc73b5adca8e58793e7d173239987d0808e +SHA256 (libtool.patch) = 4781834cb3e60e2c83ed2ec7acf0e0443804426a7fc74399287e4c75794a3fc8 +SHA256 (rpath.patch) = 1e42a2cc6bde21e5f00953f7003adccbcf21b060c0aa12688dfc341738746422 diff --git a/coin-or-clp/Pkgfile b/coin-or-clp/Pkgfile index 89994a95c..7bd42f5ae 100644 --- a/coin-or-clp/Pkgfile +++ b/coin-or-clp/Pkgfile @@ -5,11 +5,19 @@ name=coin-or-clp version=1.17.7 -release=1 -source=(https://github.com/coin-or/Clp/archive/releases/$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/coin-or/Clp/archive/releases/$version/$name-$version.tar.gz + configure-exit.patch + libtool.patch + rpath.patch) build() { cd Clp-releases-$version/Clp + + patch -Np1 -i $SRC/configure-exit.patch + patch -Np1 -i $SRC/libtool.patch + patch -Np1 -i $SRC/rpath.patch + COIN_SKIP_PROJECTS="Sample" \ ./configure --prefix=/usr \ --with-osi-lib="$(pkg-config --libs osi)" \ @@ -18,7 +26,9 @@ build() { --with-coinutils-incdir="/usr/include/coin/" \ --with-cholmod-lib='-lcholmod' --with-cholmod-incdir=/usr/include make + PKG_CONFIG_LIBDIR="$PKG"/usr/lib/pkgconfig/ \ make DESTDIR="$PKG" install + rm -fr $PKG/usr/share/coin/doc } diff --git a/coin-or-clp/configure-exit.patch b/coin-or-clp/configure-exit.patch new file mode 100644 index 000000000..5b5db5060 --- /dev/null +++ b/coin-or-clp/configure-exit.patch @@ -0,0 +1,11 @@ +--- Clp/configure ++++ Clp/configure +@@ -3528,8 +3528,6 @@ + fi + for ac_declaration in \ + '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' diff --git a/coin-or-clp/libtool.patch b/coin-or-clp/libtool.patch new file mode 100644 index 000000000..7e59a77c2 --- /dev/null +++ b/coin-or-clp/libtool.patch @@ -0,0 +1,27 @@ +--- Clp/ltmain.sh ++++ Clp/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/coin-or-clp/rpath.patch b/coin-or-clp/rpath.patch new file mode 100644 index 000000000..53b217565 --- /dev/null +++ b/coin-or-clp/rpath.patch @@ -0,0 +1,10 @@ +--- Clp/configure ++++ Clp/configure +@@ -12482,6 +12482,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support

1 0

ports/contrib (3.7): coin-or-osi: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit cde9f10a6cd480dc5669dc6b81caf1a9888ca127 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:33:37 2023 +0100 coin-or-osi: pulled patches from libreoffice diff --git a/coin-or-osi/.signature b/coin-or-osi/.signature index 63409d1c4..49b7d70ec 100644 --- a/coin-or-osi/.signature +++ b/coin-or-osi/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33Hl33MxSHSjjBjLgMNd7SkWENPvVwCQ58R8kY1bIpW3Oon3ftvHDBW5Oj7vJ283Xb5akeYGzm9lTwBSY/goeQY= -SHA256 (Pkgfile) = 570ed48d936aa88c6e36cf44140d452f1b73b928ec936465f1afc4716c80a46b +RWSagIOpLGJF30Kwg1oLU4Y+683v4gLY1HW0ts2HJeG56wvFDyPM3WDm6gXFHXnL/trZ+qGGAKyloXo/2fbpyj0+qHiScTSCpww= +SHA256 (Pkgfile) = 721523e52e976a57dab66c5f00414747f908385cb323f3e57fb2fdebc0c1f103 SHA256 (.footprint) = 8e25cc4d888b307bfc6c0ca71795d9ef2840205126c7587805392a3af401e333 SHA256 (coin-or-osi-0.108.7.tar.gz) = f1bc53a498585f508d3f8d74792440a30a83c8bc934d0c8ecf8cd8bc0e486228 +SHA256 (libtool.patch) = d1e46ba425585bdc9faa0c943a6d7327688aa88e5528fb71a11979eedce6cedc +SHA256 (rpath.patch) = f65509337f9b34b6a838e9cf47f28dd1141213a62e86c15e70f4757245204123 diff --git a/coin-or-osi/Pkgfile b/coin-or-osi/Pkgfile index fbc6e2d89..c2597c4dd 100644 --- a/coin-or-osi/Pkgfile +++ b/coin-or-osi/Pkgfile @@ -5,18 +5,26 @@ name=coin-or-osi version=0.108.7 -release=1 -source=(https://github.com/coin-or/Osi/archive/releases/$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/coin-or/Osi/archive/releases/$version/$name-$version.tar.gz + libtool.patch + rpath.patch) build() { cd Osi-releases-$version + + patch -Np1 -i $SRC/libtool.patch + patch -Np1 -i $SRC/rpath.patch + COIN_SKIP_PROJECTS="Sample" \ ./configure --prefix=/usr \ --enable-dependency-linking \ --with-coinutils-lib="$(pkg-config --libs coinutils)" \ --with-coinutils-incdir="/usr/include/coin/" make + PKG_CONFIG_LIBDIR="${PKG}/usr/lib/pkgconfig/" \ make DESTDIR="$PKG" install + rm -fr $PKG/usr/share/coin/doc } diff --git a/coin-or-osi/libtool.patch b/coin-or-osi/libtool.patch new file mode 100644 index 000000000..e0830d4cb --- /dev/null +++ b/coin-or-osi/libtool.patch @@ -0,0 +1,27 @@ +--- Osi/ltmain.sh ++++ Osi/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/coin-or-osi/rpath.patch b/coin-or-osi/rpath.patch new file mode 100644 index 000000000..c352d32b5 --- /dev/null +++ b/coin-or-osi/rpath.patch @@ -0,0 +1,10 @@ +--- Osi/configure ++++ Osi/configure +@@ -12453,6 +12453,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support

1 0