diff options
author | François Andriot <albator78@libertysurf.fr> | 2013-10-02 20:15:50 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2013-10-02 20:15:50 +0200 |
commit | 8af8d5c2c458ec76eca7074bed52ea49e73b477c (patch) | |
tree | 7ef6c4b0863a49223c250208a5c88ddb165e14db /redhat/applications/gtk-qt-engine | |
parent | 7a822b9d1f705e3970033f35ad1512ffdfe9249a (diff) | |
download | tde-packaging-8af8d5c2c458ec76eca7074bed52ea49e73b477c.tar.gz tde-packaging-8af8d5c2c458ec76eca7074bed52ea49e73b477c.zip |
RPM Packaging: updates
Diffstat (limited to 'redhat/applications/gtk-qt-engine')
-rw-r--r-- | redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch | 3 | ||||
-rw-r--r-- | redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 4 |
2 files changed, 5 insertions, 2 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 index 73021cb11..f3e37218e 100644 --- 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 @@ -1,6 +1,6 @@ --- 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 @@ +@@ -261,13 +261,22 @@ } } @@ -20,6 +20,7 @@ + if(gtk3installed) { + widget->styleBox3->insertStringList(otherGtk3Styles); + } ++ otherGtk3Styles.clear(); widget->styleKde3->setEnabled(gtk3installed); + widget->styleBox3->setEnabled(gtk3installed); + widget->styleOther3->setEnabled(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..2bbcf8c43 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,6 +44,7 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 +Patch0: gtk-qt-engine-14.0.0-debug.patch Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -72,7 +73,8 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .segv +%patch0 -p1 -b .debug +#patch1 -p1 -b .segv %build |