Compare commits
43 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
34f7036707 | ||
|
09d2db7f26 | ||
|
774eb524ba | ||
|
fc55e7be91 | ||
|
af83570d95 | ||
|
b0dd003112 | ||
|
e0cd5bdb52 | ||
|
a031fcc237 | ||
|
a6384873ab | ||
|
7faa4d66b2 | ||
|
3b7aeaa2c5 | ||
|
227d061013 | ||
|
46784b8f51 | ||
|
11402d7cc2 | ||
|
9f5b7d7273 | ||
|
9696368fdb | ||
|
ba7e61b9cb | ||
|
2ed49ba0fa | ||
|
264c677431 | ||
|
cb0bd4bae3 | ||
|
19c42cbb09 | ||
|
9c6af130dd | ||
|
191f29ba71 | ||
|
31040e724c | ||
|
4bfaca81ff | ||
|
b255f4460b | ||
|
baea747e16 | ||
|
246d0f9a80 | ||
|
0af3427ed4 | ||
|
e2600c1ece | ||
|
7b01edf271 | ||
|
9a1f5a311d | ||
|
638c8ce44c | ||
|
d6f296f0d6 | ||
|
40639f9561 | ||
|
b3777c7623 | ||
|
4b62966846 | ||
|
49abe2cf13 | ||
|
9a6f37c1ea | ||
|
dc5d116ede | ||
|
b056ba112f | ||
|
297b45d498 | ||
|
0e4fa57d87 |
@ -1 +0,0 @@
|
|||||||
kdelibs-4.3.1.tar.bz2
|
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
kdelibs-4.4.3.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
|
|
@ -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,16 +0,0 @@
|
|||||||
diff -rU5 kdelibs-4.3.0/kio/bookmarks/kbookmark.cc kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc
|
|
||||||
--- kdelibs-4.3.0/kio/bookmarks/kbookmark.cc 2008-07-08 05:54:18.000000000 -0400
|
|
||||||
+++ kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc 2009-08-28 15:09:07.000000000 -0400
|
|
||||||
@@ -681,11 +681,11 @@
|
|
||||||
doc.setContent( payload );
|
|
||||||
QDomElement elem = doc.documentElement();
|
|
||||||
QDomNodeList children = elem.childNodes();
|
|
||||||
for ( int childno = 0; childno < children.count(); childno++)
|
|
||||||
{
|
|
||||||
- bookmarks.append( KBookmark( children.item(childno).cloneNode(true).toElement() ));
|
|
||||||
+ bookmarks.append( KBookmark( children.item(childno).toElement() ));
|
|
||||||
}
|
|
||||||
return bookmarks;
|
|
||||||
}
|
|
||||||
const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
|
|
||||||
if ( !urls.isEmpty() )
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up kdelibs-4.3.1/kioslave/http/http.cpp.kdebug#186763 kdelibs-4.3.1/kioslave/http/http.cpp
|
|
||||||
--- kdelibs-4.3.1/kioslave/http/http.cpp.kdebug#186763 2009-07-29 06:09:41.000000000 -0500
|
|
||||||
+++ kdelibs-4.3.1/kioslave/http/http.cpp 2009-09-09 10:21:22.000000000 -0500
|
|
||||||
@@ -4355,7 +4355,7 @@ bool HTTPProtocol::readBody( bool dataIn
|
|
||||||
if (m_request.responseCode >= 500 && m_request.responseCode <= 599) {
|
|
||||||
error(ERR_INTERNAL_SERVER, m_request.url.host());
|
|
||||||
return false;
|
|
||||||
- } else if (m_request.responseCode >= 400 && m_request.responseCode <= 499) {
|
|
||||||
+ } else if (m_request.responseCode >= 400 && m_request.responseCode <= 499 && m_request.responseCode != 401) {
|
|
||||||
error(ERR_DOES_NOT_EXIST, m_request.url.host());
|
|
||||||
return false;
|
|
||||||
}
|
|
@ -1,61 +0,0 @@
|
|||||||
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig kdelibs-4.3.1/kio/kssl/kopenssl.cpp
|
|
||||||
--- kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig 2009-09-01 21:58:06.000000000 +0200
|
|
||||||
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp 2009-09-01 22:08:16.000000000 +0200
|
|
||||||
@@ -622,7 +622,7 @@ KOpenSSLProxy::KOpenSSLProxy()
|
|
||||||
K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
|
|
||||||
K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
|
|
||||||
K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
|
|
||||||
- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
|
|
||||||
+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
diff -up kdelibs-4.3.1/kio/kssl/kopenssl.h.orig kdelibs-4.3.1/kio/kssl/kopenssl.h
|
|
||||||
--- kdelibs-4.3.1/kio/kssl/kopenssl.h.orig 2009-09-01 21:58:31.000000000 +0200
|
|
||||||
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h 2009-09-01 22:48:44.000000000 +0200
|
|
||||||
@@ -44,6 +44,14 @@ class KOpenSSLProxyPrivate;
|
|
||||||
#include <openssl/stack.h>
|
|
||||||
#include <openssl/bn.h>
|
|
||||||
#undef crypt
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
|
||||||
+#define STACK _STACK
|
|
||||||
+#define OSSL_SKVALUE_RTYPE void
|
|
||||||
+#define OSSL_MORECONST const
|
|
||||||
+#else
|
|
||||||
+#define OSSL_SKVALUE_RTYPE char
|
|
||||||
+#define OSSL_MORECONST
|
|
||||||
+#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -505,6 +513,9 @@ public:
|
|
||||||
*/
|
|
||||||
void sk_free(STACK *s);
|
|
||||||
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
|
||||||
+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Number of elements in the stack
|
|
||||||
@@ -517,6 +528,9 @@ public:
|
|
||||||
*/
|
|
||||||
char *sk_value(STACK *s, int n);
|
|
||||||
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
|
||||||
+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Create a new stack
|
|
||||||
@@ -529,6 +543,10 @@ public:
|
|
||||||
*/
|
|
||||||
int sk_push(STACK *s, char *d);
|
|
||||||
|
|
||||||
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
|
||||||
+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Duplicate the stack
|
|
@ -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
|
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.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-04 18:13:11.000000000 +0100
|
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-01 01:27:28.000000000 +0100
|
||||||
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-10 18:45:41.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 @@
|
@@ -17,6 +17,8 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
@ -10,7 +10,7 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||||||
#include "halstorageaccess.h"
|
#include "halstorageaccess.h"
|
||||||
|
|
||||||
#include "halfstabhandling.h"
|
#include "halfstabhandling.h"
|
||||||
@@ -172,11 +174,21 @@
|
@@ -177,11 +179,21 @@
|
||||||
{
|
{
|
||||||
// TODO: Better error reporting here
|
// TODO: Better error reporting here
|
||||||
if (m_setupInProgress) {
|
if (m_setupInProgress) {
|
||||||
@ -21,7 +21,7 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||||||
+ }
|
+ }
|
||||||
m_setupInProgress = false;
|
m_setupInProgress = false;
|
||||||
emit setupDone(Solid::UnauthorizedOperation,
|
emit setupDone(Solid::UnauthorizedOperation,
|
||||||
error.name()+": "+error.message(),
|
QString(error.name()+": "+error.message()),
|
||||||
m_device->udi());
|
m_device->udi());
|
||||||
} else if (m_teardownInProgress) {
|
} else if (m_teardownInProgress) {
|
||||||
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
||||||
@ -31,8 +31,8 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||||||
+ }
|
+ }
|
||||||
m_teardownInProgress = false;
|
m_teardownInProgress = false;
|
||||||
emit teardownDone(Solid::UnauthorizedOperation,
|
emit teardownDone(Solid::UnauthorizedOperation,
|
||||||
error.name()+": "+error.message(),
|
QString(error.name()+": "+error.message()),
|
||||||
@@ -294,8 +306,9 @@
|
@@ -311,8 +323,9 @@
|
||||||
#else
|
#else
|
||||||
QString uid="uid=";
|
QString uid="uid=";
|
||||||
#endif
|
#endif
|
||||||
@ -44,7 +44,7 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef Q_OS_FREEBSD
|
#ifdef Q_OS_FREEBSD
|
||||||
@@ -333,6 +346,59 @@
|
@@ -354,6 +367,59 @@
|
||||||
SLOT(slotDBusError(const QDBusError &)));
|
SLOT(slotDBusError(const QDBusError &)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -104,10 +104,10 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
|
|||||||
bool StorageAccess::callHalVolumeUnmount()
|
bool StorageAccess::callHalVolumeUnmount()
|
||||||
{
|
{
|
||||||
QDBusConnection c = QDBusConnection::systemBus();
|
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
|
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.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h 2008-05-21 13:07:38.000000000 +0200
|
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h 2009-12-01 01:27:28.000000000 +0100
|
||||||
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h 2008-11-10 18:45:01.000000000 +0100
|
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2009-12-03 03:49:55.000000000 +0100
|
||||||
@@ -69,6 +69,9 @@
|
@@ -70,6 +70,9 @@
|
||||||
bool callSystemMount();
|
bool callSystemMount();
|
||||||
bool callSystemUnmount();
|
bool callSystemUnmount();
|
||||||
|
|
@ -1,133 +1,6 @@
|
|||||||
diff -up kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake
|
diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl
|
||||||
--- kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-07-08 16:41:09.000000000 +0200
|
--- kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500
|
||||||
+++ kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake 2009-07-13 16:32:48.000000000 +0200
|
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl 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:
|
|
||||||
@@ -129,7 +129,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)
|
|
||||||
@@ -383,23 +383,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)
|
|
||||||
@@ -497,7 +497,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} )
|
|
||||||
|
|
||||||
|
|
||||||
@@ -510,12 +511,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)
|
|
||||||
@@ -782,7 +783,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/
|
|
||||||
@@ -1166,9 +1168,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)
|
|
||||||
@@ -1187,7 +1189,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.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh
|
|
||||||
--- kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200
|
|
||||||
+++ kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh 2009-07-13 16:26:04.000000000 +0200
|
|
||||||
@@ -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.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl
|
|
||||||
--- kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200
|
|
||||||
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl 2009-07-13 16:26:04.000000000 +0200
|
|
||||||
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
||||||
|
|
||||||
$kcfgc = $file . "c";
|
$kcfgc = $file . "c";
|
||||||
@ -143,15 +16,15 @@ diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kde
|
|||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt
|
diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt
|
||||||
--- kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-01-06 18:27:49.000000000 +0100
|
--- kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-10-26 04:15:46.000000000 -0500
|
||||||
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200
|
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
|
||||||
@@ -8,13 +8,13 @@ add_subdirectory( example )
|
@@ -4,13 +4,13 @@
|
||||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||||
|
|
||||||
|
|
||||||
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
|
-kde4_add_executable(kconfig_compiler NOGUI ${kconfig_compiler_SRCS})
|
||||||
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${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_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||||
+target_link_libraries(kconfig_compiler4 ${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.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel k
|
|||||||
|
|
||||||
|
|
||||||
########### install files ###############
|
########### install files ###############
|
||||||
diff -up kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake
|
||||||
--- kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200
|
--- kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-12-17 10:33:38.000000000 -0600
|
||||||
+++ kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200
|
+++ kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake 2009-12-18 08:39:50.000000000 -0600
|
||||||
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
|
@@ -15,10 +15,10 @@
|
||||||
add_custom_command(
|
# The following variables are defined for the various tools required to
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
# compile KDE software:
|
||||||
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)
|
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
|
||||||
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
|
+# 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)
|
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
|
||||||
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
|
set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen )
|
||||||
diff -up kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdewidgets/CMakeLists.txt
|
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
|
||||||
--- kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel 2009-01-06 18:27:44.000000000 +0100
|
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
|
||||||
+++ kdelibs-4.2.96/kdewidgets/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200
|
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(
|
@@ -14,24 +14,24 @@ include_directories(
|
||||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||||
|
|
||||||
|
|
||||||
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
-kde4_add_executable(makekdewidgets NOGUI ${makekdewidgets_SRCS})
|
||||||
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
+kde4_add_executable(makekdewidgets4 NOGUI ${makekdewidgets_SRCS})
|
||||||
|
|
||||||
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
||||||
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
||||||
@ -217,3 +189,30 @@ diff -up kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/
|
|||||||
|
|
||||||
set(kde3supportwidgets_PART_SRCS
|
set(kde3supportwidgets_PART_SRCS
|
||||||
classpreviews.cpp
|
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
|
||||||
|
|
12
kdelibs-4.3.90-install_all_css.patch
Normal file
12
kdelibs-4.3.90-install_all_css.patch
Normal file
@ -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
|
25
kdelibs-4.3.98-no_rpath.patch
Normal file
25
kdelibs-4.3.98-no_rpath.patch
Normal file
@ -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)
|
||||||
|
|
168
kdelibs-4.4.2-kpixmapcache.patch
Normal file
168
kdelibs-4.4.2-kpixmapcache.patch
Normal file
@ -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)
|
432
kdelibs.spec
432
kdelibs.spec
@ -1,10 +1,14 @@
|
|||||||
%define phonon_ver 4.3.1
|
|
||||||
%define soprano_ver 2.3.0
|
|
||||||
%define strigi_ver 0.7
|
|
||||||
|
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
%define attica_ver 0.1.2
|
||||||
Version: 4.3.1
|
%define phonon_ver 4.3.80
|
||||||
Release: 7%{?dist}
|
%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
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -16,95 +20,103 @@ Provides: kdelibs4 = %{version}-%{release}
|
|||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.kde.org/
|
URL: http://www.kde.org/
|
||||||
Group: System Environment/Libraries
|
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)
|
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: kde4-macros(api) >= 2
|
||||||
BuildRequires: kde-filesystem >= 4-23
|
BuildRequires: kde-filesystem >= 4-23
|
||||||
|
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||||
# used in kde.(sh|csh)
|
# used in kde.(sh|csh)
|
||||||
Requires: coreutils grep
|
Requires: coreutils grep
|
||||||
# dbus-launch needed here? don't think so, but be safe and keep
|
%endif
|
||||||
# for now -- Rex
|
|
||||||
Requires: dbus-x11
|
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
Requires: kde-filesystem >= 4-23
|
Requires: kde-filesystem >= 4-23
|
||||||
Requires: kde-settings
|
Requires: kde-settings
|
||||||
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
|
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
|
||||||
Requires: shared-mime-info
|
# versioned dep ok, as long as it comes from *here*
|
||||||
Requires: kdelibs-common
|
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: hal
|
||||||
Requires: hunspell
|
Requires: hunspell
|
||||||
Requires: phonon%{?_isa} >= %{phonon_ver}
|
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
|
||||||
Requires: soprano%{?_isa} >= %{soprano_ver}
|
Requires: phonon%{?_isa} >= %{phonon_version}
|
||||||
Requires: strigi-libs%{?_isa} >= %{strigi_ver}
|
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
|
Source1: kde4.sh
|
||||||
Source2: kde4.csh
|
Source2: kde4.csh
|
||||||
|
|
||||||
# make -devel packages parallel-installable
|
# make -devel packages parallel-installable
|
||||||
Patch0: kdelibs-4.2.96-parallel_devel.patch
|
Patch0: kdelibs-4.3.85-parallel_devel.patch
|
||||||
# fix kde#149705
|
# fix kde#149705
|
||||||
Patch2: kdelibs-4.2.85-kde149705.patch
|
Patch2: kdelibs-4.2.85-kde149705.patch
|
||||||
|
## UPSTREAM ME
|
||||||
# Hunspell support for K3Spell
|
# Hunspell support for K3Spell
|
||||||
# http://fedoraproject.org/wiki/Releases/FeatureDictionary
|
# http://fedoraproject.org/wiki/Releases/FeatureDictionary
|
||||||
# http://bugs.kde.org/show_bug.cgi?id=154561
|
# http://bugs.kde.org/show_bug.cgi?id=154561
|
||||||
Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
|
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
|
# install all .css files and Doxyfile.global in kdelibs-common to build
|
||||||
# kdepimlibs-apidocs against
|
# 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
|
# add Fedora/V-R to KHTML UA string
|
||||||
Patch9: kdelibs-4.0.2-branding.patch
|
Patch9: kdelibs-4.0.2-branding.patch
|
||||||
# don't cache kdeglobals paths because they change after profile directories
|
# don't cache kdeglobals paths because they change after profile directories
|
||||||
# are loaded from kde4rc
|
# are loaded from kde4rc
|
||||||
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
||||||
# workaround for policykit
|
# 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
|
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||||
Patch14: kdelibs-4.2.85-libexecdir.patch
|
Patch14: kdelibs-4.2.85-libexecdir.patch
|
||||||
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
|
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
||||||
Patch18: kdelibs-4.1.72-kstandarddirs.patch
|
Patch18: kdelibs-4.1.72-kstandarddirs.patch
|
||||||
|
# COMMENT ME PLEASE
|
||||||
Patch20: kdelibs-4.1.70-cmake.patch
|
Patch20: kdelibs-4.1.70-cmake.patch
|
||||||
Patch21: kdelibs-4.3.1-ossl-1.x.patch
|
# disable drkonqi by default, RHEL prefers/wants abrt
|
||||||
# patch to fix keditbookmarks crash (kde#160679)
|
|
||||||
Patch22: kdelibs-4.3.0-bookmarks.patch
|
|
||||||
# http://bugs.kde.org/186763
|
|
||||||
Patch23: kdelibs-4.3.1-kde186763.patch
|
|
||||||
Patch24: kdelibs-4.3.1-drkonq.patch
|
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
|
# upstreamable
|
||||||
# 4.3 branch
|
|
||||||
|
|
||||||
# security fix
|
## 4.4 upstream
|
||||||
|
|
||||||
|
## trunk upstream
|
||||||
|
|
||||||
|
## security fix
|
||||||
|
# Not Upstreamed? why not ? -- Rex
|
||||||
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= 4.5.0
|
%if 0%{?fedora} && 0%{?fedora} < 13
|
||||||
# qt4%{_?_isa} isn't provided yet -- Rex
|
Conflicts: kdebase-workspace-libs < 4.3.80
|
||||||
#Requires: qt4%{?_isa} >= %{_qt4_version}
|
%endif
|
||||||
Requires: qt4 >= %{_qt4_version}
|
|
||||||
|
BuildRequires: qt4-devel >= 4.6.0
|
||||||
|
BuildRequires: qt4-webkit-devel
|
||||||
|
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
Requires(post): /sbin/ldconfig
|
Requires(post): /sbin/ldconfig
|
||||||
Requires(postun): /sbin/ldconfig
|
Requires(postun): /sbin/ldconfig
|
||||||
|
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
|
BuildRequires: attica-devel >= %{attica_ver}
|
||||||
BuildRequires: automoc4 >= 0.9.88
|
BuildRequires: automoc4 >= 0.9.88
|
||||||
BuildRequires: avahi-devel
|
BuildRequires: avahi-devel
|
||||||
|
BuildRequires: bison flex
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: cmake >= 2.6.2-3
|
BuildRequires: cmake >= 2.6.4
|
||||||
BuildRequires: cups-devel cups
|
BuildRequires: cups-devel cups
|
||||||
BuildRequires: enchant-devel
|
BuildRequires: enchant-devel
|
||||||
BuildRequires: gamin-devel
|
BuildRequires: gamin-devel
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: giflib-devel
|
BuildRequires: giflib-devel
|
||||||
# busted at least on x86_64
|
|
||||||
#BuildRequires: hspell-devel
|
|
||||||
BuildRequires: jasper-devel
|
BuildRequires: jasper-devel
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: libacl-devel libattr-devel
|
BuildRequires: libacl-devel libattr-devel
|
||||||
@ -117,6 +129,9 @@ BuildRequires: OpenEXR-devel
|
|||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: phonon-devel >= %{phonon_ver}
|
BuildRequires: phonon-devel >= %{phonon_ver}
|
||||||
|
BuildRequires: polkit-qt-devel
|
||||||
|
BuildRequires: qca2-devel
|
||||||
|
BuildRequires: shared-desktop-ontologies-devel
|
||||||
BuildRequires: shared-mime-info
|
BuildRequires: shared-mime-info
|
||||||
BuildRequires: soprano-devel >= %{soprano_ver}
|
BuildRequires: soprano-devel >= %{soprano_ver}
|
||||||
BuildRequires: strigi-devel >= %{strigi_ver}
|
BuildRequires: strigi-devel >= %{strigi_ver}
|
||||||
@ -125,8 +140,6 @@ BuildRequires: zlib-devel
|
|||||||
# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
|
# 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
|
%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}}
|
%{?x_deps:BuildRequires: %{x_deps}}
|
||||||
BuildRequires: openssh-clients
|
|
||||||
BuildRequires: subversion
|
|
||||||
|
|
||||||
%if 0%{?apidocs}
|
%if 0%{?apidocs}
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -137,8 +150,15 @@ BuildRequires: qt4-doc
|
|||||||
Provides: kross(javascript) = %{version}-%{release}
|
Provides: kross(javascript) = %{version}-%{release}
|
||||||
Provides: kross(qtscript) = %{version}-%{release}
|
Provides: kross(qtscript) = %{version}-%{release}
|
||||||
|
|
||||||
|
Provides: kdelibs-experimental = %{version}-%{release}
|
||||||
|
Obsoletes: kdelibs-experimental < 4.3.75
|
||||||
|
|
||||||
|
%if 0%{?fedora} && 0%{?fedora} < 15
|
||||||
|
Obsoletes: webkitkde < 0.0.6
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Libraries for the K Desktop Environment 4.
|
Libraries for KDE 4.
|
||||||
|
|
||||||
%package common
|
%package common
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -150,21 +170,37 @@ This package includes the common files for the KDE 3 and KDE 4 libraries.
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Summary: Header files for compiling KDE 4 applications
|
Summary: Header files for compiling KDE 4 applications
|
||||||
# stuff moved, help upgrade path
|
# stuff moved, help upgrade path
|
||||||
|
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||||
Conflicts: kdebase-runtime < 4.2.90
|
Conflicts: kdebase-runtime < 4.2.90
|
||||||
Conflicts: kdebase-workspace-devel < 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}
|
Provides: plasma-devel = %{version}-%{release}
|
||||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
||||||
Provides: kdelibs4-devel = %{version}-%{release}
|
Provides: kdelibs4-devel = %{version}-%{release}
|
||||||
Requires: cmake >= 2.6.2-3
|
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
|
||||||
|
Requires: attica-devel >= %{attica_ver}
|
||||||
Requires: automoc4 >= 0.9.88
|
Requires: automoc4 >= 0.9.88
|
||||||
Requires: qt4-devel
|
Requires: cmake >= 2.6.4
|
||||||
Requires: openssl-devel
|
Requires: openssl-devel
|
||||||
Requires: phonon-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
|
# do we really still need all these below? -- Rex
|
||||||
Requires: strigi-devel
|
Requires: strigi-devel
|
||||||
Requires: bzip2-devel gamin-devel libacl-devel
|
Requires: bzip2-devel gamin-devel libacl-devel
|
||||||
%{?x_deps:Requires: %{x_deps}}
|
%{?x_deps:Requires: %{x_deps}}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package includes the header files you will need to compile
|
This package includes the header files you will need to compile
|
||||||
applications for KDE 4.
|
applications for KDE 4.
|
||||||
@ -176,6 +212,7 @@ Summary: KDE 4 API documentation
|
|||||||
# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||||
Requires: kde-filesystem
|
Requires: kde-filesystem
|
||||||
Provides: kdelibs4-apidocs = %{version}-%{release}
|
Provides: kdelibs4-apidocs = %{version}-%{release}
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
%description apidocs
|
%description apidocs
|
||||||
This package includes the KDE 4 API documentation in HTML
|
This package includes the KDE 4 API documentation in HTML
|
||||||
@ -183,31 +220,31 @@ format for easy browsing.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kdelibs-%{version}
|
%setup -q -n kdelibs-%{version}%{?alphatag}
|
||||||
|
|
||||||
%patch0 -p1 -b .parallel_devel
|
%patch0 -p1 -b .parallel_devel
|
||||||
%patch2 -p1 -b .kde149705
|
%patch2 -p1 -b .kde149705
|
||||||
%patch5 -p1 -b .k3spell-hunspell
|
%patch5 -p1 -b .k3spell-hunspell
|
||||||
%patch8 -p1 -b .all-css
|
%patch8 -p1 -b .install_all_css
|
||||||
%patch9 -p1 -b .branding
|
%patch9 -p1 -b .branding
|
||||||
%patch11 -p1 -b .policykit
|
%patch11 -p1 -b .policykit
|
||||||
%patch12 -p1 -b .Administration-menu
|
%patch12 -p1 -b .Administration-menu
|
||||||
%patch14 -p1 -b .libexecdir
|
%patch14 -p1 -b .libexecdir
|
||||||
%patch18 -p1 -b .kstandarddirs
|
%patch18 -p1 -b .kstandarddirs
|
||||||
%patch20 -p1 -b .xxcmake
|
%patch20 -p1 -b .xxcmake
|
||||||
%patch21 -p1 -b .ossl-1.x
|
|
||||||
%patch22 -p1 -b .bookmarks
|
|
||||||
%patch23 -p1 -b .kde186763
|
|
||||||
%if 0%{?rhel} > 5
|
%if 0%{?rhel} > 5
|
||||||
%patch24 -p1 -b .drkonq
|
%patch24 -p1 -b .drkonq
|
||||||
%endif
|
%endif
|
||||||
|
%patch27 -p1 -b .no_rpath
|
||||||
|
|
||||||
|
# upstreamable patches
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# 4.3
|
|
||||||
|
|
||||||
# security fix
|
# security fix
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
# add release version
|
# add release version
|
||||||
@ -218,9 +255,7 @@ pushd %{_target_platform}
|
|||||||
%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
|
%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if 0%{?rest}
|
|
||||||
make %{?_smp_mflags} -C %{_target_platform}
|
make %{?_smp_mflags} -C %{_target_platform}
|
||||||
%endif
|
|
||||||
|
|
||||||
# build apidocs
|
# build apidocs
|
||||||
%if 0%{?apidocs}
|
%if 0%{?apidocs}
|
||||||
@ -232,7 +267,6 @@ doc/api/doxygen.sh .
|
|||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%if 0%{?rest}
|
|
||||||
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
||||||
|
|
||||||
# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
|
# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
|
||||||
@ -242,16 +276,6 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
|
|||||||
# create/own, see http://bugzilla.redhat.com/483318
|
# create/own, see http://bugzilla.redhat.com/483318
|
||||||
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
|
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
|
# move devel symlinks
|
||||||
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
|
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
|
||||||
pushd %{buildroot}%{_kde4_libdir}
|
pushd %{buildroot}%{_kde4_libdir}
|
||||||
@ -270,7 +294,7 @@ do
|
|||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if 0%{?fedora} < 12
|
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||||
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
|
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
|
||||||
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
|
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
|
||||||
%endif
|
%endif
|
||||||
@ -282,11 +306,10 @@ bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
|
|||||||
|
|
||||||
# install apidocs and generator script
|
# install apidocs and generator script
|
||||||
install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
|
install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?apidocs}
|
%if 0%{?apidocs}
|
||||||
mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
|
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
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -313,12 +336,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
|
|||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?rest}
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS README TODO
|
%doc AUTHORS README TODO
|
||||||
%doc COPYING.LIB
|
%doc COPYING.LIB
|
||||||
%if 0%{?fedora} < 12
|
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||||
%config(noreplace) %{_sysconfdir}/profile.d/*
|
%config(noreplace) %{_sysconfdir}/profile.d/*
|
||||||
%endif
|
%endif
|
||||||
%{_kde4_bindir}/*
|
%{_kde4_bindir}/*
|
||||||
@ -331,10 +353,13 @@ rm -rf %{buildroot}
|
|||||||
%exclude %{_kde4_appsdir}/cmake/
|
%exclude %{_kde4_appsdir}/cmake/
|
||||||
%{_kde4_configdir}/*
|
%{_kde4_configdir}/*
|
||||||
%{_datadir}/dbus-1/interfaces/*
|
%{_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_datadir}/mime/packages/kde.xml
|
||||||
%{_kde4_sharedir}/kde4/services/*
|
%{_kde4_sharedir}/kde4/services/*
|
||||||
%{_kde4_sharedir}/kde4/servicetypes/*
|
%{_kde4_sharedir}/kde4/servicetypes/*
|
||||||
%{_kde4_iconsdir}/hicolor/*/actions/*
|
%{_kde4_iconsdir}/hicolor/*/*/*
|
||||||
%{_kde4_docdir}/HTML/en/sonnet/
|
%{_kde4_docdir}/HTML/en/sonnet/
|
||||||
%{_kde4_docdir}/HTML/en/kioslave/
|
%{_kde4_docdir}/HTML/en/kioslave/
|
||||||
%{_kde4_libdir}/lib*.so.*
|
%{_kde4_libdir}/lib*.so.*
|
||||||
@ -342,12 +367,39 @@ rm -rf %{buildroot}
|
|||||||
%{_kde4_libdir}/kconf_update_bin/
|
%{_kde4_libdir}/kconf_update_bin/
|
||||||
%dir %{_kde4_libdir}/kde4/
|
%dir %{_kde4_libdir}/kde4/
|
||||||
%{_kde4_libdir}/kde4/*.so
|
%{_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_libdir}/kde4/plugins/
|
||||||
%{_kde4_sysconfdir}/xdg/menus/*.menu
|
%{_kde4_sysconfdir}/xdg/menus/*.menu
|
||||||
%doc %{_mandir}/man*/*
|
%{_mandir}/man1/checkXML.1*
|
||||||
# kdelibs-common comes from here for fedora >= 9
|
%{_mandir}/man1/kde4-config.1*
|
||||||
%if "%{name}" == "kdelibs"
|
%{_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}/kdebug.areas
|
||||||
%exclude %{_kde4_configdir}/kdebugrc
|
%exclude %{_kde4_configdir}/kdebugrc
|
||||||
%exclude %{_kde4_configdir}/ui/ui_standards.rc
|
%exclude %{_kde4_configdir}/ui/ui_standards.rc
|
||||||
@ -374,11 +426,12 @@ rm -rf %{buildroot}
|
|||||||
%{_kde4_appsdir}/kdeui
|
%{_kde4_appsdir}/kdeui
|
||||||
%{_kde4_docdir}/HTML/en/common/
|
%{_kde4_docdir}/HTML/en/common/
|
||||||
%{_kde4_datadir}/locale/all_languages/
|
%{_kde4_datadir}/locale/all_languages/
|
||||||
%endif
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc KDE4PORTING.html
|
%doc KDE4PORTING.html
|
||||||
|
%{_mandir}/man1/kdecmake.1*
|
||||||
|
%{_mandir}/man1/makekdewidgets.1*
|
||||||
%{_kde4_bindir}/kconfig_compiler4
|
%{_kde4_bindir}/kconfig_compiler4
|
||||||
%{_kde4_bindir}/makekdewidgets4
|
%{_kde4_bindir}/makekdewidgets4
|
||||||
%{_kde4_bindir}/kde4-doxygen.sh
|
%{_kde4_bindir}/kde4-doxygen.sh
|
||||||
@ -386,7 +439,6 @@ rm -rf %{buildroot}
|
|||||||
%{_kde4_appsdir}/kdewidgets/
|
%{_kde4_appsdir}/kdewidgets/
|
||||||
%{_kde4_includedir}/*
|
%{_kde4_includedir}/*
|
||||||
%{_kde4_libdir}/kde4/devel/
|
%{_kde4_libdir}/kde4/devel/
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?apidocs}
|
%if 0%{?apidocs}
|
||||||
%files apidocs
|
%files apidocs
|
||||||
@ -396,6 +448,228 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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+)
|
- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user