diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-06-30 21:15:08 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-06-30 21:15:08 +0200 |
| commit | 2d4b1216e089a2259539e514761f2c11b0b93212 (patch) | |
| tree | 4c8f8a151cb4be57d09f2f3a019150aa07ff9ef9 /redhat/applications/tdmtheme | |
| parent | 2150025507b510d1a8c40872487ac191ce12b02b (diff) | |
| download | tde-packaging-2d4b1216e089a2259539e514761f2c11b0b93212.tar.gz tde-packaging-2d4b1216e089a2259539e514761f2c11b0b93212.zip | |
RPM Packaging: updates
Diffstat (limited to 'redhat/applications/tdmtheme')
| -rw-r--r-- | redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch | 35 | ||||
| -rw-r--r-- | redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec | 9 |
2 files changed, 43 insertions, 1 deletions
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch new file mode 100644 index 000000000..64272fe6a --- /dev/null +++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch @@ -0,0 +1,35 @@ +--- trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp.ORI 2013-06-13 08:36:49.449599069 +0200 ++++ trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp 2013-06-13 08:44:01.014366366 +0200 +@@ -268,16 +268,22 @@ + + void KDMThemeWidget::updateInfoView( ThemeData *theme ) + { +- info->setText( +- ((theme->copyright.length() > 0) ? +- i18n("<qt><strong>Copyright:</strong> %1<br/></qt>", +- theme->copyright) : "") + +- ((theme->description.length() > 0) ? +- i18n("<qt><strong>Description:</strong> %1</qt>", +- theme->description) : "") ); +- preview->setPixmap( theme->path + '/' + theme->screenShot ); +- preview->setText( theme->screenShot.isEmpty() ? +- "Screenshot not available" : TQString() ); ++ if(theme) { ++ info->setText( ++ ((theme->copyright.length() > 0) ? ++ i18n("<qt><strong>Copyright:</strong> %1<br/></qt>", ++ theme->copyright) : "") + ++ ((theme->description.length() > 0) ? ++ i18n("<qt><strong>Description:</strong> %1</qt>", ++ theme->description) : "") ); ++ preview->setPixmap( theme->path + '/' + theme->screenShot ); ++ preview->setText( theme->screenShot.isEmpty() ? ++ i18n("Screenshot not available") : TQString() ); ++ } else { ++ info->setText(i18n("No theme selected.")); ++ preview->setPixmap(NULL); ++ preview->setText(i18n("Screenshot not available")); ++ } + } + + void KDMThemeWidget::installNewTheme() diff --git a/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec index c4962b772..a75c032ef 100644 --- a/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec +++ b/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tdecomp} Summary: theme manager for TDM [Trinity] Version: 1.2.2 -Release: 4%{?dist}%{?_variant} +Release: 5%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -40,6 +40,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-3.5.13.2.tar.gz +# [tdmtheme] Fix tdmtheme crash. This resolves Bug 1544 +Patch1: tdmtheme-3.5.13.2-fix_segv.patch + BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 BuildRequires: trinity-tdebase-devel >= 3.5.13.2 @@ -63,6 +66,7 @@ that allows you to easily install, remove and change your KDM themes. %prep %setup -q -n %{name}-3.5.13.2 +%patch1 -p1 -b .segv # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -121,6 +125,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-5 +- Fix tdmtheme crash. This resolves Bug 1544 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-4 - Initial release for TDE 3.5.13.2 |