Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22090
Modified Files:
qcad.info qcad.patch
Log Message:
New version. Installed docs and patched so online help can find them.
Index: qcad.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/qcad.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qcad.info 6 Feb 2006 15:50:08 -0000 1.4
+++ qcad.info 2 Aug 2006 16:02:12 -0000 1.5
@@ -1,44 +1,44 @@
Package: qcad
-Version: 2.0.1.3-1
-Revision: 2
+Version: 2.0.5.0-1
+Revision: 1
Maintainer: Jeremy Higgs <[EMAIL PROTECTED]>
BuildDepends: libjpeg, libpng3, qt3, x11-dev
Depends: qt3-shlibs, libpng3-shlibs
GCC: 3.3
-Source: http://www.ribbonsoft.com/archives/%n/%n-%v.src.tar.gz
-Source-MD5: 480c0a67e37ed57d14e67d2977db8cff
-Patch: %n.patch
-PatchScript: perl -pi -e 's/exit/exit 1/' scripts/build_qcad.sh
-#CompileScript: <<
-# export TMAKEPATH=%p/lib/tmake/darwin-c++; tmake qcad.pro -o Makefile
-# make
-#<<
+Source: http://www.ribbonsoft.com/archives/%n/%n-%v-community.src.tar.gz
+Source-MD5: 96b6a56027782aec953c9c4e64c5998c
+PatchScript: <<
+ sed 's,@PREFIX@,%p,g' < %a/%n.patch | patch -p1
+ perl -pi -e 's/exit/exit 1/' scripts/build_qcad.sh
+ perl -pi -e 's,/bin/bash,/bin/bash -e,' scripts/build_qcad.sh
+ perl -pi -e 's/darwin/darwin_NEVER_MATCH/g' scripts/build_qcad.sh
+ perl -pi -e 's,-L(..\S*/lib)\s+-l(\S+),\1/lib\2.a,' `find . -name \*.pro`
+<<
CompileScript: <<
- cd scripts/; sh ./build_qcad.sh
+ cd scripts && sh ./build_qcad.sh notrans
<<
InstallScript: <<
- cd dxflib; make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
- cd fparser; make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
- cd qcadactions; make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
- cd qcadcmd; make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
- cd qcadguiqt; make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
- cd qcadlib; make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
- install -d %i/bin
- install -d -m 775 %i/share/%n/examples
- install -d -m 775 %i/share/%n/fonts
- install -d -m 775 %i/share/%n/patterns
- install -d -m 755 %i/share/%n/qm
+ cd dxflib && make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
+ cd fparser && make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
+ cd qcadactions && make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
+ cd qcadcmd && make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
+ cd qcadguiqt && make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
+ cd qcadlib && make install LIBDIR=%i/lib/qcad INCDIR=%i/include/qcad
+
+ install -d -m 755 %i/bin
install -m 755 %n/%n %i/bin
- cp %n/examples/* %i/share/%n/examples
- cp %n/fonts/* %i/share/%n/fonts
- cp %n/patterns/* %i/share/%n/patterns
- cp %n/qm/* %i/share/%n/qm
-<<
-PostInstScript: <<
-chmod -R 0775 %p/share/%n/*
-chown -R root:staff %p/share/%n/*
+
+ install -d -m 755 %i/share/%n/fonts
+ install -m 644 %n/fonts/* %i/share/%n/fonts
+
+ install -d -m 755 %i/share/%n/patterns
+ install -m 644 %n/patterns/* %i/share/%n/patterns
+
+ install -d -m 755 %i/share/doc/%n
+ cp -r qcad/doc/* %i/share/doc/%n
+ chmod -R go=u-w %i/share/doc/%n
<<
-DocFiles: README
+DocFiles: qcad/README
Description: Simple 2D CAD program
DescDetail: <<
Qcad is a simple 2D CAD system that allows the user to create or modify
@@ -47,6 +47,17 @@
<<
DescPackaging: <<
Customised CompileScript and InstallScripts to compile and install properly.
+
+Patch build script to crash instead of continuing when something goes wrong.
+
+Force non-detection of OS X so we get a unixish result instead of an
+.app bundle.
+
+Link directly to locally-build libs instead of using -l and local -L paths.
+
+Need to use "notrans" because release_translations.sh doesn't exist.
+
+Patch to find support files in fink's filesystem layout.
<<
License: GPL
Homepage: http://www.ribbonsoft.com/qcad.html
Index: qcad.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/qcad.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qcad.patch 13 Dec 2003 03:48:39 -0000 1.1
+++ qcad.patch 2 Aug 2006 16:02:14 -0000 1.2
@@ -1,16 +1,25 @@
-diff -ru qcad-2.0.0.8-1.src-old/qcad/src/main.cpp
qcad-2.0.0.8-1.src/qcad/src/main.cpp
---- qcad-2.0.0.8-1.src-old/qcad/src/main.cpp Thu Oct 2 05:39:45 2003
-+++ qcad-2.0.0.8-1.src/qcad/src/main.cpp Wed Oct 8 15:30:53 2003
-@@ -30,7 +30,7 @@
+diff -Nurd -x'*~' qcad-2.0.5.0-1-community.src.orig/qcad/src/main.cpp
qcad-2.0.5.0-1-community.src/qcad/src/main.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcad/src/main.cpp 2005-11-22
06:49:37.000000000 -0500
++++ qcad-2.0.5.0-1-community.src/qcad/src/main.cpp 2006-08-01
14:54:35.000000000 -0400
+@@ -31,7 +31,7 @@
+ #include <qapplication.h>
- //#include <qwindowsstyle.h>
#ifdef __APPLE__
-#include <qmacstyle_mac.h>
+//#include <qmacstyle_mac.h>
#endif
- #include <qtimer.h>
-@@ -110,7 +110,7 @@
+ #include <qtimer.h>
+@@ -123,7 +123,7 @@
+ QFileInfo prgInfo( QFile::decodeName(argv[0]) );
+ QString prgDir(prgInfo.dirPath(true));
+ RS_SETTINGS->init(QC_COMPANYKEY, QC_APPKEY);
+- RS_SYSTEM->init(QC_APPNAME, QC_VERSION, QC_APPDIR, prgDir);
++ RS_SYSTEM->init(QC_APPNAME, QC_VERSION, QC_APPDIR, "@PREFIX@");
+
+ RS_FILEIO->registerFilter(new RS_FilterCXF());
+ RS_FILEIO->registerFilter(new RS_FilterDXF());
+@@ -230,7 +230,7 @@
//QApplication::setStyle(new QWindowsStyle());
//QApplication::setStyle(new QPlatinumStyle());
#ifdef __APPLE__
@@ -18,4 +27,47 @@
+ // QApplication::setStyle(new QMacStyle());
#endif
- #ifdef SPLASHSCREEN_H
+ #ifdef QC_BUILTIN_STYLE //js:
+diff -Nurd -x'*~'
qcad-2.0.5.0-1-community.src.orig/qcadlib/src/engine/rs_system.cpp
qcad-2.0.5.0-1-community.src/qcadlib/src/engine/rs_system.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/engine/rs_system.cpp
2005-11-22 06:52:36.000000000 -0500
++++ qcad-2.0.5.0-1-community.src/qcadlib/src/engine/rs_system.cpp
2006-08-01 14:57:27.000000000 -0400
+@@ -324,7 +324,7 @@
+ RS_StringList RS_System::getDirectoryList(const RS_String& subDirectory) {
+ RS_StringList dirList;
+
+-#ifdef __APPLE__
++#if 0
+
+ if (subDirectory!="library") {
+ #endif
+@@ -334,15 +334,15 @@
+ }
+
+ // Redhat style:
+- dirList.append("/usr/share/" + appDirName + "/" + subDirectory);
++ dirList.append("@PREFIX@/share/" + appDirName + "/" + subDirectory);
+
+ // SuSE style:
+ dirList.append("/usr/X11R6/" + appDirName + "/" + subDirectory);
+
+- dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
++ dirList.append("/usr/share/" + appDirName + "/" + subDirectory);
+ dirList.append(getHomeDir() + "/." + appDirName + "/" + subDirectory);
+
+-#ifdef __APPLE__
++#if 0
+
+ }
+ #endif
+diff -Nurd -x'*~'
qcad-2.0.5.0-1-community.src.orig/qcadlib/src/engine/rs_system.h
qcad-2.0.5.0-1-community.src/qcadlib/src/engine/rs_system.h
+--- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/engine/rs_system.h
2005-11-22 06:52:38.000000000 -0500
++++ qcad-2.0.5.0-1-community.src/qcadlib/src/engine/rs_system.h
2006-08-01 15:03:38.000000000 -0400
+@@ -125,7 +125,7 @@
+ * @return Absolute path to the documentation.
+ */
+ RS_String getDocPath() {
+- RS_StringList lst = getDirectoryList("doc");
++ RS_StringList lst = getDirectoryList("share/doc/qcad");
+ return lst.first();
+ }
+
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
