rpms/kdelibs4/F-8 kdelibs-4.1.0-#455130.patch, NONE, 1.1 kdelibs-4.1.1-kde#169447-khtml-regression.patch, NONE, 1.1 kdelibs-4.1.1-kde#856379-cookiejar.patch, NONE, 1.1 kdelibs-4.1.1-kde#856403-urlnav.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdelibs4.spec, 1.32, 1.33 sources, 1.12, 1.13 kdelibs-4.0.98-revert-kinit-regression.patch, 1.1, NONE kdelibs-4.1.0-kcookiejar-crash.patch, 1.2, NONE kdelibs-4.1.0-kde#167826.patch, 1.2, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1629/F-8

Modified Files:
	.cvsignore kdelibs4.spec sources 
Added Files:
	kdelibs-4.1.0-#455130.patch 
	kdelibs-4.1.1-kde#169447-khtml-regression.patch 
	kdelibs-4.1.1-kde#856379-cookiejar.patch 
	kdelibs-4.1.1-kde#856403-urlnav.patch 
Removed Files:
	kdelibs-4.0.98-revert-kinit-regression.patch 
	kdelibs-4.1.0-kcookiejar-crash.patch 
	kdelibs-4.1.0-kde#167826.patch 
Log Message:
Sync from kdelibs/devel:

* Wed Sep 03 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.1-5
- fixed crash on setting cookies on empty domains (like the file
  system), KDE bug #170147
- fix URL navigator focus in file dialogs, KDE bug #169497, #170211

* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
- apply patch to fix regression in khtml

* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
- respun

* Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
- drop revert-kinit-regression hack (fixes ioslave translations)

* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
- 4.1.1

kdelibs-4.1.0-#455130.patch:

--- NEW FILE kdelibs-4.1.0-#455130.patch ---
diff -ur kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp
--- kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp	2008-06-25 09:57:24.000000000 +0200
+++ kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp	2008-08-29 14:48:54.000000000 +0200
@@ -393,7 +393,7 @@
 
             QString result;
             QByteArray oldpath = qgetenv( "PATH" );
-            QByteArray newpath = QFile::encodeName( KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) );
+            QByteArray newpath = QFile::encodeName( KGlobal::hasMainComponent() ? KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) : QString() );
             if( !newpath.isEmpty() && !oldpath.isEmpty() )
                 newpath += KPATH_SEPARATOR;
             newpath += oldpath;

kdelibs-4.1.1-kde#169447-khtml-regression.patch:

--- NEW FILE kdelibs-4.1.1-kde#169447-khtml-regression.patch ---
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(Revision 855359)
+++ khtml/rendering/render_layer.cpp	(Revision 855360)
@@ -397,7 +397,7 @@
                     }
                 }
             }
-            count = sc->m_negZOrderList ? sc->m_negZOrderList->count() : 0;
+            count = sc->m_posZOrderList ? sc->m_posZOrderList->count() : 0;
             if ( count > 0 ) {
                 needUpdate = true;
                 for (uint i = 0; i < count; i++) {

kdelibs-4.1.1-kde#856379-cookiejar.patch:

--- NEW FILE kdelibs-4.1.1-kde#856379-cookiejar.patch ---
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856378)
+++ kioslave/http/kcookiejar/kcookiejar.cpp	(revision 856379)
@@ -516,8 +516,10 @@
    extractDomains(_fqdn, domains);
    if (domains.count() > 3)
       _domain = domains[3];
+   else if ( domains.count() > 0 )
+      _domain = domains[0];
    else
-      _domain = domains[0];
+      _domain = L1("");
 }
 
 QString KCookieJar::stripDomain(const KHttpCookie& cookie)

kdelibs-4.1.1-kde#856403-urlnav.patch:

--- NEW FILE kdelibs-4.1.1-kde#856403-urlnav.patch ---
Index: kfile/kurlnavigator.cpp
===================================================================
--- kfile/kurlnavigator.cpp	(revision 856402)
+++ kfile/kurlnavigator.cpp	(revision 856403)
@@ -344,6 +344,7 @@
     // initialize the path box of the traditional view
     m_pathBox = new KUrlComboBox(KUrlComboBox::Both, true, q);
     m_pathBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_pathBox->installEventFilter(q);
 
     KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);
     m_pathBox->setCompletionObject(kurlCompletion);
