Added patch to allow qcad to compile using CXXFLAGS

4 files changed, 70 insertions, 4 deletions

diff --git a/app-sci/qcad/ChangeLog b/app-sci/qcad/ChangeLog
index e19def488243..a68a3bc37c5d 100644
--- a/app-sci/qcad/ChangeLog
+++ b/app-sci/qcad/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-sci/qcad
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/ChangeLog,v 1.10 2003/10/10 07:12:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/ChangeLog,v 1.11 2003/10/21 03:09:28 brandy Exp $
+
+  21 Oct 2003; Brandy Westcott brandy@gentoo.org qcad-2.0.1.0.ebuild:
+  Added patch to allow qcad to compile using CXXFLAGS
 
 *qcad-2.0.1.0 (10 Oct 2003)
 
diff --git a/app-sci/qcad/Manifest b/app-sci/qcad/Manifest
index 191fc1c3ecef..b42adb873b6e 100644
--- a/app-sci/qcad/Manifest
+++ b/app-sci/qcad/Manifest
@@ -1,10 +1,11 @@
 MD5 9e82d59b8d5ec5d5d378363481c5384d qcad-2.0.0.1.ebuild 1002
 MD5 297285ae9f8ed4fcf8431b961bc92c41 qcad-2.0.0.8.ebuild 1002
 MD5 bf3847f2e7959afa3128e1695453c6b0 qcad-1.5.4.ebuild 1043
-MD5 8dc65ca4280c2ef4d4c8a696b568232e qcad-2.0.1.0.ebuild 1138
-MD5 5eba46d4439e7cbe8f6005edb880eca6 ChangeLog 2113
+MD5 e372c3cdccc68fb8fd7689916f95adbf qcad-2.0.1.0.ebuild 1186
+MD5 9b42d7f71ef739da2857b912fe0c9b82 ChangeLog 2236
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 1a2663c1af2274b28422a9a3c04a7bac files/digest-qcad-1.5.4 67
+MD5 ec141f17f0419be4c51b80ed330f4d35 files/qcad-2.0.1.0-1.src-gentoo.patch 2409
 MD5 60a5ca4d64db440e1b071abd424ccfdf files/digest-qcad-2.0.0.1 71
 MD5 239c38056a04c1872458500adc01d71b files/digest-qcad-2.0.0.8 71
 MD5 d5c21b497bf2f1e9ce5f134eb5f96a2e files/digest-qcad-2.0.1.0 71
diff --git a/app-sci/qcad/files/qcad-2.0.1.0-1.src-gentoo.patch b/app-sci/qcad/files/qcad-2.0.1.0-1.src-gentoo.patch
new file mode 100644
index 000000000000..215994fecbe0
--- /dev/null
+++ b/app-sci/qcad/files/qcad-2.0.1.0-1.src-gentoo.patch
@@ -0,0 +1,60 @@
+diff -ur qcad-2.0.1.0-1.src/qcad/Makefile qcad-2.0.1.0-1.src-gentoo/qcad/Makefile
+--- qcad-2.0.1.0-1.src/qcad/Makefile	2003-10-08 10:09:05.000000000 +1300
++++ qcad-2.0.1.0-1.src-gentoo/qcad/Makefile	2003-10-21 15:28:49.000000000 +1300
+@@ -20,7 +20,7 @@
+ 
+ qcad: src/Makefile src/*.h src/*.cpp ../dxflib/lib/libdxf.a ../qcadguiqt/lib/libqcadguiqt.a ../qcadlib/lib/libqcad.a
+ 	- rm qcad
+-	cd src && $(MAKE)
++	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
+ 
+ src/Makefile: src/qcad.pro
+ 	cd src && qmake qcad.pro
+diff -ur qcad-2.0.1.0-1.src/qcadactions/Makefile qcad-2.0.1.0-1.src-gentoo/qcadactions/Makefile
+--- qcad-2.0.1.0-1.src/qcadactions/Makefile	2003-10-08 10:09:03.000000000 +1300
++++ qcad-2.0.1.0-1.src-gentoo/qcadactions/Makefile	2003-10-21 14:27:13.000000000 +1300
+@@ -29,7 +29,7 @@
+ 
+ ./lib/libqcadactions.a: src/Makefile
+ 	$(MAKE) src/Makefile
+-	cd src && $(MAKE)
++	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DRS_OPT_PYTHON -DQT_NO_DEBUG"
+ 
+ src/Makefile:
+ 	cd src && qmake qcadactions.pro
+diff -ur qcad-2.0.1.0-1.src/qcadcmd/Makefile qcad-2.0.1.0-1.src-gentoo/qcadcmd/Makefile
+--- qcad-2.0.1.0-1.src/qcadcmd/Makefile	2003-10-08 10:09:03.000000000 +1300
++++ qcad-2.0.1.0-1.src-gentoo/qcadcmd/Makefile	2003-10-21 14:24:06.000000000 +1300
+@@ -29,7 +29,7 @@
+ 
+ ./lib/libqcadcmd.a: src/Makefile
+ 	$(MAKE) src/Makefile
+-	cd src && $(MAKE)
++	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DQT_NO_DEBUG"
+ 
+ src/Makefile:
+ 	cd src && qmake qcadcmd.pro
+diff -ur qcad-2.0.1.0-1.src/qcadguiqt/Makefile qcad-2.0.1.0-1.src-gentoo/qcadguiqt/Makefile
+--- qcad-2.0.1.0-1.src/qcadguiqt/Makefile	2003-10-08 10:09:04.000000000 +1300
++++ qcad-2.0.1.0-1.src-gentoo/qcadguiqt/Makefile	2003-10-21 14:53:40.000000000 +1300
+@@ -89,7 +89,7 @@
+ 	done )
+ 
+ ./lib/libqcadguiqt.a: src/Makefile
+-	cd src && $(MAKE)
++	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DQT_NO_DEBUG"
+ 
+ src/Makefile:
+ 	cd src && qmake qcadguiqt.pro
+diff -ur qcad-2.0.1.0-1.src/qcadlib/Makefile qcad-2.0.1.0-1.src-gentoo/qcadlib/Makefile
+--- qcad-2.0.1.0-1.src/qcadlib/Makefile	2003-10-08 10:09:02.000000000 +1300
++++ qcad-2.0.1.0-1.src-gentoo/qcadlib/Makefile	2003-10-21 14:23:55.000000000 +1300
+@@ -29,7 +29,7 @@
+ 
+ ./lib/libqcad.a: src/Makefile
+ 	$(MAKE) src/Makefile
+-	cd src && $(MAKE)
++	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DQT_NO_DEBUG"
+ 
+ src/Makefile:
+ 	cd src && qmake qcadlib.pro
diff --git a/app-sci/qcad/qcad-2.0.1.0.ebuild b/app-sci/qcad/qcad-2.0.1.0.ebuild
index d3e8417110e2..a3d31782d9e5 100644
--- a/app-sci/qcad/qcad-2.0.1.0.ebuild
+++ b/app-sci/qcad/qcad-2.0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/qcad-2.0.1.0.ebuild,v 1.1 2003/10/10 07:12:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/qcad-2.0.1.0.ebuild,v 1.2 2003/10/21 03:09:28 brandy Exp $
 
 inherit kde-functions
 
@@ -21,6 +21,8 @@ DEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-gentoo.patch
 	cd ${S}/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh
 	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh