diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-10-01 17:44:36 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-10-01 17:44:36 +0200 |
| commit | 3b0463ff4659724866ad4a1316e77b68ce365708 (patch) | |
| tree | 2270c583a2527ce8699cac839ee91ec1aae65a17 /redhat | |
| parent | cebaec407ddbc26500406c41f80df8230558610b (diff) | |
| download | tde-packaging-3b0463ff4659724866ad4a1316e77b68ce365708.tar.gz tde-packaging-3b0463ff4659724866ad4a1316e77b68ce365708.zip | |
RPM Packaging: update gtk-qt-engine
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch | 28 | ||||
| -rw-r--r-- | redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 3 |
2 files changed, 0 insertions, 31 deletions
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch deleted file mode 100644 index 73021cb11..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch +++ /dev/null @@ -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); diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index d51ec3f2e..a4dc45479 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -44,8 +44,6 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-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-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -72,7 +70,6 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .segv %build |