RPM Packaging: update gtk-qt-engine

pull/3/head
François Andriot 11 years ago
parent cebaec407d
commit 3b0463ff46

@ -1,28 +0,0 @@
--- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI 2013-07-23 23:35:16.614406882 +0200
+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2013-07-23 23:56:39.121594541 +0200
@@ -261,13 +261,21 @@
}
}
+ bool gtk3installed = false;
widget->styleBox3->clear();
TQStringList otherGtk3Styles = gtk3Themes.keys();
- otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
- widget->styleBox3->insertStringList(otherGtk3Styles);
-
- bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
+ if(!otherGtk3Styles.empty()) {
+ otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
+ if(!otherGtk3Styles.empty()) {
+ gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
+ }
+ }
+ if(gtk3installed) {
+ widget->styleBox3->insertStringList(otherGtk3Styles);
+ }
widget->styleKde3->setEnabled(gtk3installed);
+ widget->styleBox3->setEnabled(gtk3installed);
+ widget->styleOther3->setEnabled(gtk3installed);
widget->warning4->setHidden(gtk3installed);
widget->warning5->setHidden(gtk3installed);
widget->warning6->setHidden(gtk3installed);

@ -44,8 +44,6 @@ Source1: gtk-qt-engine.rc.sh
Source2: gtkrc-2.0-kde4 Source2: gtkrc-2.0-kde4
Source3: gtkrc-2.0-kde-kde4 Source3: gtkrc-2.0-kde-kde4
Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -72,7 +70,6 @@ a way to configure it from within KControl.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .segv
%build %build

Loading…
Cancel
Save