update qepcad to B 1.74

build/pkgs/qepcad/SPKG.rst

@@ -10,33 +10,11 @@ cylindrical algebraic decomposition
 License
 -------
 
-QEPCAD B Copyright (c) 1990, 2008, Hoon Hong & Chris Brown (contact
-wcbrown@usna.edu)
-
-Permission to use, copy, modify, and/or distribute this software,
-including source files, README files, etc., for any purpose with or
-without fee is hereby granted, provided that the above copyright notice
-and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+ICS :wikipedia:`ISC_license`
 
 Upstream Contact
 ----------------
 
--  Website: http://www.usna.edu/CS/qepcadweb/B/QEPCAD.html
--  Alternative location (sometimes more up-to-date):
-
-   https://www.usna.edu/Users/cs/wcbrown/qepcad/B/QEPCAD.html
-
-Special Update/Build Instructions
----------------------------------
-
-One might need to set MAKE to "make -j1" fo this to be built
-successfully.
+- Repository:  https://github.com/chriswestbrown/qepcad
+- Tarballs:   https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/IQ.html
+- Website: (outdated) https://www.usna.edu/Users/cs/wcbrown/qepcad/B/QEPCAD.html

build/pkgs/qepcad/checksums.ini

@@ -1,5 +1,5 @@
 tarball=qepcad-VERSION.tar.gz
-sha1=7de9ff3a7ce61e751d91fe5e74079a706174e4fa
-md5=61ebb23f407a72cee6142a3b144dea06
-cksum=2428332890
-upstream_url=http://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/qepcad-VERSION.tar.gz
+sha1=644324e1224350cc663e93c5ce99b93de0de26e3
+md5=f368459cfab2d42caa40919e60093020
+cksum=783450087
+upstream_url=https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/qepcad-B.VERSION.tgz

build/pkgs/qepcad/distros/debian.txt

@@ -0,0 +1 @@
+qepcad

build/pkgs/qepcad/distros/fedora.txt

@@ -0,0 +1 @@
+qepcad-B

build/pkgs/qepcad/distros/macports.txt

@@ -0,0 +1 @@
+qepcad

build/pkgs/qepcad/package-version.txt

@@ -1 +1 @@
-B.1.72
+1.74

build/pkgs/qepcad/patches/qepcad-B-destructor.patch

@@ -1,6 +1,11 @@
---- a/extensions/rend/Rend_Sample.cc.orig	2018-01-25 14:25:22.000000000 -0700
-+++ b/extensions/rend/Rend_Sample.cc	2018-08-29 20:07:27.087257552 -0600
-@@ -40,11 +40,6 @@ Rend_Sample_1DS::Rend_Sample_1DS(Word C,
+Description: Fix abstract base classes with non-virtual destructors.
+Origin: https://src.fedoraproject.org/rpms/qepcad-B/blob/91dd25b/f/qepcad-B-destructor.patch
+Forwarded: https://github.com/chriswestbrown/qepcad/pull/2
+Last-Update: 2021-06-23
+
+--- a/extensions/rend/Rend_Sample.cc
++++ b/extensions/rend/Rend_Sample.cc
+@@ -40,11 +40,6 @@
  }
 
 
