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 #ifdef __APPLE__ -#include +//#include #endif #include @@ -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__ - QApplication::setStyle(new QMacStyle()); + // QApplication::setStyle(new QMacStyle()); #endif #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(); }