From c19869c0e8eccb043e32fc384bc3586a19aa2bcd Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Fri, 31 Jul 2020 14:55:35 +0100 Subject: [PATCH] [startkde] Drop setting up of ghostscript This existed to include the .kde directories in the search paths for ghostscript, which clearly hasn't been the case for years, but the code has kept getting ported and migrated. At some point this has got broken, startplasma-x11 doesn't call this path and we've not had any bug reports. We may as well clear this legacy. --- startkde/startplasma-waylandsession.cpp | 1 - startkde/startplasma.cpp | 11 ----------- startkde/startplasma.h | 1 - 3 files changed, 13 deletions(-) diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp index f59654d18..ae7e49663 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp @@ -51,7 +51,6 @@ int main(int argc, char** argv) } else { qWarning() << "running kwin without Xwayland support"; } - setupGSLib(); if (!syncDBusEnvironment()) { out << "Could not sync environment to dbus.\n"; diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index a055d5635..b3b1185f9 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -334,17 +334,6 @@ QProcess* setupKSplash() return p; } -void setupGSLib() -// Get Ghostscript to look into user's KDE fonts dir for additional Fontmap -{ - const QByteArray usr_fdir = QFile::encodeName(QDir::home().absoluteFilePath(QStringLiteral(".fonts"))); - if (qEnvironmentVariableIsSet("GS_LIB")) { - qputenv("GS_LIB", usr_fdir + ':' + qgetenv("GS_LIB")); - } else { - qputenv("GS_LIB", usr_fdir); - } -} - bool startPlasmaSession(bool wayland) { OrgKdeKSplashInterface iface(QStringLiteral("org.kde.KSplash"), QStringLiteral("/KSplash"), QDBusConnection::sessionBus()); diff --git a/startkde/startplasma.h b/startkde/startplasma.h index d46008e78..e37322724 100644 --- a/startkde/startplasma.h +++ b/startkde/startplasma.h @@ -41,7 +41,6 @@ void cleanupX11(); bool syncDBusEnvironment(); void setupFontDpi(); QProcess* setupKSplash(); -void setupGSLib(); void setupX11(); bool startKDEInit();