Djam/kdebase4-workspace
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kdebase4-workspace.git synced 2025-02-23 17:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore dont-export-colors-gtk+ patch

Browse source
This commit is contained in:
Andrey Bondrov 2017-03-13 18:23:08 +10:00
parent bb0bc7a51d
commit c161507b6f
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kde-workspace-4.11.22-dont-export-colors-gtk+.patch Normal file
View file

@ -0,0 +1,19 @@
diff -urN kde-workspace-4.11.22/kcontrol/krdb/krdb.cpp kde-workspace-4.11.22-patched/kcontrol/krdb/krdb.cpp
--- kde-workspace-4.11.22/kcontrol/krdb/krdb.cpp 2015-08-12 17:03:15.000000000 +1000
+++ kde-workspace-4.11.22-patched/kcontrol/krdb/krdb.cpp 2017-02-24 23:57:10.410032342 +1000
@@ -320,6 +320,7 @@
}
+ if ((gtkTheme.toLower() != QLatin1String("gtk+")) && (gtkTheme.toLower() != QLatin1String("qgtkstylealt")) && (gtkTheme.toLower() != QLatin1String("gtk2"))) {
if (exportColors)
{
t << "style \"default\"" << endl;
@@ -378,6 +379,7 @@
t << "class \"*MenuItem\" style \"MenuItem\"" << endl;
t << endl;
}
+ }
}

5
kdebase4-workspace.spec
View file

@ -13,7 +13,7 @@
Summary: KDE 4 application workspace components
Name: kdebase4-workspace
Version: 4.11.22
Release: 12
Release: 13
Epoch: 2
License: GPLv2+
Group: Graphical desktop/KDE
@ -86,6 +86,8 @@ Patch26: kdebase-workspace-4.11.0-simpleapplet-defaults.patch
Patch27: kde-workspace-4.11.6-dbus-wallpaper.patch
Patch28: kde-workspace-4.11.22-ksysguarddrc.patch
Patch29: kde-workspace-4.11.22-aurorae-knsrc.patch
# Don't mess up GTK colors if GTK+, QGTKStyleAlt or GTK2 widget styles are used
Patch30: kde-workspace-4.11.22-dont-export-colors-gtk+.patch
# See http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=c1469413f36d4e4cd9dd49e70bc5d660cf2f3c55
# And http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=dcc70fbb55919ac56ae188ceb3d5bf7b94c2dbcd
# We partially revert it because we need at least deKorator to work
@ -1638,6 +1640,7 @@ tar xf %{SOURCE6}
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch50 -p1
%patch100 -p1
%patch101 -p1