rpms/kdelibs/F-7 kdelibs-3.5.8-kde#150944.patch, NONE, 1.1 kdelibs.spec, 1.222, 1.223
Than Ngo (than)
fedora-extras-commits at redhat.com
Thu Oct 25 13:34:42 UTC 2007
- Previous message: rpms/egoboo/F-8 KNOWN-BUGS.txt, NONE, 1.1 egoboo-2.4.3-unix.patch, 1.2, 1.3 egoboo.spec, 1.3, 1.4
- Next message: rpms/egoboo/F-7 KNOWN-BUGS.txt, NONE, 1.1 egoboo-2.4.3-unix.patch, 1.2, 1.3 egoboo.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18920
Modified Files:
kdelibs.spec
Added Files:
kdelibs-3.5.8-kde#150944.patch
Log Message:
fix kde#150944, rh#335461, KSelectAction can not be edited
kdelibs-3.5.8-kde#150944.patch:
--- NEW FILE kdelibs-3.5.8-kde#150944.patch ---
--- 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<KToolBar*>( 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_ );
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- kdelibs.spec 24 Oct 2007 16:26:03 -0000 1.222
+++ kdelibs.spec 25 Oct 2007 13:34:08 -0000 1.223
@@ -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 @@
## 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}
@@ -231,6 +231,7 @@
# 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
@@ -514,6 +515,9 @@
%changelog
+* Tue Oct 25 2007 Than Ngo <than at redhat.com> - 3.5.8-6
+- fix kde#150944, rh#335461, KSelectAction can not be edited
+
* Thu Oct 18 2007 Than Ngo <than at redhat.com> - 3.5.8-5
- bz273681, add vhdl syntax for kate, thanks to Chitlesh GOORAH
- Previous message: rpms/egoboo/F-8 KNOWN-BUGS.txt, NONE, 1.1 egoboo-2.4.3-unix.patch, 1.2, 1.3 egoboo.spec, 1.3, 1.4
- Next message: rpms/egoboo/F-7 KNOWN-BUGS.txt, NONE, 1.1 egoboo-2.4.3-unix.patch, 1.2, 1.3 egoboo.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list