Skip to content

Commit cde0125

Browse files
dimpasedimpase
committed
update qepcad to B 1.74
We removed 'B' from the version number to accommodate the tarfile name from Debian
1 parent 272582b commit cde0125

12 files changed

+767
-610
lines changed

‎build/pkgs/qepcad/SPKG.rst

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,4 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3030
Upstream Contact
3131
----------------
3232

33-
- Website: http://www.usna.edu/CS/qepcadweb/B/QEPCAD.html
34-
- Alternative location (sometimes more up-to-date):
35-
36-
https://www.usna.edu/Users/cs/wcbrown/qepcad/B/QEPCAD.html
37-
38-
Special Update/Build Instructions
39-
---------------------------------
40-
41-
One might need to set MAKE to "make -j1" fo this to be built
42-
successfully.
33+
https://github.com/chriswestbrown/qepcad

‎build/pkgs/qepcad/checksums.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tarball=qepcad-VERSION.tar.gz
2-
sha1=7de9ff3a7ce61e751d91fe5e74079a706174e4fa
3-
md5=61ebb23f407a72cee6142a3b144dea06
4-
cksum=2428332890
5-
upstream_url=http://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/qepcad-VERSION.tar.gz
1+
tarball=qepcad-VERSION.tar.xz
2+
sha1=3c482a88bf552cea6702e4db6a3d17e4b7549eb6
3+
md5=7d3f85d253473f6d90d83033ff22820d
4+
cksum=2757536071
5+
upstream_url=http://deb.debian.org/debian/pool/main/q/qepcad/qepcad_VERSION+ds.orig.tar.xz

‎build/pkgs/qepcad/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
B.1.72
1+
1.74

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

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
--- a/extensions/rend/Rend_Sample.cc.orig 2018-01-25 14:25:22.000000000 -0700
2-
+++ b/extensions/rend/Rend_Sample.cc 2018-08-29 20:07:27.087257552 -0600
3-
@@ -40,11 +40,6 @@ Rend_Sample_1DS::Rend_Sample_1DS(Word C,
1+
Description: Fix abstract base classes with non-virtual destructors.
2+
Origin: https://src.fedoraproject.org/rpms/qepcad-B/blob/91dd25b/f/qepcad-B-destructor.patch
3+
Forwarded: https://github.com/chriswestbrown/qepcad/pull/2
4+
Last-Update: 2021-06-23
5+
6+
--- a/extensions/rend/Rend_Sample.cc
7+
+++ b/extensions/rend/Rend_Sample.cc
8+
@@ -40,11 +40,6 @@
49
}
510

611

