diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-06-14 20:29:21 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-23 02:23:02 +0100 |
| commit | 1a68e615e1a17f519c73644ebc607de12a3df710 (patch) | |
| tree | 2cbf4ff561e30057bfeb8fac0573ebe3199ba046 /kdeprint/cups | |
| parent | 67d736925c398deb9df42ffa589a65106f492bde (diff) | |
| download | tdelibs-1a68e615e1a17f519c73644ebc607de12a3df710.tar.gz tdelibs-1a68e615e1a17f519c73644ebc607de12a3df710.zip | |
Fix several issues on freebsd
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e469e42c76000b70aebaf838f5a3c4ded184b0e3)
Diffstat (limited to 'kdeprint/cups')
| -rw-r--r-- | kdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 | ||||
| -rw-r--r-- | kdeprint/cups/kmcupsmanager.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 9863a6146..de1f07027 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -71,7 +71,7 @@ extern "C" int getServerPid() { -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) TQProcess *proc = new TQProcess(); proc->addArgument("pgrep"); proc->addArgument("cupsd"); diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index b1c776004..02dfeb77e 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -102,7 +102,7 @@ TQString KMCupsManager::driverDirectory() { TQString d = cupsInstallDir(); if (d.isEmpty()) { -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) d = "/usr/local"; #else d = "/usr"; @@ -110,7 +110,7 @@ TQString KMCupsManager::driverDirectory() } d.append("/share/cups/model"); // raw foomatic support -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) d.append(":/usr/local/share/foomatic/db/source"); #else d.append(":/usr/share/foomatic/db/source"); @@ -640,7 +640,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { TQStringList comps = TQStringList::split('/', drname, false); TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) 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"); @@ -959,7 +959,7 @@ void KMCupsManager::exportDriver() { TQString path = cupsInstallDir(); if (path.isEmpty()) { -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) path = "/usr/local/share/cups"; #else path = "/usr/share/cups"; |