From nobody Sat Jan 21 00:16:04 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NzH2r5D4Cz2t052; Sat, 21 Jan 2023 00:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NzH2r4fvSz40Vc; Sat, 21 Jan 2023 00:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674260164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fPTabH//PAY/6qbdtZDf9CJbxW4mOAaLuNKFq8Aa/8M=; b=ePLkj1OtBEv4o2t+hrcz/MysC7t14msZtOaMcKVJl24lSpTKF5q7nIuuAEWkfTKH6GzIEg uMMqMQlWspwo2VBMrA/i+RDs4LzjXie/mjKqSFmcueGd/ZxdDxPgyGv9UmvQyx5E4Megns N+7dnLIEyHV/JL4rrsVZnC78XlU/2Z8/SeXg27Xi4sL9HY6E20HyzrIyS3bsoAkV4RJni3 k3/C0HhnqR2hVCSI/DSh2KRb6ugRmfquHczKUbtplRdOsxXMyoQTm/rgYaoWOljiZGHcIG 9oCxo8/VBj1/AqwcUoQobH4P13UwegbOzB+Kf7Fn5yiakMjj3v49WM8SOaelaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674260164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fPTabH//PAY/6qbdtZDf9CJbxW4mOAaLuNKFq8Aa/8M=; b=dx18hIhVEkh/3FiubqwoAe/wlYeugPL0/HPgVJOKuRzNSDQuNEeIIXR0684W7kdYHJLG/T Z2P4vFC3w4iePIWKest9iijqsHQ24U7j5qS4xAqZhrDQr9Mx0Qdg7d0FVbhlEnNlYXyynJ iUpdATwMpaPYWdEYBCnywG5g85S7LVtoeTfLS3Waq23Nx23JB0qp1xdf5mbQtNfk/NUCgi +dU7CDH1UInoW39X1OI9D60XdySAqHSBxffr00HotxgRBJPBJ+MEp9G/SPOegmmce+gWaj 7hmrOFVZwsJpqA77s9v0jCJyaguIm/nMPz2+7SPjxmSJJk1unPcMD/Vkq0szLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674260164; a=rsa-sha256; cv=none; b=x65lfHfcQVbeyXJ+1hIycn/M3otJhqbqfg8qKUZhiWxgigV9Tm2Zw96XxHPokHo+JBEMnp IiVrVHvTpFxKUCQ0gIswSlQjMOHLWQSx9QBRK8yKLkTZqXkdB3Sj+PxsPcKHcZKNVzC10o cMBFLowckuCb7oYR4F8YJpfcmYO9rUdTIvxDkHlCEx/VfH1Uz+0iCrYM02+lehiAHza0Fh vBtyv9Z/x6Fz9EwlSfKVk4CX2RXtoomigYx+o8tiO+8KJxeJJzimNPOVgISQA3X16Epypg cn2w1YwK6eupPvTPDvl9cqLtI+las1hqrZ9WRN7Ex6wcmhetuI4AcqM3GDO/sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NzH2r3PmrzqF0; Sat, 21 Jan 2023 00:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30L0G4rd031007; Sat, 21 Jan 2023 00:16:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30L0G4tK031006; Sat, 21 Jan 2023 00:16:04 GMT (envelope-from git) Date: Sat, 21 Jan 2023 00:16:04 GMT Message-Id: <202301210016.30L0G4tK031006@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 9ed8e38cde84 - main - math/octave: Cope with API differences between SuiteSparse versions List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ed8e38cde84939fa33ab749b2ac30c2c9cc4938 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ed8e38cde84939fa33ab749b2ac30c2c9cc4938 commit 9ed8e38cde84939fa33ab749b2ac30c2c9cc4938 Author: Stephen Montgomery-Smith AuthorDate: 2023-01-21 00:13:31 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2023-01-21 00:15:57 +0000 math/octave: Cope with API differences between SuiteSparse versions Obtained from: https://hg.octave.org/octave/rev/aaffac4fbe30 --- math/octave/files/patch-libgnu_math.in.h | 4 +-- .../octave/files/patch-liboctave_util_oct-sparse.h | 36 ++++++++++++++++++++++ .../patch-scripts_pkg_private_configure__make.m | 6 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/math/octave/files/patch-libgnu_math.in.h b/math/octave/files/patch-libgnu_math.in.h index 077b7d108046..08de62e0a526 100644 --- a/math/octave/files/patch-libgnu_math.in.h +++ b/math/octave/files/patch-libgnu_math.in.h @@ -1,7 +1,7 @@ ---- libgnu/math.in.h.orig 2020-11-26 18:20:44 UTC +--- libgnu/math.in.h.orig 2022-11-02 18:19:56 UTC +++ libgnu/math.in.h @@ -15,7 +15,7 @@ - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _@GUARD_PREFIX@_MATH_H diff --git a/math/octave/files/patch-liboctave_util_oct-sparse.h b/math/octave/files/patch-liboctave_util_oct-sparse.h new file mode 100644 index 000000000000..34a9b5005f75 --- /dev/null +++ b/math/octave/files/patch-liboctave_util_oct-sparse.h @@ -0,0 +1,36 @@ +--- liboctave/util/oct-sparse.h.orig 2022-11-02 18:19:56 UTC ++++ liboctave/util/oct-sparse.h +@@ -89,16 +89,27 @@ + # include + #endif + +-// Cope with new SuiteSparse versions ++// Cope with API differences between SuiteSparse versions + + #if defined (SUITESPARSE_VERSION) +-# if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3)) ++# if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (7, 0)) + # define SUITESPARSE_NAME(name) SuiteSparse_ ## name +-# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign) +-# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign)) ++# define SUITESPARSE_SET_FCN(name) SuiteSparse_config_ ## name ## _set ++# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \ ++ SUITESPARSE_SET_FCN(f_name) (f_assign) ++# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \ ++ SUITESPARSE_SET_FCN(f_name) (SUITESPARSE_NAME (f_assign)) ++# elif (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3)) ++# define SUITESPARSE_NAME(name) SuiteSparse_ ## name ++# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \ ++ (SuiteSparse_config.f_name = f_assign) ++# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \ ++ (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign)) + # else +-# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign) +-# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign)) ++# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \ ++ (f_var = f_assign) ++# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \ ++ (f_var = CHOLMOD_NAME (f_assign)) + # endif + #endif + diff --git a/math/octave/files/patch-scripts_pkg_private_configure__make.m b/math/octave/files/patch-scripts_pkg_private_configure__make.m index e6933ce95a16..92084c4f3b91 100644 --- a/math/octave/files/patch-scripts_pkg_private_configure__make.m +++ b/math/octave/files/patch-scripts_pkg_private_configure__make.m @@ -1,6 +1,6 @@ ---- scripts/pkg/private/configure_make.m.orig 2021-10-30 14:20:24 UTC +--- scripts/pkg/private/configure_make.m.orig 2022-11-02 18:19:56 UTC +++ scripts/pkg/private/configure_make.m -@@ -102,7 +102,7 @@ function configure_make (desc, packdir, verbose) +@@ -110,7 +110,7 @@ function configure_make (desc, packdir, verbose) endif if (exist (fullfile (src, "Makefile"), "file")) @@ -8,4 +8,4 @@ + [status, output] = shell (sprintf ("%s gmake --jobs %i --directory '%s'", scenv, jobs, src), verbose); if (status != 0) - rmdir (desc.dir, "s"); + disp (output);