From 248853aecd9188315d41da02b93916cd7356d3ab Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sat, 1 Dec 2007 19:11:36 +0000
Subject: [PATCH] sync w/ kdelibs/devel

---
 kdelibs-3.5.7-autostart.patch       | 15 +++++++++++
 kdelibs-3.5.8-http-regression.patch | 41 +++++++++++++++++++++++++++++
 kdelibs-3.5.8-kate-vhdl.patch       | 10 +++++++
 kdelibs-3.5.8-kde#150944.patch      | 13 +++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 kdelibs-3.5.7-autostart.patch
 create mode 100644 kdelibs-3.5.8-http-regression.patch
 create mode 100644 kdelibs-3.5.8-kate-vhdl.patch
 create mode 100644 kdelibs-3.5.8-kde#150944.patch

diff --git a/kdelibs-3.5.7-autostart.patch b/kdelibs-3.5.7-autostart.patch
new file mode 100644
index 0000000..535540c
--- /dev/null
+++ b/kdelibs-3.5.7-autostart.patch
@@ -0,0 +1,15 @@
+--- kdelibs-3.5.7/kinit/autostart.cpp.orig	2007-09-25 11:32:07.000000000 +0200
++++ kdelibs-3.5.7/kinit/autostart.cpp	2007-09-25 14:14:29.000000000 +0200
+@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
+   m_startList = new AutoStartList;
+   m_startList->setAutoDelete(true);
+   KGlobal::dirs()->addResourceType("autostart", "share/autostart");
++  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
++  if (xdgconf_dirs.isEmpty())
++	  xdgconf_dirs = "/etc/xdg";
++  QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
++  for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
++	  KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
+ }
+ 
+ AutoStart::~AutoStart()
diff --git a/kdelibs-3.5.8-http-regression.patch b/kdelibs-3.5.8-http-regression.patch
new file mode 100644
index 0000000..62d3ba8
--- /dev/null
+++ b/kdelibs-3.5.8-http-regression.patch
@@ -0,0 +1,41 @@
+Index: kioslave/http/http.cc
+===================================================================
+--- kioslave/http/http.cc	(Revision 717341)
++++ kioslave/http/http.cc	(Revision 726097)
+@@ -3409,10 +3409,6 @@
+ 
+   } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
+ 
+-  // Send the current response before processing starts or it
+-  // might never get sent...
+-  forwardHttpResponseHeader();
+-
+   // Now process the HTTP/1.1 upgrade
+   QStringList::Iterator opt = upgradeOffers.begin();
+   for( ; opt != upgradeOffers.end(); ++opt) {
+@@ -3818,6 +3814,10 @@
+     mimeType( m_strMimeType );
+   }
+ 
++  // Do not move send response header before any redirection as it seems
++  // to screw up some sites. See BR# 150904.
++  forwardHttpResponseHeader();
++
+   if (m_request.method == HTTP_HEAD)
+      return true;
+ 
+@@ -3830,10 +3830,10 @@
+         // Check...
+         createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
+         if (!m_request.fcache)
+-	    {
+-		m_request.bCachedWrite = false; // Error creating cache entry.
+-		kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
+-	    }
++        {
++          m_request.bCachedWrite = false; // Error creating cache entry.
++          kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
++        }
+         m_request.expireDate = expireDate;
+         m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
+      }
diff --git a/kdelibs-3.5.8-kate-vhdl.patch b/kdelibs-3.5.8-kate-vhdl.patch
new file mode 100644
index 0000000..d8c104c
--- /dev/null
+++ b/kdelibs-3.5.8-kate-vhdl.patch
@@ -0,0 +1,10 @@
+--- kdelibs-3.5.8/kate/data/vhdl.xml.orig	2007-10-18 19:34:32.000000000 +0200
++++ kdelibs-3.5.8/kate/data/vhdl.xml	2007-10-18 19:33:04.000000000 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="VHDL" version="1.04" kateversion="2.1" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl">
++<language name="VHDL" version="1.04" kateversion="2.1" section="Hardware" extensions="*.vhdl;*.vhd;*.vst;*.vbe" mimetype="text/x-vhdl">
+     <highlighting>
+         <list name="keywords">
+             <item> access </item>
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<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_ );