rubiks: Import fedora patches; use sage.features.rubiks in sage.interfaces.rubik

[mkoeppe]

Importing Fedora patches to make the package compile with modern compilers.

Upstreaming a generalized version of https://salsa.debian.org/science-team/sagemath/-/blob/master/debian/patches/d0-rubiks.patch by providing a configuration variable RUBIKS_BINS_PREFIX (in analogy to NAUTY_BINS_PREFIX) in sage_conf.

This now goes through the Features already defined for the rubiks executables.

CC: @tobihan @kiwifb @orlitzky @dimpase

Component: build

Keywords: sd111

Author: Matthias Koeppe, Dima Pasechnik

Branch/Commit: 197830c

Reviewer: Dima Pasechnik, Matthias Koeppe

Issue created by migration from https://trac.sagemath.org/ticket/30582

[mkoeppe]

Description changed:

--- 
+++ 
@@ -1,4 +1,4 @@
 Upstreaming a generalized version of
 https://salsa.debian.org/science-team/sagemath/-/blob/master/debian/patches/d0-rubiks.patch
-by providing a configuration variable `RUBIKS_BINS_PREFIX` (in analogy to NAUTY_BINS_PREFIX`) in `sage_conf`
+by providing a configuration variable `RUBIKS_BINS_PREFIX` (in analogy to `NAUTY_BINS_PREFIX`) in `sage_conf`

[mkoeppe]

comment:3

Hoping we can make progress on this ticket this week - https://wiki.sagemath.org/days111

[mkoeppe]

Changed keywords from none to sd111

[mkoeppe]

comment:4

Sage development has entered the release candidate phase for 9.3. Setting a new milestone for this ticket based on a cursory review of ticket status, priority, and last modification date.

[mkoeppe]

Branch: u/mkoeppe/sage_interfaces_rubik__configure_executable_prefix_via_sage_config__define_rubiksexecutable_feature

[7ed8c4ca-6d56-4ae9-953a-41e42b4ed313]

Commit: 23b8649

[7ed8c4ca-6d56-4ae9-953a-41e42b4ed313]

Branch pushed to git repo; I updated commit sha1. New commits:

23b8649

build/pkgs/rubiks/distros: Add more

[7ed8c4ca-6d56-4ae9-953a-41e42b4ed313]

Branch pushed to git repo; I updated commit sha1. New commits:

fffef85	build/pkgs/rubiks/patches: Import from https://src.fedoraproject.org/rpms/rubiks/tree/f36
99d4b16	src/sage/interfaces/rubik.py: Fixup

[7ed8c4ca-6d56-4ae9-953a-41e42b4ed313]

Changed commit from 23b8649 to 99d4b16

[mkoeppe]

Author: Matthias Koeppe

[mkoeppe]

Description changed:

--- 
+++ 
@@ -1,4 +1,8 @@
+Importing Fedora patches to make the package compile with modern compilers.
+
 Upstreaming a generalized version of
 https://salsa.debian.org/science-team/sagemath/-/blob/master/debian/patches/d0-rubiks.patch
-by providing a configuration variable `RUBIKS_BINS_PREFIX` (in analogy to `NAUTY_BINS_PREFIX`) in `sage_conf`
+by providing a configuration variable `RUBIKS_BINS_PREFIX` (in analogy to `NAUTY_BINS_PREFIX`) in `sage_conf`.

+This now goes through the `Feature`s already defined for the rubiks executables.
+

[mkoeppe]

comment:12

Tested only on macOS with homebrew

[dimpase]

comment:13

on Linux:

[rubiks-20070912.p21] Applying ../patches/fedora-6-rubiks-attributes.patch
[rubiks-20070912.p21] patching file dietz/cu2/cu2.h
[rubiks-20070912.p21] Hunk #1 FAILED at 24 (different line endings).
[rubiks-20070912.p21] 1 out of 1 hunk FAILED -- saving rejects to file dietz/cu2/cu2.h.rej
[rubiks-20070912.p21] patching file dietz/cu2/main.cpp
[rubiks-20070912.p21] Hunk #1 FAILED at 66 (different line endings).
[rubiks-20070912.p21] 1 out of 1 hunk FAILED -- saving rejects to file dietz/cu2/main.cpp.rej
[rubiks-20070912.p21] patching file dietz/mcube/main.cpp
[rubiks-20070912.p21] Hunk #1 FAILED at 66 (different line endings).
[rubiks-20070912.p21] 1 out of 1 hunk FAILED -- saving rejects to file dietz/mcube/main.cpp.rej
[rubiks-20070912.p21] patching file dietz/mcube/mcube.h
[rubiks-20070912.p21] Hunk #1 FAILED at 24 (different line endings).
[rubiks-20070912.p21] 1 out of 1 hunk FAILED -- saving rejects to file dietz/mcube/mcube.h.rej
[rubiks-20070912.p21] patching file dietz/solver/cubex.h
[rubiks-20070912.p21] patching file reid/optimal.c
[rubiks-20070912.p21] Error applying '../patches/fedora-6-rubiks-attributes.patch'

[dimpase]

Reviewer: Dima Pasechnik

[dimpase]

Changed commit from 99d4b16 to c947db4

[dimpase]

comment:14

maybe applying dos2unix to the whole tarball?

---

New commits:

c947db4

dos2unix tarball and the patches

[dimpase]

Changed branch from u/mkoeppe/sage_interfaces_rubik__configure_executable_prefix_via_sage_config__define_rubiksexecutable_feature to u/dimpase/sage_interfaces_rubik__configure_executable_prefix_via_sage_config__define_rubiksexecutable_feature

[7ed8c4ca-6d56-4ae9-953a-41e42b4ed313]

Changed commit from c947db4 to 197830c

[7ed8c4ca-6d56-4ae9-953a-41e42b4ed313]

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

197830c

dos2unix tarball and the patches

[mkoeppe]

comment:17

That's a good solution, thanks

[mkoeppe]

Changed author from Matthias Koeppe to Matthias Koeppe, Dima Pasechnik

[mkoeppe]

Changed reviewer from Dima Pasechnik to Dima Pasechnik, Matthias Koeppe

[dimpase]

comment:19

did you mean to set this to positive review?

[mkoeppe]

comment:20

I am happy to give your changes a positive review

[dimpase]

comment:21

OK

[mkoeppe]

comment:22

Thank you

[vbraun]

Changed branch from u/dimpase/sage_interfaces_rubik__configure_executable_prefix_via_sage_config__define_rubiksexecutable_feature to 197830c