diff --git a/kdelibs-3.5.8-kde#150944.patch b/kdelibs-3.5.8-kde#150944.patch new file mode 100644 index 0000000..f787efa --- /dev/null +++ b/kdelibs-3.5.8-kde#150944.patch @@ -0,0 +1,13 @@ +--- branches/KDE/3.5/kdelibs/kdeui/kactionclasses.cpp 2007/08/30 19:30:39 706570 ++++ branches/KDE/3.5/kdelibs/kdeui/kactionclasses.cpp 2007/10/20 20:49:01 727528 +@@ -667,8 +667,8 @@ + KToolBar* bar = static_cast( widget ); + int id_ = KAction::getToolButtonID(); + bar->insertCombo( comboItems(), id_, isEditable(), +- SIGNAL( activated( int ) ), this, +- SLOT( slotActivated( int ) ), isEnabled(), ++ SIGNAL( activated( const QString & ) ), this, ++ SLOT( slotActivated( const QString & ) ), isEnabled(), + toolTip(), -1, index ); + + QComboBox *cb = bar->getCombo( id_ ); diff --git a/kdelibs.spec b/kdelibs.spec index bbe4462..8cb6388 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -21,7 +21,7 @@ Summary: K Desktop Environment - Libraries Version: 3.5.8 -Release: 5%{?dist} +Release: 6%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -73,7 +73,7 @@ Patch103: kdelibs-3.5.0-101956.patch ## upstream patches Patch200: kdelibs-3.5.8-http-regression.patch - +Patch201: kdelibs-3.5.8-kde#150944.patch %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}} Requires: qt >= %{qt_epoch}:%{qt_ver} @@ -232,6 +232,7 @@ format for easy browsing # upstream patches %patch200 -p0 -b .http-regression +%patch201 -p0 -b .kde#150944 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -515,6 +516,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Tue Oct 23 2007 Than Ngo - 3.5.8-6 +- Resolves: rh#335461, kpdf and kview lost custom zoom + * Thu Oct 18 2007 Than Ngo - 3.5.8-5 - bz273681, add vhdl syntax for kate, thanks to Chitlesh GOORAH