@@ -12,7 +17,7 @@
1217
/*************************************************************
1318
** Refines I to 2^k or less, and returns binary rational
1419
** middle of interval.
15-
@@ -112,13 +107,6 @@ Rend_Sample_1DO::Rend_Sample_1DO(Rend_Ce
20+
@@ -112,13 +107,6 @@
1621
L.W = NIL;
1722
}
1823

@@ -26,7 +31,7 @@
2631
Word Rend_Sample_1DO::coordinate(int k)
2732
{
2833
Word e,j1,j2,J,kp = k;
29-
@@ -178,11 +166,6 @@ Rend_Sample_2DS::Rend_Sample_2DS(Word C)
34+
@@ -178,11 +166,6 @@
3035
}
3136

3237

@@ -38,7 +43,7 @@
3843
/*************************************************************
3944
** Refines I to 2^k or less, and returns binary rational
4045
** lower endpoint.
41-
@@ -237,11 +220,6 @@ Rend_Sample_2DC::Rend_Sample_2DC(Word C,
46+
@@ -237,11 +220,6 @@
4247

4348
}
4449

@@ -50,7 +55,7 @@
5055
Word Rend_Sample_2DC::coordinate(int k)
5156
{
5257
return L.W;
53-
@@ -265,11 +243,6 @@ Rend_Sample_BR::Rend_Sample_BR(Word a)
58+
@@ -265,11 +243,6 @@
5459
N.W = a;
5560
}
5661

@@ -62,9 +67,9 @@
6267
Word Rend_Sample_BR::coordinate(int k)
6368
{
6469
return N.W;
65-
--- a/extensions/rend/Rend_Sample.h.orig 2018-01-25 14:25:22.000000000 -0700
66-
+++ b/extensions/rend/Rend_Sample.h 2018-08-29 20:07:27.087257552 -0600
67-
@@ -32,7 +32,7 @@ class Rend_Sample
70+
--- a/extensions/rend/Rend_Sample.h
71+
+++ b/extensions/rend/Rend_Sample.h
72+
@@ -32,7 +32,7 @@
6873
virtual Word coordinate(int k) = 0;
6974
virtual Word round(int k,int roundup)
7075
{ return this -> coordinate(k); }
@@ -73,49 +78,49 @@
7378
};
7479

7580
class Rend_Sample_1DS : public Rend_Sample
76-
@@ -49,7 +49,6 @@ private:
81+
@@ -49,7 +49,6 @@
7782
gcmemloc A,I;
7883
public:
7984
Rend_Sample_1DS(Word C, Word P);
8085
- virtual ~Rend_Sample_1DS();
8186
virtual Word coordinate(int k);
8287
virtual Word round(int k, int roundup);
8388
Word weakcompare(Word R);
84-
@@ -66,7 +65,6 @@ public:
89+
@@ -66,7 +65,6 @@
8590
gcmemloc L;
8691
public:
8792
Rend_Sample_1DO(Rend_Cell *dad);
8893
- virtual ~Rend_Sample_1DO();
8994
virtual Word coordinate(int k);
9095

9196
};
92-
@@ -86,7 +84,6 @@ private:
97+
@@ -86,7 +84,6 @@
9398
gcmemloc A,I;
9499
public:
95100
Rend_Sample_2DS(Word C);
96101
- virtual ~Rend_Sample_2DS();
97102
virtual Word coordinate(int k);
98103

99104
};
100-
@@ -101,7 +98,6 @@ public:
105+
@@ -101,7 +98,6 @@
101106
gcmemloc L;
102107
public:
103108
Rend_Sample_2DC(Word C,Word P);
104109
- virtual ~Rend_Sample_2DC();
105110
virtual Word coordinate(int k);
106111
void add_point(Word p);
107112
void clear_points();
108-
@@ -116,7 +112,6 @@ private:
113+
@@ -116,7 +112,6 @@
109114
gcmemloc N;
110115
public:
111116
Rend_Sample_BR(Word a);
112117
- virtual ~Rend_Sample_BR();
113118
virtual Word coordinate(int k);
114119
};
115120

116-
--- a/plot2d/plot.cc.orig 2018-01-25 14:25:22.000000000 -0700
117-
+++ b/plot2d/plot.cc 2018-08-29 20:07:27.086257553 -0600
118-
@@ -37,6 +37,7 @@ class CADELT
121+
--- a/plot2d/plot.cc
122+
+++ b/plot2d/plot.cc
123+
@@ -37,6 +37,7 @@
119124
public:
120125
virtual bool read(istream &in) = 0;
121126
virtual void glRend(const CADColors &C) = 0;

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
--- a/plot2d/plot.cc.orig 2018-08-29 20:10:06.396075816 -0600
2-
+++ b/plot2d/plot.cc 2018-08-29 20:11:48.982924732 -0600
3-
@@ -276,7 +276,7 @@ bool SNoverSR::read(istream &in)
1+
Description: Adapt to GCC 6
2+
Origin: https://src.fedoraproject.org/rpms/qepcad-B/blob/91dd25b/f/qepcad-B-gcc6.patch
3+
Forwarded: https://github.com/chriswestbrown/qepcad/pull/2
4+
Last-Update: 2021-06-23
5+
6+
--- a/plot2d/plot.cc
7+
+++ b/plot2d/plot.cc
8+
@@ -276,7 +276,7 @@
49
V.resize(N);
510
for(int i = 0; i < N; i++)
611
in >> V[i];
@@ -9,7 +14,7 @@
914
}
1015

1116
void SNoverSR::glRend(const CADColors &C)
12-
@@ -333,7 +333,7 @@ bool SRoverSR::read(istream &in)
17+
@@ -333,7 +333,7 @@
1318
}
1419
}
1520

@@ -18,7 +23,7 @@
1823
}
1924

2025
void SRoverSR::glRend(const CADColors &C)
21-
@@ -351,7 +351,7 @@ bool SRoverSN::read(istream &in)
26+
@@ -351,7 +351,7 @@
2227
{
2328
in >> colorType >> a >> b.y;
2429
b.x = a.x;
@@ -27,7 +32,7 @@
2732
}
2833

2934
void SRoverSN::glRend(const CADColors &C)
30-
@@ -365,7 +365,8 @@ void SRoverSN::glRend(const CADColors &C
35+
@@ -365,7 +365,8 @@
3136

3237
bool SNoverSN::read(istream &in)
3338
{
@@ -37,7 +42,7 @@
3742
}
3843

3944
void SNoverSN::glRend(const CADColors &C)
40-
@@ -380,7 +381,8 @@ void SNoverSN::glRend(const CADColors &C
45+
@@ -380,7 +381,8 @@
4146

4247
bool SN::read(istream &in)
4348
{
@@ -47,7 +52,7 @@
4752
}
4853

4954
void SN::glRend(const CADColors &C)
50-
@@ -394,7 +396,8 @@ void SN::glRend(const CADColors &C)
55+
@@ -394,7 +396,8 @@
5156

5257
bool SR::read(istream &in)
5358
{

‎build/pkgs/qepcad/patches/qepcad-B-parens.patch

Lines changed: 57 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
1-
--- a/extensions/adj2d/truthbytop/BOUNDARY2D.c.orig 2018-01-25 14:25:22.000000000 -0700
2-
+++ b/extensions/adj2d/truthbytop/BOUNDARY2D.c 2018-08-29 20:07:50.511232206 -0600
3-
@@ -106,7 +106,7 @@ Step6: /* Split cell list by dimension.
1+
Description: Add parentheses to disambiguate mixed boolean operators.
2+
Origin: https://src.fedoraproject.org/rpms/qepcad-B/blob/60ceecd/f/qepcad-B-parens.patch
3+
Forwarded: https://github.com/chriswestbrown/qepcad/pull/2
4+
Last-Update: 2021-06-23
5+
6+
--- a/extensions/adj2d/truthbytop/BOUNDARY2D.c
7+
+++ b/extensions/adj2d/truthbytop/BOUNDARY2D.c
8+
@@ -38,9 +38,9 @@
9+
while(S_c != NIL && RED(S_c) != NIL)
10+
{
11+
Word c1 = FIRST(S_c), c2 = SECOND(S_c), c3 = THIRD(S_c);
12+
- if (LELTI(c1,TRUTH) == TRUE && LELTI(c3,TRUTH) == FALSE
13+
+ if ((LELTI(c1,TRUTH) == TRUE && LELTI(c3,TRUTH) == FALSE)
14+
||
15+
- LELTI(c1,TRUTH) == FALSE && LELTI(c3,TRUTH) == TRUE)
16+
+ (LELTI(c1,TRUTH) == FALSE && LELTI(c3,TRUTH) == TRUE))
17+
{
18+
SLELTI(c2,TRUTH,TRUE);
19+
SLELTI(c2,HOWTV,TOPINF);
20+
@@ -106,7 +106,7 @@
421
tc++;
522
else
623
fc++; }
@@ -9,9 +26,9 @@
926
GNEWLABEL(v,TRUE,G);
1027
else
1128
GNEWLABEL(v,FALSE,G); }
12-
--- a/extensions/lift2D/IBPRRIOAP.c.orig 2018-01-25 14:25:22.000000000 -0700
13-
+++ b/extensions/lift2D/IBPRRIOAP.c 2018-08-29 20:07:50.510232207 -0600
14-
@@ -95,7 +95,7 @@ Step3: /* Isolate the roots of B(alpha,y
29+
--- a/extensions/lift2D/IBPRRIOAP.c
30+
+++ b/extensions/lift2D/IBPRRIOAP.c
31+
@@ -95,7 +95,7 @@
1532
goto Return; }
1633

1734
/* get trend of first root */
@@ -20,9 +37,9 @@
2037
t1 = -1;
2138
else
2239
t1 = 1;
23-
--- a/extensions/lift2D/modIBPRRIOAP.c.orig 2018-01-25 14:25:22.000000000 -0700
24-
+++ b/extensions/lift2D/modIBPRRIOAP.c 2018-08-29 20:07:50.510232207 -0600
25-
@@ -97,7 +97,7 @@ Step3: /* Isolate the roots of B(alpha,y
40+
--- a/extensions/lift2D/modIBPRRIOAP.c
41+
+++ b/extensions/lift2D/modIBPRRIOAP.c
42+
@@ -97,7 +97,7 @@
2643
goto Return; }
2744

2845
/* get trend of first root */
@@ -31,9 +48,9 @@
3148
t1 = -1;
3249
else
3350
t1 = 1;
34-
--- a/source/db/convenientstreams.h.orig 2018-01-25 14:25:22.000000000 -0700
35-
+++ b/source/db/convenientstreams.h 2018-08-29 20:07:50.511232206 -0600
36-
@@ -31,7 +31,7 @@ public:
51+
--- a/source/db/convenientstreams.h
52+
+++ b/source/db/convenientstreams.h
53+
@@ -31,7 +31,7 @@
3754
string s = "";
3855
char c = in.get();
3956
if (opt == skipleadingws)
@@ -42,20 +59,29 @@
4259
// States : 0 = normal, 1 = in comment, 2 = just read a backslash
4360
int state = 0;
4461
do {
45-
--- a/source/db/SINGULAR.c.orig 2018-01-25 14:25:22.000000000 -0700
46-
+++ b/source/db/SINGULAR.c 2018-08-29 20:07:50.511232206 -0600
47-
@@ -58,7 +58,7 @@ void SingularServer::reportStats(ostream
62+
@@ -44,7 +44,7 @@
63+
if (state == 0 && c == '\\') { state = 2; continue; }
64+
s += c;
65+
state = 0;
66+
- }while(c = in.get());
67+
+ }while((c = in.get()));
68+
str(s);
69+
}
70+
};
71+
--- a/source/db/SINGULAR.c
72+
+++ b/source/db/SINGULAR.c
73+
@@ -58,7 +58,7 @@
4874

