mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 21:03:15 +00:00
1c3492f358
Fixes: #38919 The KCModule is patched to set the appropriate environment variables in the parent process when it is initialized.
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
|
Date: Tue, 27 Oct 2015 18:07:54 -0500
|
|
Subject: [PATCH] follow symlinks
|
|
|
|
---
|
|
src/appearancegtk2.cpp | 2 +-
|
|
src/iconthemesmodel.cpp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp
|
|
===================================================================
|
|
--- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp
|
|
+++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp
|
|
@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(
|
|
QStringList themes=installedThemes();
|
|
themes=themes.filter(QRegExp("/"+themeName+"/?$"));
|
|
if(themes.size()==1) {
|
|
- QDirIterator it(themes.first(), QDirIterator::Subdirectories);
|
|
+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
|
while(it.hasNext()) {
|
|
it.next();
|
|
if(it.fileName()=="gtkrc") {
|
|
Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
|
|
===================================================================
|
|
--- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp
|
|
+++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
|
|
@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh
|
|
|
|
foreach(const QString& dir, dirs) {
|
|
QDir userIconsDir(dir);
|
|
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
|
|
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
|
|
while(it.hasNext()) {
|
|
QString currentPath = it.next();
|
|
QDir dir(currentPath);
|
|
Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
|
|
===================================================================
|
|
--- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp
|
|
+++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
|
|
@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed
|
|
|
|
foreach(const QString& dir, dirs) {
|
|
QDir userIconsDir(dir);
|
|
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
|
|
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
|
|
while(it.hasNext()) {
|
|
QString currentPath = it.next();
|
|
QDir dir(currentPath);
|