rpms/kdelibs/devel kdelibs-3.4.0-menu.patch, 1.2, 1.3 kdelibs-3.5.3-kde#129187.patch, NONE, 1.1 kdelibs.spec, 1.154, 1.155
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jul 11 18:49:24 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21835
Modified Files:
kdelibs.spec
Added Files:
kdelibs-3.4.0-menu.patch kdelibs-3.5.3-kde#129187.patch
Log Message:
kde#129187 - konqueror crash when modifying address bar address
kdelibs-3.4.0-menu.patch:
kbuildsycoca.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
Index: kdelibs-3.4.0-menu.patch
===================================================================
RCS file: kdelibs-3.4.0-menu.patch
diff -N kdelibs-3.4.0-menu.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdelibs-3.4.0-menu.patch 11 Jul 2006 18:49:22 -0000 1.3
@@ -0,0 +1,15 @@
+--- kdelibs-3.4.0/kded/kbuildsycoca.cpp.menu 2005-02-22 18:20:55.000000000 +0100
++++ kdelibs-3.4.0/kded/kbuildsycoca.cpp 2005-04-07 21:11:02.000000000 +0200
+@@ -378,7 +378,11 @@
+ connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
+ this, SLOT(slotCreateEntry(const QString &, KService **)));
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu;
++ if ( QFile::exists( "/etc/xdg/menus/kde-applications.menu" ) )
++ kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
++ else
++ kdeMenu = g_vfolder->parseMenu("applications.menu", true);
+
+ KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
kdelibs-3.5.3-kde#129187.patch:
khtml_part.cpp | 29 ++++++++++++++++++-----------
khtmlpart_p.h | 2 +-
2 files changed, 19 insertions(+), 12 deletions(-)
--- NEW FILE kdelibs-3.5.3-kde#129187.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp (Revision 556325)
+++ khtml/khtml_part.cpp (Revision 556326)
@@ -1876,10 +1876,14 @@
removeJSErrorExtension();
setSuppressedPopupIndicator( false );
d->m_openableSuppressedPopups = 0;
- for ( KHTMLPart* part = d->m_suppressedPopupOriginParts.first(); part; part = d->m_suppressedPopupOriginParts.next() ) {
- KJS::Window *w = KJS::Window::retrieveWindow( part );
- if (w)
- w->forgetSuppressedWindows();
+ for ( QValueListIterator<QGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+ i != d->m_suppressedPopupOriginParts.end(); ++i ) {
+
+ if (KHTMLPart* part = *i) {
+ KJS::Window *w = KJS::Window::retrieveWindow( part );
+ if (w)
+ w->forgetSuppressedWindows();
+ }
}
}
@@ -7360,7 +7364,7 @@
if ( enable && originPart ) {
d->m_openableSuppressedPopups++;
- if ( d->m_suppressedPopupOriginParts.find( originPart ) == -1 )
+ if ( d->m_suppressedPopupOriginParts.findIndex( originPart ) == -1 )
d->m_suppressedPopupOriginParts.append( originPart );
}
@@ -7405,12 +7409,15 @@
}
void KHTMLPart::showSuppressedPopups() {
- for ( KHTMLPart* part = d->m_suppressedPopupOriginParts.first(); part; part = d->m_suppressedPopupOriginParts.next() ) {
- KJS::Window *w = KJS::Window::retrieveWindow( part );
- if (w) {
- w->showSuppressedWindows();
- w->forgetSuppressedWindows();
- }
+ for ( QValueListIterator<QGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+ i != d->m_suppressedPopupOriginParts.end(); ++i ) {
+ if (KHTMLPart* part = *i) {
+ KJS::Window *w = KJS::Window::retrieveWindow( part );
+ if (w) {
+ w->showSuppressedWindows();
+ w->forgetSuppressedWindows();
+ }
+ }
}
setSuppressedPopupIndicator( false );
d->m_openableSuppressedPopups = 0;
Index: khtml/khtmlpart_p.h
===================================================================
--- khtml/khtmlpart_p.h (Revision 556325)
+++ khtml/khtmlpart_p.h (Revision 556326)
@@ -316,7 +316,7 @@
KURLLabel* m_statusBarUALabel;
KURLLabel* m_statusBarJSErrorLabel;
KURLLabel* m_statusBarPopupLabel;
- QPtrList<KHTMLPart> m_suppressedPopupOriginParts;
+ QValueList<QGuardedPtr<KHTMLPart> > m_suppressedPopupOriginParts;
int m_openableSuppressedPopups;
DOM::DocumentImpl *m_doc;
khtml::Decoder *m_decoder;
Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdelibs.spec 11 Jul 2006 16:23:46 -0000 1.154
+++ kdelibs.spec 11 Jul 2006 18:49:22 -0000 1.155
@@ -37,6 +37,7 @@
Patch2: kdelibs-3.0.0-ndebug.patch
Patch4: kdelibs-3.0.4-ksyscoca.patch
Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
+Patch7: kdelibs-3.4.0-menu.patch
Patch15: kdelibs-3.4.91-buildroot.patch
Patch16: kdelibs-3.1-ssl-krb5.patch
Patch20: kdelibs-3.3.92-defaultstyle.patch
@@ -64,6 +65,7 @@
Patch112: kdelibs-3.5.3-kde#123307.patch
Patch113: kdelibs-3.5.3-kde#106795.patch
Patch114: kdelibs-3.5.3-kde#130605.patch
+Patch115: kdelibs-3.5.3-kde#129187.patch
%if %{arts}
Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -181,6 +183,7 @@
%endif
%patch4 -p1 -b .ksyscoca
%patch5 -p1 -b .openssl
+%patch7 -p1 -b .menu
%patch15 -p1 -b .buildroot
%patch16 -p1 -b .ssl-krb5
%patch20 -p1 -b .defaultstyle
@@ -208,6 +211,7 @@
%patch112 -p0 -b .kde#130252
%patch113 -p0 -b .kde#106795
%patch114 -p0 -b .kde#130605
+%patch115 -p0 -b .kde#129187
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
@@ -299,6 +303,7 @@
pushd %{buildroot}%{_sysconfdir}/xdg/menus/
mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
ln -s applications-merged kde-applications-merged
+ ln -s ../../xdg.d/kde/menus/applications.menu kde-applications.menu
popd
echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
@@ -434,11 +439,12 @@
* Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
- upstream patches,
kde#130605 - konqueror crash
+ kde#129187 - konqueror crash when modifying address bar address
* Mon Jul 10 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
- apply upstream patches,
- #123307 - Find previous does nothing sometimes
- #106795 - konqueror crash
+ kde#123307 - Find previous does nothing sometimes
+ kde#106795 - konqueror crash
* Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
- apply upstream patches, fix #128940/#81806/#128760
More information about the fedora-cvs-commits
mailing list