4975
char peekNonWS(istream &in)
5076
{
5177
- char c; while((c = in.peek()) && c == ' ' || c == '\t' || c == '\n') in.get(); return c;
52-
+ char c; while(c = in.peek() && (c == ' ' || c == '\t' || c == '\n')) in.get(); return c;
78+
+ char c; while((c = in.peek()) && (c == ' ' || c == '\t' || c == '\n')) in.get(); return c;
5379
}
5480

5581

56-
--- a/source/proj/GROUPSAMEPJ.c.orig 2018-01-25 14:25:22.000000000 -0700
57-
+++ b/source/proj/GROUPSAMEPJ.c 2018-08-29 20:07:50.511232206 -0600
58-
@@ -46,7 +46,7 @@ BDigit PRJPNTEQUAL(Word A, Word B)
82+
--- a/source/proj/GROUPSAMEPJ.c
83+
+++ b/source/proj/GROUPSAMEPJ.c
84+
@@ -46,7 +46,7 @@
5985
Word KR = LIST2(SECOND(aK),LIST2(1,1));
6086
Word sL = AFSIGN(aM,aI,AFPEMV(1,aM,G,KL));
6187
Word sR = AFSIGN(aM,aI,AFPEMV(1,aM,G,KR));
@@ -64,7 +90,7 @@
6490
}
6591

