summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2014-10-05 16:40:33 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-10-05 16:40:33 +0200
commit69e7a5c4fa39591e0cb5f1774707bf84d8c0fd9b (patch)
treec2c2c622bfeb36f51fa9c38dc5f83b7987463ba5
parent754647ba5a501c4e6d872746a7f69248a752b828 (diff)
downloadtdelibs-69e7a5c4fa39591e0cb5f1774707bf84d8c0fd9b.tar.gz
tdelibs-69e7a5c4fa39591e0cb5f1774707bf84d8c0fd9b.zip
Fix cups default directories on openbsd
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp26
1 files changed, 22 insertions, 4 deletions
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index eaf5070b8..7f06e0636 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -101,11 +101,20 @@ TQString KMCupsManager::driverDbCreationProgram()
TQString KMCupsManager::driverDirectory()
{
TQString d = cupsInstallDir();
- if (d.isEmpty())
+ if (d.isEmpty()) {
+#ifdef __OpenBSD__
+ d = "/usr/local";
+#else
d = "/usr";
+#endif
+ }
d.append("/share/cups/model");
// raw foomatic support
+#ifdef __OpenBSD__
+ d.append(":/usr/local/share/foomatic/db/source");
+#else
d.append(":/usr/share/foomatic/db/source");
+#endif
return d;
}
@@ -138,7 +147,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p)
req.setOperation(CUPS_ADD_CLASS);
TQStringList members = p->members(), uris;
TQString s;
- s = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
+ s = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
uris.append(s+(*it));
req.addURI(IPP_TAG_PRINTER,"member-uris",uris);
@@ -627,7 +636,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
{
TQStringList comps = TQStringList::split('/', drname, false);
TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+#ifdef __OpenBSD__
+ TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+#else
TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+#endif
TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty())
{
@@ -937,10 +950,15 @@ void KMCupsManager::exportDriver()
!m_currentprinter->isClass(true) && !m_currentprinter->isSpecial())
{
TQString path = cupsInstallDir();
- if (path.isEmpty())
+ if (path.isEmpty()) {
+#ifdef __OpenBSD__
+ path = "/usr/local/share/cups";
+#else
path = "/usr/share/cups";
- else
+#endif
+ } else {
path += "/share/cups";
+ }
CupsAddSmb::exportDest(m_currentprinter->printerName(), path);
}
}