From 74f904b5031eb048462594987ec6ab9abf45c39c Mon Sep 17 00:00:00 2001 From: GĂ©rard Milmeister Date: Feb 22 2008 21:54:06 +0000 Subject: patch to compile with GCC 4.3 --- diff --git a/qcad-gcc43.patch b/qcad-gcc43.patch new file mode 100644 index 0000000..beff83c --- /dev/null +++ b/qcad-gcc43.patch @@ -0,0 +1,34 @@ +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.spec b/qcad.spec index d5114e0..baa63ae 100644 --- a/qcad.spec +++ b/qcad.spec @@ -1,6 +1,6 @@ Name: qcad Version: 2.0.5.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Simple 2D CAD program Group: Applications/Engineering @@ -13,6 +13,7 @@ Patch2: qcad-manual-bugs.patch Patch3: qcad-64bit.patch Patch4: qcad-nopedantic.patch Patch5: qcad-arc.patch +Patch6: qcad-gcc43.patch URL: http://www.ribbonsoft.com/qcad.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 3.1.2, python-devel, desktop-file-utils @@ -40,6 +41,7 @@ released under the GPL (Open Source). %patch3 -p1 -b .64bit %patch4 -p1 -b .nopedantic %patch5 -p1 -b .arc +%patch6 -p1 -b .gcc43 %build @@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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