6692
/* One primitive, the other not */
67-
@@ -75,10 +75,10 @@ Step1: /* Group. */
93+
@@ -75,10 +75,10 @@
6894
{
6995
ADV(Jt,&J2,&Jt);
7096
Jt2 = LELTI(J2,PO_POLY);
@@ -79,9 +105,9 @@
79105
{
80106
SLELTI(J2,PO_PARENT,CONC(LELTI(J2,PO_PARENT),LELTI(J1,PO_PARENT)));
81107
t = 1;
82-
--- a/source/proj/PROJMCECmod.c.orig 2018-01-25 14:25:22.000000000 -0700
83-
+++ b/source/proj/PROJMCECmod.c 2018-08-29 20:07:50.511232206 -0600
84-
@@ -67,7 +67,7 @@ Step1: /* Obtain coefficients. */
108+
--- a/source/proj/PROJMCECmod.c
109+
+++ b/source/proj/PROJMCECmod.c
110+
@@ -67,7 +67,7 @@
85111
t = 1; }
86112

87113
/* If r = 2 OR r-1 is in free variable space, the leading coefficient is always enough! */
@@ -90,7 +116,7 @@
90116
|| (experimentalExtensionFlag && qfrCheckNonNullified(r,Ap1,GVNA.W,GVNQFF.W,GVVL.W))
91117
)
92118
t = 0;
93-
@@ -101,7 +101,7 @@ Step1: /* Obtain coefficients. */
119+
@@ -101,7 +101,7 @@
94120
tf = tf || (Q == FULLDE || Q == FULLDA);
95121

