diff options
| author | François Andriot <[email protected]> | 2013-07-24 11:25:02 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2013-07-24 11:25:02 +0200 |
| commit | 0c4b32438a57f52601dfe66d133bd263a5d304ee (patch) | |
| tree | 9389a6db04f282ab54a2cc4ca8f55124285a5fa4 /redhat/applications/gtk-qt-engine | |
| parent | 700ec263535470631ef4f6fb816000500eb4227e (diff) | |
| download | tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.tar.gz tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.zip | |
RPM Packaging: updates for R14
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 | 28 | ||||
| -rw-r--r-- | redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 9 |
2 files changed, 34 insertions, 3 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 new file mode 100644 index 000000000..73021cb11 --- /dev/null +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch @@ -0,0 +1,28 @@ +--- 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 384d73c46..6f21d16f7 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 @@ -40,9 +40,11 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 +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-tdelibs-devel >= %{tde_version} @@ -68,6 +70,7 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .segv # Renames the '.po' files for f in po/*/*.po; do |