From ef9eb4959e8e2df853a8dcdf31a21b525fd42808 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:53:13 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- admin/detect_uds_hidden.diff | 2 +- admin/kde.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'admin') diff --git a/admin/detect_uds_hidden.diff b/admin/detect_uds_hidden.diff index 254de80..98805c9 100644 --- a/admin/detect_uds_hidden.diff +++ b/admin/detect_uds_hidden.diff @@ -8,7 +8,7 @@ diff -ur bksys-1.5.1.pre4/admin/kde.py kio-locate/admin/kde.py + ## check if KDE has the UDS_HIDDEN patch + print "Checking KDE for UDS_HIDDEN : ", -+ if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/kio/global.h').read(): ++ if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/tdeio/global.h').read(): + env['HAVE_UDS_HIDDEN']='1' + p('GREEN', 'yes') + else: diff --git a/admin/kde.py b/admin/kde.py index 955a515..a67f722 100644 --- a/admin/kde.py +++ b/admin/kde.py @@ -248,7 +248,7 @@ def detect_kde(env): ## check if KDE has the UDS_HIDDEN patch print "Checking KDE for UDS_HIDDEN : ", - if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/kio/global.h').read(): + if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/tdeio/global.h').read(): env['HAVE_UDS_HIDDEN']='1' p('GREEN', 'yes') else: -- cgit v1.2.1