diff --git a/package/public/qcad/cstring_convert.patch b/package/public/qcad/cstring_convert.patch new file mode 100644 index 000000000..4749b9ecf --- /dev/null +++ b/package/public/qcad/cstring_convert.patch @@ -0,0 +1,11 @@ +--- ./qcadlib/src/filters/rs_filterdxf.cpp.orig 2005-03-18 10:56:35.485734958 +0100 ++++ ./qcadlib/src/filters/rs_filterdxf.cpp 2005-03-18 11:07:21.593857587 +0100 +@@ -509,7 +509,7 @@ + lss = RS2::Exact; + } + +- mtext+=data.text; ++ mtext+=data.text.c_str(); + + RS_String locallyEncoded = mtext; + RS_String enc = RS_System::getEncoding( diff --git a/package/public/qcad/gcc34.patch b/package/public/qcad/gcc34.patch deleted file mode 100644 index 94e10abdd..000000000 --- a/package/public/qcad/gcc34.patch +++ /dev/null @@ -1,52 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/qcad/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./qcadlib/src/filters/rs_filtercxf.h.orig 2004-09-11 05:17:51.961336120 +0200 -+++ ./qcadlib/src/filters/rs_filtercxf.h 2004-09-11 05:14:22.931113544 +0200 -@@ -28,6 +28,8 @@ - #ifndef RS_FILTERCXF_H - #define RS_FILTERCXF_H - -+#undef min -+#undef max - #include - - #include "rs_filterinterface.h" ---- ./qcadlib/src/filters/rs_filterdxf.h.orig 2004-09-11 05:17:36.443695160 +0200 -+++ ./qcadlib/src/filters/rs_filterdxf.h 2004-09-11 05:13:50.997968120 +0200 -@@ -44,6 +44,8 @@ - #include "rs_image.h" - - #include "dl_creationinterface.h" -+#undef min -+#undef max - #include "dl_dxf.h" - - ---- ./qcad/src/qc_applicationwindow.cpp.orig 2004-09-11 05:39:43.001027792 +0200 -+++ ./qcad/src/qc_applicationwindow.cpp 2004-09-11 05:40:19.329505024 +0200 -@@ -26,6 +26,8 @@ - - #include "qc_applicationwindow.h" - -+#undef min -+#undef max - #include - - #include diff --git a/package/public/qcad/qcad.conf b/package/public/qcad/qcad.conf index e9fbdf856..2f4e3d8a7 100644 --- a/package/public/qcad/qcad.conf +++ b/package/public/qcad/qcad.conf @@ -33,7 +33,7 @@ qcad_main() { cd qcad cp -vf qcad $bindir/ mkdir -p $datadir/qcad - cp -rvf examples fonts patterns qm scripts $datadir/qcad/ + cp -rvf examples fonts patterns qm $datadir/qcad/ } custmain="qcad_main" diff --git a/package/public/qcad/qcad.desc b/package/public/qcad/qcad.desc index 8f18427e5..29460ffae 100644 --- a/package/public/qcad/qcad.desc +++ b/package/public/qcad/qcad.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 2.0.3.3 +[V] 2.0.4.0 [P] X -?---5---9 167.600 -[D] 1222573256 qcad-2.0.3.3-1.src.tar.gz http://www.ribbonsoft.com/archives/qcad/ +[D] 558814660 qcad-2.0.4.0-1.src.tar.gz http://www.ribbonsoft.com/archives/qcad/