96122
/* Test 3: in free variable space when the PCMZERROR option is used */
@@ -99,9 +125,9 @@
99125

100126
/* Test 4: has no common zero with the system of all other coefficients */
101127
if (!tf)
102-
--- a/source/proj/PROJMCmod.c.orig 2018-01-25 14:25:22.000000000 -0700
103-
+++ b/source/proj/PROJMCmod.c 2018-08-29 20:07:50.511232206 -0600
104-
@@ -57,7 +57,7 @@ Step1: /* Obtain coefficients. */
128+
--- a/source/proj/PROJMCmod.c
129+
+++ b/source/proj/PROJMCmod.c
130+
@@ -57,7 +57,7 @@
105131
t = 1; }
106132

107133
/* If r = 2 OR r-1 is in free variable space, the leading coefficient is always enough! */
@@ -110,7 +136,7 @@
110136
|| (experimentalExtensionFlag && qfrCheckNonNullified(r,Ap1,GVNA.W,GVNQFF.W,GVVL.W))
111137
)
112138
t = 0;
113-
@@ -91,7 +91,7 @@ Step1: /* Obtain coefficients. */
139+
@@ -91,7 +91,7 @@
114140
tf = tf || (Q == FULLDE || Q == FULLDA);
115141

116142
/* Test 3: in free variable space when the PCMZERROR option is used */
@@ -119,9 +145,9 @@
119145

120146
/* Test 4: has no common zero with the system of all other coefficients */
121147
if (!tf)
122-
--- a/source/ticad/INITPCAD.c.orig 2018-01-25 14:25:22.000000000 -0700
123-
+++ b/source/ticad/INITPCAD.c 2018-08-29 20:07:50.511232206 -0600
124-
@@ -14,7 +14,7 @@ Word QepcadCls::INITPCAD()
148+
--- a/source/ticad/INITPCAD.c
149+
+++ b/source/ticad/INITPCAD.c
150+
@@ -14,7 +14,7 @@
125151
Word D, tv;
126152

127153
Step0: /* Determine truth value! */

0 commit comments

Comments
 (0)