From 087a2fd8542004264a99e35b05df44e4d2242398 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Jul 15 2013 10:27:22 +0000 Subject: http://bugzilla.redhat.com/907111 - Qcad included non-free files --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7220e94..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -qcad-2.0.5.0-1-community.src.tar.gz -qcad-manual-en-2.0.4.0-1.html.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a388f90 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +http://bugzilla.redhat.com/907111 - Qcad included non-free files diff --git a/qcad-2.0.5.0-latin2.patch b/qcad-2.0.5.0-latin2.patch deleted file mode 100644 index 0e1fcad..0000000 --- a/qcad-2.0.5.0-latin2.patch +++ /dev/null @@ -1,1444 +0,0 @@ ---- qcad/fonts/normallatin2.cxf.orig 2005-11-22 12:49:55.000000000 +0100 -+++ qcad/fonts/normallatin2.cxf 2010-07-03 19:53:19.000000000 +0200 -@@ -1,65 +1,65 @@ - # Format: QCad II Font - # Creator: QCad --# Version: 1 -+# Version: 2.0.5.0 - # Name: Normal Latin 2 - # Encoding: ISO8859-2 --# LetterSpacing: 3.0 -+# LetterSpacing: 3 - # WordSpacing: 6.75 --# LineSpacingFactor: 1.0 -+# LineSpacingFactor: 1 - # Author: Hughes Jeangerard - --[!] 2 -+[0021] ! - L 0,9,0,3 - L 0,0,0,0.5 - --["] 2 -+[0022] " - L 0.5,7,1,9 - L 3.5,7,4,9 - --[#] 4 --L 1.999969,0,1.999969,8.999999 --L 4.999969,8.999999,4.999969,0 --L -0.000031,2.5,6.999969,2.5 --L 6.999969,6.499999,-0.000031,6.499999 -+[0023] # -+L 2,0,2,9 -+L 5,9,5,0 -+L 0,2.5,7,2.5 -+L 7,6.5,0,6.5 - --[&] 5 -+[0026] & - L 6,3.21499,3.425964,0.59764 - A 2,2,2,135.478088,315.478088 - L 0.574036,3.40236,3.569458,6.44823 - A 2.5,7.5,1.5,315.478271,209.372314 --L 1.19281,6.76428,5,0 -+L 1.192810,6.76428,5,0 - --['] 1 -+[0027] ' - L 0.5,7,1,9 - --[(] 1 -+[0028] ( - A 13,4,13,157.380142,202.619858 - --[)] 1 -+[0029] ) - A -12,4,13,337.380127,22.61986 - --[*] 2 -+[002a] * - L 0,6,4,2 - L 4,6,0,2 - --[+] 2 -+[002b] + - L 0,4,4,4 - L 2,6,2,2 - --[,] 2 -+[002c] , - L 1,0,0,-3 - L 1,0,1,0.5 - --[-] 1 -+[002d] - - L 0,4,4,4 - --[.] 1 -+[002e] . - L 0,0,0,0.5 - --[/] 1 -+[002f] / - L 4,9,0,0 - --[0] 10 -+[0030] 0 - A 2,7.91049,1.08951,32.75695,147.243042 - A 4.93335,5.62352,4.80559,143.232468,169.491135 - A 4.93335,3.37648,4.80559,190.508865,216.767532 -@@ -71,17 +71,17 @@ - A 9.404663,4.46906,9.40473,179.811493,192.086868 - A 9.404663,4.53094,9.40473,167.913132,180.188507 - --[1] 2 -+[0031] 1 - L 0,7,2,9 - L 2,9,2,0 - --[2] 4 -+[0032] 2 - L 4,0,0,0 - L 0,0,3.864502,6.64668 - A 3,7.14931,1,329.82547,20.52911 - A 2,7,2,14.47751,165.522491 - --[3] 7 -+[0033] 3 - L 0,9,2,9 - A 2,7,2,270,90 - L 2,5,1,5 -@@ -90,12 +90,12 @@ - A 2,2,2,270,0 - L 2,0,0,0 - --[4] 3 -+[0034] 4 - L 3.5,0,3.5,4 - L 5,2,0,2 - L 0,2,2,9 - --[5] 7 -+[0035] 5 - L 4,9,0,9 - L 0,9,0,5 - L 0,5,2,5 -@@ -104,7 +104,7 @@ - A 2,2,2,270,0 - L 2,0,0,0 - --[6] 6 -+[0036] 6 - A 6,3.80385,6,120,180 - L 0,3.80385,0,2 - A 2,2,2,180,0 -@@ -112,12 +112,12 @@ - A 2,3,2,0,90 - L 2,5,0.120422,5 - --[7] 3 -+[0037] 7 - L 0,9,4,9 - L 4,9,1.5,0 - L 2,5,4,5 - --[8] 8 -+[0038] 8 - L 0,3,0,2 - A 2,2,2,180,0 - L 4,2,4,3 -@@ -127,7 +127,7 @@ - L 3.75,6.75,3.75,7.25 - A 2,7.25,1.75,0,180 - --[9] 6 -+[0039] 9 - A -2,5.19615,6,300,0 - L 4,5.19615,4,7 - A 2,7,2,0,180 -@@ -135,28 +135,28 @@ - A 2,6,2,180,270 - L 2,4,3.879578,4 - --[:] 2 -+[003a] : - L 0,0,0,0.5 - L 0,4,0,3.5 - --[;] 3 -+[003b] ; - L 1,0,0,-3 - L 1,0,1,0.5 - L 1,4,1,3.5 - --[<] 2 -+[003c] < - L 4,7,0,3.5 - L 0,3.5,4,0 - --[=] 2 -+[003d] = - L 0,5.5,4,5.5 - L 0,2.5,4,2.5 - --[>] 2 -+[003e] > - L 0,7,4,3.5 - L 4,3.5,0,0 - --[?] 9 -+[003f] ? - L 2,0,2,0.5 - L 2,3,2,3.39445 - L 0,7,0,7.5 -@@ -167,7 +167,7 @@ - A 1.5,7.5,1.5,90,180 - A 2.5,7.5,1.5,1.87147,90 - --[@] 11 -+[0040] @ - L 8,1,6.067566,0.28186 - A 4.5,4.5,4.5,333.472015,290.386322 - A 7.412354,2.943008,1.2,168.690186,337.880432 -@@ -180,12 +180,12 @@ - L 6.321533,3.607756,7,7 - L 5.049561,7,5.170288,7 - --[A] 3 -+[0041] A - L 0,0,3,9 - L 3,9,6,0 - L 0.833313,2.5,5.166687,2.5 - --[B] 8 -+[0042] B - L 0,0,0,9 - L 0,9,2.5,9 - A 2.5,7,2,270,90 -@@ -195,14 +195,14 @@ - A 2.599976,2.4,2.4,270,0 - L 2.599976,0,0,0 - --[C] 5 -+[0043] C - L 4,9,2,9 - A 2,7,2,90,180 - L 0,7,0,2 - A 2,2,2,180,270 - L 2,0,4,0 - --[D] 6 -+[0044] D - L 0,0,3,0 - A 3,2,2,270,0 - L 5,2,5,7 -@@ -210,18 +210,18 @@ - L 3,9,0,9 - L 0,9,0,0 - --[E] 4 -+[0045] E - L 4,9,0,9 - L 0,9,0,0 - L 0,0,4,0 - L 0,5,3,5 - --[F] 3 -+[0046] F - L 4,9,0,9 - L 0,9,0,0 - L 0,5,4,5 - --[G] 7 -+[0047] G - L 5,9,2,9 - A 2,7,2,90,180 - L 0,7,0,2 -@@ -230,40 +230,40 @@ - L 5,0,5,5 - L 5,5,3.5,5 - --[H] 3 -+[0048] H - L 0,9,0,0 - L 5,0,5,9 - L 0,5,5,5 - --[I] 1 -+[0049] I - L 0,9,0,0 - --[J] 3 -+[004a] J - L 3,9,3,2 - A 1,2,2,270,0 - L 1,0,0,0 - --[K] 3 -+[004b] K - L 0,9,0,0 - L 0,3.5,5,9 - L 1.671326,5.33844,5,0 - --[L] 2 -+[004c] L - L 0,9,0,0 - L 0,0,4,0 - --[M] 4 -+[004d] M - L 0,0,0,9 - L 0,9,3,4 - L 3,4,6,9 - L 6,9,6,0 - --[N] 3 -+[004e] N - L 0,0,0,9 - L 0,9,5,0 - L 5,0,5,9 - --[O] 8 -+[004f] O - L 0,2,0,7 - A 2,7,2,90,180 - L 2,9,3,9 -@@ -273,7 +273,7 @@ - L 3,0,2,0 - A 2,2,2,180,270 - --[P] 6 -+[0050] P - L 0,0,0,9 - L 0,9,3,9 - A 3,7,2,0,90 -@@ -281,7 +281,7 @@ - A 3,6,2,270,0 - L 3,4,0,4 - --[Q] 9 -+[0051] Q - L 0,2,0,7 - A 2,7,2,90,180 - L 2,9,3,9 -@@ -292,7 +292,7 @@ - A 2,2,2,180,270 - L 6,0,3,2 - --[R] 7 -+[0052] R - L 0,0,0,9 - L 0,9,3,9 - A 3,7,2,0,90 -@@ -301,60 +301,60 @@ - L 3,4,0,4 - L 3,4,5,0 - --[S] 5 -+[0053] S - A 2,2.375,6.625,63.074589,90 - A 2,7,2,90,242.981201 - L 1.091431,5.21829,3.908569,3.78171 - A 3,2,2,270,62.98119 - A 3,6.625,6.625,243.074585,270 - --[T] 2 -+[0054] T - L 0,9,6,9 - L 3,9,3,0 - --[U] 3 -+[0055] U - L 0,9,0,2.5 - A 2.5,2.5,2.5,180,0 - L 5,2.5,5,9 - --[V] 2 -+[0056] V - L 0,9,3,0 - L 3,0,6,9 - --[W] 4 -+[0057] W - L 0,9,2,0 - L 2,0,4,6 - L 4,6,6,0 - L 6,0,8,9 - --[X] 2 -+[0058] X - L 0,9,6,0 - L 0,0,6,9 - --[Y] 3 -+[0059] Y - L 0,9,3,5 - L 3,5,3,0 - L 3,5,6,9 - --[Z] 3 -+[005a] Z - L 0,9,5,9 - L 5,9,0,0 - L 0,0,5,0 - --[[] 3 -+[005b] [ - L 1,-1,0,-1 - L 0,-1,0,9 - L 0,9,1,9 - --[\] 1 -+[005c] \ - L 0,9,4,0 - --[]] 3 -+[005d] ] - L 0,9,1,9 - L 1,9,1,-1 - L 1,-1,0,-1 - --[a] 6 -+[0061] a - L 0.5,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 -@@ -362,7 +362,7 @@ - A 1.5,1.5,1.5,90,270 - L 1.5,3,4,3 - --[b] 6 -+[0062] b - L 0,9,0,0 - L 0,0,2.5,0 - A 2.5,1.5,1.5,270,0 -@@ -370,14 +370,14 @@ - A 2.5,4.5,1.5,0,90 - L 2.5,6,0,6 - --[c] 5 -+[0063] c - L 3,6,1.5,6 - A 1.5,4.5,1.5,90,180 - L 0,4.5,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,3,0 - --[d] 6 -+[0064] d - L 4,9,4,0 - L 4,0,1.5,0 - A 1.5,1.5,1.5,180,270 -@@ -385,7 +385,7 @@ - A 1.5,4.5,1.5,90,180 - L 1.5,6,4,6 - --[e] 6 -+[0065] e - L 0,3,4,3 - L 4,3,4,4 - A 2,4,2,0,180 -@@ -393,13 +393,13 @@ - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 - --[f] 4 -+[0066] f - L 1,0,1,7.5 - A 2.5,7.5,1.5,90,180 - L 2.5,9,3,9 - L 0,6,3,6 - --[g] 8 -+[0067] g - L 0,-3,2.5,-3 - A 2.5,-1.5,1.5,270,0 - L 4,-1.5,4,6 -@@ -409,51 +409,51 @@ - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 - --[h] 4 -+[0068] h - L 0,9,0,0 - L 0,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 - --[i] 2 -+[0069] i - L 0,0,0,6 - L 0,8.5,0,9 - --[j] 4 -+[006a] j - L 0,-3,0.5,-3 - A 0.5,-1.5,1.5,270,0 - L 2,-1.5,2,6 - L 2,8.5,2,9 - --[k] 3 -+[006b] k - L 0,9,0,0 - L 0,3.5,4,6 - L 1.320923,4.32555,4,0 - --[l] 2 -+[006c] l - L 0,9,0,1 - A 1,1,1,180,270 - --[m] 5 -+[006d] m - L 0,0,0,6 - L 0,6,4.5,6 - A 4.5,4.5,1.5,0,90 - L 6,4.5,6,0 - L 3,6,3,0 - --[n] 4 -+[006e] n - L 0,0,0,6 - L 0,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 - --[o] 4 -+[006f] o - L 0,4,0,2 - A 2,2,2,180,0 - L 4,2,4,4 - A 2,4,2,0,180 - --[p] 6 -+[0070] p - L 0,0,2.5,0 - A 2.5,1.5,1.5,270,0 - L 4,1.5,4,4.5 -@@ -461,7 +461,7 @@ - L 2.5,6,0,6 - L 0,6,0,-3 - --[q] 6 -+[0071] q - L 4,0,1.5,0 - A 1.5,1.5,1.5,180,270 - L 0,1.5,0,4.5 -@@ -469,54 +469,54 @@ - L 1.5,6,4,6 - L 4,6,4,-3 - --[r] 3 -+[0072] r - L 0,0,0,6 - L 0,6,2,6 - A 2,5,1,0,90 - --[s] 5 -+[0073] s - A 2.164185,1.82088,4.0573,63.09737,108.27552 - A 1.268188,4.53406,1.2,108.274567,247.790543 - L 0.814575,3.42309,3.185425,2.45509 - A 2.731812,1.34412,1.19999,288.274933,67.791191 - A 1.835815,4.05732,4.05732,243.097656,288.275513 - --[t] 2 -+[0074] t - L 0,6,3,6 - L 1,9,1,0 - --[u] 4 -+[0075] u - L 0,6,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 - L 4,0,4,6 - --[v] 2 -+[0076] v - L 0,6,2,0 - L 2,0,4,6 - --[w] 4 -+[0077] w - L 0,6,1.5,0 - L 1.5,0,3,4 - L 3,4,4.5,0 - L 4.5,0,6,6 - --[x] 2 -+[0078] x - L 0,6,4,0 - L 0,0,4,6 - --[y] 4 -+[0079] y - L 0,6,2,0 - L 4,6,1.227905,-2.31623 - A 0.279297,-2,1,270,341.565063 - L 0.279297,-3,0,-3 - --[z] 3 -+[007a] z - L 0,6,4,6 - L 4,6,0,0 - L 0,0,4,0 - --[{] 6 -+[007b] { - A 2,8,1,90,180 - L 1,8,1,5 - A 0,5,1,270,0 -@@ -524,7 +524,7 @@ - L 1,3,1,0 - A 2,0,1,180,270 - --[}] 6 -+[007d] } - A 0,8,1,0,90 - L 1,8,1,5 - A 2,5,1,180,270 -@@ -532,43 +532,16 @@ - L 1,3,1,0 - A 0,0,1,270,0 - --[#0104] 4 --L 0,0,3,9 --L 3,9,6,0 --L 0.833313,2.5,5.166687,2.5 --A 5.842222,-0.831208,0.84605,79.252124,297.569897 -- --[�] 1 -+[00a2] � - A 3,12.083333,2.083333,196.260205,343.739795 - --[#0141] 3 --L 0,3.5,2.5,5.5 --L 1,9,1,0 --L 1,0,5,0 -- --[�] 6 --A 2,3,1,90,270 --A 2,3,1,270,90 --L 1.2,3.6,0,4.5 --L 1.2,2.4,0,1.5 --L 2.8,2.4,4,1.5 --L 2.8,3.6,4,4.5 -- --[�] 4 -+[00a5] � - L 0,9,0,0 - L 0,0,4,0 - L 0.5,12,2,10 - L 2,10,3.5,12 - --[#015A] 6 --A 2,2.375,6.625,63.074589,90 --A 2,7,2,90,242.981201 --L 1.091431,5.21829,3.908569,3.78171 --A 3,2,2,270,62.98119 --A 3,6.625,6.625,243.074585,270 --L 2.5,10,5,12 -- --[�] 6 -+[00a7] � - A 2,2.375,6.625,63.074589,90 - A 2,7,2,90,242.981201 - A 3,2,2,270,62.98119 -@@ -576,190 +549,97 @@ - A 2.274781,4.058343,1.657038,350.389979,135.57225 - A 2.725219,4.941657,1.657038,170.389979,315.57225 - --[�] 2 -+[0161] � - L 5,10.25,5,10.75 - L 1,10.25,1,10.75 - --[#0160] 7 -+[0160] � - A 2,2.375,6.625,63.074589,90 - A 2,7,2,90,242.981201 - L 1.091431,5.21829,3.908569,3.78171 --A 3,2,2,270,62.98119 -+A 3,2,2,270,62.98110 - A 3,6.625,6.625,243.074585,270 - L 1,12,2.5,10 - L 2.5,10,4,12 - --[#015E] 6 --A 2,2.375,6.625,63.074589,90 --A 2,7,2,90,242.981201 --L 1.091431,5.21829,3.908569,3.78171 --A 3,2,2,270,62.98119 --A 3,6.625,6.625,243.074585,270 --A 3.157778,-0.831208,0.84605,242.430103,100.747876 -- --[#0164] 4 --L 0,9,6,9 --L 3,9,3,0 --L 1.5,12,3,10 --L 3,10,4.5,12 -- --[#0179] 4 --L 0,9,5,9 --L 5,9,0,0 --L 0,0,5,0 --L 2.5,10,5,12 -- --[�] 1 --L 0,3,3.5,3 -- --[#0170] 5 --L 0,9,5,9 --L 5,9,0,0 --L 0,0,5,0 --L 1,12,2.5,10 --L 2.5,10,4,12 -- --[#017B] 4 --L 0,9,5,9 --L 5,9,0,0 --L 0,0,5,0 --L 2.5,10,2.5,10.5 -- --[�] 2 -+[00b0] � - A 1,11,1,90,270 - A 1,11,1,270,90 - --[#0105] 7 --L 0.5,6,2.5,6 --A 2.5,4.5,1.5,0,90 --L 4,4.5,4,0 --L 4,0,1.5,0 --A 1.5,1.5,1.5,90,270 --L 1.5,3,4,3 --A 3.842222,-0.831208,0.84605,79.252124,297.569897 -- --[#0142] 3 --L 0,3,2.5,5 --L 1,9,1,1 --A 2,1,1,180,270 -- --[�] 1 -+[017d] � - L 0,10,2.5,12 - --[#013E] 4 --L 0,12,1.5,10 --L 1.5,10,3,12 --L 1.5,9,1.5,1 --A 2.5,1,1,180,270 -- --[#015B] 6 --A 2.164185,1.82088,4.0573,63.09737,108.27552 --A 1.268188,4.53406,1.2,108.274567,247.790543 --L 0.814575,3.42309,3.185425,2.45509 --A 2.731812,1.34412,1.19999,288.274933,67.791191 --A 1.835815,4.05732,4.05732,243.097656,288.275513 --L 2.5,7,5,9 -- --[�] 2 -+[00b7] � - L 0.5,11,2,9 - L 2,9,3.5,11 - --[#0161] 7 --A 2.164185,1.82088,4.0573,63.09737,108.27552 --A 1.268188,4.53406,1.2,108.274567,247.790543 --L 0.814575,3.42309,3.185425,2.45509 --A 2.731812,1.34412,1.19999,288.274933,67.791191 --A 1.835815,4.05732,4.05732,243.097656,288.275513 --L 0.5,9,2,7 --L 2,7,3.5,9 -- --[#015F] 6 --A 2.164185,1.82088,4.0573,63.09737,108.27552 --A 1.268188,4.53406,1.2,108.274567,247.790543 --L 0.814575,3.42309,3.185425,2.45509 --A 2.731812,1.34412,1.19999,288.274933,67.791191 --A 1.835815,4.05732,4.05732,243.097656,288.275513 --A 2.157778,-0.831208,0.84605,242.430103,100.747876 -- --[#0165] 4 --L 0,6,3,6 --L 1,9,1,0 --L 0,12,1.5,10 --L 1.5,10,3,12 -- --[#017A] 4 --L 0,6,4,6 --L 4,6,0,0 --L 0,0,4,0 --L 2.5,7,5,9 -- --[�] 2 --L 3.5,10,6,12 --L 1.5,10,4,12 -+[0153] � -+L 0,4,0,2 -+A 2,2,2,180,0 -+L 4,2,4,4 -+A 2,4,2,0,180 -+A 5.5,1.5,1.5,180,270 -+A 6,4,2,0,180 -+L 8,4,8,3 -+L 8,3,4,3 -+L 5.5,0,8,0 -+L 4,1.5,4,2 - --[#017E] 5 -+[017e] � - L 0,6,4,6 - L 4,6,0,0 - L 0,0,4,0 - L 0.5,9,2,7 - L 2,7,3.5,9 - --[#017C] 4 --L 0,6,4,6 --L 4,6,0,0 --L 0,0,4,0 --L 2,9,2,8.5 -- --[#0154] 8 --L 0,0,0,9 --L 0,9,3,9 --A 3,7,2,0,90 --L 5,7,5,6 --A 3,6,2,270,0 --L 3,4,0,4 --L 3,4,5,0 --L 2.5,10,5,12 -+[00c0] � -+L 0,0,3,9 -+L 3,9,6,0 -+L 0.833313,2.5,5.166687,2.5 -+L 2,12,4.5,10 - --[#00C1] 4 --L 2.5,10,5,12 -+[00c1] � - L 0,0,3,9 - L 3,9,6,0 - L 0.833313,2.5,5.166687,2.5 -+L 1.5,10,4,12 - --[#00C2] 5 -+[00c2] � - L 0,0,3,9 - L 3,9,6,0 - L 0.833313,2.5,5.166687,2.5 - L 1.5,10,3,12 - L 3,12,4.5,10 - --[#0102] 4 -+[00c3] � - L 0,0,3,9 - L 3,9,6,0 - L 0.833313,2.5,5.166687,2.5 --A 3,12.083333,2.083333,196.260205,343.739795 -+A 2,9.95,1.45,46.397181,133.602819 -+A 4,11.75,1.25,216.869898,323.130102 - --[#00C4] 5 -+[00c4] � - L 0,0,3,9 - L 3,9,6,0 - L 0.833252,2.5,5.166748,2.5 - L 5,10.25,5,10.75 - L 1,10.25,1,10.75 - --[#0139] 3 --L 0,9,0,0 --L 0,0,4,0 --L 1,10,3.5,12 -+[00c5] � -+L 0,0,3,9 -+L 3,9,6,0 -+L 0.833252,2.5,5.166748,2.5 -+A 3,11,1,0,360 - --[#0106] 6 --L 4,9,2,9 --A 2,7,2,90,180 --L 0,7,0,2 --A 2,2,2,180,270 --L 2,0,4,0 --L 2.5,10,5,12 -+[00c6] � -+L 0,0,3,9 -+L 4,9,4,0 -+L 0.833252,2.5,4,2.5 -+L 3,9,8,9 -+L 7,5,4,5 -+L 8,0,4,0 - --[#00C7] 6 -+[00c7] � - L 4,9,2,9 - A 2,7,2,90,180 - L 0,7,0,2 -@@ -767,88 +647,73 @@ - L 2,0,4,0 - A 2.657778,-0.831208,0.84605,242.430103,100.747876 - --[#010C] 7 --L 4,9,2,9 --A 2,7,2,90,180 --L 0,7,0,2 --A 2,2,2,180,270 --L 2,0,4,0 --L 0.5,12,2,10 --L 2,10,3.5,12 -- --[#00C9] 5 -+[00c9] � - L 4,9,0,9 - L 0,9,0,0 - L 0,0,4,0 - L 0,5,3,5 --L 2.5,10,5,12 -+L 1,10,3.5,12 - --[#0118] 5 -+[00c8] � - L 4,9,0,9 - L 0,9,0,0 - L 0,0,4,0 - L 0,5,3,5 --A 3.842222,-0.831208,0.84605,79.252124,297.569897 -+L 1,12,3.5,10 - --[#00CB] 6 -+[00ca] � - L 4,9,0,9 - L 0,9,0,0 - L 0,0,4,0 - L 0,5,3,5 --L 0.5,10.25,0.5,10.75 --L 3.5,10.25,3.5,10.75 -+L 0.5,10,2,12 -+L 2,12,3.5,10 - --[#011A] 6 -+[00cb] � - L 4,9,0,9 - L 0,9,0,0 - L 0,0,4,0 - L 0,5,3,5 --L 0.5,12,2,10 --L 2,10,3.5,12 -+L 0.5,10.25,0.5,10.75 -+L 3.5,10.25,3.5,10.75 - --[#013A] 2 --L 0,9,0,0 --L 0,10,2.5,12 -+[00cc] � -+L 1.5,9,1.5,0 -+L 1,12,2.5,10 -+ -+[00cd] � -+L 1.5,9,1.5,0 -+L 0.75,10,2.25,12 - --[#00CE] 3 -+[00ce] � - L 0,10,1.5,12 - L 1.5,12,3,10 - L 1.5,9,1.5,0 - --[#010E] 8 --L 0,0,3,0 --A 3,2,2,270,0 --L 5,2,5,7 --A 3,7,2,0,90 --L 3,9,0,9 --L 0,9,0,0 --L 0.5,12,2,10 --L 2,10,3.5,12 -- --[#0110] 7 --L 1,0,4,0 --A 4,2,2,270,0 --L 6,2,6,7 --A 4,7,2,0,90 --L 4,9,1,9 --L 1,9,1,0 --L 0,4.5,2.5,4.5 -+[00cf] � -+L 1.5,9,1.5,0 -+L 0.5,10.25,0.5,10.75 -+L 2.5,10.25,2.5,10.75 - --[#0143] 4 -+[00d1] � - L 0,0,0,9 - L 0,9,5,0 - L 5,0,5,9 --L 2.5,10,5,12 -+A 1.5,9.95,1.45,46.397181,133.602819 -+A 3.5,12.05,1.45,226.397181,313.602819 - --[#0147] 5 --L 0,0,0,9 --L 0,9,5,0 --L 5,0,5,9 --L 1,12,2.5,10 --L 2.5,10,4,12 -+[00d2] � -+L 0,2,0,7 -+A 2,7,2,90,180 -+L 2,9,3,9 -+A 3,7,2,0,90 -+L 5,7,5,2 -+A 3,2,2,270,0 -+L 3,0,2,0 -+A 2,2,2,180,270 -+L 1.5,12,4,10 - --[#00D3] 9 --L 2.5,10,5,12 -+[00d3] � - L 0,2,0,7 - A 2,7,2,90,180 - L 2,9,3,9 -@@ -857,8 +722,9 @@ - A 3,2,2,270,0 - L 3,0,2,0 - A 2,2,2,180,270 -+L 1,10,3.5,12 - --[#00D4] 10 -+[00d4] � - L 0,2,0,7 - A 2,7,2,90,180 - L 2,9,3,9 -@@ -870,7 +736,7 @@ - L 1,10,2.5,12 - L 2.5,12,4,10 - --[#0150] 10 -+[00d5] � - L 0,2,0,7 - A 2,7,2,90,180 - L 2,9,3,9 -@@ -879,10 +745,10 @@ - A 3,2,2,270,0 - L 3,0,2,0 - A 2,2,2,180,270 --L 3.5,10,6,12 --L 1.5,10,4,12 -+A 1.5,9.95,1.45,46.397181,133.602819 -+A 3.55,12.175,1.575793,228.215484,311.784516 - --[#00D6] 10 -+[00d6] � - L 0,2,0,7 - A 2,7,2,90,180 - L 2,9,3,9 -@@ -894,86 +760,61 @@ - L 1,10.25,1,10.75 - L 4,10.25,4,10.75 - --[�] 2 -+[00d7] � - L 0.066298,4.160725,2.732965,1.494059 - L 2.732965,4.160725,0.066298,1.494059 - --[#0158] 9 --L 0,0,0,9 --L 0,9,3,9 --A 3,7,2,0,90 --L 5,7,5,6 --A 3,6,2,270,0 --L 3,4,0,4 --L 3,4,5,0 --L 0.5,12,2,10 --L 2,10,3.5,12 -- --[#016E] 5 -+[00d9] � - L 0,9,0,2.5 - A 2.5,2.5,2.5,180,0 - L 5,2.5,5,9 --A 2.5,11,1,90,270 --A 2.5,11,1,270,90 -+L 1.5,12,4,10 - --[#00DA] 4 -+[00da] � - L 0,9,0,2.5 - A 2.5,2.5,2.5,180,0 - L 5,2.5,5,9 --L 2.5,10,5,12 -+L 1,10,3.5,12 - --[#0170] 5 -+[00db] � - L 0,9,0,2.5 - A 2.5,2.5,2.5,180,0 - L 5,2.5,5,9 --L 3.5,10,6,12 --L 1.5,10,4,12 -+L 1,10,2.5,12 -+L 2.5,12,4,10 - --[#00DC] 5 -+[00dc] � - L 0,9,0,2.5 - A 2.5,2.5,2.5,180,0 - L 5,2.5,5,9 - L 1,10.25,1,10.75 - L 4,10.25,4,10.75 - --[#00DD] 4 -+[00dd] � - L 0,9,3,5 - L 3,5,3,0 - L 3,5,6,9 --L 2.5,10,5,12 -+L 2,10,4.5,12 - --[#0162] 3 --L 0,9,6,9 --L 3,9,3,0 --A 3.157778,-0.831208,0.84605,242.430103,100.747876 -- --[#00D7] 9 --A 2.5,7,2,270,90 --A 2.599976,2.6,2.4,0,90 --L 5,2.6,5,2.4 --A 2.599976,2.4,2.4,270,0 --L 1,5,2.599976,5 --A 2,7,2,90,180 --L 2,9,2.5,9 --L 0,0,0,7 --L 2.599976,0,1,0 -- --[#0155] 4 --L 0,0,0,6 --L 0,6,2,6 --A 2,5,1,0,90 --L 1.5,7,4,9 -+[00e0] � -+L 0.5,6,2.5,6 -+A 2.5,4.5,1.5,0,90 -+L 4,4.5,4,0 -+L 4,0,1.5,0 -+A 1.5,1.5,1.5,90,270 -+L 1.5,3,4,3 -+L 1,9,3.5,7 - --[#00E1] 7 -+[00e1] � - L 0.5,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 - L 4,0,1.5,0 - A 1.5,1.5,1.5,90,270 - L 1.5,3,4,3 --L 2.5,7,5,9 -+L 1,7,3.5,9 - --[#00E2] 8 -+[00e2] � - L 0.5,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 -@@ -983,16 +824,17 @@ - L 0.5,7,2,9 - L 2,9,3.5,7 - --[#0103] 7 -+[00e3] � - L 0.5,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 - L 4,0,1.5,0 - A 1.5,1.5,1.5,90,270 - L 1.5,3,4,3 --A 2,9.583333,2.083333,196.260205,343.739795 -+AR 1.5,7.033333,0.966667,136.397181,43.602819 -+A 2.9,8.366667,0.966667,223.602819,316.397181 - --[#00E4] 8 -+[00e4] � - L 0.5,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 -@@ -1002,20 +844,29 @@ - L 1,9,1,8.5 - L 3,9,3,8.5 - --[#013A] 3 --L 0,10,2.5,12 --L 1,9,1,1 --A 2,1,1,180,270 -+[00e5] � -+L 0.5,6,2.5,6 -+A 2.5,4.5,1.5,0,90 -+L 4,4.5,4,0 -+L 4,0,1.5,0 -+A 1.5,1.5,1.5,90,270 -+L 1.5,3,4,3 -+A 2,8,1,0,360 - --[#0107] 6 --L 3,6,1.5,6 --A 1.5,4.5,1.5,90,180 --L 0,4.5,0,1.5 --A 1.5,1.5,1.5,180,270 --L 1.5,0,3,0 --L 1.5,7,4,9 -+[00e6] � -+L 0.5,6,2.5,6 -+A 2.5,4.5,1.5,0,90 -+L 4,4.5,4,0 -+L 4,0,1.5,0 -+A 1.5,1.5,1.5,90,270 -+L 1.5,3,4,3 -+A 6,4,2,0,180 -+A 5.5,1.5,1.5,180,270 -+L 4,3,8,3 -+L 5.5,0,8,0 -+L 8,3,8,4 - --[#00E7] 6 -+[00e7] � - L 3,6,1.5,6 - A 1.5,4.5,1.5,90,180 - L 0,4.5,0,1.5 -@@ -1023,104 +874,85 @@ - L 1.5,0,3,0 - A 2.157778,-0.831208,0.84605,242.430103,100.747876 - --[#010D] 7 --L 3,6,1.5,6 --A 1.5,4.5,1.5,90,180 --L 0,4.5,0,1.5 --A 1.5,1.5,1.5,180,270 --L 1.5,0,3,0 --L 0,9,1.5,7 --L 1.5,7,3,9 -- --[#00E9] 7 --L 2.5,7,5,9 -+[00e8] � - L 0,3,4,3 - L 4,3,4,4 - A 2,4,2,0,180 - L 0,4,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 -+L 1,9,3.5,7 - --[#0119] 7 -+[00e9] � - L 0,3,4,3 - L 4,3,4,4 - A 2,4,2,0,180 - L 0,4,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 --A 3.842222,-0.831208,0.84605,79.252124,297.569897 -+L 1,7,3.5,9 - --[#00EB] 8 -+[00ea] � - L 0,3,4,3 - L 4,3,4,4 - A 2,4,2,0,180 - L 0,4,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 --L 1,9,1,8.5 --L 3,9,3,8.5 -+L 0.5,7,2,9 -+L 2,9,3.5,7 - --[#011B] 8 -+[00eb] � - L 0,3,4,3 - L 4,3,4,4 - A 2,4,2,0,180 - L 0,4,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 --L 0.5,9,2,7 --L 2,7,3.5,9 -+L 1,9,1,8.5 -+L 3,9,3,8.5 - --[#00ED] 2 --L 0,7,2.5,9 -+[00ec] � - L 0.5,0,0.5,6 -+L -0.5,9,2,7 - --[#00EE] 3 -+[00ed] � -+L 0.5,0,0.5,6 -+L -0.5,7,2,9 -+ -+[00ee] � - L 0,7,1.5,9 - L 1.5,9,3,7 - L 1.5,0,1.5,6 - --[#010F] 8 --L 4,9,4,0 --L 4,0,1.5,0 --A 1.5,1.5,1.5,180,270 --L 0,1.5,0,4.5 --A 1.5,4.5,1.5,90,180 --L 1.5,6,4,6 --L 0.5,12,2,10 --L 2,10,3.5,12 -- --[#0111] 7 --L 4,9,4,0 --L 4,0,1.5,0 --A 1.5,1.5,1.5,180,270 --L 0,1.5,0,4.5 --A 1.5,4.5,1.5,90,180 --L 1.5,6,4,6 --L 3,7.5,5,7.5 -+[00ef] � -+L 1.5,0,1.5,6 -+L 0.5,9,0.5,8.5 -+L 2.5,9,2.5,8.5 - --[#0144] 5 -+[00f1] � - L 0,0,0,6 - L 0,6,2.5,6 - A 2.5,4.5,1.5,0,90 - L 4,4.5,4,0 --L 2.5,7,5,9 -+A 2.7,8.366670,0.966667,223.603,316.397 -+AR 1.3,7.033330,0.966667,136.397,43.602800 - --[#0148] 6 --L 0,0,0,6 --L 0,6,2.5,6 --A 2.5,4.5,1.5,0,90 --L 4,4.5,4,0 --L 0.5,9,2,7 --L 2,7,3.5,9 -+[00f2] � -+L 0,4,0,2 -+A 2,2,2,180,0 -+L 4,2,4,4 -+A 2,4,2,0,180 -+L 1,9,3.5,7 - --[#00F3] 5 --L 2.5,7,5,9 -+[00f3] � - L 0,4,0,2 - A 2,2,2,180,0 - L 4,2,4,4 - A 2,4,2,0,180 -+L 1,7,3.5,9 - --[#00F4] 6 -+[00f4] � - L 0,4,0,2 - A 2,2,2,180,0 - L 4,2,4,4 -@@ -1128,15 +960,15 @@ - L 0.5,7,2,9 - L 2,9,3.5,7 - --[#0151] 6 -+[00f5] � - L 0,4,0,2 - A 2,2,2,180,0 - L 4,2,4,4 - A 2,4,2,0,180 --L 1,7,3.5,9 --L 3,7,5.5,9 -+A 1.3,7.333330,0.966667,43.602800,136.397 -+A 2.7,8.666670,0.966667,223.603,316.397 - --[#00F6] 6 -+[00f6] � - L 0,4,0,2 - A 2,2,2,180,0 - L 4,2,4,4 -@@ -1144,37 +976,29 @@ - L 1,9,1,8.5 - L 3,9,3,8.5 - --[#0159] 5 --L 0,0,0,6 --L 0,6,2,6 --A 2,5,1,0,90 --L 0,9,1.5,7 --L 1.5,7,3,9 -- --[#016F] 6 -+[00f9] � - L 0,6,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 - L 4,0,4,6 --A 2,8,1,90,270 --A 2,8,1,270,90 -+L 1,9,3.5,7 - --[#00FA] 5 --L 2.5,7,5,9 -+[00fa] � - L 0,6,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 - L 4,0,4,6 -+L 1,7,3.5,9 - --[#0171] 6 -+[00fb] � - L 0,6,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 - L 4,0,4,6 --L 1,7,3.5,9 --L 3,7,5.5,9 -+L 0.5,7,2,9 -+L 2,9,3.5,7 - --[#00FC] 6 -+[00fc] � - L 0,6,0,1.5 - A 1.5,1.5,1.5,180,270 - L 1.5,0,4,0 -@@ -1182,16 +1006,19 @@ - L 1,9,1,8.5 - L 3,9,3,8.5 - --[#00FD] 5 -+[00fd] � - L 0,6,2,0 --L 4,6,1.227905,-2.31623 -+L 4,6,1.227905,-2.316230 - A 0.279297,-2,1,270,341.565063 - L 0.279297,-3,0,-3 --L 2.5,7,5,9 -+L 1,7,3.5,9 - --[#0163] 3 --L 0,6,3,6 --L 1,9,1,0 --A 1.157778,-0.831208,0.84605,242.430103,100.747876 -+[00ff] � -+L 0,6,2,0 -+L 4,6,1.227905,-2.316230 -+A 0.279297,-2,1,270,341.565063 -+L 0.279297,-3,0,-3 -+L 1,9,1,8.5 -+L 3,9,3,8.5 - - #EOF diff --git a/qcad-2.0.5.0.french-mispelling.patch b/qcad-2.0.5.0.french-mispelling.patch deleted file mode 100644 index b20f4ef..0000000 --- a/qcad-2.0.5.0.french-mispelling.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru qcad-2.0.5.0-1-community.src/qcadactions/src/ts/qcadactions_fr.ts qcad-2.0.5.0-1-community.src-outour/qcadactions/src/ts/qcadactions_fr.ts ---- qcad-2.0.5.0-1-community.src/qcadactions/src/ts/qcadactions_fr.ts 2005-11-22 12:51:35.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src-outour/qcadactions/src/ts/qcadactions_fr.ts 2010-07-04 18:57:08.000000000 +0200 -@@ -2335,7 +2335,7 @@ - - - Rotate Entities around two centers -- Tourne Objets outour de 2 centres -+ Tourne Objets autour de 2 centres - - - Specify absolute reference point -diff -ru qcad-2.0.5.0-1-community.src/qcadguiqt/src/ts/qcadguiqt_fr.ts qcad-2.0.5.0-1-community.src-outour/qcadguiqt/src/ts/qcadguiqt_fr.ts ---- qcad-2.0.5.0-1-community.src/qcadguiqt/src/ts/qcadguiqt_fr.ts 2005-11-22 12:52:02.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src-outour/qcadguiqt/src/ts/qcadguiqt_fr.ts 2010-07-04 18:59:37.000000000 +0200 -@@ -782,7 +782,7 @@ - - - Rotate around two centers -- Tourne outour de 2 centres -+ Tourne autour de 2 centres - - - Edit Entity Attributes -Seulement dans qcad-2.0.5.0-1-community.src-outour/qcadguiqt/src/ts: qcadguiqt_fr.ts~ diff --git a/qcad-64bit.patch b/qcad-64bit.patch deleted file mode 100644 index 91b9261..0000000 --- a/qcad-64bit.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_entity.cpp.64bit 2005-05-25 18:09:58.000000000 -0400 -+++ qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_entity.cpp 2005-05-25 18:10:29.000000000 -0400 -@@ -849,7 +849,7 @@ - os << " layer: NULL "; - } else { - os << " layer: " << e.layer->getName().latin1() << " "; -- os << " layer address: " << (int)(e.layer) << " "; -+ os << " layer address: " << (e.layer) << " "; - } - - os << e.pen << "\n"; ---- qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_layer.cpp.64bit 2005-05-25 18:15:22.000000000 -0400 -+++ qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_layer.cpp 2005-05-25 18:16:12.000000000 -0400 -@@ -57,7 +57,7 @@ - os << " name: " << l.getName().latin1() - << " pen: " << l.getPen() - << " frozen: " << (int)l.isFrozen() -- << " address: " << (int)(&l) -+ << " address: " << (&l) - << std::endl; - return os; - } diff --git a/qcad-arc.patch b/qcad-arc.patch deleted file mode 100644 index bc50727..0000000 --- a/qcad-arc.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ur BUILD/qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp ---- BUILD/qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp 2008-01-16 22:04:55.000000000 +0200 -+++ qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp 2008-01-16 21:56:16.000000000 +0200 -@@ -750,6 +750,9 @@ - action = actionFactory.createAction(RS2::ActionDrawArcParallel, actionHandler); - action->addTo(subMenu); - connect(this, SIGNAL(windowsChanged(bool)), action, SLOT(setEnabled(bool))); -+ action = actionFactory.createAction(RS2::ActionDrawArcTangential, actionHandler); -+ action->addTo(subMenu); -+ connect(this, SIGNAL(windowsChanged(bool)), action, SLOT(setEnabled(bool))); - menu->insertItem(tr("&Arc"), subMenu); - // Circles: - subMenu=new QPopupMenu(this); -diff -ur BUILD/qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp ---- BUILD/qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp 2005-11-22 13:52:22.000000000 +0200 -+++ qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp 2008-01-16 20:31:59.000000000 +0200 -@@ -45,6 +45,7 @@ - #include "rs_actiondimradial.h" - #include "rs_actiondrawarc.h" - #include "rs_actiondrawarc3p.h" -+#include "rs_actiondrawarctangential.h" - #include "rs_actiondrawcircle.h" - #include "rs_actiondrawcircle2p.h" - #include "rs_actiondrawcircle3p.h" -@@ -632,6 +633,12 @@ - obj, SLOT(slotDrawArcParallel())); - break; - -+ case RS2::ActionDrawArcTangential: -+ action = RS_ActionDrawArcTangential::createGUIAction(id, mw); -+ connect(action, SIGNAL(activated()), -+ obj, SLOT(slotDrawArcTangential())); -+ break; -+ - case RS2::ActionDrawEllipseAxis: - action = RS_ActionDrawEllipseAxis::createGUIAction(id, mw); - connect(action, SIGNAL(activated()), diff --git a/qcad-assistant.patch b/qcad-assistant.patch deleted file mode 100644 index 5443759..0000000 --- a/qcad-assistant.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur qcad-2.0.4.0-1.src-orig/qcad/src/qc_applicationwindow.cpp qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.cpp ---- qcad-2.0.4.0-1.src-orig/qcad/src/qc_applicationwindow.cpp 2004-09-14 22:13:07.000000000 +0200 -+++ qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.cpp 2005-04-05 15:40:25.000000000 +0200 -@@ -27,6 +27,9 @@ - #include "qc_applicationwindow.h" - - #include -+#include -+#include -+#include - - #include - #include -@@ -2774,11 +2777,44 @@ - #if QT_VERSION>=0x030200 - assistant->setArguments(args); - #endif -+ connect( assistant, SIGNAL(error(const QString&)), this, SLOT(slotAssistantError(const QString&)) ); - } - assistant->openAssistant(); - //assistant->showPage("index.html"); - } - -+void QC_ApplicationWindow::slotAssistantError(const QString&) { -+ if ( !assistant->isOpen() ) { -+ pid_t pid; -+ if ( (pid = fork()) < 0 ) { -+ perror( "fork" ); -+ QMessageBox::critical( this, QC_APPNAME, "Could not fork child process." ); -+ return; -+ } -+ if ( pid==0 ) { // child -+ pid_t gcpid; -+ if ( (gcpid = fork()) < 0 ) { -+ perror( "fork" ); -+ _exit(1); -+ } -+ if ( gcpid==0 ) { // grandchild -+ char* argv[] = { "gnome-open", -+ "/usr/share/qcad/doc/cad/index.html", -+ 0 -+ }; -+ execvp( argv[0], argv); -+ perror( "execvp" ); -+ _exit(1); -+ } -+ int status; -+ waitpid( pid, &status, 0 ); -+ _exit(0); -+ } -+ // parent -+ int status; -+ waitpid( pid, &status, 0 ); -+ } -+} - - - /** -diff -Nur qcad-2.0.4.0-1.src-orig/qcad/src/qc_applicationwindow.h qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.h ---- qcad-2.0.4.0-1.src-orig/qcad/src/qc_applicationwindow.h 2004-09-14 22:13:07.000000000 +0200 -+++ qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.h 2005-02-14 23:03:46.000000000 +0100 -@@ -224,6 +224,8 @@ - /** resizes window to 640x480 for screen shots */ - void slotTestResize1024(); - -+ void slotAssistantError(const QString&); -+ - signals: - void gridChanged(bool on); - void draftChanged(bool on); diff --git a/qcad-gcc43.patch b/qcad-gcc43.patch deleted file mode 100644 index beff83c..0000000 --- a/qcad-gcc43.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up qcad-2.0.5.0-1-community.src/qcadactions/src/rs_actionzoompan.cpp.gcc43 qcad-2.0.5.0-1-community.src/qcadactions/src/rs_actionzoompan.cpp ---- qcad-2.0.5.0-1-community.src/qcadactions/src/rs_actionzoompan.cpp.gcc43 2008-02-22 21:46:34.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src/qcadactions/src/rs_actionzoompan.cpp 2008-02-22 21:47:06.000000000 +0100 -@@ -27,6 +27,7 @@ - #include "rs_actionzoompan.h" - #include "rs_snapper.h" - #include "rs_point.h" -+#include - - - RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container, -diff -up qcad-2.0.5.0-1-community.src/dxflib/src/dl_writer.h.gcc43 qcad-2.0.5.0-1-community.src/dxflib/src/dl_writer.h ---- qcad-2.0.5.0-1-community.src/dxflib/src/dl_writer.h.gcc43 2008-02-22 21:48:05.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src/dxflib/src/dl_writer.h 2008-02-22 21:49:06.000000000 +0100 -@@ -28,6 +28,8 @@ - #ifndef DL_WRITER_H - #define DL_WRITER_H - -+#include -+ - #if _MSC_VER > 1000 - #pragma once - #endif // _MSC_VER > 1000 -diff -up qcad-2.0.5.0-1-community.src/qcadlib/src/information/rs_information.cpp.gcc43 qcad-2.0.5.0-1-community.src/qcadlib/src/information/rs_information.cpp ---- qcad-2.0.5.0-1-community.src/qcadlib/src/information/rs_information.cpp.gcc43 2008-02-22 21:50:37.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src/qcadlib/src/information/rs_information.cpp 2008-02-22 21:51:02.000000000 +0100 -@@ -27,6 +27,7 @@ - #include "rs_information.h" - - #include "rs_constructionline.h" -+#include - - - /** diff --git a/qcad-manual-bugs.patch b/qcad-manual-bugs.patch deleted file mode 100644 index 006a51f..0000000 --- a/qcad-manual-bugs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur qcad-manual-en-2.0.4.0-1.html-orig/qcaddoc.adp qcad-manual-en-2.0.4.0-1.html/qcaddoc.adp ---- qcad-manual-en-2.0.4.0-1.html-orig/qcaddoc.adp 2004-09-12 00:51:05.000000000 +0200 -+++ qcad-manual-en-2.0.4.0-1.html/qcaddoc.adp 2005-02-14 20:08:22.649667144 +0100 -@@ -4,8 +4,6 @@ - - QCad Manual - -- cad/imgs/qcadicon.png -- - cad/index.html - - About QCad Manual -@@ -15,7 +13,7 @@ - . - - -- -+ -
-
- diff --git a/qcad-nopedantic.patch b/qcad-nopedantic.patch deleted file mode 100644 index fbfe404..0000000 --- a/qcad-nopedantic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qcad-2.0.5.0-1-community.src/mkspecs/defs.pro.nopedantic 2005-11-23 12:51:31.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src/mkspecs/defs.pro 2005-11-23 12:51:38.000000000 +0100 -@@ -1,6 +1,6 @@ - # $Id: defs.pro 606 2004-12-25 03:08:40Z andrew $ --QMAKE_CXXFLAGS_DEBUG += -pedantic --QMAKE_CXXFLAGS += -pedantic -+#QMAKE_CXXFLAGS_DEBUG += -pedantic -+#QMAKE_CXXFLAGS += -pedantic - - win32 { - QMAKE_CFLAGS_THREAD -= -mthreads diff --git a/qcad-qass.patch b/qcad-qass.patch deleted file mode 100644 index 24648b0..0000000 --- a/qcad-qass.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp.qass 2005-11-23 12:58:38.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp 2005-11-23 12:59:46.000000000 +0100 -@@ -2946,12 +2946,12 @@ - RS_SYSTEM->getAppDir().latin1()); - RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s", - RS_SYSTEM->getAppDir().latin1()); -- assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this); -+ assistant = new QAssistantClient("/usr/bin", this); - connect(assistant, SIGNAL(error(const QString&)), - this, SLOT(slotError(const QString&))); - QStringList args; - args << "-profile"; -- args << QDir::convertSeparators(RS_SYSTEM->getDocPath() + "/qcaddoc.adp"); -+ args << QDir::convertSeparators("/usr/share/qcad/doc/qcaddoc.adp"); - // args << QString("doc") + QDir::separator() + QString("qcaddoc.adp"); - - #if QT_VERSION>=0x030200 diff --git a/qcad.spec b/qcad.spec deleted file mode 100644 index 040d489..0000000 --- a/qcad.spec +++ /dev/null @@ -1,254 +0,0 @@ -Name: qcad -Version: 2.0.5.0 -Release: 21%{?dist} -Summary: Simple 2D CAD program -Summary(fr): Un simple programme de conception 2D assistée par ordinateur (CAO) - -Group: Applications/Engineering -License: GPLv2 -Source: http://www.ribbonsoft.com/archives/qcad/qcad-2.0.5.0-1-community.src.tar.gz -Source1: http://www.ribbonsoft.com/archives/qcad/qcad-manual-en-2.0.4.0-1.html.zip -Patch: qcad-qass.patch -Patch1: qcad-assistant.patch -Patch2: qcad-manual-bugs.patch -Patch3: qcad-64bit.patch -Patch4: qcad-nopedantic.patch -Patch5: qcad-arc.patch -Patch6: qcad-gcc43.patch -Patch10: %{name}-%{version}-latin2.patch -Patch11: %{name}-%{version}.french-mispelling.patch - -URL: http://www.ribbonsoft.com/qcad.html -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: qt3-devel -BuildRequires: python-devel, desktop-file-utils -# Help viewer is Qt Assistant in qt-devel package. -#Requires: /usr/bin/assistant -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils - - -%description -QCad is an application for computer aided drafting in two -dimensions. With QCad you can create technical drawings such as plans -for buildings, interiors or mechanical parts. QCad works under Linux, -Unix Systems, Mac OS X and Windows. The source code of QCad is -released under the GPL (Open Source). - -%description -l fr -QCad est une application de conception assistée par ordinateur de dessin -en deux dimensions. Avec QCad, vous pouvez créer des dessins techniques -comme des plans architecturaux de construction ou d'intérieur, des pièces -mécaniques. - - -%prep -%setup -q -n %{name}-%{version}-1-community.src -%setup -q -T -D -a 1 -n %{name}-%{version}-1-community.src -%patch -p1 -%patch1 -p1 -b .assistanterror -# no backup file here, so it doesn't get packaged -%patch2 -p0 -%patch3 -p1 -b .64bit -%patch4 -p1 -b .nopedantic -%patch5 -p1 -b .arc -%patch6 -p1 -b .gcc43 -%patch10 -p0 -b .latin2 -%patch11 -p1 -b .french-mispelling - - -%build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -( - cd scripts -# perl -pi -e "s|^export MAKE=.*|export MAKE=\'make CFLAGS=\"$RPM_OPT_FLAGS\" CXXFLAGS=\"$RPM_OPT_FLAGS\"\'|" build_qcad.sh - ./build_qcad.sh -) -find -name '*.ts' -exec lrelease '{}' ';' -find -name '*.qm' -exec cp '{}' qcad/qm ';' - - -%install -rm -rf $RPM_BUILD_ROOT - -%define pkgdatadir %{_datadir}/qcad -mkdir -p $RPM_BUILD_ROOT%{pkgdatadir} -mkdir -p $RPM_BUILD_ROOT%{pkgdatadir}/library -mkdir -p $RPM_BUILD_ROOT%{pkgdatadir}/doc - -cp -fr qcad-manual-en-2.0.4.0-1.html/* $RPM_BUILD_ROOT%{pkgdatadir}/doc - -cd qcad -cp -fr fonts $RPM_BUILD_ROOT%{pkgdatadir} -cp -fr patterns $RPM_BUILD_ROOT%{pkgdatadir} -cp -fr qm $RPM_BUILD_ROOT%{pkgdatadir} - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp -f src/xpm/qcad.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps - -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp -f qcad $RPM_BUILD_ROOT%{_bindir} - -cat > qcad.desktop < /dev/null 2>&1 || : - - -%postun -%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - - -%files -%defattr(-,root,root,-) -%doc qcad/README qcad/data -%{_bindir}/* -%{_datadir}/qcad -%{_datadir}/applications/* -%{_datadir}/pixmaps/* - - -%changelog -* Fri Feb 22 2013 Toshio Kuratomi - 2.0.5.0-21 -- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077 - -* Thu Feb 14 2013 Fedora Release Engineering - 2.0.5.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 2.0.5.0-19 -- rebuild due to "jpeg8-ABI" feature drop - -* Fri Dec 21 2012 Adam Tkac - 2.0.5.0-18 -- rebuild against new libjpeg - -* Sat Jul 21 2012 Fedora Release Engineering - 2.0.5.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 2.0.5.0-16 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 2.0.5.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 2.0.5.0-14 -- Rebuild for new libpng - -* Tue Feb 08 2011 Fedora Release Engineering - 2.0.5.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jul 4 2010 Alain Portal - 2.0.5.0-12 -- Patch to add some missing caracters to the latin1 charset -- Patch to to fix a french mispelling -- Frenchify desktop and spec files - -* Sun Jul 26 2009 Fedora Release Engineering - 2.0.5.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 2.0.5.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Sep 3 2008 Tom "spot" Callaway - 2.0.5.0-9 -- fix license tag - -* Fri Feb 22 2008 Gerard Milmeister - 2.0.5.0-8 -- patch to compile with GCC 4.3 - -* Mon Feb 18 2008 Fedora Release Engineering - 2.0.5.0-7 -- Autorebuild for GCC 4.3 - -* Wed Jan 23 2008 Gerard Milmeister - 2.0.5.0-6 -- added patch to add arc type tangential to menu - -* Mon Aug 28 2006 Gerard Milmeister - 2.0.5.0-5 -- Rebuild for FE6 - -* Fri Feb 17 2006 Gerard Milmeister - 2.0.5.0-4 -- Rebuild for Fedora Extras 5 - -* Thu Nov 24 2005 Gerard Milmeister - 2.0.5.0-3 -- generate and include qm files - -* Wed Nov 23 2005 Gerard Milmeister - 2.0.5.0 -- New Version 2.0.5.0 - -* Wed May 25 2005 Jeremy Katz - 2.0.4.0-5.fc4 -- fix build on 64bit arches (#158650) - -* Sun May 22 2005 Jeremy Katz - 2.0.4.0-4.fc4 -- rebuild on all arches - -* Tue Apr 5 2005 Michael Schwendt - 2.0.4.0-3.fc4 -- Add missing line in qcad-assistant.patch which prevents orphans. - -* Mon Feb 14 2005 Michael Schwendt - 2.0.4.0-2 -- Remove /usr/bin/assistant (-> qt-devel) dependency, replace with - patches to open a warning dialog in case of Qt Assistant error - conditions. Add a related patch for the English manual which - removes references to two missing images. - -* Sat Feb 12 2005 Gerard Milmeister - 2.0.4.0-1 -- Added documentation -- Fixed code for calling Qt Assistant: qcad-qass.patch - -* Mon Nov 15 2004 Gerard Milmeister - 2.0.4.0-0.fdr.2 -- Added mime type to desktop file - -* Fri Oct 1 2004 Gerard Milmeister - 2.0.4.0-0.fdr.1 -- New Version 2.0.4.0 - -* Sat Jun 5 2004 Gerard Milmeister - 2.0.3.3-0.fdr.1 -- New Version 2.0.3.3 - -* Sun Apr 25 2004 Gerard Milmeister - 2.0.3.1-0.fdr.2 -- Set QTDIR from qt.sh - -* Sun Apr 11 2004 Gerard Milmeister - 2.0.3.1-0.fdr.1 -- New Version 2.0.3.1 - -* Sat Feb 28 2004 Gerard Milmeister - 2.0.2.0-0.fdr.1 -- New Version 2.0.2.0 - -* Fri Dec 12 2003 Gerard Milmeister - 2.0.1.3-0.fdr.1 -- New Version 2.0.1.3 - -* Wed Nov 26 2003 Gerard Milmeister - 2.0.1.2-1.fdr.2 -- Respect RPM_OPT_FLAGS - -* Wed Nov 26 2003 Gerard Milmeister - 2.0.1.2-0.fdr.1 -- New Version 2.0.1.2 - -* Tue Oct 21 2003 Gerard Milmeister - 2.0.1.1-1.fdr.1 -- First Fedora release diff --git a/sources b/sources deleted file mode 100644 index 507e61e..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -96b6a56027782aec953c9c4e64c5998c qcad-2.0.5.0-1-community.src.tar.gz -20d8fddbe0da978f996bdfaf9ae6bec1 qcad-manual-en-2.0.4.0-1.html.zip