@@ -1122,6 +1123,16 @@
     QWidget::resizeEvent(event);
 }
 
+bool KUrlNavigator::eventFilter(QObject* watched, QEvent* event)
+{
+    if ((watched == d->m_pathBox) && (event->type() == QEvent::FocusIn)) {
+        requestActivation();
+        setFocus();
+    }
+
+    return QWidget::eventFilter(watched, event);
+}
+
 int KUrlNavigator::historySize() const
 {
     return d->m_history.count();
Index: kfile/kurlnavigator.h
===================================================================
--- kfile/kurlnavigator.h	(revision 856402)
+++ kfile/kurlnavigator.h	(revision 856403)
@@ -312,6 +312,8 @@
     /* @see QWidget::resizeEvent() */
     virtual void resizeEvent(QResizeEvent* event);
 
+    virtual bool eventFilter(QObject* watched, QEvent* event);
+
 private:
     Q_PRIVATE_SLOT(d, void slotReturnPressed(const QString& text))
     Q_PRIVATE_SLOT(d, void slotReturnPressed())


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Jul 2008 18:16:49 -0000	1.12
+++ .cvsignore	4 Sep 2008 09:45:21 -0000	1.13
@@ -1 +1 @@
-kdelibs-4.1.0.tar.bz2
+kdelibs-4.1.1.tar.bz2


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kdelibs4.spec	29 Aug 2008 08:45:31 -0000	1.32
+++ kdelibs4.spec	4 Sep 2008 09:45:21 -0000	1.33
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.0
-Release: 9%{?dist}
+Version: 4.1.1
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -77,17 +77,13 @@
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
-# revert a kinit patch which triggers an assertion failure in KComponentData
-# (and its followup) (#455130)
-Patch19: kdelibs-4.0.98-revert-kinit-regression.patch
+# fix running commands in kglobalconfig before KComponentData init (#455130)
+Patch19: kdelibs-4.1.0-#455130.patch
 
 ## upstream patches
-# konq processes never terminate, 
-# http://bugs.kde.org/167825 , http://bugzilla.redhat.com/457526
-Patch100: kdelibs-4.1.0-kde#167826.patch
-# fix kcookiejar crash on invalid cookie file from KDE 3
-# http://websvn.kde.org/?view=rev&revision=844830
-Patch101: kdelibs-4.1.0-kcookiejar-crash.patch
+Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
+Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
+Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -211,12 +207,12 @@
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch19 -p0 -b .kinit-regression
+%patch19 -p1 -b .#455130
 
 ## upstream patches
-%patch100 -p1 -b .kde#167826
-%patch101 -p0 -b .kcookiejar-crash
-
+%patch100 -p0 -b .kde#169447-khtml-regression
+%patch101 -p0 -b .kde#856379-cookiejar
+%patch102 -p0 -b .kde#856403-urlnav
 
 %build
 
@@ -377,6 +373,24 @@
 
 
 %changelog
+* Wed Sep 03 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.1-5
+- fixed crash on setting cookies on empty domains (like the file
+  system), KDE bug #170147
+- fix URL navigator focus in file dialogs, KDE bug #169497, #170211
+
+* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
+- apply patch to fix regression in khtml
+
+* Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- respun
+
+* Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
+- drop revert-kinit-regression hack (fixes ioslave translations)
+
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-9
 - -devel: +Requires: libutempter-devel (cmake wants to link it in)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Jul 2008 18:16:50 -0000	1.12
+++ sources	4 Sep 2008 09:45:21 -0000	1.13
@@ -1 +1 @@
-86496aed25d4dce440418b3064a27913  kdelibs-4.1.0.tar.bz2
+d75ec557cd864e3f9150059c3e58ed61  kdelibs-4.1.1.tar.bz2


--- kdelibs-4.0.98-revert-kinit-regression.patch DELETED ---


--- kdelibs-4.1.0-kcookiejar-crash.patch DELETED ---


--- kdelibs-4.1.0-kde#167826.patch DELETED ---