Opened 5 years ago

Closed 5 years ago

#20933 closed defect (fixed)

Update MathJax and other spkgs' patches to conform to same format as other patches

Reported by: embray Owned by:
Priority: minor Milestone: sage-7.3
Component: packages: standard Keywords:
Cc: Merged in:
Authors: Erik Bray Reviewers: Jeroen Demeyer
Report Upstream: N/A Work issues:
Branch: 86279c4 (Commits, GitHub, GitLab) Commit: 86279c4146a13f060f3ce05017478c499860ed59
Dependencies: Stopgaps:

Status badges

Description (last modified by jdemeyer)

#20837 tried to bring all spkgs into a uniform format for patches to the upstream sources. In particular it ensures that all patches are applied from within the root of the upstream sources.

In the process I missed a few more packages that were a bit unusual.

The following packages were patching from a different directory than src:

  • atlas
  • mathjax
  • ntl
  • singular

The following packages were copying complete files instead of using patches:

  • jmol
  • tachyon
  • rubiks: not in this ticket, see #21103

I have updated these packages to use the new "standard" patch format, so this can be considered a followup to #20837. Fixing this is needed for #20692 to be completed.

Change History (21)

comment:1 Changed 5 years ago by embray

  • Status changed from new to needs_review

comment:2 Changed 5 years ago by embray

Found a few other examples since pushing this branch. Will update this to include the others as well.

comment:3 Changed 5 years ago by embray

  • Status changed from needs_review to needs_work

comment:4 Changed 5 years ago by embray

  • Branch set to u/embray/patch-normalization-2
  • Commit set to c6f2f64813dd1652e18f0f3af54d9728c32edd06
  • Description modified (diff)
  • Status changed from needs_work to needs_review
  • Summary changed from Update MathJax patches to conform to same format as other patches to Update MathJax and other spkgs' patches to conform to same format as other patches

New commits:

e79d16dMathJax patches were no relative to the root of the upstream sources, like patches for other spkgs.
73d01bdReworked jmol installation to be somewhat more consistent.
7bb48f7ntl patches were not quite conformant either, due to the layout of the ntl upstream tarball
ca88d3cReformat ATLAS patches to conform with other spkgs (the root of the ATLAS source tarball is src/, not src/ATLAS)
b48b391Clean up patching of rubiks
66ceeb2Rewrite Singular ptches to comply to the new standard format
c6f2f64Make tachyon conform to the standard patch format.

comment:5 Changed 5 years ago by mkoeppe

Probably people who have worked on these packages in the past should be put on the cc list. They might remember from which source the patches were generated.

comment:6 Changed 5 years ago by embray

I doubt they would remember off-hand, in most cases. Some of these packages haven't been touched in years--I would't remember something like that. In any case what does it matter?

comment:7 Changed 5 years ago by novoselt

I've based #19430 on this one to get rid of strange "patches"

comment:8 Changed 5 years ago by jdemeyer

  • Description modified (diff)

comment:9 Changed 5 years ago by jdemeyer

  • Description modified (diff)

comment:10 follow-up: Changed 5 years ago by jdemeyer

For NTL, could you use ../patches/*.patch instead of "$CUR"/patches/*.patch to make it even more standard?

Same for Singular.

Last edited 5 years ago by jdemeyer (previous) (diff)

comment:11 Changed 5 years ago by jdemeyer

  • Reviewers set to Jeroen Demeyer

comment:12 Changed 5 years ago by jdemeyer

  • Status changed from needs_review to needs_work

With Sage 7.3.beta9, a patch was added to Singular which should also be treated.

comment:13 Changed 5 years ago by git

  • Commit changed from c6f2f64813dd1652e18f0f3af54d9728c32edd06 to 7e13bb1600064a2773cb766f3286432fc8b29a2b

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

6880e3dMathJax patches were no relative to the root of the upstream sources, like patches for other spkgs.
bd671feReworked jmol installation to be somewhat more consistent.
ba88cbentl patches were not quite conformant either, due to the layout of the ntl upstream tarball
d1a7c64Reformat ATLAS patches to conform with other spkgs (the root of the ATLAS source tarball is src/, not src/ATLAS)
6e3f471Clean up patching of rubiks
41b7fe2Rewrite Singular patches to comply to the new standard format
4b13b90Make tachyon conform to the standard patch format.
7e13bb1Make NTL and singular 'more standard'

comment:14 in reply to: ↑ 10 Changed 5 years ago by embray

Replying to jdemeyer:

For NTL, could you use ../patches/*.patch instead of "$CUR"/patches/*.patch to make it even more standard?

Same for Singular.

Done.

Rebased and included fixing the new patch for Singular.

comment:15 Changed 5 years ago by embray

  • Status changed from needs_work to needs_review

comment:16 Changed 5 years ago by jdemeyer

First test: Sage builds from scratch with this branch applied.

comment:17 Changed 5 years ago by jdemeyer

The four packages which just have their directories changed are fine.

With tachyon and jmol, the installed version with this branch is the same before this branch (as far as I can tell). So this is fine too.

Rubiks on the other hand has substantial changes, probably because of a different Makefile. I cannot immediately tell whether they are fine.

comment:18 Changed 5 years ago by jdemeyer

  • Branch changed from u/embray/patch-normalization-2 to u/jdemeyer/patch-normalization-2

comment:19 Changed 5 years ago by jdemeyer

  • Commit changed from 7e13bb1600064a2773cb766f3286432fc8b29a2b to 86279c4146a13f060f3ce05017478c499860ed59
  • Description modified (diff)
  • Status changed from needs_review to positive_review

New commits:

23131e7Rewrite Singular patches to comply to the new standard format
c863b90Make tachyon conform to the standard patch format.
86279c4Make NTL and singular 'more standard'

comment:20 Changed 5 years ago by jdemeyer

positive_review to everything except rubiks. I removed the rubiks commit and will move it to #21103.

comment:21 Changed 5 years ago by vbraun

  • Branch changed from u/jdemeyer/patch-normalization-2 to 86279c4146a13f060f3ce05017478c499860ed59
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.