rpms/kdelibs/FC-6 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 .cvsignore, 1.39, 1.40 kdelibs.spec, 1.209, 1.210 sources, 1.51, 1.52 kdelibs-3.5.7-ICEauthority.patch, 1.1, NONE kdelibs-3.5.7-kde#146105.patch, 1.1, NONE post-3.5.7-kdelibs-kdecore.diff, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 26 17:25:41 UTC 2007
Author: than
Update of /cvs/dist/rpms/kdelibs/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7678
Modified Files:
.cvsignore kdelibs.spec sources
Added Files:
kdelibs-3.5.7-autostart.patch
kdelibs-3.5.8-http-regression.patch
kdelibs-3.5.8-kate-vhdl.patch
Removed Files:
kdelibs-3.5.7-ICEauthority.patch
kdelibs-3.5.7-kde#146105.patch post-3.5.7-kdelibs-kdecore.diff
Log Message:
3.5.8
kdelibs-3.5.7-autostart.patch:
autostart.cpp | 6 ++++++
1 files changed, 6 insertions(+)
--- 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:
http.cc | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
--- 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:
vhdl.xml | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- 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>
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-6/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 5 Jun 2007 14:00:36 -0000 1.39
+++ .cvsignore 26 Nov 2007 17:25:39 -0000 1.40
@@ -1,16 +1 @@
-kdelibs-3.3.0.tar.bz2
-kdelibs-3.3.1.tar.bz2
-kdelibs-3.3.2.tar.bz2
-kdelibs-3.4.0-rc1.tar.bz2
-kdelibs-3.4.0.tar.bz2
-kdelibs-3.4.1.tar.bz2
-kdelibs-3.4.2.tar.bz2
-kdelibs-3.4.91.tar.bz2
-kdelibs-3.4.92.tar.bz2
-kdelibs-3.5.0.tar.bz2
-kdelibs-3.5.1.tar.bz2
-kdelibs-3.5.2.tar.bz2
-kdelibs-3.5.3.tar.bz2
-kdelibs-3.5.4.tar.bz2
-kdelibs-3.5.5.tar.bz2
-kdelibs-3.5.7.tar.bz2
+kdelibs-3.5.8.tar.bz2
Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-6/kdelibs.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- kdelibs.spec 2 Oct 2007 14:34:24 -0000 1.209
+++ kdelibs.spec 26 Nov 2007 17:25:39 -0000 1.210
@@ -16,14 +16,14 @@
%define make_cvs 0
%define arts 1
-Version: 3.5.7
+Version: 3.5.8
Release: 1%{?dist}
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
Epoch: 6
Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: kde.sh
@@ -46,15 +46,13 @@
Patch39: kdelibs-3.5.4-kabc-make.patch
Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
Patch41: kdelibs-3.5.6-utempter.patch
-Patch42: kdelibs-3.5.7-ICEauthority.patch
Patch43: kdelibs-3.5.6-lang.patch
+Patch45: kdelibs-3.5.7-autostart.patch
+Patch46: kdelibs-3.5.8-kate-vhdl.patch
# upstream patches
-Patch100: kdelibs-3.5.7-kde#146105.patch
-
-# security patches
-# CVE-2007-4224, CVE-2007-3820 konqueror address bar spoofing
-Patch500: post-3.5.7-kdelibs-kdecore.diff
+Patch200: kdelibs-3.5.8-http-regression.patch
+Patch201: kdelibs-3.5.8-kde#150944.patch
Requires: arts >= %{arts_epoch}:%{arts_version}
Requires: qt >= %{qt_epoch}:%{qt_version}
@@ -179,15 +177,9 @@
%patch39 -p1 -b .kabc-make
%patch40 -p1 -b .kdeprint-utf8
%patch41 -p1 -b .utempter
-%patch42 -p1 -b .ICEauthority
%patch43 -p1 -b .lang
-
-# upstream patches
-%patch100 -p0 -b .kde#146105
-
-# security patches
-%patch500 -p0 -b .CVE-2007-4224-CVE-2007-3820
-
+%patch45 -p1 -b .xdg-autostart
+%patch46 -p1 -b .kate-vhdl
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
@@ -279,14 +271,6 @@
%clean
rm -rf %{buildroot}
-%pre
-if [ -d /etc/skel/Desktop/Autostart ]; then
- mv -f /etc/skel/Desktop/Autostart /etc/skel/Desktop/Autostart-OLD..KDE
-elif [ -d /etc/skel/Desktop/Autostart.rpmsave ]; then
- mv -f /etc/skel/Desktop/Autostart.rpmsave /etc/skel/Desktop/Autostart-OLD..KDE
-fi
-exit 0
-
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
@@ -404,6 +388,9 @@
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
+* Mon Nov 26 2007 Than Ngo <than at redhat.com> 3.5.8-1
+- 3.5.8
+
* Tue Oct 02 2007 Than Ngo <than at redhat.com> - 6:3.5.7-1.fc6
- CVE-2007-4224, CVE-2007-3820 konqueror address bar spoofing
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-6/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 5 Jun 2007 14:00:36 -0000 1.51
+++ sources 26 Nov 2007 17:25:39 -0000 1.52
@@ -1 +1 @@
-50ed644f2ec91963570fe2b155652957 kdelibs-3.5.7.tar.bz2
+acaa37e79e840d10dca326277a20863c kdelibs-3.5.8.tar.bz2
--- kdelibs-3.5.7-ICEauthority.patch DELETED ---
--- kdelibs-3.5.7-kde#146105.patch DELETED ---
--- post-3.5.7-kdelibs-kdecore.diff DELETED ---
More information about the fedora-cvs-commits
mailing list