Mercurial > mxe-octave

annotate src/of-matgeom-1-move-verLessThan.patch @ 7251:e3bf1ceb1511 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Fix building for Linux without libdrm. * src/mesa-1-libdrm.patch: Add new patch. * dist-files.mk: Add new file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 12 Jun 2024 20:54:42 +0200
parents 287c648ea6f0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6870
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From c0de561fee4b5fc2efd6dae79ec5ae2c78761ac6 Mon Sep 17 00:00:00 2001
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Sun, 17 Sep 2023 17:10:19 +0200
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH] Add dummy verLessThan only to path for older Octave versions.
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 ---
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 .../inst/__matgeom_package_register__.m | 19 ++++++++-----------
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 .../inst/{ => before-octave-6}/verLessThan.m | 0
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 2 files changed, 8 insertions(+), 11 deletions(-)
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 rename inst/{ => before-octave-6}/verLessThan.m (100%)
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 diff --git a/inst/__matgeom_package_register__.m b/inst/__matgeom_package_register__.m
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 index 1258759..afe9d62 100644
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 --- a/inst/__matgeom_package_register__.m
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 +++ b/inst/__matgeom_package_register__.m
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 @@ -33,22 +33,19 @@ function subdir_paths = __matgeom_package_register__ (loading = 0)
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 if (loading > 0)
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 - ## Disable dummy verLessThan.m
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 - if compare_versions (version, '6.0.0', '>=')
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 - ## Check if this package still has varLessThan
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 - pkgverchecker = fullfile (base_pkg_path, 'verLessThan.');
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 - if exist ([pkgverchecker, 'm'], 'file')
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 - warning ('Octave:deprecated-function',
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 - 'Permanently renaming verLessThan.m since it is already present');
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 - ## The change is permanent and done only once
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 - ## Means that if testing in older version of Octave, needs re-install
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 - rename([pkgverchecker, 'm'], [pkgverchecker, 'deprecated']);
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 - endif
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 + if compare_versions (version, '6.0.0', '<')
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 + ## Add path to dummy verLessThan.m only for older versions of Octave
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 + addpath (fullfile (base_pkg_path, "before-octave-6"));
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 endif
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 addpath (subdir_paths{:});
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 elseif (loading < 0)
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 + if compare_versions (version, '6.0.0', '<')
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 + ## Path to dummy verLessThan.m only added for older versions of Octave
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 + rmpath (fullfile (base_pkg_path, "before-octave-6"));
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 + endif
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 +
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 rmpath (subdir_paths{:});
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 endif
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 diff --git a/inst/verLessThan.m b/inst/before-octave-6/verLessThan.m
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 similarity index 100%
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 rename from inst/verLessThan.m
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 rename to inst/before-octave-6/verLessThan.m
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 --
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 2.38.0.windows.1
287c648ea6f0 of-matgeom: Avoid renaming file at possibly read-only location.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53