DELTA SVN^`^^--- src/zip/RZip.cpp.orig 2018-07-01 14:53:24 UTC +++ src/zip/RZip.cpp @@ -19,7 +19,7 @@ //#include //#include -#include "JlCompress.h" +#include #include "RZip.h" ENDREP DELTA SVNuwuu--- src/zip/zip.pro.orig 2018-07-01 14:10:25 UTC +++ src/zip/zip.pro @@ -1,6 +1,6 @@ include( ../../shared.pri ) -INCLUDEPATH+=../3rdparty/quazip/src +# INCLUDEPATH+=../3rdparty/quazip/src greaterThan(QT_MAJOR_VERSION, 4) { INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib @@ -23,7 +23,7 @@ else { CONFIG += plugin } TARGET = $${RLIBNAME}zip -LIBS += -l$${RLIBNAME}core -lquazip +LIBS += -l$${RLIBNAME}core -lquazip5 OTHER_FILES += zip.dox DEFINES += QCADZIP_LIBRARY RC_FILE = zip.rc ENDREP id: 4-474116.0-325094.r474116/783 type: file count: 0 text: 474116 0 239 222 c1593254427909ff6091d6a8c93df56d 1cc9f2ab43391aca5962b3dd9010f17a22c0f605 474115-a5tw/_6 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/cad/qcad/files/patch-src_zip_RZip.cpp copyroot: 325094 /head/cad/qcad id: 7-474116.0-325094.r474116/1090 type: file count: 0 text: 474116 252 518 501 fb825709a6e7e79283c38d46c8d778ee 3609c22b1ab3a0e06f498db9feb8a259b0bc51a6 474115-a5tw/_8 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/cad/qcad/files/patch-src_zip_zip.pro copyroot: 325094 /head/cad/qcad PLAIN K 7 bbox.in V 36 file 7-325094.0-325094.r325094/49648 K 10 dwg2bmp.in V 36 file a-325094.0-325094.r325094/49945 K 10 dwg2pdf.in V 36 file c-325094.0-325094.r325094/50245 K 10 dwg2svg.in V 36 file e-325094.0-325094.r325094/50545 K 14 patch-qcad.pro V 36 file 6-436776.0-325094.r474010/10806 K 20 patch-shared_app.pri V 36 file g-325094.0-325094.r474010/11146 K 31 patch-src_3rdparty_3rdparty.pro V 35 file i-325094.0-325094.r404790/1464 K 21 patch-src_core_RS.cpp V 35 file 5-378174.0-325094.r453874/5146 K 28 patch-src_core_RSettings.cpp V 36 file m-325094.0-325094.r325094/51793 K 23 patch-src_core_core.pro V 36 file o-325094.0-325094.r474010/11493 K 29 patch-src_core_math_RSpline.h V 36 file q-325094.0-325094.r474010/11843 K 27 patch-src_entity_entity.pro V 36 file s-325094.0-325094.r474010/12200 K 39 patch-src_scripting_ecmaapi_ecmaapi.pro V 36 file 5-402695.0-325094.r474010/12555 K 22 patch-src_zip_RZip.cpp V 34 file 4-474116.0-325094.r474116/783 K 21 patch-src_zip_zip.pro V 35 file 7-474116.0-325094.r474116/1090 K 51 patch-support_ecmagenerator_src_srcml_RSpline.srcml V 36 file u-325094.0-325094.r474010/12921 END ENDREP id: a-23796.0-325094.r474116/2541 type: dir pred: a-23796.0-325094.r474010/14306 count: 34 text: 474116 1399 1129 0 b5429f1ca025d7c7db406987d16e79eb cpath: /head/cad/qcad/files copyroot: 325094 /head/cad/qcad PLAIN K 8 Makefile V 35 file 5-23796.0-325094.r474010/10150 K 8 distinfo V 35 file 8-23796.0-325094.r474010/10478 K 5 files V 33 dir a-23796.0-325094.r474116/2541 K 9 pkg-descr V 36 file g-23796.0-325094.r340718/941309 K 9 pkg-plist V 36 file w-325094.0-325094.r474010/14516 END ENDREP id: 4-23796.0-325094.r474116/3037 type: dir pred: 4-23796.0-325094.r474010/15140 count: 122 text: 474116 2751 273 0 91373ab747fd0659cbcc60223b129564 cpath: /head/cad/qcad copyroot: 325094 /head/cad/qcad PLAIN K 8 Makefile V 27 file 2-755.0.r474000/100630 K 10 NASTRAN-95 V 36 dir 4-420085.0-420088.r464084/207320 K 3 abc V 27 dir 4-468187.0.r468187/4288 K 6 admesh V 28 dir 4-90740.0.r415498/253064 K 4 adms V 26 dir 4-169094.0.r439040/960 K 8 alliance V 28 dir 4-109077.0.r473699/68182 K 11 astk-client V 27 dir 4-85437.0.r348597/16095 K 12 astk-serveur V 26 dir 4-85435.0.r469120/1980 K 4 atlc V 28 dir 4-70060.0.r405891/200671 K 8 basicdsp V 27 dir 4-218728.0.r443053/2017 K 10 brickutils V 29 dir 4-347198.0.r462307/109079 K 6 brlcad V 28 dir 4-129418.0.r459598/21184 K 8 calculix V 27 dir 4-80178.0.r474058/53634 K 12 calculix-ccx V 35 dir 4-80178.2-447973.r464084/209633 K 7 cascade V 27 dir 4-70051.0.r441979/15184 K 9 chipvault V 28 dir 4-74193.0.r340718/905399 K 11 cura-engine V 29 dir 4-364337.0.r449591/238538 K 9 dinotrace V 26 dir 4-113000.0.r472883/567 K 7 dxf2fig V 29 dir 4-117302.0.r340722/517511 K 8 electric V 25 dir 2-31125.0.r453801/937 K 11 electric-ng V 27 dir 4-174152.0.r427012/1392 K 8 elmerfem V 27 dir 4-370235.0.r466257/1598 K 6 feappv V 26 dir 4-158739.0.r473375/508 K 8 fidocadj V 29 dir 4-296050.0.r415498/257490 K 7 freecad V 36 dir 4-191927.0-421541.r473503/329100 K 7 freehdl V 28 dir 4-176541.0.r473699/68917 K 8 fritzing V 29 dir 4-407684.0.r473503/329872 K 9 gdsreader V 27 dir 4-191068.0.r366654/1133 K 3 gdt V 29 dir 4-191098.0.r431996/109384 K 4 geda V 28 dir 2-15151.0.r428152/162750 K 5 gerbv V 26 dir 4-63026.0.r458279/2229 K 4 ghdl V 27 dir 4-387985.0.r467751/4499 K 4 gmsh V 28 dir 4-85448.0.r464084/214178 K 8 gmsh-occ V 29 dir 4-225061.0.r464084/214771 K 6 gnucap V 27 dir 4-54293.0.r444463/95168 K 7 gplcver V 29 dir 4-152326.0.r431996/110075 K 8 gspiceui V 29 dir 4-169394.0.r449591/242945 K 7 gtkwave V 34 dir 4-212528.0-303646.r471557/1184 K 6 impact V 28 dir 4-130327.0.r428144/56409 K 5 irsim V 24 dir 2-594.0.r473367/1465 K 8 iverilog V 26 dir 4-38298.0.r452817/1135 K 7 jspice3 V 28 dir 4-167526.0.r431796/81754 K 5 kicad V 27 dir 4-150689.0.r470981/1657 K 11 kicad-devel V 27 dir q-150689.0.r473971/2297 K 13 kicad-library V 28 dir q-446084.0.r450079/34486 K 30 kicad-library-footprints-devel V 33 dir q-446084.0-474000.r474023/917 K 30 kicad-library-packages3d-devel V 34 dir q-446084.1-474000.r474023/1908 K 27 kicad-library-symbols-devel V 34 dir q-446084.2-474000.r474023/2896 K 7 klayout V 29 dir 4-191075.0.r473503/330560 K 12 layouteditor V 29 dir 4-267410.0.r473503/331258 K 5 ldraw V 26 dir 4-314115.0.r422002/654 K 6 leocad V 28 dir 4-55432.0.r473503/331995 K 10 libopencad V 27 dir 4-429524.0.r456105/1245 K 8 librecad V 29 dir 2-288505.0.r473503/332688 K 12 linux-eagle5 V 26 dir g-52211.0.r469120/2714 K 14 linuxcnc-devel V 29 dir 4-418465.0.r467711/297951 K 7 logisim V 26 dir 4-313229.0.r375015/500 K 5 magic V 26 dir 2-593.0.r441503/161775 K 7 meshdev V 29 dir 4-290494.0.r415498/260429 K 7 meshlab V 29 dir 4-269134.0.r473503/333428 K 6 netgen V 28 dir 4-108482.0.r468844/94206 K 14 ngspice_rework V 26 dir 4-54430.0.r446703/2315 K 11 opencascade V 27 dir 4-188917.0.r469338/4192 K 8 openscad V 29 dir 4-280009.0.r473503/334125 K 14 openscad-devel V 36 dir 4-280009.0-468045.r473503/334939 K 7 openvsp V 27 dir 4-295250.0.r465714/2001 K 7 p5-GDS2 V 29 dir 4-191096.0.r470993/562013 K 15 p5-Verilog-Perl V 26 dir 4-234576.0.r451814/596 K 3 pcb V 24 dir 3-276.0.r457179/1391 K 7 pdnmesh V 28 dir 4-48761.0.r464084/217698 K 8 py-gdspy V 29 dir 4-415361.0.r472884/424413 K 8 py-lcapy V 29 dir 4-415342.0.r472884/425060 K 8 py-pycam V 36 dir 4-407489.0-407822.r472884/425792 K 8 py-pyfda V 29 dir 4-460847.0.r472884/426475 K 12 python-gdsii V 36 dir 4-425355.0-425853.r472884/427171 K 9 pythoncad V 28 dir 4-93776.0.r472884/427957 K 4 qcad V 33 dir 4-23796.0-325094.r474116/3037 K 12 qelectrotech V 29 dir 4-258017.0.r473503/336516 K 4 qfsm V 28 dir 4-57583.0.r473503/337248 K 4 qmls V 29 dir 4-51304.0.r340725/1126032 K 4 qucs V 36 dir 4-137272.0-372825.r473503/338040 K 10 repsnapper V 28 dir 4-305014.0.r472665/61141 K 13 rubygem-gdsii V 27 dir 4-415343.0.r415343/9563 K 6 scotch V 29 dir 4-155160.0.r464084/221863 K 10 solvespace V 28 dir 4-425822.0.r457965/51941 K 5 sp2sp V 27 dir 4-425428.0.r425874/2301 K 5 spice V 24 dir 2-3120.0.r425871/622 K 8 stepcode V 27 dir 4-391246.0.r464438/2129 K 4 sumo V 26 dir 4-455420.0.r471726/625 K 11 sweethome3d V 28 dir 4-314867.0.r465606/47849 K 6 tkgate V 28 dir 4-390482.0.r427552/83279 K 7 tochnog V 28 dir 4-84798.0.r464084/222595 K 9 transcalc V 28 dir 4-65722.0.r428152/164118 K 6 varkon V 28 dir 4-81567.0.r441503/169109 K 15 verilog-mode.el V 28 dir 4-225826.0.r471191/57047 K 8 xcircuit V 26 dir 2-11041.0.r473004/1072 K 3 z88 V 29 dir 4-127103.0.r441503/169840 K 4 zcad V 26 dir 4-439964.0.r471478/592 END ENDREP id: 1-276.0.r474116/7976 type: dir pred: 1-276.0.r474058/58547 count: 2744 text: 474116 3241 4722 0 c110635bc8f60ce4cb04666502fc8cf1 cpath: /head/cad copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 26 file 1-411777.0.r467740/54 K 11 .gitauthors V 26 file 1-467739.0.r473970/83 K 10 .gitignore V 26 file 1-348322.0.r458023/77 K 11 .gitmessage V 27 file 3-457790.0.r457790/987 K 7 CHANGES V 29 file 1-99373.0.r473503/169671 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r470957/47 K 4 GIDs V 28 file 1-168311.0.r474069/7816 K 8 Keywords V 27 dir 1-314142.0.r419368/1305 K 5 LEGAL V 25 file 1-748.0.r471892/1487 K 5 MOVED V 26 file 1-69878.0.r473926/766 K 8 Makefile V 21 file 1-6.0.r460340/56 K 2 Mk V 22 dir 1-5.0.r474017/8316 K 6 README V 24 file 1-2408.0.r469089/62 K 9 Templates V 26 dir 1-2932.0.r473324/12517 K 5 Tools V 26 dir 3-15302.0.r473752/3108 K 4 UIDs V 28 file 4-168311.0.r474069/8097 K 8 UPDATING V 29 file 1-102685.0.r473910/20549 K 13 accessibility V 28 dir 1-42583.0.r473503/190336 K 6 arabic V 27 dir 1-38973.0.r473396/50714 K 9 archivers V 25 dir 1-242.0.r474083/13945 K 5 astro V 24 dir 1-301.0.r473988/7716 K 5 audio V 25 dir 1-148.0.r474088/48899 K 4 base V 27 dir 1-420954.0.r473568/2685 K 10 benchmarks V 23 dir 1-62.0.r474111/5902 K 7 biology V 26 dir 1-9066.0.r473806/10025 K 3 cad V 24 dir 1-276.0.r474116/7976 K 7 chinese V 27 dir 1-3770.0.r473503/353527 K 5 comms V 24 dir 1-76.0.r474058/69373 K 10 converters V 26 dir 1-1561.0.r474058/80798 K 9 databases V 25 dir 1-771.0.r474065/60474 K 9 deskutils V 26 dir 1-2098.0.r474101/36473 K 5 devel V 25 dir 1-73.0.r474107/345050 K 3 dns V 26 dir 1-6145.0.r473882/12912 K 7 editors V 23 dir 4-6.0.r474095/14710 K 9 emulators V 25 dir 1-181.0.r474045/10391 K 7 finance V 26 dir 1-4110.0.r474109/12807 K 6 french V 29 dir 1-25673.0.r473503/1096025 K 3 ftp V 26 dir 1-199.0.r473660/464739 K 5 games V 25 dir 1-104.0.r474113/63195 K 6 german V 28 dir 1-7451.0.r473503/1274050 K 8 graphics V 24 dir 1-94.0.r474115/62142 K 6 hebrew V 28 dir 3-31142.0.r473396/140449 K 9 hungarian V 29 dir 1p-38973.0.r473396/141864 K 3 irc V 23 dir 1-42.0.r474035/8048 K 8 japanese V 25 dir 1-410.0.r474103/21046 K 4 java V 25 dir 1-2798.0.r474076/8048 K 6 korean V 28 dir 1-5873.0.r473503/1470502 K 4 lang V 24 dir 1-15.0.r474104/19943 K 4 mail V 24 dir 1-57.0.r474084/42617 K 4 math V 25 dir 1-162.0.r474063/44731 K 4 misc V 24 dir 7-35.0.r474056/30103 K 10 multimedia V 25 dir d-333.0.r474105/26576 K 3 net V 24 dir 1-22.0.r474098/82594 K 6 net-im V 29 dir 15-11144.0.r474058/749333 K 8 net-mgmt V 26 dir r-1011.0.r474082/22439 K 7 net-p2p V 26 dir g-29106.0.r474012/7507 K 4 news V 26 dir 1-145.0.r473699/926382 K 4 palm V 28 dir 1-6646.0.r470993/3680658 K 6 polish V 30 dir tv-38973.0.r473503/1972198 K 10 ports-mgmt V 25 dir 1-5132.0.r473723/6549 K 10 portuguese V 28 dir 1-17842.0.r473396/164623 K 5 print V 24 dir 1-79.0.r473853/15189 K 7 russian V 27 dir 1-1559.0.r473396/167542 K 7 science V 26 dir n-5356.0.r473919/13992 K 8 security V 25 dir 1-269.0.r474091/73964 K 6 shells V 25 dir w-6.0.r473611/1251682 K 8 sysutils V 25 dir b-339.0.r474092/74845 K 8 textproc V 26 dir 1-322.0.r474112/100902 K 9 ukrainian V 28 dir g-39704.0.r473396/168943 K 10 vietnamese V 27 dir 1-4812.0.r473396/170691 K 3 www V 26 dir 1-114.0.r474110/149861 K 3 x11 V 24 dir 1-16.0.r474114/29606 K 10 x11-clocks V 24 dir 1-931.0.r473812/4541 K 11 x11-drivers V 27 dir 1-157567.0.r473914/5671 K 6 x11-fm V 24 dir 1-691.0.r473874/3763 K 9 x11-fonts V 25 dir 1-543.0.r473808/11878 K 11 x11-servers V 25 dir 1n-710.0.r470462/2150 K 10 x11-themes V 27 dir 1-14410.0.r473514/11913 K 12 x11-toolkits V 25 dir 1-120.0.r473927/17371 K 6 x11-wm V 25 dir 1-40.0.r474058/779507 END ENDREP id: 2-1.0.r474116/11775 type: dir pred: 2-1.0.r474115/65948 count: 467984 text: 474116 8141 3621 0 8746405e2622ad530cee25a148de945b props: 458023 3927 157 0 4d85142843815bcc29c89469bccb873c cpath: /head copyroot: 0 / minfo-cnt: 1 PLAIN K 8 branches V 24 dir 0-1.0.r474093/156685 K 4 head V 23 dir 2-1.0.r474116/11775 K 8 projects V 24 dir 0-377393.0.r441387/0 K 8 svnadmin V 22 dir 3-1.0.r473896/1653 K 4 tags V 24 dir 8-1.0.r471851/179907 END ENDREP id: 0.0.r474116/12227 type: dir pred: 0.0.r474115/66401 count: 474116 text: 474116 12006 208 0 bf408d2ce20154347347fae804103417 props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 42 _4.0-325094.t474115-a5tw add-file true true /head/cad/qcad/files/patch-src_zip_RZip.cpp _7.0-325094.t474115-a5tw add-file true true /head/cad/qcad/files/patch-src_zip_zip.pro 12227 12451