35 lines
1.3 KiB
Plaintext
35 lines
1.3 KiB
Plaintext
$OpenBSD: patch-kdeprint_cups_kmcupsmanager_cpp,v 1.2 2007/10/24 21:52:18 espie Exp $
|
|
--- kdeprint/cups/kmcupsmanager.cpp.orig Mon Jan 15 12:34:19 2007
|
|
+++ kdeprint/cups/kmcupsmanager.cpp Thu Oct 18 00:39:45 2007
|
|
@@ -102,10 +102,10 @@ QString KMCupsManager::driverDirectory()
|
|
{
|
|
QString d = cupsInstallDir();
|
|
if (d.isEmpty())
|
|
- d = "/usr";
|
|
+ d = "/usr/local";
|
|
d.append("/share/cups/model");
|
|
// raw foomatic support
|
|
- d.append(":/usr/share/foomatic/db/source");
|
|
+ d.append(":/usr/local/share/foomatic/db/source");
|
|
return d;
|
|
}
|
|
|
|
@@ -576,7 +576,7 @@ DrMain* KMCupsManager::loadMaticDriver(const QString&
|
|
{
|
|
QStringList comps = QStringList::split('/', drname, false);
|
|
QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
|
|
- QString PATH = getenv("PATH") + QString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
|
|
+ QString PATH = getenv("PATH") + QString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
|
|
QString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
|
|
if (exe.isEmpty())
|
|
{
|
|
@@ -867,7 +867,7 @@ void KMCupsManager::exportDriver()
|
|
{
|
|
QString path = cupsInstallDir();
|
|
if (path.isEmpty())
|
|
- path = "/usr/share/cups";
|
|
+ path = "/usr/local/share/cups";
|
|
else
|
|
path += "/share/cups";
|
|
CupsAddSmb::exportDest(m_currentprinter->printerName(), path);
|