Compare commits
72 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | 71f211425a | |
Kevin Kofler | 1aca010e6d | |
Rex Dieter | 68e1ef6284 | |
Than Ngo | 7599884762 | |
Rex Dieter | 36c24f3da6 | |
Rex Dieter | cf3f55ffd0 | |
Rex Dieter | fbe58a3c51 | |
Rex Dieter | 01b9679b41 | |
Rex Dieter | feac0e970b | |
Rex Dieter | 3057e479a2 | |
Lukas Tinkl | 3c12a9b44c | |
Lukas Tinkl | 3300607f2c | |
Rex Dieter | ed679813cd | |
Kevin Kofler | 626d082d3c | |
Than Ngo | 125784d5c0 | |
Than Ngo | 147c3987f7 | |
Than Ngo | 4ec14d45e2 | |
Rex Dieter | b0a2013a10 | |
Rex Dieter | 88f449fcfe | |
Kevin Kofler | b887581f5f | |
Rex Dieter | 0d4b2e09f3 | |
Rex Dieter | 789962a78d | |
Rex Dieter | 3b6f34df29 | |
Rex Dieter | fb19cf9e76 | |
Rex Dieter | d3e71b9401 | |
Than Ngo | 6f7e567926 | |
Than Ngo | 41c8cfe17b | |
Bill Nottingham | dee507b24d | |
Rex Dieter | 086a9edcff | |
Rex Dieter | 8c4b60e80b | |
Rex Dieter | eb15a2cdfd | |
Lukas Tinkl | 85f16a6abb | |
Lukas Tinkl | 2dcaa9e3d3 | |
Lukas Tinkl | e22171f202 | |
Lukas Tinkl | 3ee8594bea | |
Rex Dieter | 62691e6825 | |
Rex Dieter | 6706557c13 | |
Lukas Tinkl | 70df5626e6 | |
Lukas Tinkl | c35b0ad2bb | |
Kevin Kofler | e3d9bb4b31 | |
Than Ngo | 19c3b1623e | |
Ben Boeckel | 959bba2926 | |
Lukas Tinkl | e497caa501 | |
Lukas Tinkl | 7e9bcf8132 | |
Lukas Tinkl | cfafe340b2 | |
Lukas Tinkl | d4b8d7f993 | |
Rex Dieter | 7e0b19c68b | |
Rex Dieter | 563887686c | |
Rex Dieter | 50fba62a52 | |
Kevin Kofler | 9826456992 | |
Jaroslav Reznik | 9be6766fac | |
Kevin Kofler | c0b2db97bd | |
Rex Dieter | b213d4e169 | |
Lukas Tinkl | 664f9c09b4 | |
Lukas Tinkl | 6dd3f14575 | |
Lukas Tinkl | 685303493f | |
Lukas Tinkl | 2807dff4c2 | |
Rex Dieter | bd57ae3f13 | |
Rex Dieter | db6b40a670 | |
Than Ngo | cc22988313 | |
Than Ngo | ec3a45e557 | |
Than Ngo | c889b55647 | |
Lukas Tinkl | ae15153c4f | |
Kevin Kofler | 6c1dc55d4b | |
Kevin Kofler | 8c6aaa9c21 | |
Kevin Kofler | 7a89a56e7f | |
Than Ngo | 8308488d5d | |
Kevin Kofler | 51cdadf6aa | |
Kevin Kofler | ada111ffb5 | |
Rex Dieter | 43bfaee992 | |
Rex Dieter | a04c58ae99 | |
Jesse Keating | bfe36476fa |
|
@ -1 +0,0 @@
|
|||
kdelibs-4.2.2.tar.bz2
|
|
@ -0,0 +1,2 @@
|
|||
kdelibs-4.4.3.tar.bz2
|
||||
kdelibs-4.4.4.tar.bz2
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: kdelibs
|
||||
# $Id$
|
||||
NAME := kdelibs
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
|
@ -1 +0,0 @@
|
|||
kdelibs-4_1_69-1_fc10:HEAD:kdelibs-4.1.69-1.fc10.src.rpm:1224265644
|
11
kde4.csh
11
kde4.csh
|
@ -12,14 +12,3 @@ if ( -f /etc/sysconfig/prelink ) then
|
|||
endif
|
||||
unset PRELINKING
|
||||
endif
|
||||
|
||||
# handled in startkde, but this sets for other DE's too
|
||||
set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
|
||||
if ( $?QT_PLUGIN_PATH ) then
|
||||
if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
|
||||
setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
|
||||
endif
|
||||
else
|
||||
setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS}
|
||||
endif
|
||||
unset KDE4_QTPLUGINS
|
||||
|
|
12
kde4.sh
12
kde4.sh
|
@ -9,15 +9,3 @@ if [ -z "$KDE_IS_PRELINKED" ] ; then
|
|||
grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
|
||||
KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
|
||||
fi
|
||||
|
||||
|
||||
# handled in startkde, but this sets for other DE's too
|
||||
if [ -n "$QT_PLUGIN_PATH" ] ; then
|
||||
if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then
|
||||
QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
|
||||
fi
|
||||
else
|
||||
QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
|
||||
fi
|
||||
export QT_PLUGIN_PATH
|
||||
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
diff -up kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl kdelibs-4.0.0/kio/kssl/kopenssl.cpp
|
||||
--- kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl 2008-01-04 18:00:20.000000000 -0600
|
||||
+++ kdelibs-4.0.0/kio/kssl/kopenssl.cpp 2008-01-23 06:58:32.000000000 -0600
|
||||
@@ -357,6 +357,10 @@ KOpenSSLProxy::KOpenSSLProxy()
|
||||
#ifdef SHLIB_VERSION_NUMBER
|
||||
<< "libssl.so." SHLIB_VERSION_NUMBER
|
||||
#endif
|
||||
+ << "libssl.so.0.9.8g"
|
||||
+ << "libssl.so.7"
|
||||
+ << "libssl.so.0.9.8b"
|
||||
+ << "libssl.so.6"
|
||||
<< "libssl.so"
|
||||
<< "libssl.so.0"
|
||||
#endif
|
||||
@@ -374,6 +378,10 @@ KOpenSSLProxy::KOpenSSLProxy()
|
||||
#ifdef SHLIB_VERSION_NUMBER
|
||||
<< "libcrypto.so." SHLIB_VERSION_NUMBER
|
||||
#endif
|
||||
+ << "libcrypto.so.0.9.8g"
|
||||
+ << "libcrypto.so.7"
|
||||
+ << "libcrypto.so.0.9.8b"
|
||||
+ << "libcrypto.so.6"
|
||||
<< "libcrypto.so"
|
||||
<< "libcrypto.so.0"
|
||||
#endif
|
|
@ -1,12 +0,0 @@
|
|||
diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt
|
||||
--- kdelibs-4.0.2/doc/common/CMakeLists.txt 2008-01-05 01:00:05.000000000 +0100
|
||||
+++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-06 05:18:11.000000000 +0100
|
||||
@@ -7,6 +7,8 @@
|
||||
xml.dcl
|
||||
doxygen.css
|
||||
tabs.css
|
||||
+ kde.css flat.css print.css
|
||||
+ Doxyfile.global
|
||||
header.html
|
||||
footer.html
|
||||
mainheader.html
|
|
@ -1,117 +0,0 @@
|
|||
diff -up kdelibs-4.1.96/plasma/package.cpp.orig kdelibs-4.1.96/plasma/package.cpp
|
||||
--- kdelibs-4.1.96/plasma/package.cpp.orig 2009-01-06 18:27:56.000000000 +0100
|
||||
+++ kdelibs-4.1.96/plasma/package.cpp 2009-01-16 14:42:39.000000000 +0100
|
||||
@@ -139,6 +139,10 @@ QString Package::filePath(const char *fi
|
||||
}
|
||||
|
||||
if (QFile::exists(path)) {
|
||||
+ if (d->structure->allowExternalPaths()) {
|
||||
+ return path;
|
||||
+ }
|
||||
+
|
||||
// ensure that we don't return files outside of our base path
|
||||
// due to symlink or ../ games
|
||||
QDir dir(path);
|
||||
@@ -171,6 +175,10 @@ QStringList Package::entryList(const cha
|
||||
QDir dir(d->basePath + d->structure->contentsPrefix() + path);
|
||||
|
||||
if (dir.exists()) {
|
||||
+ if (d->structure->allowExternalPaths()) {
|
||||
+ return dir.entryList(QDir::Files | QDir::Readable);
|
||||
+ }
|
||||
+
|
||||
// ensure that we don't return files outside of our base path
|
||||
// due to symlink or ../ games
|
||||
QString canonicalized = dir.canonicalPath();
|
||||
diff -up kdelibs-4.1.96/plasma/packagestructure.cpp.orig kdelibs-4.1.96/plasma/packagestructure.cpp
|
||||
--- kdelibs-4.1.96/plasma/packagestructure.cpp.orig 2009-01-16 14:41:56.000000000 +0100
|
||||
+++ kdelibs-4.1.96/plasma/packagestructure.cpp 2009-01-16 14:42:39.000000000 +0100
|
||||
@@ -58,17 +58,19 @@ class ContentStructure
|
||||
QString path;
|
||||
QString name;
|
||||
QStringList mimetypes;
|
||||
- bool directory;
|
||||
- bool required;
|
||||
+ bool directory : 1;
|
||||
+ bool required : 1;
|
||||
};
|
||||
|
||||
class PackageStructurePrivate
|
||||
{
|
||||
public:
|
||||
PackageStructurePrivate()
|
||||
- : metadata(0)
|
||||
+ : metadata(0),
|
||||
+ externalPaths(false)
|
||||
{
|
||||
}
|
||||
+
|
||||
~PackageStructurePrivate()
|
||||
{
|
||||
delete metadata;
|
||||
@@ -76,6 +78,8 @@ public:
|
||||
|
||||
void createPackageMetadata(const QString &path);
|
||||
|
||||
+ static QHash<QString, PackageStructure::Ptr> structures;
|
||||
+
|
||||
QString type;
|
||||
QString path;
|
||||
QString contentsPrefix;
|
||||
@@ -83,8 +87,8 @@ public:
|
||||
QString servicePrefix;
|
||||
QMap<QByteArray, ContentStructure> contents;
|
||||
QStringList mimetypes;
|
||||
- static QHash<QString, PackageStructure::Ptr> structures;
|
||||
PackageMetadata *metadata;
|
||||
+ bool externalPaths;
|
||||
};
|
||||
|
||||
QHash<QString, PackageStructure::Ptr> PackageStructurePrivate::structures;
|
||||
@@ -487,6 +491,16 @@ PackageMetadata PackageStructure::metada
|
||||
return *d->metadata;
|
||||
}
|
||||
|
||||
+bool PackageStructure::allowExternalPaths() const
|
||||
+{
|
||||
+ return d->externalPaths;
|
||||
+}
|
||||
+
|
||||
+void PackageStructure::setAllowExternalPaths(bool allow)
|
||||
+{
|
||||
+ d->externalPaths = allow;
|
||||
+}
|
||||
+
|
||||
} // Plasma namespace
|
||||
|
||||
#include "packagestructure.moc"
|
||||
diff -up kdelibs-4.1.96/plasma/packagestructure.h.orig kdelibs-4.1.96/plasma/packagestructure.h
|
||||
--- kdelibs-4.1.96/plasma/packagestructure.h.orig 2009-01-16 14:19:12.000000000 +0100
|
||||
+++ kdelibs-4.1.96/plasma/packagestructure.h 2009-01-16 14:42:39.000000000 +0100
|
||||
@@ -278,6 +278,12 @@ public:
|
||||
*/
|
||||
virtual PackageMetadata metadata();
|
||||
|
||||
+ /**
|
||||
+ * @return true if paths/symlinks outside the package itself should be followed.
|
||||
+ * By default this is set to false for security reasons.
|
||||
+ */
|
||||
+ bool allowExternalPaths() const;
|
||||
+
|
||||
Q_SIGNALS:
|
||||
/**
|
||||
* Emitted when the new widget browser process completes.
|
||||
@@ -286,6 +292,13 @@ Q_SIGNALS:
|
||||
|
||||
protected:
|
||||
/**
|
||||
+ * Sets whether or not external paths/symlinks can be followed by a package
|
||||
+ * @arg allow true if paths/symlinks outside of the package should be followed,
|
||||
+ * false if they should be rejected.
|
||||
+ */
|
||||
+ void setAllowExternalPaths(bool allow);
|
||||
+
|
||||
+ /**
|
||||
* Sets the prefix that all the contents in this package should
|
||||
* appear under. This defaults to "contents/" and is added automatically
|
||||
* between the base path and the entries as defined by the package
|
|
@ -1,38 +0,0 @@
|
|||
diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake
|
||||
--- kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig 2009-01-08 22:14:13.000000000 +0100
|
||||
+++ kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake 2009-01-08 22:14:59.000000000 +0100
|
||||
@@ -64,9 +64,13 @@
|
||||
# See kdepimlibs/CMakeLists.txt and kdepimlibs/KdepimLibsConfig.cmake.in
|
||||
# for details. Alex
|
||||
|
||||
-
|
||||
+set(KDEPIMLIBS_VERSION 4.2.0)
|
||||
+set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
|
||||
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
|
||||
+ set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs-${KDEPIMLIBS_VERSION} )
|
||||
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
|
||||
set(_KdepimLibs_FIND_QUIETLY ${KdepimLibs_FIND_QUIETLY})
|
||||
-find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KdepimLibs/cmake )
|
||||
+find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
|
||||
set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake
|
||||
--- kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig 2009-01-10 21:53:41.000000000 +0100
|
||||
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake 2009-01-10 21:54:03.000000000 +0100
|
||||
@@ -62,8 +62,14 @@
|
||||
# for details. Alex
|
||||
|
||||
|
||||
+set(KDE4WORKSPACE_VERSION 4.2.0)
|
||||
+set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
|
||||
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
|
||||
+ set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
|
||||
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
|
||||
+
|
||||
set(_KDE4Workspace_FIND_QUIETLY ${KDE4Workspace_FIND_QUIETLY})
|
||||
-find_package(KDE4Workspace QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KDE4Workspace/cmake )
|
||||
+find_package(KDE4Workspace QUIET NO_MODULE PATHS ${_KdeWorkspaceConfig_INSTALL_DIR} )
|
||||
set(KDE4Workspace_FIND_QUIETLY ${_KDE4Workspace_FIND_QUIETLY})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
|
@ -1,47 +0,0 @@
|
|||
diff -up kdelibs-4.2.0/kdeui/util/fixx11h.h.orig kdelibs-4.2.0/kdeui/util/fixx11h.h
|
||||
--- kdelibs-4.2.0/kdeui/util/fixx11h.h.orig 2008-05-21 13:08:51.000000000 +0200
|
||||
+++ kdelibs-4.2.0/kdeui/util/fixx11h.h 2009-02-26 12:14:01.000000000 +0100
|
||||
@@ -251,13 +251,21 @@ const int FontChange = XFontChange;
|
||||
#ifndef FIXX11H_index
|
||||
#define FIXX11H_index
|
||||
inline
|
||||
+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
||||
+char* Xindex( char* s, int c )
|
||||
+#else
|
||||
char* Xindex( const char* s, int c )
|
||||
+#endif
|
||||
{
|
||||
return index( s, c );
|
||||
}
|
||||
#undef index
|
||||
inline
|
||||
+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
||||
+char* index( char* s, int c )
|
||||
+#else
|
||||
char* index( const char* s, int c )
|
||||
+#endif
|
||||
{
|
||||
return Xindex( s, c );
|
||||
}
|
||||
@@ -271,13 +279,21 @@ char* index( const char* s, int c )
|
||||
#ifndef FIXX11H_rindex
|
||||
#define FIXX11H_rindex
|
||||
inline
|
||||
+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
||||
+char* Xrindex( char* s, int c )
|
||||
+#else
|
||||
char* Xrindex( const char* s, int c )
|
||||
+#endif
|
||||
{
|
||||
return rindex( s, c );
|
||||
}
|
||||
#undef rindex
|
||||
inline
|
||||
+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
||||
+char* rindex( char* s, int c )
|
||||
+#else
|
||||
char* rindex( const char* s, int c )
|
||||
+#endif
|
||||
{
|
||||
return Xrindex( s, c );
|
||||
}
|
|
@ -1,14 +0,0 @@
|
|||
diff -up kdelibs-4.2.0/cmake/modules/CheckPrototypeExists.cmake.orig kdelibs-4.2.0/cmake/modules/CheckPrototypeExists.cmake
|
||||
diff -up kdelibs-4.2.0/ConfigureChecks.cmake.orig kdelibs-4.2.0/ConfigureChecks.cmake
|
||||
diff -up kdelibs-4.2.0/kdecore/kdefakes.h.cmake.orig kdelibs-4.2.0/kdecore/kdefakes.h.cmake
|
||||
--- kdelibs-4.2.0/kdecore/kdefakes.h.cmake.orig 2009-02-16 14:41:16.000000000 +0100
|
||||
+++ kdelibs-4.2.0/kdecore/kdefakes.h.cmake 2009-02-16 14:41:47.000000000 +0100
|
||||
@@ -57,7 +57,7 @@ unsigned long strlcpy(char*, const char*
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#cmakedefine HAVE_STRCASESTR_PROTO 1
|
||||
+#define HAVE_STRCASESTR_PROTO 1
|
||||
#if !defined(HAVE_STRCASESTR_PROTO)
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
|
@ -1,12 +0,0 @@
|
|||
diff -ur kdelibs-4.2.0/kjs/CMakeLists.txt kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt
|
||||
--- kdelibs-4.2.0/kjs/CMakeLists.txt 2008-11-19 11:20:10.000000000 +0100
|
||||
+++ kdelibs-4.2.0-kjs-gcc44-crash/kjs/CMakeLists.txt 2009-02-18 19:43:20.000000000 +0100
|
||||
@@ -183,6 +183,8 @@
|
||||
CompileState.cpp
|
||||
)
|
||||
|
||||
+set_source_files_properties(dtoa.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
|
||||
+
|
||||
if (NOT DEFINED QT_ONLY)
|
||||
set(KJSLIBNAME kjs)
|
||||
else (NOT DEFINED QT_ONLY)
|
|
@ -1,10 +0,0 @@
|
|||
--- branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp 2009/04/02 20:19:16 948353
|
||||
+++ branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp 2009/04/08 23:48:02 951343
|
||||
@@ -297,6 +297,7 @@
|
||||
&& next->isInlineFlow()))
|
||||
break;
|
||||
current = next;
|
||||
+ next = 0;
|
||||
}
|
||||
return next;
|
||||
}
|
|
@ -1,135 +0,0 @@
|
|||
Index: kioslave/http/http.cpp
|
||||
===================================================================
|
||||
--- kioslave/http/http.cpp (Revision 950464)
|
||||
+++ kioslave/http/http.cpp (Revision 950465)
|
||||
@@ -229,16 +229,12 @@
|
||||
}
|
||||
|
||||
|
||||
+#define NO_SIZE ((KIO::filesize_t) -1)
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
-#define NO_SIZE ((KIO::filesize_t) -1)
|
||||
-
|
||||
#ifdef HAVE_STRTOLL
|
||||
-#define STRTOLL strtoll
|
||||
+#define STRTOLL strtoll
|
||||
#else
|
||||
-#define STRTOLL strtol
|
||||
+#define STRTOLL strtol
|
||||
#endif
|
||||
|
||||
|
||||
@@ -259,6 +255,7 @@
|
||||
, m_proxyAuth(0)
|
||||
, m_socketProxyAuth(0)
|
||||
, m_isError(false)
|
||||
+ , m_isLoadingErrorPage(false)
|
||||
, m_remoteRespTimeout(DEFAULT_RESPONSE_TIMEOUT)
|
||||
{
|
||||
reparseConfiguration();
|
||||
@@ -292,6 +289,7 @@
|
||||
{
|
||||
m_isEOF = false;
|
||||
m_isError = false;
|
||||
+ m_isLoadingErrorPage = false;
|
||||
}
|
||||
|
||||
void HTTPProtocol::resetResponseParsing()
|
||||
@@ -575,8 +573,11 @@
|
||||
m_server.initFrom(m_request);
|
||||
}
|
||||
break;
|
||||
- } else if (m_isError) {
|
||||
- // Hard error, abort everything.
|
||||
+ } else if (m_isError || m_isLoadingErrorPage) {
|
||||
+ // Unrecoverable error, abort everything.
|
||||
+ // Also, if we've just loaded an error page there is nothing more to do.
|
||||
+ // In that case we abort to avoid loops; some webservers manage to send 401 and
|
||||
+ // no authentication request. Or an auth request we don't understand.
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1728,6 +1729,15 @@
|
||||
error( ERR_SLAVE_DEFINED, errorString );
|
||||
}
|
||||
|
||||
+void HTTPProtocol::setLoadingErrorPage()
|
||||
+{
|
||||
+ if (m_isLoadingErrorPage) {
|
||||
+ kWarning(7113) << "called twice during one request, something is probably wrong.";
|
||||
+ }
|
||||
+ m_isLoadingErrorPage = true;
|
||||
+ SlaveBase::errorPage();
|
||||
+}
|
||||
+
|
||||
bool HTTPProtocol::isOffline(const KUrl &url)
|
||||
{
|
||||
const int NetWorkStatusUnknown = 1;
|
||||
@@ -2720,7 +2730,7 @@
|
||||
; // Ignore error
|
||||
} else {
|
||||
if (m_request.preferErrorPage) {
|
||||
- errorPage();
|
||||
+ setLoadingErrorPage();
|
||||
} else {
|
||||
error(ERR_INTERNAL_SERVER, m_request.url.url());
|
||||
return false;
|
||||
@@ -2743,7 +2753,7 @@
|
||||
// Any other client errors
|
||||
// Tell that we will only get an error page here.
|
||||
if (m_request.preferErrorPage) {
|
||||
- errorPage();
|
||||
+ setLoadingErrorPage();
|
||||
} else {
|
||||
error(ERR_DOES_NOT_EXIST, m_request.url.url());
|
||||
return false;
|
||||
@@ -3303,14 +3313,14 @@
|
||||
kDebug(7113) << "pointer to auth class is now" << *auth;
|
||||
if (!(*auth)) {
|
||||
if (m_request.preferErrorPage) {
|
||||
- errorPage();
|
||||
+ setLoadingErrorPage();
|
||||
} else {
|
||||
error(ERR_UNSUPPORTED_ACTION, "Unknown Authorization method!");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
- // auth may still be null due to errorPage().
|
||||
+ // *auth may still be null due to setLoadingErrorPage().
|
||||
|
||||
if (*auth) {
|
||||
// remove trailing space from the method string, or digest auth will fail
|
||||
@@ -3357,7 +3367,7 @@
|
||||
|
||||
if ((*auth)->isError()) {
|
||||
if (m_request.preferErrorPage) {
|
||||
- errorPage();
|
||||
+ setLoadingErrorPage();
|
||||
} else {
|
||||
error(ERR_UNSUPPORTED_ACTION, "Authorization failed!");
|
||||
return false;
|
||||
Index: kioslave/http/http.h
|
||||
===================================================================
|
||||
--- kioslave/http/http.h (Revision 950464)
|
||||
+++ kioslave/http/http.h (Revision 950465)
|
||||
@@ -259,6 +259,7 @@
|
||||
void cacheUpdate( const KUrl &url, bool nocache, time_t expireDate);
|
||||
|
||||
void httpError(); // Generate error message based on response code
|
||||
+ void setLoadingErrorPage(); // Call SlaveBase::errorPage() and remember that we've called it
|
||||
|
||||
bool isOffline(const KUrl &url); // Check network status
|
||||
|
||||
@@ -523,6 +524,8 @@
|
||||
|
||||
// Indicates whether there was some connection error.
|
||||
bool m_isError;
|
||||
+ // Whether we are loading an error page (we should close the connection afterwards)
|
||||
+ bool m_isLoadingErrorPage;
|
||||
|
||||
// Values that determine the remote connection timeouts.
|
||||
int m_remoteRespTimeout;
|
|
@ -1,63 +0,0 @@
|
|||
Index: kdeui/jobs/kuiserverjobtracker.cpp
|
||||
===================================================================
|
||||
--- kdeui/jobs/kuiserverjobtracker.cpp (Revision 950982)
|
||||
+++ kdeui/jobs/kuiserverjobtracker.cpp (Revision 950983)
|
||||
@@ -35,13 +35,32 @@
|
||||
class KUiServerJobTracker::Private
|
||||
{
|
||||
public:
|
||||
- Private() { }
|
||||
+ Private(KUiServerJobTracker *parent)
|
||||
+ : q(parent)
|
||||
+ {
|
||||
+ }
|
||||
|
||||
+ KUiServerJobTracker *const q;
|
||||
+
|
||||
+ void _k_killJob();
|
||||
+
|
||||
QHash<KJob*, org::kde::JobView*> progressJobView;
|
||||
};
|
||||
|
||||
+void KUiServerJobTracker::Private::_k_killJob()
|
||||
+{
|
||||
+ org::kde::JobView *jobView = qobject_cast<org::kde::JobView*>(q->sender());
|
||||
+
|
||||
+ if (jobView) {
|
||||
+ KJob *job = progressJobView.key(jobView);
|
||||
+
|
||||
+ if (job)
|
||||
+ job->kill(KJob::EmitResult);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
KUiServerJobTracker::KUiServerJobTracker(QObject *parent)
|
||||
- : KJobTrackerInterface(parent), d(new Private)
|
||||
+ : KJobTrackerInterface(parent), d(new Private(this))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -81,8 +100,8 @@
|
||||
reply.value().path(),
|
||||
QDBusConnection::sessionBus());
|
||||
|
||||
- QObject::connect(jobView, SIGNAL(cancelRequested()), job,
|
||||
- SLOT(kill()));
|
||||
+ QObject::connect(jobView, SIGNAL(cancelRequested()), this,
|
||||
+ SLOT(_k_killJob()));
|
||||
QObject::connect(jobView, SIGNAL(suspendRequested()), job,
|
||||
SLOT(suspend()));
|
||||
QObject::connect(jobView, SIGNAL(resumeRequested()), job,
|
||||
Index: kdeui/jobs/kuiserverjobtracker.h
|
||||
===================================================================
|
||||
--- kdeui/jobs/kuiserverjobtracker.h (Revision 950982)
|
||||
+++ kdeui/jobs/kuiserverjobtracker.h (Revision 950983)
|
||||
@@ -78,6 +78,8 @@
|
||||
private:
|
||||
class Private;
|
||||
Private *const d;
|
||||
+
|
||||
+ Q_PRIVATE_SLOT(d, void _k_killJob())
|
||||
};
|
||||
|
||||
#endif
|
|
@ -1,12 +0,0 @@
|
|||
diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp
|
||||
--- kdelibs-4.2.2/plasma/popupapplet.cpp.orig 2009-03-30 23:41:08.000000000 +0200
|
||||
+++ kdelibs-4.2.2/plasma/popupapplet.cpp 2009-04-07 17:36:51.000000000 +0200
|
||||
@@ -276,7 +276,7 @@ void PopupAppletPrivate::popupConstraint
|
||||
//emulate the same kind of behavior as Qt::Popup (close when you click somewhere
|
||||
//else.
|
||||
//Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
|
||||
- Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
|
||||
+ Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
|
||||
|
||||
if (passive) {
|
||||
wflags |= Qt::X11BypassWindowManagerHint;
|
|
@ -1,19 +1,19 @@
|
|||
diff -Naurw kdelibs-4.1.82/kdeui/icons/kicontheme.cpp kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp
|
||||
--- kdelibs-4.1.82/kdeui/icons/kicontheme.cpp 2008-10-23 01:05:04.000000000 +0200
|
||||
+++ kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp 2008-12-09 14:15:14.000000000 +0100
|
||||
@@ -516,7 +516,7 @@
|
||||
return *_theme;
|
||||
diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp
|
||||
--- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 2009-04-15 12:26:44.000000000 +0200
|
||||
+++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp 2009-05-11 16:01:29.000000000 +0200
|
||||
@@ -525,7 +525,7 @@ QString KIconTheme::current()
|
||||
}
|
||||
|
||||
KConfigGroup cg(KGlobal::config(), "Icons");
|
||||
- *_theme = cg.readEntry("Theme", defaultThemeName());
|
||||
+ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
|
||||
if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
|
||||
/* if (_theme->isEmpty())
|
||||
{
|
||||
diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp
|
||||
--- kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp 2008-11-28 16:40:11.000000000 +0100
|
||||
+++ kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp 2008-12-09 14:17:51.000000000 +0100
|
||||
@@ -831,7 +831,7 @@
|
||||
if ( *_theme == QLatin1String("hicolor") ) {
|
||||
*_theme = defaultThemeName();
|
||||
}
|
||||
diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp
|
||||
--- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 2009-03-27 15:47:33.000000000 +0100
|
||||
+++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp 2009-05-11 16:00:06.000000000 +0200
|
||||
@@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS
|
||||
if (kde_overrideStyle.isEmpty()) {
|
||||
const QString &defaultStyle = KStyle::defaultStyle();
|
||||
const KConfigGroup pConfig(KGlobal::config(), "General");
|
||||
|
@ -22,9 +22,9 @@ diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde14
|
|||
|
||||
if (styleStr.isEmpty() ||
|
||||
// check whether we already use the correct style to return then
|
||||
diff -Naurw kdelibs-4.1.82/kutils/kdeglobals.kcfg kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg
|
||||
--- kdelibs-4.1.82/kutils/kdeglobals.kcfg 2008-05-21 13:08:56.000000000 +0200
|
||||
+++ kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg 2008-12-09 14:15:14.000000000 +0100
|
||||
diff -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg
|
||||
--- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 2009-04-15 12:26:45.000000000 +0200
|
||||
+++ kdelibs-4.2.85/kutils/kdeglobals.kcfg 2009-05-11 16:00:06.000000000 +0200
|
||||
@@ -24,6 +24,10 @@
|
||||
<whatsthis>The name of the widget style, for example "keramik" or "plastik". Without quotes.</whatsthis>
|
||||
<default>keramik</default>
|
|
@ -1,7 +1,7 @@
|
|||
diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp
|
||||
--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2008-07-03 00:06:28.000000000 -0500
|
||||
+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp 2008-07-06 14:38:18.000000000 -0500
|
||||
@@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults()
|
||||
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
|
||||
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2009-05-06 05:14:38.000000000 -0500
|
||||
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp 2009-05-14 11:34:04.732889142 -0500
|
||||
@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
|
||||
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
|
||||
index+=2;
|
||||
}
|
||||
|
@ -9,10 +9,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.
|
|||
+ addResourceType("exe", 0, "libexec/kde4", true );
|
||||
|
||||
addResourceDir("home", QDir::homePath(), false);
|
||||
}
|
||||
diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp
|
||||
--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500
|
||||
+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp 2008-07-06 14:38:18.000000000 -0500
|
||||
|
||||
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
|
||||
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500
|
||||
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
|
||||
if (strcmp("lib", type) == 0)
|
||||
return QString::fromLatin1(LIB_INSTALL_DIR "/");
|
||||
|
@ -22,10 +22,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs
|
|||
if (strcmp("locale", type) == 0)
|
||||
return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
|
||||
break;
|
||||
diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp
|
||||
--- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2008-07-03 00:06:29.000000000 -0500
|
||||
+++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp 2008-07-06 14:41:31.000000000 -0500
|
||||
@@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource
|
||||
diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
|
||||
--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2009-02-27 06:31:32.000000000 -0600
|
||||
+++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||
@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
|
||||
#define KIOSLAVE "bin/kioslave.exe"
|
||||
#else
|
||||
#define EXT ""
|
||||
|
@ -36,7 +36,7 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
|
|||
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
|
||||
QVERIFY( !bin.isEmpty() );
|
||||
QVERIFY( bin.endsWith( KIOSLAVE ) );
|
||||
@@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe()
|
||||
@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
|
||||
// findExe with a result in libexec
|
||||
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
|
||||
QVERIFY( !lnusertemp.isEmpty() );
|
||||
|
@ -45,9 +45,9 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
|
|||
#endif
|
||||
|
||||
// Check the "exe" resource too
|
||||
diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp
|
||||
--- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500
|
||||
+++ kdelibs-4.0.85/kio/tests/krununittest.cpp 2008-07-06 14:38:18.000000000 -0500
|
||||
diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
|
||||
--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500
|
||||
+++ kdelibs-4.2.85/kio/tests/krununittest.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
|
||||
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
|
||||
if (!kdeinit.isEmpty()) {
|
|
@ -0,0 +1,69 @@
|
|||
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopenssl.cpp
|
||||
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp 2008-10-23 01:05:00.000000000 +0200
|
||||
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp 2009-09-04 14:09:22.000000000 +0200
|
||||
@@ -196,6 +196,7 @@
|
||||
static X509_NAME *(*K_X509_NAME_new)() = 0L;
|
||||
static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
|
||||
static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
|
||||
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
|
||||
static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
|
||||
|
||||
#endif
|
||||
@@ -530,6 +531,7 @@
|
||||
K_X509_NAME_new = (X509_NAME *(*)()) d->cryptoLib->resolveFunction("X509_NAME_new");
|
||||
K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) d->cryptoLib->resolveFunction("X509_REQ_set_subject_name");
|
||||
K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_data");
|
||||
+ K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_length");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1577,6 +1579,13 @@
|
||||
return 0L;
|
||||
}
|
||||
|
||||
+
|
||||
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
|
||||
+ if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
|
||||
+ return 0L;
|
||||
+}
|
||||
+
|
||||
+
|
||||
STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
|
||||
if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
|
||||
return 0L;
|
||||
diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.h kdelibs-4.3.1/kio/kssl/kopenssl.h
|
||||
--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.h 2009-05-19 14:06:53.000000000 +0200
|
||||
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h 2009-09-04 14:09:22.000000000 +0200
|
||||
@@ -589,13 +589,17 @@
|
||||
*/
|
||||
void ASN1_INTEGER_free(ASN1_INTEGER *x);
|
||||
|
||||
-
|
||||
/*
|
||||
* ASN1_STRING_data
|
||||
*/
|
||||
unsigned char *ASN1_STRING_data(ASN1_STRING *x);
|
||||
|
||||
/*
|
||||
+ * ASN1_STRING_length
|
||||
+ */
|
||||
+ int ASN1_STRING_length(ASN1_STRING *x);
|
||||
+
|
||||
+ /*
|
||||
*
|
||||
*/
|
||||
int OBJ_obj2nid(ASN1_OBJECT *o);
|
||||
diff -Nur kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp
|
||||
--- kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp 2009-01-16 16:07:05.000000000 +0100
|
||||
+++ kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp 2009-09-04 14:09:22.000000000 +0200
|
||||
@@ -1305,7 +1305,9 @@
|
||||
}
|
||||
|
||||
QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
|
||||
- if (!s.isEmpty()) {
|
||||
+ if (!s.isEmpty() &&
|
||||
+ /* skip subjectAltNames with embedded NULs */
|
||||
+ s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
|
||||
rc += s;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
diff -up kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig kdelibs-4.3.1/kdeui/util/kcrash.cpp
|
||||
--- kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig 2009-09-21 17:42:19.000000000 +0200
|
||||
+++ kdelibs-4.3.1/kdeui/util/kcrash.cpp 2009-09-21 17:43:44.000000000 +0200
|
||||
@@ -67,7 +67,7 @@ static char *s_autoRestartCommand = 0;
|
||||
static char *s_appPath = 0;
|
||||
static char *s_drkonqiPath = 0;
|
||||
static KCrash::CrashFlags s_flags = 0;
|
||||
-static bool s_launchDrKonqi = true;
|
||||
+static bool s_launchDrKonqi = false;
|
||||
|
||||
namespace KCrash
|
||||
{
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp
|
||||
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-04 18:13:11.000000000 +0100
|
||||
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-10 18:45:41.000000000 +0100
|
||||
diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
|
||||
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-01 01:27:28.000000000 +0100
|
||||
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-03 03:49:55.000000000 +0100
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
*/
|
||||
|
@ -10,29 +10,29 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||
#include "halstorageaccess.h"
|
||||
|
||||
#include "halfstabhandling.h"
|
||||
@@ -172,11 +174,21 @@
|
||||
@@ -177,11 +179,21 @@
|
||||
{
|
||||
// TODO: Better error reporting here
|
||||
if (m_setupInProgress) {
|
||||
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
||||
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
||||
+ if (callPrivilegedMount())
|
||||
+ return;
|
||||
+ // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
|
||||
+ }
|
||||
m_setupInProgress = false;
|
||||
emit setupDone(Solid::UnauthorizedOperation,
|
||||
error.name()+": "+error.message(),
|
||||
QString(error.name()+": "+error.message()),
|
||||
m_device->udi());
|
||||
} else if (m_teardownInProgress) {
|
||||
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
||||
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
||||
+ if (callPrivilegedUnmount())
|
||||
+ return;
|
||||
+ // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
|
||||
+ }
|
||||
m_teardownInProgress = false;
|
||||
emit teardownDone(Solid::UnauthorizedOperation,
|
||||
error.name()+": "+error.message(),
|
||||
@@ -294,8 +306,9 @@
|
||||
QString(error.name()+": "+error.message()),
|
||||
@@ -311,8 +323,9 @@
|
||||
#else
|
||||
QString uid="uid=";
|
||||
#endif
|
||||
|
@ -44,7 +44,7 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||
}
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
@@ -333,6 +346,59 @@
|
||||
@@ -354,6 +367,59 @@
|
||||
SLOT(slotDBusError(const QDBusError &)));
|
||||
}
|
||||
|
||||
|
@ -104,10 +104,10 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||
bool StorageAccess::callHalVolumeUnmount()
|
||||
{
|
||||
QDBusConnection c = QDBusConnection::systemBus();
|
||||
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h
|
||||
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h 2008-05-21 13:07:38.000000000 +0200
|
||||
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h 2008-11-10 18:45:01.000000000 +0100
|
||||
@@ -69,6 +69,9 @@
|
||||
diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
|
||||
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h 2009-12-01 01:27:28.000000000 +0100
|
||||
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2009-12-03 03:49:55.000000000 +0100
|
||||
@@ -70,6 +70,9 @@
|
||||
bool callSystemMount();
|
||||
bool callSystemUnmount();
|
||||
|
|
@ -1,133 +1,6 @@
|
|||
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-01-07 01:13:55.000000000 +0100
|
||||
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake 2009-01-07 22:42:22.000000000 +0100
|
||||
@@ -15,10 +15,10 @@
|
||||
# The following variables are defined for the various tools required to
|
||||
# compile KDE software:
|
||||
#
|
||||
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
|
||||
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
|
||||
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
|
||||
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
|
||||
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
|
||||
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
|
||||
#
|
||||
# The following variables point to the location of the KDE libraries,
|
||||
# but shouldn't be used directly:
|
||||
@@ -131,7 +131,7 @@
|
||||
# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
|
||||
#
|
||||
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
||||
-# Use this to add widget description files for the makekdewidgets code generator
|
||||
+# Use this to add widget description files for the makekdewidgets4 code generator
|
||||
# for Qt Designer plugins.
|
||||
#
|
||||
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
|
||||
@@ -370,23 +370,23 @@ if (_kdeBootStrapping)
|
||||
if (WIN32)
|
||||
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
|
||||
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
|
||||
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
|
||||
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
|
||||
|
||||
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
|
||||
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
|
||||
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
|
||||
else (WIN32)
|
||||
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
|
||||
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
|
||||
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
|
||||
|
||||
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
|
||||
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
|
||||
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
|
||||
endif (WIN32)
|
||||
|
||||
set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
|
||||
|
||||
# when building kdelibs, make the kcfg rules depend on the binaries...
|
||||
- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
|
||||
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
|
||||
+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
|
||||
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
|
||||
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
||||
|
||||
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
||||
@@ -488,7 +488,8 @@ else (_kdeBootStrapping)
|
||||
|
||||
# KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
|
||||
# use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
|
||||
- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
|
||||
+ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
|
||||
+ link_directories("${KDE4_LIB_DIR}")
|
||||
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
|
||||
|
||||
|
||||
@@ -501,12 +502,12 @@ else (_kdeBootStrapping)
|
||||
|
||||
# get the build CONFIGURATIONS which were exported in this file, and use just the first
|
||||
# of them to get the location of the installed executables
|
||||
- get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
|
||||
+ get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
|
||||
list(GET _importedConfigurations 0 _firstConfig)
|
||||
|
||||
- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig})
|
||||
+ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${firstConfig})
|
||||
get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${firstConfig})
|
||||
- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${firstConfig})
|
||||
+ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${firstConfig})
|
||||
|
||||
# allow searching cmake modules in all given kde install locations (KDEDIRS based)
|
||||
execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
@@ -738,7 +739,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
|
||||
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
||||
"${KDE4_BIN_INSTALL_DIR}" )
|
||||
|
||||
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
|
||||
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
"${KDE4_LIB_INSTALL_DIR}" )
|
||||
|
||||
# under Windows dlls may be also installed in bin/
|
||||
@@ -1121,9 +1123,9 @@ macro (KDE4_PRINT_RESULTS)
|
||||
endif (NOT _kdeBootStrapping)
|
||||
|
||||
if(KDE4_KCFGC_EXECUTABLE)
|
||||
- message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
|
||||
+ message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
|
||||
else(KDE4_KCFGC_EXECUTABLE)
|
||||
- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
|
||||
+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
|
||||
endif(KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
if(AUTOMOC4_EXECUTABLE)
|
||||
@@ -1142,7 +1145,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
|
||||
endif (NOT KDE4_INSTALLED_VERSION_OK)
|
||||
|
||||
if (NOT KDE4_KCFGC_EXECUTABLE)
|
||||
- message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
|
||||
+ message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
|
||||
endif (NOT KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
|
||||
diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200
|
||||
+++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh 2009-01-07 22:04:13.000000000 +0100
|
||||
@@ -2,9 +2,9 @@
|
||||
# Generates and cleans KConfigXT source code during a API dox build
|
||||
#
|
||||
|
||||
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
|
||||
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
|
||||
if test -z "$kcfg_compiler"; then
|
||||
- echo "kconfig_compiler not found!"
|
||||
+ echo "kconfig_compiler4 not found!"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200
|
||||
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl 2009-01-07 22:04:13.000000000 +0100
|
||||
diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500
|
||||
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
||||
|
||||
$kcfgc = $file . "c";
|
||||
|
@ -143,15 +16,15 @@ diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kde
|
|||
exit 1;
|
||||
}
|
||||
|
||||
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-01-06 18:27:49.000000000 +0100
|
||||
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt 2009-01-07 22:44:57.000000000 +0100
|
||||
@@ -8,13 +8,13 @@ add_subdirectory( example )
|
||||
diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-10-26 04:15:46.000000000 -0500
|
||||
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -4,13 +4,13 @@
|
||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||
|
||||
|
||||
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
|
||||
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
|
||||
-kde4_add_executable(kconfig_compiler NOGUI ${kconfig_compiler_SRCS})
|
||||
+kde4_add_executable(kconfig_compiler4 NOGUI ${kconfig_compiler_SRCS})
|
||||
|
||||
-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
+target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
|
@ -163,27 +36,126 @@ diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel k
|
|||
|
||||
|
||||
########### install files ###############
|
||||
diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200
|
||||
+++ kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-01-07 22:04:13.000000000 +0100
|
||||
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
||||
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
|
||||
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
|
||||
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
|
||||
diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-12-17 10:33:38.000000000 -0600
|
||||
+++ kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -15,10 +15,10 @@
|
||||
# The following variables are defined for the various tools required to
|
||||
# compile KDE software:
|
||||
#
|
||||
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
|
||||
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
|
||||
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
|
||||
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
|
||||
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
|
||||
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
|
||||
#
|
||||
# The following variables point to the location of the KDE libraries,
|
||||
# but shouldn't be used directly:
|
||||
@@ -138,7 +138,7 @@
|
||||
# relative path to the file.
|
||||
#
|
||||
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
||||
-# Use this to add widget description files for the makekdewidgets code generator
|
||||
+# Use this to add widget description files for the makekdewidgets4 code generator
|
||||
# for Qt Designer plugins.
|
||||
#
|
||||
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
|
||||
@@ -421,25 +421,25 @@ if (_kdeBootStrapping)
|
||||
if (WIN32)
|
||||
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
|
||||
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
|
||||
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
|
||||
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
|
||||
|
||||
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
|
||||
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
|
||||
diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel 2009-01-06 18:27:44.000000000 +0100
|
||||
+++ kdelibs-4.1.96/kdewidgets/CMakeLists.txt 2009-01-07 22:46:30.000000000 +0100
|
||||
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
|
||||
set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen )
|
||||
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
|
||||
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
|
||||
else (WIN32)
|
||||
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
|
||||
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
||||
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
||||
set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
||||
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
||||
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
||||
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
||||
endif (WIN32)
|
||||
|
||||
set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
|
||||
|
||||
# when building kdelibs, make the kcfg rules depend on the binaries...
|
||||
- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
|
||||
+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
|
||||
set( _KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP kauth-policy-gen)
|
||||
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
|
||||
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
|
||||
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
||||
|
||||
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
||||
@@ -487,7 +487,8 @@ else (_kdeBootStrapping)
|
||||
|
||||
# KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
|
||||
# use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
|
||||
- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
|
||||
+ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
|
||||
+ link_directories("${KDE4_LIB_DIR}")
|
||||
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
|
||||
|
||||
|
||||
@@ -503,10 +504,10 @@ else (_kdeBootStrapping)
|
||||
get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
|
||||
list(GET _importedConfigurations 0 _firstConfig)
|
||||
|
||||
- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
|
||||
+ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
|
||||
get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig})
|
||||
get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${KDE4_TARGET_PREFIX}kauth-policy-gen LOCATION_${_firstConfig})
|
||||
- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig})
|
||||
+ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${_firstConfig})
|
||||
|
||||
# allow searching cmake modules in all given kde install locations (KDEDIRS based)
|
||||
execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
@@ -830,7 +831,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
|
||||
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
||||
"${KDE4_BIN_INSTALL_DIR}" )
|
||||
|
||||
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
|
||||
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
"${KDE4_LIB_INSTALL_DIR}" )
|
||||
|
||||
# under Windows dlls may be also installed in bin/
|
||||
@@ -1224,9 +1227,9 @@ macro (KDE4_PRINT_RESULTS)
|
||||
endif (NOT _kdeBootStrapping)
|
||||
|
||||
if(KDE4_KCFGC_EXECUTABLE)
|
||||
- message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
|
||||
+ message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
|
||||
else(KDE4_KCFGC_EXECUTABLE)
|
||||
- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
|
||||
+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
|
||||
endif(KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
if(AUTOMOC4_EXECUTABLE)
|
||||
@@ -1245,7 +1248,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
|
||||
endif (NOT KDE4_INSTALLED_VERSION_OK)
|
||||
|
||||
if (NOT KDE4_KCFGC_EXECUTABLE)
|
||||
- message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
|
||||
+ message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
|
||||
endif (NOT KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
|
||||
diff -up kdelibs-4.3.85/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.3.85/kdewidgets/CMakeLists.txt.parallel_devel 2009-09-23 14:23:44.000000000 -0500
|
||||
+++ kdelibs-4.3.85/kdewidgets/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -14,24 +14,24 @@ include_directories(
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
||||
|
||||
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
||||
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
||||
-kde4_add_executable(makekdewidgets NOGUI ${makekdewidgets_SRCS})
|
||||
+kde4_add_executable(makekdewidgets4 NOGUI ${makekdewidgets_SRCS})
|
||||
|
||||
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
||||
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
||||
|
@ -208,3 +180,39 @@ diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/
|
|||
|
||||
set(kdewidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
@@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
|
||||
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
|
||||
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
|
||||
- MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
|
||||
+ MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
|
||||
|
||||
set(kde3supportwidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
diff -up kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-08-12 05:00:20.000000000 -0500
|
||||
+++ kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
||||
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
|
||||
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
|
||||
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
|
||||
|
||||
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
|
||||
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
|
||||
diff -up kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 06:07:26.000000000 -0500
|
||||
+++ kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -2,9 +2,9 @@
|
||||
# Generates and cleans KConfigXT source code during a API dox build
|
||||
#
|
||||
|
||||
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
|
||||
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
|
||||
if test -z "$kcfg_compiler"; then
|
||||
- echo "kconfig_compiler not found!"
|
||||
+ echo "kconfig_compiler4 not found!"
|
||||
exit 1;
|
||||
fi
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -up kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css kdelibs-4.3.90/doc/common/CMakeLists.txt
|
||||
--- kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css 2010-01-06 10:58:53.000000000 -0600
|
||||
+++ kdelibs-4.3.90/doc/common/CMakeLists.txt 2010-01-06 13:33:35.920884922 -0600
|
||||
@@ -8,6 +8,8 @@ install(FILES
|
||||
kde-docs.css
|
||||
doxygen.css
|
||||
tabs.css
|
||||
+ kde.css flat.css print.css
|
||||
+ Doxyfile.global
|
||||
header.html
|
||||
footer.html
|
||||
mainheader.html
|
|
@ -0,0 +1,25 @@
|
|||
diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-02-02 08:56:04.117624211 -0600
|
||||
+++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake 2010-02-02 09:51:15.752373945 -0600
|
||||
@@ -947,10 +947,19 @@ if (UNIX)
|
||||
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
|
||||
else (APPLE)
|
||||
# add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
|
||||
- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
|
||||
+ # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
|
||||
+ message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
|
||||
+ message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
|
||||
+ list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
|
||||
+ message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
|
||||
+ if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
|
||||
+ message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
|
||||
+ list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
|
||||
+ endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
|
||||
+
|
||||
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
|
||||
endif (APPLE)
|
||||
endif (UNIX)
|
||||
|
|
@ -0,0 +1,168 @@
|
|||
--- branches/KDE/4.4/kdelibs/kdeui/util/kpixmapcache.cpp 2010/01/24 02:37:20 1079318
|
||||
+++ branches/KDE/4.4/kdelibs/kdeui/util/kpixmapcache.cpp 2010/03/25 02:24:54 1107210
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <kstandarddirs.h>
|
||||
#include <kdebug.h>
|
||||
#include <klockfile.h>
|
||||
+#include <ksavefile.h>
|
||||
#include <ksvgrenderer.h>
|
||||
#include <kdefakes.h>
|
||||
|
||||
@@ -633,6 +634,10 @@
|
||||
qint32 leftchild, rightchild;
|
||||
stream >> fkey >> foffset >> timesused >> lastused >> leftchild >> rightchild;
|
||||
|
||||
+ if (fkey.isEmpty()) {
|
||||
+ return start;
|
||||
+ }
|
||||
+
|
||||
if (key < fkey) {
|
||||
if (leftchild) {
|
||||
return binarySearchKey(stream, key, leftchild);
|
||||
@@ -660,12 +665,23 @@
|
||||
// exist yet and there are no entries. Otherwise, do a binary search
|
||||
// starting from the root node.
|
||||
if (!stream.atEnd()) {
|
||||
+ // One exception is that the root node may exist but be invalid,
|
||||
+ // which can happen when the cache data is discarded. This is
|
||||
+ // represented by an empty fkey
|
||||
+ QString fkey;
|
||||
+ stream >> fkey;
|
||||
+
|
||||
+ if (fkey.isEmpty()) {
|
||||
+ delete device;
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
int nodeoffset = binarySearchKey(stream, key, mIndexRootOffset);
|
||||
|
||||
// Load the found entry and check if it's the one we're looking for.
|
||||
device->seek(nodeoffset);
|
||||
- QString fkey;
|
||||
stream >> fkey;
|
||||
+
|
||||
if (fkey == key) {
|
||||
// Read offset and statistics
|
||||
qint32 foffset;
|
||||
@@ -814,7 +830,9 @@
|
||||
QString fkey;
|
||||
stream.device()->seek(parentoffset);
|
||||
stream >> fkey;
|
||||
- if (key == fkey) {
|
||||
+
|
||||
+ // The key would be empty if the cache had been discarded.
|
||||
+ if (key == fkey || fkey.isEmpty()) {
|
||||
// We're overwriting an existing entry
|
||||
offset = parentoffset;
|
||||
}
|
||||
@@ -1195,16 +1213,14 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
- d->invalidateMmapFiles();
|
||||
- d->unmmapFiles();
|
||||
-
|
||||
- d->mEnabled = false;
|
||||
-
|
||||
KPCLockFile lock(d->mLockFileName);
|
||||
// Hope we got the lock...
|
||||
|
||||
+ d->invalidateMmapFiles();
|
||||
+ d->mEnabled = false;
|
||||
+
|
||||
// Create index file
|
||||
- QFile indexfile(d->mIndexFile);
|
||||
+ KSaveFile indexfile(d->mIndexFile);
|
||||
if (!indexfile.open(QIODevice::WriteOnly)) {
|
||||
kError() << "Couldn't create index file" << d->mIndexFile;
|
||||
return false;
|
||||
@@ -1212,7 +1228,7 @@
|
||||
|
||||
d->mCacheId = ::time(0);
|
||||
d->mTimestamp = ::time(0);
|
||||
-
|
||||
+
|
||||
// We can't know the full size until custom headers written.
|
||||
// mmapFiles() will take care of correcting the size.
|
||||
KPixmapCacheIndexHeader indexHeader = { {0}, KPIXMAPCACHE_VERSION, 0, d->mCacheId, d->mTimestamp };
|
||||
@@ -1221,7 +1237,7 @@
|
||||
indexfile.write(reinterpret_cast<char*>(&indexHeader), sizeof indexHeader);
|
||||
|
||||
// Create data file
|
||||
- QFile datafile(d->mDataFile);
|
||||
+ KSaveFile datafile(d->mDataFile);
|
||||
if (!datafile.open(QIODevice::WriteOnly)) {
|
||||
kError() << "Couldn't create data file" << d->mDataFile;
|
||||
return false;
|
||||
@@ -1243,40 +1259,54 @@
|
||||
// Close the files and mmap them (if mmapping is used)
|
||||
indexfile.close();
|
||||
datafile.close();
|
||||
+ indexfile.finalize();
|
||||
+ datafile.finalize();
|
||||
+
|
||||
d->mEnabled = true;
|
||||
d->mmapFiles();
|
||||
+
|
||||
return true;
|
||||
}
|
||||
|
||||
void KPixmapCache::deleteCache(const QString& name)
|
||||
{
|
||||
- foreach (KPixmapCache::Private *d, Private::mCaches) {
|
||||
- if (d->mName == name && d->mInited) {
|
||||
- d->q->discard();
|
||||
- }
|
||||
- }
|
||||
+ QString indexFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + name + ".index");
|
||||
+ QString dataFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + name + ".data");
|
||||
+
|
||||
+ QFile::remove(indexFile);
|
||||
+ QFile::remove(dataFile);
|
||||
}
|
||||
|
||||
void KPixmapCache::discard()
|
||||
{
|
||||
- d->invalidateMmapFiles();
|
||||
- d->unmmapFiles();
|
||||
- d->mInited = false;
|
||||
+ // To "discard" the cache we simply have to make sure that every that
|
||||
+ // was in there before is no longer present when we search for them.
|
||||
+ // Easiest way to do *that* is to simply delete the index.
|
||||
+
|
||||
+ KPCLockFile lock(d->mLockFileName);
|
||||
+ if(!lock.isValid()) {
|
||||
+ kError(264) << "Unable to lock pixmap cache when trying to discard it";
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ QIODevice *device = d->indexDevice();
|
||||
+ if (!device) {
|
||||
+ kError(264) << "Unable to access index when trying to discard cache";
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ device->seek(d->mIndexRootOffset);
|
||||
+ QDataStream stream(device);
|
||||
+
|
||||
+ // Stream an empty QString as the hash key to signify that the cache
|
||||
+ // has been discarded.
|
||||
+ stream << QString();
|
||||
|
||||
if (d->mUseQPixmapCache) {
|
||||
// TODO: This is broken, it removes every cached QPixmap in the whole
|
||||
// process, not just this KPixmapCache.
|
||||
QPixmapCache::clear();
|
||||
}
|
||||
-
|
||||
- QString indexFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + d->mName + ".index");
|
||||
- QString dataFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + d->mName + ".data");
|
||||
-
|
||||
- QFile::remove(indexFile);
|
||||
- QFile::remove(dataFile);
|
||||
-
|
||||
- // No need to remove the lockfile
|
||||
- d->init();
|
||||
}
|
||||
|
||||
void KPixmapCache::removeEntries(int newsize)
|
625
kdelibs.spec
625
kdelibs.spec
|
@ -1,123 +1,122 @@
|
|||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.2.2
|
||||
Release: 5%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
%define attica_ver 0.1.2
|
||||
%define phonon_ver 4.3.80
|
||||
%define soprano_ver 2.4.0
|
||||
%define strigi_ver 0.7.1
|
||||
# to build/include apidocs or not
|
||||
%define apidocs 1
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.4.4
|
||||
Release: 1%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
Obsoletes: kdelibs4 < %{version}-%{release}
|
||||
Provides: kdelibs4 = %{version}-%{release}
|
||||
%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
|
||||
%else
|
||||
Name: kdelibs4
|
||||
%endif
|
||||
|
||||
# LGPLv2: everything, except (see below)
|
||||
# BSD: kdoctools/
|
||||
# GFDL: kdoctools/customization ?
|
||||
License: LGPLv2
|
||||
# http://techbase.kde.org/Policies/Licensing_Policy
|
||||
License: LGPLv2+
|
||||
URL: http://www.kde.org/
|
||||
Group: System Environment/Libraries
|
||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
|
||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%ifarch noarch
|
||||
%define apidocs 1
|
||||
%else
|
||||
%define rest 1
|
||||
%endif
|
||||
|
||||
BuildRequires: kde4-macros(api) >= 2
|
||||
BuildRequires: kde-filesystem >= 4-23
|
||||
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||
# used in kde.(sh|csh)
|
||||
Requires: coreutils grep
|
||||
# dbus-launch needed here? don't think so, but be safe and keep
|
||||
# for now -- Rex
|
||||
Requires: dbus-x11
|
||||
%endif
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: kde-filesystem >= 4-23
|
||||
Requires: kde-settings
|
||||
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
|
||||
Requires: shared-mime-info
|
||||
%if "%{name}" == "kdelibs"
|
||||
Requires: kdelibs-common
|
||||
%endif
|
||||
%if 0%{?fedora} >= 9
|
||||
# versioned dep ok, as long as it comes from *here*
|
||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||
Requires: hal
|
||||
Requires: hunspell
|
||||
%endif
|
||||
Requires: phonon%{?_isa} >= 4.3.0
|
||||
Requires: soprano%{?_isa} >= 2.2
|
||||
Requires: strigi-libs%{?_isa} >= 0.6.3
|
||||
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
|
||||
Requires: phonon%{?_isa} >= %{phonon_version}
|
||||
Requires: shared-desktop-ontologies
|
||||
Requires: shared-mime-info
|
||||
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
|
||||
Requires: soprano%{?_isa} >= %{soprano_version}
|
||||
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
|
||||
Requires: strigi-libs%{?_isa} >= %{strigi_version}
|
||||
|
||||
Source1: kde4.sh
|
||||
Source2: kde4.csh
|
||||
|
||||
# make -devel packages parallel-installable
|
||||
Patch0: kdelibs-4.1.96-parallel_devel.patch
|
||||
Patch0: kdelibs-4.3.85-parallel_devel.patch
|
||||
# fix kde#149705
|
||||
Patch2: kdelibs-4.1.82-kde149705.patch
|
||||
Patch2: kdelibs-4.2.85-kde149705.patch
|
||||
## UPSTREAM ME
|
||||
# Hunspell support for K3Spell
|
||||
# http://fedoraproject.org/wiki/Releases/FeatureDictionary
|
||||
# http://bugs.kde.org/show_bug.cgi?id=154561
|
||||
Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
|
||||
# openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
|
||||
Patch6: kdelibs-4.0.0-openssl.patch
|
||||
# install all .css files and Doxyfile.global in kdelibs-common to build
|
||||
# kdepimlibs-apidocs against
|
||||
Patch8: kdelibs-4.0.2-install-all-css.patch
|
||||
Patch8: kdelibs-4.3.90-install_all_css.patch
|
||||
# add Fedora/V-R to KHTML UA string
|
||||
Patch9: kdelibs-4.0.2-branding.patch
|
||||
# don't cache kdeglobals paths because they change after profile directories
|
||||
# are loaded from kde4rc
|
||||
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
||||
# workaround for policykit
|
||||
Patch11: kdelibs-4.1.72-policykit-workaround.patch
|
||||
Patch11: kdelibs-4.3.80-policykit-workaround.patch
|
||||
# COMMENT ME PLEASE
|
||||
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||
Patch14: kdelibs-4.0.85-libexecdir.patch
|
||||
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
|
||||
Patch14: kdelibs-4.2.85-libexecdir.patch
|
||||
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
||||
Patch18: kdelibs-4.1.72-kstandarddirs.patch
|
||||
# COMMENT ME PLEASE
|
||||
Patch20: kdelibs-4.1.70-cmake.patch
|
||||
Patch22: kdelibs-4.1.96-cmake.patch
|
||||
Patch23: kdelibs-4.2.0-gcc44-workaround.patch
|
||||
# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
|
||||
Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
|
||||
Patch25: kdelibs-4.2.0-gcc44-misc.patch
|
||||
Patch26: kdelibs-4.2.2-plasma-focus.patch
|
||||
# disable drkonqi by default, RHEL prefers/wants abrt
|
||||
Patch24: kdelibs-4.3.1-drkonq.patch
|
||||
# die rpath die, since we're using standard paths, we can avoid
|
||||
# this extra hassle (even though cmake is *supposed* to not add standard
|
||||
# paths (like /usr/lib64) already! With this, we can drop
|
||||
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
||||
Patch27: kdelibs-4.3.98-no_rpath.patch
|
||||
|
||||
# upstream
|
||||
# 4.2 branch
|
||||
Patch100: kdelibs-4.2.2-kio_http.patch
|
||||
Patch101: kdelibs-4.2.2-kjob.patch
|
||||
Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
|
||||
# upstreamable
|
||||
|
||||
# 4.3 branch
|
||||
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
|
||||
## 4.4 upstream
|
||||
|
||||
BuildRequires: qt4-devel >= 4.4.0
|
||||
# qt4%{_?_isa} isn't provided yet -- Rex
|
||||
#Requires: qt4%{?_isa} >= %{_qt4_version}
|
||||
Requires: qt4 >= %{_qt4_version}
|
||||
## trunk upstream
|
||||
|
||||
## security fix
|
||||
# Not Upstreamed? why not ? -- Rex
|
||||
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} < 13
|
||||
Conflicts: kdebase-workspace-libs < 4.3.80
|
||||
%endif
|
||||
|
||||
BuildRequires: qt4-devel >= 4.6.0
|
||||
BuildRequires: qt4-webkit-devel
|
||||
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||
Requires: xdg-utils
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
BuildRequires: alsa-lib-devel
|
||||
%if 0%{?fedora} < 9
|
||||
# we don't want a hard dependency on aspell on F9+, use enchant only
|
||||
BuildRequires: aspell-devel
|
||||
%endif
|
||||
BuildRequires: attica-devel >= %{attica_ver}
|
||||
BuildRequires: automoc4 >= 0.9.88
|
||||
BuildRequires: avahi-devel
|
||||
BuildRequires: bison flex
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: cmake >= 2.6.2-3
|
||||
BuildRequires: cmake >= 2.6.4
|
||||
BuildRequires: cups-devel cups
|
||||
BuildRequires: enchant-devel
|
||||
BuildRequires: gamin-devel
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: giflib-devel
|
||||
# busted at least on x86_64
|
||||
#BuildRequires: hspell-devel
|
||||
BuildRequires: jasper-devel
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libacl-devel libattr-devel
|
||||
|
@ -125,20 +124,22 @@ BuildRequires: libjpeg-devel
|
|||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libxslt-devel libxml2-devel
|
||||
BuildRequires: libutempter-devel
|
||||
BuildRequires: OpenEXR-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: phonon-devel >= 4.3.0
|
||||
BuildRequires: phonon-devel >= %{phonon_ver}
|
||||
BuildRequires: polkit-qt-devel
|
||||
BuildRequires: qca2-devel
|
||||
BuildRequires: shared-desktop-ontologies-devel
|
||||
BuildRequires: shared-mime-info
|
||||
BuildRequires: soprano-devel >= 2.2
|
||||
BuildRequires: strigi-devel >= 0.6.3
|
||||
BuildRequires: soprano-devel >= %{soprano_ver}
|
||||
BuildRequires: strigi-devel >= %{strigi_ver}
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libutempter-devel
|
||||
# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
|
||||
%define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
|
||||
%{?x_deps:BuildRequires: %{x_deps}}
|
||||
BuildRequires: openssh-clients
|
||||
BuildRequires: subversion
|
||||
|
||||
%if 0%{?apidocs}
|
||||
BuildRequires: doxygen
|
||||
|
@ -149,35 +150,57 @@ BuildRequires: qt4-doc
|
|||
Provides: kross(javascript) = %{version}-%{release}
|
||||
Provides: kross(qtscript) = %{version}-%{release}
|
||||
|
||||
%description
|
||||
Libraries for the K Desktop Environment 4.
|
||||
Provides: kdelibs-experimental = %{version}-%{release}
|
||||
Obsoletes: kdelibs-experimental < 4.3.75
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} < 15
|
||||
Obsoletes: webkitkde < 0.0.6
|
||||
%endif
|
||||
|
||||
%description
|
||||
Libraries for KDE 4.
|
||||
|
||||
%if "%{name}" == "kdelibs"
|
||||
%package common
|
||||
Group: System Environment/Libraries
|
||||
Summary: Common files for KDE 3 and KDE 4 libraries
|
||||
%description common
|
||||
This package includes the common files for the KDE 3 and KDE 4 libraries.
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Header files for compiling KDE 4 applications
|
||||
# stuff moved, help upgrade path
|
||||
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||
Conflicts: kdebase-runtime < 4.2.90
|
||||
%endif
|
||||
%if 0%{?fedora} && 0%{?fedora} < 13
|
||||
Conflicts: kdebase-workspace-devel < 4.3.80
|
||||
Obsoletes: kdelibs-experimental-devel < 4.3.75
|
||||
Provides: kdelibs-experimental-devel = %{version}-%{release}
|
||||
%endif
|
||||
%if 0%{?fedora} && 0%{?fedora} < 15
|
||||
Obsoletes: webkitkde-devel < 0.0.6
|
||||
%endif
|
||||
Provides: plasma-devel = %{version}-%{release}
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if "%{name}" != "kdelibs4"
|
||||
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
||||
Provides: kdelibs4-devel = %{version}-%{release}
|
||||
%endif
|
||||
Requires: cmake >= 2.6.2-3
|
||||
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
|
||||
Requires: attica-devel >= %{attica_ver}
|
||||
Requires: automoc4 >= 0.9.88
|
||||
Requires: qt4-devel
|
||||
Requires: cmake >= 2.6.4
|
||||
Requires: openssl-devel
|
||||
Requires: phonon-devel
|
||||
Provides: nepomuk-devel = %{version}-%{release}
|
||||
# considered part of nepomuk-devel
|
||||
Requires: shared-desktop-ontologies-devel soprano-devel
|
||||
Requires: qt4-devel
|
||||
Requires: qt4-webkit-devel
|
||||
# do we really still need all these below? -- Rex
|
||||
Requires: strigi-devel
|
||||
Requires: bzip2-devel gamin-devel libacl-devel
|
||||
%{?x_deps:Requires: %{x_deps}}
|
||||
|
||||
%description devel
|
||||
This package includes the header files you will need to compile
|
||||
applications for KDE 4.
|
||||
|
@ -188,14 +211,8 @@ Summary: KDE 4 API documentation
|
|||
# Not strictly required -- Rex
|
||||
# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: kde-filesystem
|
||||
%if "%{name}" != "kdelibs4"
|
||||
Provides: kdelibs4-apidocs = %{version}-%{release}
|
||||
#else
|
||||
# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs
|
||||
# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be
|
||||
# worth it anyway.
|
||||
#Provides: kdelibs-apidocs = 6:%{version}-%{release}
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
%description apidocs
|
||||
This package includes the KDE 4 API documentation in HTML
|
||||
|
@ -203,50 +220,42 @@ format for easy browsing.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n kdelibs-%{version}
|
||||
%setup -q -n kdelibs-%{version}%{?alphatag}
|
||||
|
||||
%patch0 -p1 -b .parallel_devel
|
||||
%patch2 -p1 -b .kde149705
|
||||
%if 0%{?fedora} >= 9
|
||||
%patch5 -p1 -b .k3spell-hunspell
|
||||
%else
|
||||
# shouldn't be needed f9+, we'll see -- Rex
|
||||
%patch6 -p1 -b .openssl
|
||||
%endif
|
||||
%patch8 -p1 -b .all-css
|
||||
%patch8 -p1 -b .install_all_css
|
||||
%patch9 -p1 -b .branding
|
||||
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
||||
%patch10 -p1 -b .no-cache-kdeglobals-paths
|
||||
%patch11 -p1 -b .policykit
|
||||
%patch12 -p1 -b .Administration-menu
|
||||
%patch14 -p1 -b .libexecdir
|
||||
%patch18 -p1 -b .kstandarddirs
|
||||
%patch20 -p1 -b .xxcmake
|
||||
%patch22 -p1 -b .kdepimlibs-cmake
|
||||
%patch23 -p1 -b .gcc44
|
||||
%patch24 -p1 -b .kjs-gcc44-crash
|
||||
%patch25 -p1 -b .gcc44-misc
|
||||
%patch26 -p1 -b .kickoff-focus
|
||||
%if 0%{?rhel} > 5
|
||||
%patch24 -p1 -b .drkonq
|
||||
%endif
|
||||
%patch27 -p1 -b .no_rpath
|
||||
|
||||
# upstreamable patches
|
||||
|
||||
# upstream patches
|
||||
# 4.2
|
||||
%patch100 -p0 -b .kio_http
|
||||
%patch101 -p0 -b .kjob
|
||||
%patch102 -p4 -b .bidi-kde#189161
|
||||
|
||||
# 4.3
|
||||
%patch200 -p1 -b .AllowExternalPaths
|
||||
# security fix
|
||||
%patch200 -p1 -b .CVE-2009-2702
|
||||
|
||||
|
||||
%build
|
||||
|
||||
# add release version
|
||||
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
||||
|
||||
mkdir -p %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
|
||||
popd
|
||||
|
||||
%if 0%{?rest}
|
||||
make %{?_smp_mflags} -C %{_target_platform}
|
||||
%endif
|
||||
|
||||
# build apidocs
|
||||
%if 0%{?apidocs}
|
||||
|
@ -258,7 +267,6 @@ doc/api/doxygen.sh .
|
|||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%if 0%{?rest}
|
||||
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
||||
|
||||
# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
|
||||
|
@ -268,16 +276,6 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
|
|||
# create/own, see http://bugzilla.redhat.com/483318
|
||||
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
|
||||
|
||||
%if "%{name}" != "kdelibs"
|
||||
# remove files which conflict with KDE 3
|
||||
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
|
||||
%{buildroot}%{_kde4_bindir}/kunittestmodrunner
|
||||
rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
|
||||
%{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
|
||||
rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
|
||||
rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
|
||||
%endif
|
||||
|
||||
# move devel symlinks
|
||||
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
|
||||
pushd %{buildroot}%{_kde4_libdir}
|
||||
|
@ -296,8 +294,10 @@ do
|
|||
done
|
||||
popd
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
|
||||
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
|
||||
%endif
|
||||
|
||||
# fix Sonnet documentation multilib conflict
|
||||
bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
|
||||
|
@ -306,11 +306,10 @@ bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
|
|||
|
||||
# install apidocs and generator script
|
||||
install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
|
||||
%endif
|
||||
|
||||
%if 0%{?apidocs}
|
||||
mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
|
||||
cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
|
||||
cp -prf kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
|
||||
%endif
|
||||
|
||||
|
||||
|
@ -337,25 +336,30 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
|
|||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%if 0%{?rest}
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS README TODO
|
||||
%doc COPYING.LIB
|
||||
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/*
|
||||
%endif
|
||||
%{_kde4_bindir}/*
|
||||
%exclude %{_kde4_bindir}/kconfig_compiler4
|
||||
%{_kde4_appsdir}/*
|
||||
# kdewidgets
|
||||
%exclude %{_kde4_bindir}/makekdewidgets4
|
||||
%exclude %{_kde4_bindir}/kde4-doxygen.sh
|
||||
%exclude %{_kde4_appsdir}/kdewidgets/
|
||||
%exclude %{_kde4_appsdir}/cmake/
|
||||
%{_kde4_configdir}/*
|
||||
%{_datadir}/dbus-1/interfaces/*
|
||||
%{_datadir}/dbus-1/system-services/*
|
||||
%{_polkit_qt_policydir}/org.kde.kcontrol.kcmremotewidgets.policy
|
||||
%{_sysconfdir}/dbus-1/system.d/*
|
||||
%{_kde4_datadir}/mime/packages/kde.xml
|
||||
%{_kde4_sharedir}/kde4/services/*
|
||||
%{_kde4_sharedir}/kde4/servicetypes/*
|
||||
%{_kde4_iconsdir}/hicolor/*/actions/*
|
||||
%{_kde4_iconsdir}/hicolor/*/*/*
|
||||
%{_kde4_docdir}/HTML/en/sonnet/
|
||||
%{_kde4_docdir}/HTML/en/kioslave/
|
||||
%{_kde4_libdir}/lib*.so.*
|
||||
|
@ -363,12 +367,39 @@ rm -rf %{buildroot}
|
|||
%{_kde4_libdir}/kconf_update_bin/
|
||||
%dir %{_kde4_libdir}/kde4/
|
||||
%{_kde4_libdir}/kde4/*.so
|
||||
%{_kde4_libexecdir}/*
|
||||
%{_kde4_libexecdir}/filesharelist
|
||||
%{_kde4_libexecdir}/fileshareset
|
||||
%{_kde4_libexecdir}/kauth-policy-gen
|
||||
%{_kde4_libexecdir}/kcmremotewidgetshelper
|
||||
%{_kde4_libexecdir}/kconf_update
|
||||
%{_kde4_libexecdir}/kdesu_stub
|
||||
%{_kde4_libexecdir}/kdontchangethehostname
|
||||
%{_kde4_libexecdir}/kio_http_cache_cleaner
|
||||
%{_kde4_libexecdir}/kioslave
|
||||
%{_kde4_libexecdir}/klauncher
|
||||
%{_kde4_libexecdir}/kmailservice
|
||||
# see kio/misc/kpac/README.wpad
|
||||
%attr(4755,root,root) %{_kde4_libexecdir}/kpac_dhcp_helper
|
||||
%{_kde4_libexecdir}/ksendbugmail
|
||||
%{_kde4_libexecdir}/ktelnetservice
|
||||
%{_kde4_libexecdir}/lnusertemp
|
||||
%{_kde4_libexecdir}/start_kdeinit
|
||||
%{_kde4_libexecdir}/start_kdeinit_wrapper
|
||||
%{_kde4_libdir}/kde4/plugins/
|
||||
%{_kde4_sysconfdir}/xdg/menus/*.menu
|
||||
%doc %{_mandir}/man*/*
|
||||
# kdelibs-common comes from here for fedora >= 9
|
||||
%if "%{name}" == "kdelibs"
|
||||
%{_mandir}/man1/checkXML.1*
|
||||
%{_mandir}/man1/kde4-config.1*
|
||||
%{_mandir}/man1/kjs.1*
|
||||
%{_mandir}/man1/kjscmd.1*
|
||||
%{_mandir}/man1/kross.1*
|
||||
%{_mandir}/man7/kdeoptions.7*
|
||||
%{_mandir}/man7/qtoptions.7*
|
||||
%{_mandir}/man8/kbuildsycoca4.8*
|
||||
%{_mandir}/man8/kcookiejar4.8*
|
||||
%{_mandir}/man8/kded4.8*
|
||||
%{_mandir}/man8/kdeinit4.8*
|
||||
%{_mandir}/man8/meinproc4.8*
|
||||
# these are in kdelibs-common:
|
||||
%exclude %{_kde4_configdir}/kdebug.areas
|
||||
%exclude %{_kde4_configdir}/kdebugrc
|
||||
%exclude %{_kde4_configdir}/ui/ui_standards.rc
|
||||
|
@ -395,11 +426,12 @@ rm -rf %{buildroot}
|
|||
%{_kde4_appsdir}/kdeui
|
||||
%{_kde4_docdir}/HTML/en/common/
|
||||
%{_kde4_datadir}/locale/all_languages/
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc KDE4PORTING.html
|
||||
%{_mandir}/man1/kdecmake.1*
|
||||
%{_mandir}/man1/makekdewidgets.1*
|
||||
%{_kde4_bindir}/kconfig_compiler4
|
||||
%{_kde4_bindir}/makekdewidgets4
|
||||
%{_kde4_bindir}/kde4-doxygen.sh
|
||||
|
@ -407,7 +439,6 @@ rm -rf %{buildroot}
|
|||
%{_kde4_appsdir}/kdewidgets/
|
||||
%{_kde4_includedir}/*
|
||||
%{_kde4_libdir}/kde4/devel/
|
||||
%endif
|
||||
|
||||
%if 0%{?apidocs}
|
||||
%files apidocs
|
||||
|
@ -417,6 +448,348 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun May 30 2010 Than Ngo <than@redhat.com> - 6:4.4.4-1
|
||||
- 4.4.4
|
||||
|
||||
* Sun May 16 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.3-5
|
||||
- Web proxy auto-discovery (WPAD) fails (#592658)
|
||||
|
||||
* Sat May 08 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.3-4
|
||||
- -devel: Req: qt4-webkit-devel
|
||||
|
||||
* Sat May 08 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.3-3
|
||||
- BR: qt4-webkit-devel
|
||||
|
||||
* Wed May 05 2010 Than Ngo <than@redhat.com> - 6:4.4.3-2
|
||||
- respin
|
||||
|
||||
* Fri Apr 30 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.3-1
|
||||
- 4.4.3
|
||||
|
||||
* Sun Apr 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-5
|
||||
- rebuild (soprano)
|
||||
|
||||
* Sat Apr 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-4
|
||||
- fix kidletime (kde#231628,kde#227279,kde#218468)
|
||||
- kate part ignores japanese input from input method (#585242,kde#206455)
|
||||
|
||||
* Thu Apr 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-3
|
||||
- cleanup/fix webkitkde Obsoletes a bit more (#582469)
|
||||
- (Build)Requies: cmake >= 2.6.4
|
||||
|
||||
* Fri Apr 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-2
|
||||
- Obsoletes: webkitkde < 0.0.6 (#576634)
|
||||
|
||||
* Mon Mar 29 2010 Lukas Tinkl <ltinkl@redhat.com> - 6:4.4.2-1
|
||||
- 4.4.2
|
||||
|
||||
* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-10
|
||||
- drop BR: openssh-clients subversion
|
||||
|
||||
* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-9
|
||||
- refresh kdelibs-4.4.2-kpixmapcache.patch
|
||||
|
||||
* Wed Mar 24 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-8
|
||||
- Obsoletes: webkitkde (#576634)
|
||||
|
||||
* Sat Mar 20 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-7
|
||||
- KDE default in noisy debug mode to stdout/stderr (kde#227089)
|
||||
- backport trunk/ fix building against qt-4.7
|
||||
|
||||
* Wed Mar 17 2010 Lukas Tinkl <ltinkl@redhat.com> - 6:4.4.1-6
|
||||
- fix crash in KPixmapCache (bug#568389)
|
||||
|
||||
* Tue Mar 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-5
|
||||
- rebuild (soprano)
|
||||
|
||||
* Tue Mar 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-4
|
||||
- Requires: hal (for solid)
|
||||
- drop Requires: dbus-x11 (it's already Req'd in kdebase-workspace)
|
||||
- drop Requires: coreutils grep (F-12+)
|
||||
- make Requires: kdelibs-common versioned
|
||||
|
||||
* Sun Feb 28 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-3
|
||||
- put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid
|
||||
%%_libdir/kde/devel rpaths (#568495)
|
||||
|
||||
* Sun Feb 28 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-2
|
||||
- update no_rpath patch, revert back to
|
||||
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE (#568495)
|
||||
|
||||
* Sat Feb 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-1
|
||||
- 4.4.1
|
||||
|
||||
* Fri Feb 19 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-9
|
||||
- -devel: Provides: nepomuk-devel, Requires: soprano-devel
|
||||
|
||||
* Tue Feb 16 2010 Than Ngo <than@redhat.com> - 6:4.4.0-8
|
||||
- krunner crash patch (kde#227118)
|
||||
- plasma crash patch (kde#226823)
|
||||
|
||||
* Sat Feb 13 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 6:4.4.0-7
|
||||
- rebuild for new kde-filesystem in F13, fixes kde4-config --libsuffix (#564712)
|
||||
|
||||
* Sat Feb 13 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-6
|
||||
- nepomuk_memleak patch
|
||||
|
||||
* Fri Feb 12 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-5
|
||||
- khtml_scrolling patch
|
||||
- drop khtml_svg_no_var_tracking_assignments patch
|
||||
|
||||
* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-4
|
||||
- depend on version of phonon,strigi,soprano built against
|
||||
|
||||
* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-3
|
||||
- respin
|
||||
|
||||
* Mon Feb 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-2
|
||||
- respin
|
||||
|
||||
* Fri Feb 05 2010 Than Ngo <than@redhat.com> - 6:4.4.0-1
|
||||
- 4.4.0
|
||||
|
||||
* Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-4
|
||||
- -apidocs: build as normal noarch subpkg
|
||||
|
||||
* Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-3
|
||||
- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in
|
||||
CMAKE_SYSTEM_LIBRARY_PATH. added some status messages to help debug.
|
||||
|
||||
* Mon Feb 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-2
|
||||
- no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun
|
||||
|
||||
* Sun Jan 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-1
|
||||
- KDE 4.3.98 (4.4rc3)
|
||||
|
||||
* Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-3
|
||||
- patch for kde4-config --kde-version option (kde#224540)
|
||||
|
||||
* Tue Jan 26 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-2
|
||||
- -devel: Obsoletes: webkitkde-devel
|
||||
|
||||
* Wed Jan 20 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.3.95-1
|
||||
- KDE 4.3.95 (4.4rc2)
|
||||
|
||||
* Thu Jan 14 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-6
|
||||
- use %%_polkit_qt_policydir
|
||||
- strigi_ver 0.7.1
|
||||
|
||||
* Mon Jan 11 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-5
|
||||
- hopefully correct kauth fix (old polkit cmake module is broken)
|
||||
|
||||
* Fri Jan 08 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-4
|
||||
- fix kauth polkit policies installation
|
||||
|
||||
* Thu Jan 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-3
|
||||
- bump min polkit-qt version(s)
|
||||
|
||||
* Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-2
|
||||
- -devel: Requires: shared-desktop-ontologies-devel
|
||||
|
||||
* Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-1
|
||||
- 4.3.90 (4.4rc1)
|
||||
- drop openssl patch (no longer needed since bug #429846 fixed)
|
||||
|
||||
* Tue Jan 05 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.85-7
|
||||
- PolkitQt rebuild
|
||||
|
||||
* Sun Dec 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-6
|
||||
- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80
|
||||
|
||||
* Sat Dec 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-5
|
||||
- move kdecmake,makekdewidgets manpages to -devel (#549947)
|
||||
|
||||
* Sat Dec 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-4
|
||||
- tarball respin
|
||||
|
||||
* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-3
|
||||
- -devel: Requires: attica-devel
|
||||
|
||||
* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-2
|
||||
- plasma_scrollwidget patch
|
||||
|
||||
* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-1
|
||||
- 4.3.85 (4.4 beta2)
|
||||
|
||||
* Wed Dec 16 2009 Jaroslav Reznik <jreznik@redhat.com> - 4.3.80-5
|
||||
- Repositioning the KDE Brand (#547361)
|
||||
|
||||
* Wed Dec 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.80-4
|
||||
- BR: attica-devel shared-desktop-ontologies-devel
|
||||
- phonon_ver 4.3.80
|
||||
- soprano_ver 2.3.70
|
||||
|
||||
* Fri Dec 04 2009 Than Ngo <than@redhat.com> - 4.3.80-3
|
||||
- respin
|
||||
|
||||
* Thu Dec 03 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.80-2
|
||||
- BR polkit-qt-devel
|
||||
- fix the build of the KAuth PolkitQt-1 backend (upstream patch)
|
||||
|
||||
* Tue Dec 01 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.80-1
|
||||
- KDE 4.4 beta1 (4.3.80)
|
||||
|
||||
* Wed Nov 25 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.75-0.2.svn1048496
|
||||
- -devel: Provides: kdelibs4-devel%{?_isa} ...
|
||||
- Obsoletes: kdelibs-experimental(-devel) < 4.3.75
|
||||
|
||||
* Fri Nov 20 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.75-0.1.svn1048496
|
||||
- Update to 4.3.75 snapshot
|
||||
|
||||
* Wed Nov 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-6
|
||||
- rebuild (for qt-4.6.0-rc1, f13+)
|
||||
- fix/revert soprano_ver change in -5
|
||||
|
||||
* Mon Nov 16 2009 Than Ngo <than@redhat.com> - 4.3.3-5
|
||||
- fix conditional
|
||||
|
||||
* Fri Nov 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-4
|
||||
- kubuntu_80_kaction_qt_keys.diff (#475247)
|
||||
- soprano_ver 2.3.1
|
||||
|
||||
* Fri Nov 13 2009 Than Ngo <than@redhat.com> - 4.3.3-3
|
||||
- rhel cleanup, fix conditional for RHEL
|
||||
|
||||
* Fri Nov 06 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.3-2
|
||||
- backport adFilteredBy API from trunk, required to build konq-plugins-4.3.3
|
||||
- BR flex and bison for the Solid predicate parser
|
||||
- fix build of fakes.c due to missing #include <string.h>
|
||||
|
||||
* Fri Oct 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-1
|
||||
- 4.3.3
|
||||
|
||||
* Mon Oct 12 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.2-4
|
||||
- khtml kpart crasher nr. 2 (rev.1033984)
|
||||
|
||||
* Thu Oct 08 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.2-3
|
||||
- khtml kpart crasher (kde #207173/209876)
|
||||
|
||||
* Wed Oct 07 2009 Than Ngo <than@redhat.com> - 4.3.2-2
|
||||
- fix a deadlock in KLocale
|
||||
|
||||
* Mon Oct 05 2009 Than Ngo <than@redhat.com> - 4.3.2-1
|
||||
- 4.3.2
|
||||
|
||||
* Wed Sep 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.1-7
|
||||
- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
|
||||
|
||||
* Mon Sep 21 2009 Than Ngo <than@redhat.com> - 4.3.1-6
|
||||
- use abrt for RHEL
|
||||
|
||||
* Sat Sep 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.1-5
|
||||
- groupdav connect to egroupware failed (kde#186763)
|
||||
|
||||
* Fri Sep 18 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.1-4
|
||||
- ship kde4-doxygen.sh only in -devel (fix duplicate file)
|
||||
|
||||
* Fri Sep 04 2009 Than Ngo <than@redhat.com> - 4.3.1-3
|
||||
- security fix for -CVE-2009-2702
|
||||
|
||||
* Wed Sep 02 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.1-2
|
||||
- Patch for kde#160679
|
||||
|
||||
* Fri Aug 28 2009 Than Ngo <than@redhat.com> - 4.3.1-1
|
||||
- 4.3.1
|
||||
- openssl-1.0 build fixes
|
||||
|
||||
* Wed Aug 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-8
|
||||
- BR: xz-devel
|
||||
|
||||
* Sun Aug 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-7
|
||||
- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
|
||||
|
||||
* Wed Aug 19 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0-6
|
||||
- fix crash when editting toolbars (kdebug:200815)
|
||||
|
||||
* Tue Aug 18 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0.5
|
||||
- fix KDE bug #19538, copy file after rename uses old file name
|
||||
|
||||
* Mon Aug 17 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0-4
|
||||
- fix unmounting devices
|
||||
- fix copying URLs to clipboard (kdebug:170608)
|
||||
|
||||
* Fri Aug 14 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-3
|
||||
- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
|
||||
|
||||
* Wed Aug 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2
|
||||
- microblog crashes plasma on show friends toggle (kdebug#202550)
|
||||
- khtml crasher (kdebug#199557)
|
||||
|
||||
* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1
|
||||
- 4.3.0
|
||||
|
||||
* Wed Jul 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.98-4
|
||||
- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90
|
||||
|
||||
* Sun Jul 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.98-3
|
||||
- fix CVE-2009-2537 - select length DoS
|
||||
- fix CVE-2009-1725 - crash, possible ACE in numeric character references
|
||||
- fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
|
||||
- fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
|
||||
- fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0)
|
||||
|
||||
* Fri Jul 24 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.98-2
|
||||
- respun tarball, to fix KIO HTTP redirects
|
||||
- fix phonon/strigi versions
|
||||
|
||||
* Wed Jul 22 2009 Than Ngo <than@redhat.com> - 4.2.98-1
|
||||
- 4.3rc3
|
||||
|
||||
* Thu Jul 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.96-2
|
||||
- soprano_ver 2.3.0
|
||||
- License: LGPLv2+
|
||||
|
||||
* Fri Jul 10 2009 Than Ngo <than@redhat.com> - 4.2.96-1
|
||||
- 4.3rc2
|
||||
|
||||
* Wed Jul 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.95-4
|
||||
- fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki)
|
||||
|
||||
* Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-3
|
||||
- plasma animation crasher (kdebug#198338)
|
||||
|
||||
* Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-2
|
||||
- up min versions, phonon, strigi, soprano (#509511)
|
||||
|
||||
* Thu Jun 25 2009 Than Ngo <than@redhat.com> - 4.2.95-1
|
||||
- 4.3 rc1
|
||||
|
||||
* Wed Jun 03 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.90-1
|
||||
- KDE-4.3 beta2 (4.2.90)
|
||||
|
||||
* Tue May 12 2009 Than Ngo <than@redhat.com> 4.2.85-1
|
||||
- KDE-4.3 beta1 (4.2.85)
|
||||
- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
|
||||
|
||||
* Wed Apr 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.2-14
|
||||
- -devel: Provides: kdelibs4-devel%%{?_isa} ...
|
||||
|
||||
* Tue Apr 28 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.2-13
|
||||
- upstream patch to fix GCC4.4 crashes in kjs
|
||||
(kdebug:189809)
|
||||
|
||||
* Fri Apr 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-12
|
||||
- drop the PopupApplet configuration backports (#495998) for now, kconf_update
|
||||
does not work as expected for Plasma
|
||||
|
||||
* Thu Apr 23 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-11
|
||||
- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
|
||||
|
||||
* Thu Apr 23 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-10
|
||||
- fix the kconf_update scriptlet for #495998 (broken .upd syntax)
|
||||
|
||||
* Tue Apr 21 2009 Than Ngo <than@redhat.com> - 4.2.2-9
|
||||
- don't let plasma appear over screensaver
|
||||
|
||||
* Mon Apr 20 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.2.2-8
|
||||
- fix Plasma PopupApplet configuration interfering with weather applet (#495998)
|
||||
|
||||
* Sun Apr 19 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-7
|
||||
- fix and simplify the child struct disposal (kde#180785)
|
||||
|
||||
* Sat Apr 18 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-6
|
||||
- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
|
||||
|
||||
* Fri Apr 10 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-5
|
||||
- fix bidi-related hangs in khtml (kde#189161)
|
||||
|
||||
|
|
Loading…
Reference in New Issue