@@ -12,7 +17,7 @@
  /*************************************************************
   **  Refines I to 2^k or less, and returns binary rational 
   **  middle of interval.
-@@ -112,13 +107,6 @@ Rend_Sample_1DO::Rend_Sample_1DO(Rend_Ce
+@@ -112,13 +107,6 @@
    L.W = NIL;
  }
 
@@ -26,7 +31,7 @@
  Word Rend_Sample_1DO::coordinate(int k)
  {
    Word e,j1,j2,J,kp = k;
-@@ -178,11 +166,6 @@ Rend_Sample_2DS::Rend_Sample_2DS(Word C)
+@@ -178,11 +166,6 @@
  }
 
 
@@ -38,7 +43,7 @@
  /*************************************************************
   **  Refines I to 2^k or less, and returns binary rational 
   **  lower endpoint.
-@@ -237,11 +220,6 @@ Rend_Sample_2DC::Rend_Sample_2DC(Word C,
+@@ -237,11 +220,6 @@
 
  }
 
@@ -50,7 +55,7 @@
  Word Rend_Sample_2DC::coordinate(int k)
  {
    return L.W;
-@@ -265,11 +243,6 @@ Rend_Sample_BR::Rend_Sample_BR(Word a)
+@@ -265,11 +243,6 @@
    N.W = a;
  }
 
@@ -62,9 +67,9 @@
  Word Rend_Sample_BR::coordinate(int k)
  {
    return N.W;
---- a/extensions/rend/Rend_Sample.h.orig	2018-01-25 14:25:22.000000000 -0700
-+++ b/extensions/rend/Rend_Sample.h	2018-08-29 20:07:27.087257552 -0600
-@@ -32,7 +32,7 @@ class Rend_Sample
+--- a/extensions/rend/Rend_Sample.h
++++ b/extensions/rend/Rend_Sample.h
+@@ -32,7 +32,7 @@
    virtual Word coordinate(int k) = 0; 
    virtual Word round(int k,int roundup)
      { return this -> coordinate(k); }
@@ -73,49 +78,49 @@
  };
 
  class Rend_Sample_1DS : public Rend_Sample
-@@ -49,7 +49,6 @@ private:
+@@ -49,7 +49,6 @@
    gcmemloc A,I;
  public:
    Rend_Sample_1DS(Word C, Word P);
 -  virtual ~Rend_Sample_1DS();
    virtual Word coordinate(int k);
    virtual Word round(int k, int roundup);
    Word weakcompare(Word R);
-@@ -66,7 +65,6 @@ public:
+@@ -66,7 +65,6 @@
    gcmemloc L;
  public:
    Rend_Sample_1DO(Rend_Cell *dad);
 -  virtual ~Rend_Sample_1DO();
    virtual Word coordinate(int k);
 
  };
-@@ -86,7 +84,6 @@ private:
+@@ -86,7 +84,6 @@
    gcmemloc A,I;
  public:
    Rend_Sample_2DS(Word C);
 -  virtual ~Rend_Sample_2DS();
    virtual Word coordinate(int k);
 
  };
-@@ -101,7 +98,6 @@ public:
+@@ -101,7 +98,6 @@
    gcmemloc L;
  public:
    Rend_Sample_2DC(Word C,Word P);
 -  virtual ~Rend_Sample_2DC();
    virtual Word coordinate(int k);
    void add_point(Word p);
    void clear_points();
-@@ -116,7 +112,6 @@ private:
+@@ -116,7 +112,6 @@
    gcmemloc N;
  public:
    Rend_Sample_BR(Word a);
 -  virtual ~Rend_Sample_BR();
    virtual Word coordinate(int k);    
  };
 
---- a/plot2d/plot.cc.orig	2018-01-25 14:25:22.000000000 -0700
-+++ b/plot2d/plot.cc	2018-08-29 20:07:27.086257553 -0600
-@@ -37,6 +37,7 @@ class CADELT
+--- a/plot2d/plot.cc
++++ b/plot2d/plot.cc
+@@ -37,6 +37,7 @@
  public:
    virtual bool read(istream &in) = 0;
    virtual void glRend(const CADColors &C) = 0;

build/pkgs/qepcad/patches/qepcad-B-gcc6.patch

@@ -1,6 +1,11 @@
---- a/plot2d/plot.cc.orig	2018-08-29 20:10:06.396075816 -0600
-+++ b/plot2d/plot.cc	2018-08-29 20:11:48.982924732 -0600
-@@ -276,7 +276,7 @@ bool SNoverSR::read(istream &in)
+Description: Adapt to GCC 6
+Origin: https://src.fedoraproject.org/rpms/qepcad-B/blob/91dd25b/f/qepcad-B-gcc6.patch
+Forwarded: https://github.com/chriswestbrown/qepcad/pull/2
+Last-Update: 2021-06-23
+
+--- a/plot2d/plot.cc
++++ b/plot2d/plot.cc
+@@ -276,7 +276,7 @@
    V.resize(N);
    for(int i = 0; i < N; i++)
      in >> V[i];
@@ -9,7 +14,7 @@
  }
 
  void SNoverSR::glRend(const CADColors &C)
-@@ -333,7 +333,7 @@ bool SRoverSR::read(istream &in)
+@@ -333,7 +333,7 @@
      }
    }
 
@@ -18,7 +23,7 @@
  }
 
  void SRoverSR::glRend(const CADColors &C)
-@@ -351,7 +351,7 @@ bool SRoverSN::read(istream &in)
+@@ -351,7 +351,7 @@
  {
    in >> colorType >> a >> b.y;
    b.x = a.x;
@@ -27,7 +32,7 @@
  }
 
  void SRoverSN::glRend(const CADColors &C)
-@@ -365,7 +365,8 @@ void SRoverSN::glRend(const CADColors &C
+@@ -365,7 +365,8 @@
 
  bool SNoverSN::read(istream &in)
  {
@@ -37,7 +42,7 @@
  }
 
  void SNoverSN::glRend(const CADColors &C)
-@@ -380,7 +381,8 @@ void SNoverSN::glRend(const CADColors &C
+@@ -380,7 +381,8 @@
 
  bool SN::read(istream &in)
  {
@@ -47,7 +52,7 @@
  }
 
  void SN::glRend(const CADColors &C)
-@@ -394,7 +396,8 @@ void SN::glRend(const CADColors &C)
+@@ -394,7 +396,8 @@
 
  bool SR::read(istream &in)
  {