rpms/kdelibs3/devel kdelibs-3.5.7-autostart.patch, NONE, 1.1 kdelibs-3.5.8-http-regression.patch, NONE, 1.1 kdelibs-3.5.8-kate-vhdl.patch, NONE, 1.1 kdelibs-3.5.8-kde#150944.patch, NONE, 1.1

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Sat Dec 1 19:11:39 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4681

Added Files:
	kdelibs-3.5.7-autostart.patch 
	kdelibs-3.5.8-http-regression.patch 
	kdelibs-3.5.8-kate-vhdl.patch kdelibs-3.5.8-kde#150944.patch 
Log Message:
sync w/ kdelibs/devel


kdelibs-3.5.7-autostart.patch:

--- NEW FILE kdelibs-3.5.7-autostart.patch ---
--- 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()

kdelibs-3.5.8-http-regression.patch:

--- NEW FILE kdelibs-3.5.8-http-regression.patch ---
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;
      }

kdelibs-3.5.8-kate-vhdl.patch:

--- NEW FILE kdelibs-3.5.8-kate-vhdl.patch ---
--- 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>

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_ );




More information about the fedora-extras-commits mailing list