rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f18

Browse Source 
Conflicts:
	.gitignore
	kdelibs-solid_qt_no_debug_output.patch
	kdelibs-udisks2-backend.patch
	kdelibs.spec
	sources
This commit is contained in:
Rex Dieter 2013-03-02 15:24:40 -06:00
commit 03eeceb69c
26 changed files with 254 additions and 5310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/kdelibs-4.8.5.tar.xz
/kdelibs-4.9.5.tar.xz
/kdelibs-4.10.1.tar.xz

11
kdelibs-4.1.70-cmake.patch
View File

@ -1,11 +0,0 @@
diff -Naur kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake 2008-10-19 16:56:45.000000000 +0200
+++ kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake 2008-10-19 17:06:14.000000000 +0200
@@ -817,6 +817,7 @@
# CMake generators if no build type is set.
if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

28
kdelibs-4.3.1-CVE-2009-2702.patch → kdelibs-4.10.0-CVE-2009-2702.patch
View File

@ -1,7 +1,7 @@
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 @@
diff -up kdelibs-4.10.0/kio/kssl/kopenssl.cpp.CVE-2009-2702 kdelibs-4.10.0/kio/kssl/kopenssl.cpp
--- kdelibs-4.10.0/kio/kssl/kopenssl.cpp.CVE-2009-2702 2013-01-23 15:44:24.000000000 -0600
+++ kdelibs-4.10.0/kio/kssl/kopenssl.cpp 2013-01-31 07:37:12.210503883 -0600
@@ -196,6 +196,7 @@ static int (*K_X509_NAME_add_entry_by_tx
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;
@ -9,7 +9,7 @@ diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopens
static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
#endif
@@ -530,6 +531,7 @@
@@ -525,6 +526,7 @@ KOpenSSLProxy::KOpenSSLProxy()
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");
@ -17,7 +17,7 @@ diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopens
#endif
}
@@ -1577,6 +1579,13 @@
@@ -1572,6 +1574,13 @@ unsigned char *KOpenSSLProxy::ASN1_STRIN
return 0L;
}
@ -31,10 +31,10 @@ diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopens
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 @@
diff -up kdelibs-4.10.0/kio/kssl/kopenssl.h.CVE-2009-2702 kdelibs-4.10.0/kio/kssl/kopenssl.h
--- kdelibs-4.10.0/kio/kssl/kopenssl.h.CVE-2009-2702 2013-01-23 15:44:24.000000000 -0600
+++ kdelibs-4.10.0/kio/kssl/kopenssl.h 2013-01-31 07:37:12.210503883 -0600
@@ -607,13 +607,17 @@ public:
*/
void ASN1_INTEGER_free(ASN1_INTEGER *x);
@ -53,10 +53,10 @@ diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.h kdelibs-4.3.1/kio/kssl/kopenssl
*
*/
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 @@
diff -up kdelibs-4.10.0/kio/kssl/ksslcertificate.cpp.CVE-2009-2702 kdelibs-4.10.0/kio/kssl/ksslcertificate.cpp
--- kdelibs-4.10.0/kio/kssl/ksslcertificate.cpp.CVE-2009-2702 2013-01-23 15:44:24.000000000 -0600
+++ kdelibs-4.10.0/kio/kssl/ksslcertificate.cpp 2013-01-31 07:37:12.210503883 -0600
@@ -1301,7 +1301,9 @@ QStringList KSSLCertificate::subjAltName
}
QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);

8
kdelibs-4.7.4-SOLID_UPNP.patch → kdelibs-4.10.0-SOLID_UPNP.patch
View File

@ -1,7 +1,7 @@
diff -up kdelibs-4.7.4/solid/solid/managerbase.cpp.UPNP kdelibs-4.7.4/solid/solid/managerbase.cpp
--- kdelibs-4.7.4/solid/solid/managerbase.cpp.UPNP 2011-12-01 19:22:43.644706401 -0600
+++ kdelibs-4.7.4/solid/solid/managerbase.cpp 2011-12-01 19:29:11.825853422 -0600
@@ -80,7 +80,11 @@ void Solid::ManagerBasePrivate::loadBack
diff -up kdelibs-4.10.0/solid/solid/managerbase.cpp.SOLID_UPNP kdelibs-4.10.0/solid/solid/managerbase.cpp
--- kdelibs-4.10.0/solid/solid/managerbase.cpp.SOLID_UPNP 2013-01-23 15:44:27.000000000 -0600
+++ kdelibs-4.10.0/solid/solid/managerbase.cpp 2013-01-31 07:48:05.058342162 -0600
@@ -98,7 +98,11 @@ void Solid::ManagerBasePrivate::loadBack
# endif
# if defined (HUPNP_FOUND)

11
kdelibs-4.10.0-branding.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp
--- kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp.branding 2013-01-23 15:44:24.000000000 -0600
+++ kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp 2013-01-31 07:41:09.248540500 -0600
@@ -743,6 +743,7 @@ QString KProtocolManager::defaultUserAge
d->useragent += QString::number(KDE::versionMajor());
d->useragent += QL1C('.');
d->useragent += QString::number(KDE::versionMinor());
+ d->useragent += QL1S(" Fedora/@@VERSION_RELEASE@@");
}
else
{

11
kdelibs-4.10.0-cmake.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.xxcmake kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.xxcmake 2013-01-31 07:45:31.958256176 -0600
+++ kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake 2013-01-31 07:45:31.989255789 -0600
@@ -955,6 +955,7 @@ endif(WIN32)
# CMake generators if no build type is set.
if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)

22
kdelibs-4.2.85-kde149705.patch → kdelibs-4.10.0-kde149705.patch
View File

@ -1,7 +1,7 @@
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()
diff -up kdelibs-4.10.0/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.10.0/kdeui/icons/kicontheme.cpp
--- kdelibs-4.10.0/kdeui/icons/kicontheme.cpp.kde149705 2013-01-23 15:44:19.000000000 -0600
+++ kdelibs-4.10.0/kdeui/icons/kicontheme.cpp 2013-01-31 07:40:19.163166653 -0600
@@ -527,7 +527,7 @@ QString KIconTheme::current()
}
KConfigGroup cg(KGlobal::config(), "Icons");
@ -10,10 +10,10 @@ diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeu
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
diff -up kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp.kde149705 2013-01-23 15:44:19.000000000 -0600
+++ kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp 2013-01-31 07:40:19.163166653 -0600
@@ -942,7 +942,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 -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.8
if (styleStr.isEmpty() ||
// check whether we already use the correct style to return then
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
diff -up kdelibs-4.10.0/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.10.0/kutils/kdeglobals.kcfg
--- kdelibs-4.10.0/kutils/kdeglobals.kcfg.kde149705 2013-01-23 15:44:26.000000000 -0600
+++ kdelibs-4.10.0/kutils/kdeglobals.kcfg 2013-01-31 07:40:19.164166641 -0600
@@ -24,6 +24,10 @@
<whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
<default>keramik</default>

10
kdelibs-4.6.90-kstandarddirs.patch → kdelibs-4.10.0-kstandarddirs.patch
View File

@ -1,7 +1,7 @@
diff -up kdelibs-4.6.90/kdecore/kernel/kstandarddirs.cpp.me kdelibs-4.6.90/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.6.90/kdecore/kernel/kstandarddirs.cpp.me 2011-06-28 09:43:49.000000000 +0200
+++ kdelibs-4.6.90/kdecore/kernel/kstandarddirs.cpp 2011-06-28 09:47:44.000000000 +0200
@@ -1152,7 +1152,9 @@ QStringList KStandardDirs::KStandardDirs
diff -up kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp.kstandarddirs 2013-01-31 07:44:58.336676504 -0600
+++ kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp 2013-01-31 07:44:58.340676454 -0600
@@ -1153,7 +1153,9 @@ QStringList KStandardDirs::KStandardDirs
pit != prefixList->end();
++pit)
{
@ -12,7 +12,7 @@ diff -up kdelibs-4.6.90/kdecore/kernel/kstandarddirs.cpp.me kdelibs-4.6.90/kdeco
{
for (QStringList::ConstIterator it = dirs.constBegin();
it != dirs.constEnd(); ++it)
@@ -1170,6 +1172,11 @@ QStringList KStandardDirs::KStandardDirs
@@ -1171,6 +1173,11 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}

14
kdelibs-4.5.80-no_rpath.patch → kdelibs-4.10.0-no_rpath.patch
View File

@ -1,7 +1,7 @@
diff -up kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-11-20 16:28:26.945612607 -0600
+++ kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake 2010-11-20 18:18:01.926613935 -0600
@@ -1042,7 +1042,7 @@ if (UNIX)
diff -up kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.no_rpath 2013-01-31 07:47:15.581960702 -0600
+++ kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake 2013-01-31 07:47:15.583960677 -0600
@@ -1050,7 +1050,7 @@ if (UNIX)
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
@ -10,9 +10,9 @@ diff -up kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.
endif (APPLE)
endif (UNIX)
diff -up kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath kdelibs-4.5.80/kdewidgets/CMakeLists.txt
--- kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath 2010-11-20 16:28:26.784363550 -0600
+++ kdelibs-4.5.80/kdewidgets/CMakeLists.txt 2010-11-20 18:20:09.111363760 -0600
diff -up kdelibs-4.10.0/kdewidgets/CMakeLists.txt.no_rpath kdelibs-4.10.0/kdewidgets/CMakeLists.txt
--- kdelibs-4.10.0/kdewidgets/CMakeLists.txt.no_rpath 2013-01-31 07:47:15.556961014 -0600
+++ kdelibs-4.10.0/kdewidgets/CMakeLists.txt 2013-01-31 07:47:15.583960677 -0600
@@ -46,14 +46,14 @@ if(QT_QTDESIGNER_FOUND)
kde4_add_plugin(kdewidgets ${kdewidgets_PART_SRCS})

38
kdelibs-4.8.3-webkit.patch → kdelibs-4.10.0-webkit.patch
View File

@ -1,7 +1,7 @@
diff -up kdelibs-4.8.3/CMakeLists.txt.webkit kdelibs-4.8.3/CMakeLists.txt
--- kdelibs-4.8.3/CMakeLists.txt.webkit 2012-04-29 22:38:24.266748427 +0200
+++ kdelibs-4.8.3/CMakeLists.txt 2012-05-04 12:35:38.086634268 +0200
@@ -325,7 +325,6 @@ if(NOT WINCE)
diff -up kdelibs-4.10.0/CMakeLists.txt.webkit kdelibs-4.10.0/CMakeLists.txt
--- kdelibs-4.10.0/CMakeLists.txt.webkit 2013-01-29 22:55:26.000000000 +0100
+++ kdelibs-4.10.0/CMakeLists.txt 2013-02-28 11:43:57.653616989 +0100
@@ -328,7 +328,6 @@ if(NOT WINCE)
add_subdirectory( plasma )
endif(NOT WINCE)
add_subdirectory( kunitconversion )
@ -9,9 +9,9 @@ diff -up kdelibs-4.8.3/CMakeLists.txt.webkit kdelibs-4.8.3/CMakeLists.txt
add_subdirectory( includes )
add_subdirectory( experimental )
diff -up kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit kdelibs-4.8.3/kdewidgets/CMakeLists.txt
--- kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit 2012-05-04 12:35:38.000000000 +0200
+++ kdelibs-4.8.3/kdewidgets/CMakeLists.txt 2012-05-04 12:37:23.482261882 +0200
diff -up kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit kdelibs-4.10.0/kdewidgets/CMakeLists.txt
--- kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit 2013-02-28 11:43:57.589617095 +0100
+++ kdelibs-4.10.0/kdewidgets/CMakeLists.txt 2013-02-28 11:43:57.654616988 +0100
@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
endif(NOT KDE_NO_DEPRECATED)
@ -54,27 +54,27 @@ diff -up kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit kdelibs-4.8.3/kdewidgets
if (QT_QT3SUPPORT_FOUND)
include_directories(
diff -up kdelibs-4.8.3/plasma/CMakeLists.txt.webkit kdelibs-4.8.3/plasma/CMakeLists.txt
--- kdelibs-4.8.3/plasma/CMakeLists.txt.webkit 2012-02-29 22:55:52.532149866 +0100
+++ kdelibs-4.8.3/plasma/CMakeLists.txt 2012-05-04 12:35:38.088634242 +0200
@@ -10,6 +10,8 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
diff -up kdelibs-4.10.0/plasma/CMakeLists.txt.webkit kdelibs-4.10.0/plasma/CMakeLists.txt
--- kdelibs-4.10.0/plasma/CMakeLists.txt.webkit 2013-02-28 11:43:57.600617077 +0100
+++ kdelibs-4.10.0/plasma/CMakeLists.txt 2013-02-28 11:47:28.121778200 +0100
@@ -11,6 +11,8 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+set(PLASMA_NO_KDEWEBKIT TRUE)
+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${KDE4_KDECORE_INCLUDES}
${KDE4_KDEUI_INCLUDES}
@@ -114,7 +116,6 @@ set(plasma_LIB_SRCS
if(NOT Q_WS_X11)
set(PLASMA_NO_PACKAGEKIT TRUE)
endif(NOT Q_WS_X11)
@@ -124,7 +126,6 @@ set(plasma_LIB_SRCS
framesvg.cpp
plasma.cpp
popupapplet.cpp
- private/animablegraphicswebview.cpp
private/applethandle.cpp
private/associatedapplicationmanager.cpp
private/datacontainer_p.cpp
@@ -202,7 +203,6 @@ set(plasma_LIB_SRCS
private/componentinstaller.cpp
@@ -214,7 +215,6 @@ set(plasma_LIB_SRCS
widgets/textbrowser.cpp
widgets/treeview.cpp
widgets/textedit.cpp
@ -82,7 +82,7 @@ diff -up kdelibs-4.8.3/plasma/CMakeLists.txt.webkit kdelibs-4.8.3/plasma/CMakeLi
#Temporary QtJolie branch
private/qtjolie-branch/qtjolie/abstractadaptor.cpp
@@ -266,7 +266,7 @@ endif(PHONON_FOUND)
@@ -278,7 +278,7 @@ endif(PHONON_FOUND)
kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
@ -91,7 +91,7 @@ diff -up kdelibs-4.8.3/plasma/CMakeLists.txt.webkit kdelibs-4.8.3/plasma/CMakeLi
${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
@@ -406,7 +406,6 @@ install(FILES
@@ -430,7 +430,6 @@ install(FILES
widgets/textbrowser.h
widgets/treeview.h
widgets/textedit.h

10
kdelibs-4.1.0-xdg-menu.patch → kdelibs-4.10.0-xdg-menu.patch
View File

@ -1,6 +1,6 @@
diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applications.menu
--- kdelibs-4.1.0/kded/applications.menu 2008-05-21 13:07:34.000000000 +0200
+++ kdelibs-4.1.0-xdg-menu/kded/applications.menu 2008-08-23 09:45:03.000000000 +0200
diff -up kdelibs-4.10.0/kded/applications.menu.Administration-menu kdelibs-4.10.0/kded/applications.menu
--- kdelibs-4.10.0/kded/applications.menu.Administration-menu 2013-01-23 15:44:19.000000000 -0600
+++ kdelibs-4.10.0/kded/applications.menu 2013-01-31 07:42:28.173553801 -0600
@@ -31,29 +31,31 @@
<Category>Core</Category>
<Not><Category>KDE</Category></Not>
@ -50,7 +50,7 @@ diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applic
<Name>Development</Name>
<Directory>kde-development.directory</Directory>
<Menu>
@@ -358,7 +360,11 @@
@@ -369,7 +371,11 @@
<Name>Settingsmenu</Name>
<Directory>kde-settingsmenu.directory</Directory>
<Include>
@ -63,7 +63,7 @@ diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applic
</Include>
</Menu>
<Menu>
@@ -367,7 +373,9 @@
@@ -378,7 +384,9 @@
<Include>
<And>
<Category>System</Category>

110
kdelibs-4.6.2-uri_mimetypes.patch
View File

@ -1,110 +0,0 @@
diff --git a/kio/misc/mms.protocol b/kio/misc/mms.protocol
index 286ccd8..e8afbdb 100644
--- a/kio/misc/mms.protocol
+++ b/kio/misc/mms.protocol
@@ -1,7 +1,7 @@
[Protocol]
helper=true
exec=
-defaultMimetype=uri/mms
+defaultMimetype=x-scheme-handler/mms
protocol=mms
input=none
output=none
diff --git a/kio/misc/mmst.protocol b/kio/misc/mmst.protocol
index 1f0f763..455694a 100644
--- a/kio/misc/mmst.protocol
+++ b/kio/misc/mmst.protocol
@@ -1,5 +1,5 @@
[Protocol]
-defaultMimetype=uri/mmst
+defaultMimetype=x-scheme-handler/mmst
exec=
protocol=mmst
input=none
diff --git a/kio/misc/mmsu.protocol b/kio/misc/mmsu.protocol
index deda935..1c1a7f6 100644
--- a/kio/misc/mmsu.protocol
+++ b/kio/misc/mmsu.protocol
@@ -1,5 +1,5 @@
[Protocol]
-defaultMimetype=uri/mmsu
+defaultMimetype=x-scheme-handler/mmsu
exec=
protocol=mmsu
input=none
diff --git a/kio/misc/pnm.protocol b/kio/misc/pnm.protocol
index 3ca3a7d..fe44c37 100644
--- a/kio/misc/pnm.protocol
+++ b/kio/misc/pnm.protocol
@@ -1,5 +1,5 @@
[Protocol]
-defaultMimetype=uri/pnm
+defaultMimetype=x-scheme-handler/pnm
exec=
protocol=pnm
input=none
diff --git a/kio/misc/rtspt.protocol b/kio/misc/rtspt.protocol
index 9e4fe96..4d86282 100644
--- a/kio/misc/rtspt.protocol
+++ b/kio/misc/rtspt.protocol
@@ -1,5 +1,5 @@
[Protocol]
-defaultMimetype=uri/rtspt
+defaultMimetype=x-scheme-handler/rtspt
exec=
protocol=rtspt
input=none
diff --git a/kio/misc/rtspu.protocol b/kio/misc/rtspu.protocol
index 9cc9299..5fc9d6b 100644
--- a/kio/misc/rtspu.protocol
+++ b/kio/misc/rtspu.protocol
@@ -1,5 +1,5 @@
[Protocol]
-defaultMimetype=uri/rtspu
+defaultMimetype=x-scheme-handler/rtspu
exec=
protocol=rtspu
input=none
diff --git a/mimetypes/kde.xml b/mimetypes/kde.xml
index 2810b5b..8de16f6 100644
--- a/mimetypes/kde.xml
+++ b/mimetypes/kde.xml
@@ -187,24 +187,30 @@ Notes:
<comment>all files</comment>
</mime-type>
- <!-- uri/ fake mime types -->
- <mime-type type="uri/mms">
+ <!-- x-scheme-handler/ fake(ish) mime types -->
+ <mime-type type="x-scheme-handler/mms">
<comment>mms: URIs</comment>
+ <alias type="uri/mms"/>
</mime-type>
- <mime-type type="uri/mmst">
+ <mime-type type="x-scheme-handler/mmst">
<comment>mmst: URIs</comment>
+ <alias type="uri/mmst"/>
</mime-type>
- <mime-type type="uri/mmsu">
+ <mime-type type="x-scheme-handler/mmsu">
<comment>mmsu: URIs</comment>
+ <alias type="uri/mmsu"/>
</mime-type>
- <mime-type type="uri/pnm">
+ <mime-type type="x-scheme-handler/pnm">
<comment>pnm: URIs</comment>
+ <alias type="uri/pnm"/>
</mime-type>
- <mime-type type="uri/rtspt">
+ <mime-type type="x-scheme-handler/rtspt">
<comment>rtspt: URIs</comment>
+ <alias type="uri/rtspt"/>
</mime-type>
- <mime-type type="uri/rtspu">
+ <mime-type type="x-scheme-handler/rtspu">
<comment>rtspu: URIs</comment>
+ <alias type="uri/rtspu"/>
</mime-type>
<mime-type type="application/vnd.kde.fontspackage">

11
kdelibs-4.6.80-branding.patch
View File

@ -1,11 +0,0 @@
diff -up kdelibs-4.6.80/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.6.80/kio/kio/kprotocolmanager.cpp
--- kdelibs-4.6.80/kio/kio/kprotocolmanager.cpp.branding 2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.80/kio/kio/kprotocolmanager.cpp 2011-05-27 14:18:43.999356195 +0200
@@ -645,6 +645,7 @@ QString KProtocolManager::defaultUserAge
d->useragent += QString::number(KDE::versionMajor());
d->useragent += QL1C('.');
d->useragent += QString::number(KDE::versionMinor());
+ d->useragent += QL1S(" Fedora/@@VERSION_RELEASE@@");
}
else
{

104
kdelibs-4.7.3-halectomy.patch
View File

@ -1,104 +0,0 @@
diff -up kdelibs-4.7.3/solid/solid/CMakeLists.txt.halectomy kdelibs-4.7.3/solid/solid/CMakeLists.txt
--- kdelibs-4.7.3/solid/solid/CMakeLists.txt.halectomy 2011-05-20 15:24:54.000000000 -0500
+++ kdelibs-4.7.3/solid/solid/CMakeLists.txt 2011-11-16 17:12:05.439596850 -0600
@@ -39,7 +39,6 @@ configure_file(config-processor.h.cmake
file(MAKE_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/backends/fakehw
- ${CMAKE_CURRENT_BINARY_DIR}/backends/hal
${CMAKE_CURRENT_BINARY_DIR}/backends/udev
${CMAKE_CURRENT_BINARY_DIR}/backends/wmi
)
@@ -199,33 +198,6 @@ if(NOT WIN32 AND NOT APPLE)
endif( UDEV_FOUND )
- message(STATUS "Building Solid HAL backend." )
- set(solid_LIB_SRCS ${solid_LIB_SRCS}
- backends/hal/halacadapter.cpp
- backends/hal/halaudiointerface.cpp
- backends/hal/halbattery.cpp
- backends/hal/halblock.cpp
- backends/hal/halbutton.cpp
- backends/hal/halcamera.cpp
- backends/hal/halcdrom.cpp
- backends/hal/haldeviceinterface.cpp
- backends/hal/haldvbinterface.cpp
- backends/hal/halfstabhandling.cpp
- backends/hal/halgenericinterface.cpp
- backends/hal/haldevice.cpp
- backends/hal/halmanager.cpp
- backends/hal/halnetworkinterface.cpp
- backends/hal/halserialinterface.cpp
- backends/hal/halopticaldisc.cpp
- backends/hal/halportablemediaplayer.cpp
- backends/hal/halprocessor.cpp
- backends/hal/halstorageaccess.cpp
- backends/hal/halstorage.cpp
- backends/hal/halvideo.cpp
- backends/hal/halvolume.cpp
- backends/hal/halsmartcardreader.cpp
- )
-
message(STATUS "Building Solid UPower backend." )
set(solid_LIB_SRCS ${solid_LIB_SRCS}
backends/upower/upowermanager.cpp
diff -up kdelibs-4.7.3/solid/solid/managerbase.cpp.halectomy kdelibs-4.7.3/solid/solid/managerbase.cpp
--- kdelibs-4.7.3/solid/solid/managerbase.cpp.halectomy 2011-05-20 15:24:54.000000000 -0500
+++ kdelibs-4.7.3/solid/solid/managerbase.cpp 2011-11-16 17:14:45.193599658 -0600
@@ -30,7 +30,6 @@
#if defined (Q_OS_MAC)
#include "backends/iokit/iokitmanager.h"
#elif defined (Q_OS_UNIX)
-#include "backends/hal/halmanager.h"
#include "backends/udisks/udisksmanager.h"
#include "backends/upower/upowermanager.h"
@@ -71,22 +70,13 @@ void Solid::ManagerBasePrivate::loadBack
# elif defined(Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
m_backends << new Solid::Backends::Wmi::WmiManager(0);
-# elif defined(Q_OS_UNIX) && !defined(Q_OS_LINUX)
- m_backends << new Solid::Backends::Hal::HalManager(0);
-
# elif defined(Q_OS_LINUX)
- bool solidHalLegacyEnabled
- = QString::fromLocal8Bit(qgetenv("SOLID_HAL_LEGACY")).toInt()==1;
- if (solidHalLegacyEnabled) {
- m_backends << new Solid::Backends::Hal::HalManager(0);
- } else {
# if defined(UDEV_FOUND)
m_backends << new Solid::Backends::UDev::UDevManager(0);
# endif
m_backends << new Solid::Backends::UDisks::UDisksManager(0)
<< new Solid::Backends::UPower::UPowerManager(0)
<< new Solid::Backends::Fstab::FstabManager(0);
- }
# endif
# if defined (HUPNP_FOUND)
diff -up kdelibs-4.7.3/solid/tests/CMakeLists.txt.halectomy kdelibs-4.7.3/solid/tests/CMakeLists.txt
--- kdelibs-4.7.3/solid/tests/CMakeLists.txt.halectomy 2011-10-28 02:41:29.000000000 -0500
+++ kdelibs-4.7.3/solid/tests/CMakeLists.txt 2011-11-16 17:12:05.440596838 -0600
@@ -15,21 +15,6 @@ endif(WIN32)
target_link_libraries(fakehardwaretest solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml\\"")
-
-########### halbasictest ###############
-
-if(NOT WIN32 AND NOT APPLE)
-set(halbasictest_SRCS halbasictest.cpp )
-
-kde4_add_executable(halbasictest ${halbasictest_SRCS})
-
-if(WIN32)
- set_target_properties(halbasictest PROPERTIES COMPILE_FLAGS -DSOLID_EXPORT=)
-endif(WIN32)
-
-target_link_libraries(halbasictest solid_static ${KDEWIN_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
-endif(NOT WIN32 AND NOT APPLE)
-
########### solidhwtest ###############
set(solidhwtest_SRCS

224
kdelibs-4.9.1-FindKipi-libkipi2.patch
View File

@ -1,224 +0,0 @@
diff -up kdelibs-4.9.1/cmake/modules/FindKipi.cmake.FindKipi-libkipi2 kdelibs-4.9.1/cmake/modules/FindKipi.cmake
--- kdelibs-4.9.1/cmake/modules/FindKipi.cmake.FindKipi-libkipi2 2012-08-13 03:39:41.000000000 -0500
+++ kdelibs-4.9.1/cmake/modules/FindKipi.cmake 2012-09-26 08:01:10.326462520 -0500
@@ -1,116 +1,119 @@
-# - Try to find the Kipi library
+# Module that tries to find the Kipi library
#
# If you have put a local version of libkipi into your source tree,
# set KIPI_LOCAL_DIR to the relative path to the local directory.
#
# Once done this will define
#
-# KIPI_FOUND - system has libkipi
-# KIPI_INCLUDE_DIR - the libkipi include directory
-# KIPI_LIBRARIES - Link these to use libkipi
+# KIPI_FOUND - System has libkipi
+# KIPI_INCLUDE_DIR - The libkipi include directory
+# KIPI_LIBRARIES - Link these to use libkipi
# KIPI_DEFINITIONS - Compiler switches required for using libkipi
+# KIPI_VERSION - The release version of the Kipi library
+# KIPI_SO_VERSION - The binary SO version of the Kipi library
#
-# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
+# Copyright (c) 2012, Victor Dodon <dodonvictor at gmail dot com>
+# Copyright (c) 2012, Gilles Caulier <caulier dot gilles at gmail dot com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS)
+IF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)
- message(STATUS "Found Kipi library in cache: ${KIPI_LIBRARIES}")
+ IF(NOT Kipi_FIND_QUIETLY)
+ MESSAGE(STATUS "Found kipi library in cache ${KIPI_LIBRARIES}")
+ ENDIF(NOT Kipi_FIND_QUIETLY)
+ # Already in cache
+ SET(KIPI_FOUND TRUE)
+
+ELSE(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)
+
+ IF(NOT Kipi_FIND_QUIETLY)
+ MESSAGE(STATUS "Check Kipi library in local sub-folder...")
+ ENDIF(NOT Kipi_FIND_QUIETLY)
+
+ IF(KIPI_LOCAL_DIR)
+ FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR} NO_DEFAULT_PATH)
+ IF(NOT KIPI_LOCAL_FOUND)
+ MESSAGE(WARNING "KIPI_LOCAL_DIR specified as \"${KIPI_LOCAL_DIR}\" but libkipi could not be found there.")
+ ENDIF(NOT KIPI_LOCAL_FOUND)
+ ELSE(KIPI_LOCAL_DIR)
+ FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libkipi NO_DEFAULT_PATH)
+ IF(KIPI_LOCAL_FOUND)
+ SET(KIPI_LOCAL_DIR libkipi)
+ ENDIF(KIPI_LOCAL_FOUND)
+
+ FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
+ IF(KIPI_LOCAL_FOUND)
+ SET(KIPI_LOCAL_DIR libs/libkipi)
+ ENDIF(KIPI_LOCAL_FOUND)
+ ENDIF(KIPI_LOCAL_DIR)
+
+ IF(KIPI_LOCAL_FOUND)
+
+ SET(KIPI_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
+ SET(KIPI_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
+ SET(KIPI_LIBRARIES kipi)
+ IF(NOT Kipi_FIND_QUIETLY)
+ MESSAGE(STATUS "Found Kipi library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}")
+ ENDIF(NOT Kipi_FIND_QUIETLY)
+ SET(KIPI_FOUND TRUE)
+ SET(KIPI_VERSION_H_FILENAME "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}/libkipi/version.h")
+
+ ELSE(KIPI_LOCAL_FOUND)
+
+ IF(NOT WIN32)
+ IF(NOT Kipi_FIND_QUIETLY)
+ MESSAGE(STATUS "Check Kipi library using pkg-config...")
+ ENDIF(NOT Kipi_FIND_QUIETLY)
+
+ INCLUDE(FindPkgConfig)
+ PKG_CHECK_MODULES(KIPI libkipi>=1.2.0)
+ ENDIF(NOT WIN32)
+
+ FIND_LIBRARY(KIPI_LIBRARIES NAMES libkipi PATHS ${KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
+ FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KIPI_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR})
+ SET(KIPI_VERSION_H_FILENAME "${KIPI_INCLUDE_DIR}/libkipi/version.h")
+ SET(KIPI_DEFINITIONS ${KIPI_CFLAGS} CACHE STRING "Kipi definitions")
+
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(KIPI DEFAULT_MSG KIPI_LIBRARIES KIPI_INCLUDE_DIR)
+
+ ENDIF(KIPI_LOCAL_FOUND)
+
+ IF(KIPI_FOUND)
+
+ IF(NOT KIPI_VERSION)
+ FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT)
+ STRING(REGEX REPLACE ".*static +const +char +kipi_version\\[\\] += +\"([^\"]+)\".*" "\\1" KIPI_VERSION "${KIPI_VERSION_H_CONTENT}")
+ MESSAGE(STATUS "Kipi library version: ${KIPI_VERSION}")
+ ENDIF(NOT KIPI_VERSION)
+
+ IF(NOT KIPI_SO_VERSION)
+ FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT)
+ STRING(REGEX REPLACE
+ ".*static +const +int +kipi_binary_version += ([^ ;]+).*"
+ "\\1"
+ KIPI_SO_VERSION_FOUND
+ "${KIPI_VERSION_H_CONTENT}"
+ )
+ SET(KIPI_SO_VERSION ${KIPI_SO_VERSION_FOUND} CACHE STRING "libkipi so version")
+ MESSAGE(STATUS "Kipi library SO binary version: ${KIPI_SO_VERSION}")
+ ENDIF(NOT KIPI_SO_VERSION)
+
+ UNSET(KIPI_VERSION_H_CONTENT)
+ UNSET(KIPI_VERSION_H_FILENAME)
+ ENDIF(KIPI_FOUND)
+
+ IF(KIPI_FOUND)
+ MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS KIPI_VERSION KIPI_SO_VERSION)
+ ELSE(KIPI_FOUND)
+ UNSET(KIPI_INCLUDE_DIR)
+ UNSET(KIPI_LIBRARIES)
+ UNSET(KIPI_DEFINITIONS)
+ UNSET(KIPI_VERSION)
+ UNSET(KIPI_SO_VERSION)
+ ENDIF(KIPI_FOUND)
- # in cache already
- set(KIPI_FOUND TRUE)
-
-else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS)
-
- message(STATUS "Check Kipi library in local sub-folder...")
-
- # Check if library is not in local sub-folder
-
- if (KIPI_LOCAL_DIR)
- set (KIPI_LOCAL_FOUND TRUE)
- else (KIPI_LOCAL_DIR)
- find_file(KIPI_LOCAL_FOUND libkipi/kipi.h ${CMAKE_SOURCE_DIR}/libkipi ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
-
- if (KIPI_LOCAL_FOUND)
- # Was it found in libkdcraw/ or in libs/libkdcraw?
- find_file(KIPI_LOCAL_FOUND_IN_LIBS libkipi/kipi.h ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
- if (KIPI_LOCAL_FOUND_IN_LIBS)
- set(KIPI_LOCAL_DIR libs/libkipi)
- else (KIPI_LOCAL_FOUND_IN_LIBS)
- set(KIPI_LOCAL_DIR libkipi)
- endif (KIPI_LOCAL_FOUND_IN_LIBS)
- endif (KIPI_LOCAL_FOUND)
- endif (KIPI_LOCAL_DIR)
-
- if (KIPI_LOCAL_FOUND)
- # we need two include directories: because the version.h file is put into the build directory
- # TODO KIPI_INCLUDE_DIR sounds like it should contain only one directory...
- set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR} ${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR})
- set(KIPI_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
- set(KIPI_LIBRARIES kipi)
- message(STATUS "Found Kipi library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}")
- set(KIPI_FOUND TRUE)
- mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS)
-
- else (KIPI_LOCAL_FOUND)
-
- if (NOT WIN32)
- message(STATUS "Check Kipi library using pkg-config...")
-
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- include(UsePkgConfig)
-
- PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
-
- if (_KIPILinkFlags)
- # query pkg-config asking for a libkipi >= 0.2.0
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
- if (_return_VALUE STREQUAL "0")
- message(STATUS "Found libkipi release >= 0.2.0")
- set(KIPI_VERSION_GOOD_FOUND TRUE)
- else (_return_VALUE STREQUAL "0")
- message(STATUS "Found libkipi release < 0.2.0, too old")
- set(KIPI_VERSION_GOOD_FOUND FALSE)
- set(KIPI_FOUND FALSE)
- endif (_return_VALUE STREQUAL "0")
- else (_KIPILinkFlags)
- set(KIPI_VERSION_GOOD_FOUND FALSE)
- set(KIPI_FOUND FALSE)
- endif (_KIPILinkFlags)
- else (NOT WIN32)
- set(KIPI_VERSION_GOOD_FOUND TRUE)
- endif (NOT WIN32)
- if (KIPI_VERSION_GOOD_FOUND)
- set(KIPI_DEFINITIONS ${_KIPICflags})
-
- find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
- find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
-
- if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
- set(KIPI_FOUND TRUE)
- endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
- endif (KIPI_VERSION_GOOD_FOUND)
- if (KIPI_FOUND)
- if (NOT Kipi_FIND_QUIETLY)
- message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
- endif (NOT Kipi_FIND_QUIETLY)
- else (KIPI_FOUND)
- if (Kipi_FIND_REQUIRED)
- if (NOT KIPI_INCLUDE_DIR)
- message(FATAL_ERROR "Could NOT find libkipi header files")
- endif (NOT KIPI_INCLUDE_DIR)
- if (NOT KIPI_LIBRARIES)
- message(FATAL_ERROR "Could NOT find libkipi library")
- endif (NOT KIPI_LIBRARIES)
- endif (Kipi_FIND_REQUIRED)
- endif (KIPI_FOUND)
-
- mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS)
-
- endif (KIPI_LOCAL_FOUND)
-
-endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS)
+ENDIF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)

28
kdelibs-4.9.2-FindSamba_samba4.patch
View File

@ -1,28 +0,0 @@
diff -up kdelibs-4.9.2/cmake/modules/FindSamba.cmake.samba4 kdelibs-4.9.2/cmake/modules/FindSamba.cmake
--- kdelibs-4.9.2/cmake/modules/FindSamba.cmake.samba4 2012-09-27 19:09:04.000000000 -0500
+++ kdelibs-4.9.2/cmake/modules/FindSamba.cmake 2012-10-02 07:11:38.137381941 -0500
@@ -17,10 +17,22 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES
set(Samba_FIND_QUIETLY TRUE)
endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
+IF (NOT WIN32)
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+ pkg_check_modules(PC_LIBSMBCLIENT QUIET smbclient)
+ENDIF (NOT WIN32)
-find_library(SAMBA_LIBRARIES NAMES smbclient )
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h
+ PATHS
+ ${PC_LIBSMBCLIENT_INCLUDEDIR}
+ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
+find_library(SAMBA_LIBRARIES NAMES smbclient
+ PATHS
+ ${PC_LIBSMBCLIENT_LIBDIR}
+ ${PC_LIBSMBCLIENT_LIB_DIRS})
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
set(SAMBA_FOUND TRUE)

26
kdelibs-4.9.90-FindSamba_samba4.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up kdelibs-4.9.90/cmake/modules/FindSamba.cmake.FindSamba-samba4 kdelibs-4.9.90/cmake/modules/FindSamba.cmake
--- kdelibs-4.9.90/cmake/modules/FindSamba.cmake.FindSamba-samba4 2012-11-14 09:58:29.000000000 -0600
+++ kdelibs-4.9.90/cmake/modules/FindSamba.cmake 2012-12-03 07:29:54.103057454 -0600
@@ -17,10 +17,20 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES
set(Samba_FIND_QUIETLY TRUE)
endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PC_LIBSMBCLIENT QUIET smbclient)
-find_library(SAMBA_LIBRARIES NAMES smbclient )
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h
+ HINTS
+ ${PC_LIBSMBCLIENT_INCLUDEDIR}
+ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
+find_library(SAMBA_LIBRARIES NAMES smbclient
+ HINTS
+ ${PC_LIBSMBCLIENT_LIBDIR}
+ ${PC_LIBSMBCLIENT_LIB_DIRS})
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
set(SAMBA_FOUND TRUE)

60
kdelibs-4.5.80-parallel_devel.patch → kdelibs-4.9.95-parallel_devel.patch
View File

@ -1,6 +1,6 @@
diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake 2010-10-27 21:55:42.000000000 +0200
+++ kdelibs-4.5.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2010-11-20 19:41:54.000000000 +0100
diff -up kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2012-12-18 02:26:38.000000000 -0600
+++ kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake 2012-12-19 15:21:37.963466601 -0600
@@ -38,10 +38,10 @@
# The following variables are defined for the various tools required to
# compile KDE software:
@ -23,7 +23,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para
# for Qt Designer plugins.
#
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -506,31 +506,31 @@
@@ -509,31 +509,31 @@ if (_kdeBootStrapping)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
if (NOT WINCE)
@ -62,7 +62,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -579,7 +579,8 @@
@@ -582,7 +582,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
@ -72,7 +72,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
@@ -593,18 +594,18 @@
@@ -596,18 +597,18 @@ 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
@ -95,7 +95,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para
# 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)
@@ -930,7 +931,8 @@
@@ -934,7 +935,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
"${KDE4_BIN_INSTALL_DIR}" )
@ -105,7 +105,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para
"${KDE4_LIB_INSTALL_DIR}" )
# under Windows dlls may be also installed in bin/
@@ -1360,9 +1362,9 @@
@@ -1363,9 +1365,9 @@ macro (KDE4_PRINT_RESULTS)
endif (NOT _kdeBootStrapping)
if(KDE4_KCFGC_EXECUTABLE)
@ -117,7 +117,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para
endif(KDE4_KCFGC_EXECUTABLE)
if(AUTOMOC4_EXECUTABLE)
@@ -1381,7 +1383,7 @@
@@ -1384,7 +1386,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
endif (NOT KDE4_INSTALLED_VERSION_OK)
if (NOT KDE4_KCFGC_EXECUTABLE)
@ -126,9 +126,9 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para
endif (NOT KDE4_KCFGC_EXECUTABLE)
message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -ur kdelibs-4.5.80/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.5.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.5.80/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.5.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2010-11-20 19:30:18.000000000 +0100
diff -up kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2012-12-17 08:14:16.000000000 -0600
+++ kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh 2012-12-19 15:21:37.963466601 -0600
@@ -2,9 +2,9 @@
# Generates and cleans KConfigXT source code during a API dox build
#
@ -141,10 +141,10 @@ diff -ur kdelibs-4.5.80/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.5.80-parall
exit 1;
fi
diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.5.80/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2010-11-20 19:30:18.000000000 +0100
@@ -15,12 +15,12 @@
diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2012-12-17 08:14:16.000000000 -0600
+++ kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl 2012-12-19 15:21:37.963466601 -0600
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
$kcfgc = $file . "c";
@ -159,9 +159,9 @@ diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.5.80-par
exit 1;
}
diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.5.80/kdecore/kconfig_compiler/CMakeLists.txt 2010-05-27 19:25:31.000000000 +0200
+++ kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2010-11-20 19:30:18.000000000 +0100
diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600
+++ kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600
@@ -11,13 +11,13 @@
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
@ -179,10 +179,10 @@ diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.5.80-p
# # export this binary for cross-compilation
diff -ur kdelibs-4.5.80/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.5.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.5.80/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-08-12 12:00:20.000000000 +0200
+++ kdelibs-4.5.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2010-11-20 19:30:18.000000000 +0100
@@ -9,7 +9,7 @@
diff -up kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600
+++ kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -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
@ -191,10 +191,10 @@ diff -ur kdelibs-4.5.80/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.5.
# 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 -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/kdewidgets/CMakeLists.txt
--- kdelibs-4.5.80/kdewidgets/CMakeLists.txt 2010-11-05 11:48:27.000000000 +0100
+++ kdelibs-4.5.80-parallel_devel/kdewidgets/CMakeLists.txt 2010-11-20 19:34:43.000000000 +0100
@@ -14,24 +14,24 @@
diff -up kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdewidgets/CMakeLists.txt
--- kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600
+++ kdelibs-4.9.95/kdewidgets/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600
@@ -14,24 +14,24 @@ include_directories(
set(makekdewidgets_SRCS makekdewidgets.cpp )
@ -224,7 +224,7 @@ diff -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/
set(kdewidgets_PART_SRCS
classpreviews.cpp
@@ -61,7 +61,7 @@
@@ -61,7 +61,7 @@ if(QT_QTDESIGNER_FOUND)
if(NOT KDE_NO_DEPRECATED)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdedeprecated.widgets
@ -233,7 +233,7 @@ diff -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/
set(kdedeprecated_PART_SRCS
classpreviews.cpp
@@ -96,7 +96,7 @@
@@ -96,7 +96,7 @@ if(QT_QTDESIGNER_FOUND)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
@ -242,7 +242,7 @@ diff -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/
set(kdewebkitwidgets_PART_SRCS
classpreviews.cpp
@@ -132,7 +132,7 @@
@@ -132,7 +132,7 @@ if(QT_QTDESIGNER_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

31
kdelibs-4.8.0-libexecdir.patch → kdelibs-4.9.97-libexecdir.patch
View File

@ -1,6 +1,6 @@
diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir 2012-01-10 15:17:51.000000000 +0100
+++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp 2012-01-19 13:38:07.424309462 +0100
diff -up kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp.libexecdir 2012-12-17 08:14:17.000000000 -0600
+++ kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp 2013-01-03 14:56:38.768459213 -0600
@@ -1871,7 +1871,7 @@ void KStandardDirs::addKDEDefaults()
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
index+=2;
@ -10,9 +10,9 @@ diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.8.0
addResourceDir("home", QDir::homePath(), false);
diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp
--- kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2011-07-27 20:34:33.000000000 +0200
+++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp 2012-01-19 13:38:07.424309462 +0100
diff -up kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp
--- kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2012-12-17 08:14:16.000000000 -0600
+++ kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp 2013-01-03 14:56:38.768459213 -0600
@@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const
if (strcmp("lib", type) == 0)
return QFile::decodeName(LIB_INSTALL_DIR "/");
@ -22,9 +22,9 @@ diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-
if (strcmp("locale", type) == 0)
return QFile::decodeName(LOCALE_INSTALL_DIR "/");
break;
diff -up kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp
--- kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir 2012-01-18 19:06:22.000000000 +0100
+++ kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp 2012-01-19 13:42:17.955103619 +0100
diff -up kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp
--- kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp.libexecdir 2012-12-17 08:14:17.000000000 -0600
+++ kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp 2013-01-03 14:56:38.769459202 -0600
@@ -96,8 +96,9 @@ void KStandarddirsTest::testFindResource
#define KIOSLAVE "bin/kioslave.exe"
#else
@ -46,15 +46,4 @@ diff -up kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.
#endif
#ifndef Q_OS_MAC // kdeinit4 is a bundle on Mac, so the below doesn't work
diff -up kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir kdelibs-4.8.0/kio/tests/krununittest.cpp
--- kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir 2011-07-27 20:34:37.000000000 +0200
+++ kdelibs-4.8.0/kio/tests/krununittest.cpp 2012-01-19 13:38:07.427309472 +0100
@@ -160,7 +160,7 @@ void KRunUnitTest::testProcessDesktopExe
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
if (!kdeinit.isEmpty()) {
QVERIFY(!kmailservice.isEmpty());
- QVERIFY(kmailservice.contains("kde4/libexec"));
+ QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
}
QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;
diff -up kdelibs-4.9.97/kio/tests/krununittest.cpp.libexecdir kdelibs-4.9.97/kio/tests/krununittest.cpp

246
kdelibs-FindKdcraw.patch
View File

@ -1,246 +0,0 @@
diff --git a/cmake/modules/FindKdcraw.cmake b/cmake/modules/FindKdcraw.cmake
index 518033d..1d1a2ac 100644
--- a/cmake/modules/FindKdcraw.cmake
+++ b/cmake/modules/FindKdcraw.cmake
@@ -1,124 +1,157 @@
-# - Try to find the Kdcraw library
+# Try to find the Kdcraw library
#
-# If you have put a local version of libkdcraw into your source tree,
-# set KDCRAW_LOCAL_DIR to the relative path to the local directory.
+# Parameters:
+# KDCRAW_LOCAL_DIR - If you have put a local version of libkdcraw into
+# your source tree, set KDCRAW_LOCAL_DIR to the
+# relative path from the root of your source tree
+# to the libkdcraw local directory.
#
# Once done this will define
#
-# KDCRAW_FOUND - system has libkdcraw
-# KDCRAW_INCLUDE_DIR - the libkdcraw include directory
+# KDCRAW_FOUND - System has libkdcraw
+# KDCRAW_INCLUDE_DIR - The libkdcraw include directory/directories (for #include <libkdcraw/...> style)
# KDCRAW_LIBRARIES - Link these to use libkdcraw
# KDCRAW_DEFINITIONS - Compiler switches required for using libkdcraw
+# KDCRAW_VERSION - Version of libkdcraw which was found
#
-
-# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
+# Copyright (c) 2008-2011, Gilles Caulier, <caulier.gilles@gmail.com>
+# Copyright (c) 2011, Michael G. Hansen, <mike@mghansen.de>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# Kdcraw_FIND_QUIETLY and Kdcraw_FIND_REQUIRED may be defined by CMake.
-if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS)
+if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION)
- message(STATUS "Found Kdcraw library in cache: ${KDCRAW_LIBRARIES}")
+ if (NOT Kdcraw_FIND_QUIETLY)
+ message(STATUS "Found Kdcraw library in cache: ${KDCRAW_LIBRARIES}")
+ endif (NOT Kdcraw_FIND_QUIETLY)
# in cache already
set(KDCRAW_FOUND TRUE)
-else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS)
-
- message(STATUS "Check Kdcraw library in local sub-folder...")
+else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION)
- # Check if library is not in local sub-folder
+ if (NOT Kdcraw_FIND_QUIETLY)
+ message(STATUS "Check for Kdcraw library in local sub-folder...")
+ endif (NOT Kdcraw_FIND_QUIETLY)
+ # Check for a local version of the library.
if (KDCRAW_LOCAL_DIR)
- set (KDCRAW_LOCAL_FOUND TRUE)
+ find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR} NO_DEFAULT_PATH)
+ if (NOT KDCRAW_LOCAL_FOUND)
+ message(WARNING "KDCRAW_LOCAL_DIR specified as \"${KDCRAW_LOCAL_DIR}\" but libkdcraw could not be found there.")
+ endif (NOT KDCRAW_LOCAL_FOUND)
else (KDCRAW_LOCAL_DIR)
- find_file(KDCRAW_LOCAL_FOUND libkdcraw/kdcraw.h ${CMAKE_SOURCE_DIR}/libkdcraw ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
-
+ find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/libkdcraw NO_DEFAULT_PATH)
if (KDCRAW_LOCAL_FOUND)
- # Was it found in libkdcraw/ or in libs/libkdcraw?
- find_file(KDCRAW_LOCAL_FOUND_IN_LIBS libkdcraw/kdcraw.h ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
- if (KDCRAW_LOCAL_FOUND_IN_LIBS)
- set(KDCRAW_LOCAL_DIR libs/libkdcraw)
- else (KDCRAW_LOCAL_FOUND_IN_LIBS)
- set(KDCRAW_LOCAL_DIR libkdcraw)
- endif (KDCRAW_LOCAL_FOUND_IN_LIBS)
+ set(KDCRAW_LOCAL_DIR libkdcraw)
+ endif (KDCRAW_LOCAL_FOUND)
+ find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
+ if (KDCRAW_LOCAL_FOUND)
+ set(KDCRAW_LOCAL_DIR libs/libkdcraw)
endif (KDCRAW_LOCAL_FOUND)
endif (KDCRAW_LOCAL_DIR)
if (KDCRAW_LOCAL_FOUND)
-
- # we need two include directories: because the version.h file is put into the build directory
+ # We need two include directories: because the version.h file is put into the build directory
# TODO KDCRAW_INCLUDE_DIR sounds like it should contain only one directory...
set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR} ${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR})
set(KDCRAW_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR}")
set(KDCRAW_LIBRARIES kdcraw)
- message(STATUS "Found Kdcraw library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}")
+ if (NOT Kdcraw_FIND_QUIETLY)
+ message(STATUS "Found Kdcraw library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}")
+ endif (NOT Kdcraw_FIND_QUIETLY)
set(KDCRAW_FOUND TRUE)
- mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS)
- else(KDCRAW_LOCAL_FOUND)
+ set(kdcraw_version_h_filename "${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR}/libkdcraw/version.h")
- message(STATUS "Check Kdcraw library using pkg-config...")
+ else (KDCRAW_LOCAL_FOUND)
if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- include(UsePkgConfig)
-
- PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
-
- if (_KDCRAWLinkFlags)
- # query pkg-config asking for a libkdcraw >= 0.2.0
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
- if (_return_VALUE STREQUAL "0")
- message(STATUS "Found libkdcraw release >= 0.2.0")
- set(KDCRAW_VERSION_GOOD_FOUND TRUE)
- else (_return_VALUE STREQUAL "0")
- message(STATUS "Found libkdcaw release < 0.2.0, too old")
- set(KDCRAW_VERSION_GOOD_FOUND FALSE)
- set(KDCRAW_FOUND FALSE)
- endif (_return_VALUE STREQUAL "0")
- else (_KDCRAWLinkFlags)
+ if (NOT Kdcraw_FIND_QUIETLY)
+ message(STATUS "Check Kdcraw library using pkg-config...")
+ endif (NOT Kdcraw_FIND_QUIETLY)
+
+ # use FindPkgConfig to get the directories and then use these values
+ # in the find_path() and find_library() calls
+ include(FindPkgConfig)
+
+ pkg_check_modules(PC_KDCRAW libkdcraw)
+
+ if (PC_KDCRAW_FOUND)
+ # make sure the version is >= 0.2.0
+ # TODO: WHY?
+ if (PC_KDCRAW_VERSION VERSION_LESS 0.2.0)
+ message(STATUS "Found libkdcraw release < 0.2.0, too old")
+ set(KDCRAW_VERSION_GOOD_FOUND FALSE)
+ set(KDCRAW_FOUND FALSE)
+ else (PC_KDCRAW_VERSION VERSION_LESS 0.2.0)
+ set(KDCRAW_VERSION "${PC_KDCRAW_VERSION}")
+ if (NOT Kdcraw_FIND_QUIETLY)
+ message(STATUS "Found libkdcraw release ${KDCRAW_VERSION}")
+ endif (NOT Kdcraw_FIND_QUIETLY)
+ set(KDCRAW_VERSION_GOOD_FOUND TRUE)
+ endif (PC_KDCRAW_VERSION VERSION_LESS 0.2.0)
+ else (PC_KDCRAW_FOUND)
set(KDCRAW_VERSION_GOOD_FOUND FALSE)
- set(KDCRAW_FOUND FALSE)
- endif (_KDCRAWLinkFlags)
+ endif (PC_KDCRAW_FOUND)
else (NOT WIN32)
+ # TODO: Why do we just assume the version is good?
set(KDCRAW_VERSION_GOOD_FOUND TRUE)
endif (NOT WIN32)
if (KDCRAW_VERSION_GOOD_FOUND)
- set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
-
- find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h
- ${_KDCRAWIncDir}
- )
-
- find_library(KDCRAW_LIBRARIES NAMES kdcraw
- PATHS
- ${_KDCRAWLinkDir}
- )
-
- if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
- set(KDCRAW_FOUND TRUE)
- endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
- endif (KDCRAW_VERSION_GOOD_FOUND)
- if (KDCRAW_FOUND)
- if (NOT Kdcraw_FIND_QUIETLY)
- message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
- endif (NOT Kdcraw_FIND_QUIETLY)
- else (KDCRAW_FOUND)
- if (Kdcraw_FIND_REQUIRED)
- if (NOT KDCRAW_INCLUDE_DIR)
- message(FATAL_ERROR "Could NOT find libkdcraw header files")
- endif (NOT KDCRAW_INCLUDE_DIR)
- if (NOT KDCRAW_LIBRARIES)
- message(FATAL_ERROR "Could NOT find libkdcraw library")
- endif (NOT KDCRAW_LIBRARIES)
- endif (Kdcraw_FIND_REQUIRED)
- endif (KDCRAW_FOUND)
-
- mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS)
-
- endif(KDCRAW_LOCAL_FOUND)
-
-endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS)
+ set(KDCRAW_DEFINITIONS "${PC_KDCRAW_CFLAGS_OTHER}")
+
+ find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h ${PC_KDCRAW_INCLUDE_DIRS})
+ set(kdcraw_version_h_filename "${KDCRAW_INCLUDE_DIR}/libkdcraw/version.h")
+
+ find_library(KDCRAW_LIBRARIES NAMES kdcraw HINTS ${PC_KDCRAW_LIBRARY_DIRS})
+
+ if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+ set(KDCRAW_FOUND TRUE)
+ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+ set(KDCRAW_FOUND FALSE)
+ endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+ endif (KDCRAW_VERSION_GOOD_FOUND)
+
+ if (KDCRAW_FOUND)
+ if (NOT Kdcraw_FIND_QUIETLY)
+ message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
+ endif (NOT Kdcraw_FIND_QUIETLY)
+ else (KDCRAW_FOUND)
+ if (Kdcraw_FIND_REQUIRED)
+ if (NOT KDCRAW_INCLUDE_DIR)
+ message(FATAL_ERROR "Could NOT find libkdcraw header files.")
+ else(NOT KDCRAW_INCLUDE_DIR)
+ message(FATAL_ERROR "Could NOT find libkdcraw library.")
+ endif (NOT KDCRAW_INCLUDE_DIR)
+ endif (Kdcraw_FIND_REQUIRED)
+ endif (KDCRAW_FOUND)
+
+ endif (KDCRAW_LOCAL_FOUND)
+
+ if (KDCRAW_FOUND)
+ # Find the version information, unless that was reported by pkg_search_module.
+ if (NOT KDCRAW_VERSION)
+ file(READ "${kdcraw_version_h_filename}" kdcraw_version_h_content)
+ # This is the line we are trying to find: static const char kdcraw_version[] = "1.22.4-beta_5+dfsg";
+ string(REGEX REPLACE ".*char +kdcraw_version\\[\\] += +\"([^\"]+)\".*" "\\1" KDCRAW_VERSION "${kdcraw_version_h_content}")
+ unset(kdcraw_version_h_content)
+
+ endif (NOT KDCRAW_VERSION)
+ unset(kdcraw_version_h_filename)
+ endif (KDCRAW_FOUND)
+
+ if (KDCRAW_FOUND)
+ mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS KDCRAW_VERSION KDCRAW_FOUND)
+ else (KDCRAW_FOUND)
+ # The library was not found, reset all related variables.
+ unset(KDCRAW_INCLUDE_DIR)
+ unset(KDCRAW_LIBRARIES)
+ unset(KDCRAW_DEFINITIONS)
+ unset(KDCRAW_VERSION)
+ endif (KDCRAW_FOUND)
+
+endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION)

29
kdelibs-cmake_python3.patch
View File

@ -1,29 +0,0 @@
--- a/cmake/modules/FindLibPython.py 2011-07-27 13:34:31.000000000 -0500
+++ b/cmake/modules/FindLibPython.py 2012-07-24 14:57:17.259160400 -0500
@@ -11,3 +11,5 @@
print("long_version:%s" % sys.version.split()[0])
print("py_inc_dir:%s" % distutils.sysconfig.get_python_inc())
print("site_packages_dir:%s" % distutils.sysconfig.get_python_lib(plat_specific=1))
+if sys.version_info >= (3, 2):
+ print("abiflags:%s" % sys.abiflags)
--- a/cmake/modules/FindPythonLibrary.cmake 2011-07-27 13:34:31.000000000 -0500
+++ b/cmake/modules/FindPythonLibrary.cmake 2012-07-24 15:06:50.180929600 -0500
@@ -54,6 +54,9 @@
string(REGEX REPLACE ".*\npy_inc_dir:([^\n]+).*$" "\\1" _TMP_PYTHON_INCLUDE_PATH ${python_config})
string(REGEX REPLACE ".*\nsite_packages_dir:([^\n]+).*$" "\\1" _TMP_PYTHON_SITE_PACKAGES_DIR ${python_config})
+ if(PYTHON_SHORT_VERSION VERSION_GREATER "3.1")
+ string(REGEX REPLACE ".*\nabiflags:([^\n]+).*$" "\\1" _TMP_PYTHON_ABIFLAGS ${python_config})
+ endif(PYTHON_SHORT_VERSION VERSION_GREATER "3.1")
# Put these two variables in the cache so they are visible for the user, but read-only:
set(PYTHON_INCLUDE_PATH "${_TMP_PYTHON_INCLUDE_PATH}" CACHE PATH "The python include directory" FORCE)
@@ -63,7 +66,7 @@
set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/python${PYTHON_SHORT_VERSION}/site-packages CACHE PATH "The directory where python modules will be installed to.")
string(REGEX REPLACE "([0-9]+).([0-9]+)" "\\1\\2" PYTHON_SHORT_VERSION_NO_DOT ${PYTHON_SHORT_VERSION})
- set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT})
+ set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION}${_TMP_PYTHON_ABIFLAGS} python${PYTHON_SHORT_VERSION_NO_DOT})
if(WIN32)
string(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR})
endif(WIN32)

29
kdelibs-solid_qt_no_debug_output.patch
View File

@ -1,6 +1,21 @@
diff -up kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp
--- kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-12-12 14:52:52.199346662 -0600
+++ kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 15:44:40.854085494 -0600
diff -up kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp
--- kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
+++ kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp 2012-12-12 16:18:25.817495558 -0600
@@ -340,9 +340,11 @@ bool StorageAccess::requestPassphrase()
returnService, m_lastReturnObject,
wId, appId);
m_passphraseRequested = reply.isValid();
+#ifndef QT_NO_DEBUG_STREAM
if (!m_passphraseRequested) {
qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error();
}
+#endif
return m_passphraseRequested;
}
diff -up kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp
--- kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
+++ kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 16:17:36.922022895 -0600
@@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase()
QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService,
m_lastReturnObject, wId, appId);
@ -13,10 +28,10 @@ diff -up kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.soli
return m_passphraseRequested;
}
diff -up kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/CMakeLists.txt
--- kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-12-12 14:52:52.194346712 -0600
+++ kdelibs-4.9.4/solid/solid/CMakeLists.txt 2012-12-12 14:52:52.203346619 -0600
@@ -240,7 +240,7 @@ if(NOT WIN32 AND NOT APPLE)
diff -up kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/CMakeLists.txt
--- kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
+++ kdelibs-4.9.90/solid/solid/CMakeLists.txt 2012-12-12 16:17:36.922022895 -0600
@@ -268,7 +268,7 @@ if(NOT WIN32 AND NOT APPLE)
if ( WITH_SOLID_UDISKS2 )
message(STATUS "Building Solid UDisks2 backend." )

4068
kdelibs-udisks2-backend.patch
View File

File diff suppressed because it is too large Load Diff

14
kdelibs-udisks2_2_stage.patch
View File

@ -1,14 +0,0 @@
diff -up kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp
--- kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage 2013-01-23 15:44:27.000000000 -0600
+++ kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp 2013-02-01 09:43:49.032367743 -0600
@@ -203,6 +203,10 @@ void Manager::slotInterfacesAdded(const
m_deviceCache.append(udi);
Q_EMIT deviceAdded(udi);
}
+ // re-emit in case of 2-stage devices like N9 or some Android phones
+ else if (m_deviceCache.contains(udi) && interfaces_and_properties.keys().contains(UD2_DBUS_INTERFACE_FILESYSTEM)) {
+ Q_EMIT deviceAdded(udi);
+ }
}
void Manager::slotInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces)

417
kdelibs.spec
View File

@ -8,11 +8,9 @@
%define apidocs 1
# to build/include QCH apidocs or not (currently broken)
#define apidocs_qch 1
%if 0%{?fedora} && 0%{?fedora} > 16
%define libplasma_pk 1
%endif
%if 0%{?rhel} > 6 || 0%{?fedora} > 17
%define udisks udisks2
%define udisks2 1
%else
%define udisks udisks
%endif
@ -24,8 +22,8 @@
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
Summary: KDE Libraries
Version: 4.9.5
Release: 4%{?dist}
Version: 4.10.1
Release: 1%{?dist}
Name: kdelibs
Epoch: 6
@ -58,7 +56,6 @@ Requires: kde-settings
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: hunspell
# https://git.reviewboard.kde.org/r/103028/
Requires: media-player-info
# beware of possible bootstrapping problems
# moved back to kde-runtime
@ -70,17 +67,17 @@ Requires: soprano%{?_isa} >= %{soprano_version}
Requires: strigi-libs%{?_isa} >= %{strigi_version}
# make kdelibs-devel parallel-installable with kdelibs3-devel
Patch0: kdelibs-4.5.80-parallel_devel.patch
Patch0: kdelibs-4.9.95-parallel_devel.patch
# fix kde#149705
Patch2: kdelibs-4.2.85-kde149705.patch
# fix http://bugs.kde.org/149705
Patch2: kdelibs-4.10.0-kde149705.patch
# install all .css files and Doxyfile.global in kdelibs-common to build
# kdepimlibs-apidocs against
Patch8: kdelibs-4.3.90-install_all_css.patch
# add Fedora/V-R to KHTML UA string
Patch9: kdelibs-4.6.80-branding.patch
Patch9: kdelibs-4.10.0-branding.patch
# don't cache kdeglobals paths because they change after profile directories
# are loaded from kde4rc
@ -88,22 +85,22 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
# adds the Administration menu from redhat-menus which equals System + Settings
# This prevents the stuff getting listed twice, under both System and Settings.
Patch12: kdelibs-4.1.0-xdg-menu.patch
Patch12: kdelibs-4.10.0-xdg-menu.patch
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
Patch14: kdelibs-4.8.0-libexecdir.patch
Patch14: kdelibs-4.9.97-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
Patch18: kdelibs-4.6.90-kstandarddirs.patch
Patch18: kdelibs-4.10.0-kstandarddirs.patch
# set build type
Patch20: kdelibs-4.1.70-cmake.patch
Patch20: kdelibs-4.10.0-cmake.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.5.80-no_rpath.patch
Patch27: kdelibs-4.10.0-no_rpath.patch
## libplasma PackageKit integration
# Add an API (currently private) for installing missing Plasma engines.
@ -118,12 +115,6 @@ Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch
# https://git.reviewboard.kde.org/r/102350/
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
# make forcefully hal-free build
Patch45: kdelibs-4.7.3-halectomy.patch
# udisks2 Solid backend
Patch47: kdelibs-udisks2-backend.patch
# limit solid qDebug spam
# http://bugzilla.redhat.com/882731
# TODO: could make uptreamable and conditional only on Release-type builds
@ -134,12 +125,8 @@ Patch49: kdelibs-solid_qt_no_debug_output.patch
# https://git.reviewboard.kde.org/r/102439/
Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
# https://bugs.kde.org/show_bug.cgi?id=269045
# https://git.reviewboard.kde.org/r/101231/
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
Patch52: kdelibs-4.10.0-SOLID_UPNP.patch
# add s390/s390x support in kjs
Patch53: kdelibs-4.7.2-kjs-s390.patch
@ -149,38 +136,30 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch
# patch FindSamba.cmake to find samba4 libs (using pkg-config hints)
# https://git.reviewboard.kde.org/r/106861/
Patch55: kdelibs-4.9.2-FindSamba_samba4.patch
Patch55: kdelibs-4.9.90-FindSamba_samba4.patch
# backport FindKipi.cmake from Digikam SC 3.0.0-beta1 for libkipi 2 (kde#307213)
Patch56: kdelibs-4.9.1-FindKipi-libkipi2.patch
# cmake/python3 love, see # https://bugs.kde.org/show_bug.cgi?id=275919
# see also http://git.reviewboard.kde.org/r/106707/
# reviewboard finished, double check if these remaining patches are still
# required or not -- rex
Patch58: kdelibs-cmake_python3.patch
# make filter working
# make filter working, TODO: upstream? -- rex
Patch59: kdelibs-4.9.3-kcm_ssl.patch
# solid/udisks2 fix/workaround for 2-stage devides
Patch60: kdelibs-udisks2_2_stage.patch
# disable dot to reduce apidoc size
Patch61: kdelibs-4.9.3-dot.patch
## upstream
# FindKdcraw.cmake fixes
Patch100: kdelibs-FindKdcraw.patch
## security fix
# Not Upstreamed? why not ? -- Rex
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
Patch200: kdelibs-4.10.0-CVE-2009-2702.patch
# rhel patches
Patch300: kdelibs-4.8.3-webkit.patch
Patch301: kdelibs-4.9.3-dot.patch
Patch302: kdelibs-4.x-abrt.patch
# kmailservice moved here
Conflicts: kdelibs3 < 3.5.10-38
# disable webkit
Patch300: kdelibs-4.10.0-webkit.patch
# set abrt default
Patch301: kdelibs-4.x-abrt.patch
# kmailservice/ktelnetservice moved here
Conflicts: kdelibs3 < 3.5.10-42
BuildRequires: qt4-devel >= %{qt4_ver}
%if 0%{?fedora}
@ -206,6 +185,8 @@ BuildRequires: libacl-devel libattr-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libutempter-devel
# strictly only a runtime dependency, but makes cmake happier at buildtime too -- rex
BuildRequires: media-player-info
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(avahi-core)
BuildRequires: pkgconfig(dbusmenu-qt)
@ -320,33 +301,25 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch27 -p1 -b .no_rpath
# libplasma PackageKit integration
%if 0%{?libplasma_pk}
%patch40 -p1 -b .libplasma-pk-0001
## hrm, seems only 0001 is upstreamed so far, need to poke Kevin why that is. -- rex
#patch40 -p1 -b .libplasma-pk-0001
%patch41 -p1 -b .libplasma-pk-0002
%patch42 -p1 -b .libplasma-pk-0003
%endif
%if "%{?udisks}" == "udisks2"
%patch47 -p1 -b .udisks2backend
%patch49 -p1 -b .solid_qt_no_debug_output
%else
%patch45 -p1 -b .halectomy
%endif
# upstreamable patches
%patch50 -p1 -b .knewstuff2_gpg2
%patch51 -p1 -b .uri_mimetypes
%patch52 -p1 -b .SOLID_UPNP
%patch53 -p1 -b .kjs-s390
%patch54 -p1 -b .kjs-locale
%patch55 -p1 -b .FindSamba-samba4
%patch56 -p1 -b .FindKipi-libkipi2
%patch58 -p1 -b .cmake_python3
%patch59 -p1 -b .filter
%patch60 -p1 -b .udisks2_2_stage
%patch61 -p1 -b .dot
# upstream patches
%patch100 -p1 -b .FindKdcraw
# security fixes
%patch200 -p1 -b .CVE-2009-2702
@ -354,8 +327,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# rhel patches
%if 0%{?rhel}
%patch300 -p1 -b .webkit
%patch301 -p1 -b .dot
%patch302 -p1 -b .abrt
%patch301 -p1 -b .abrt
%endif
%build
@ -363,10 +335,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} \
-DKAUTH_BACKEND:STRING="PolkitQt-1" \
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \
%if 0%{?rhel} > 6 || 0%{?fedora} > 17
-DWITH_SOLID_UDISKS2:BOOL=ON \
%endif
%{?udisks2:-DWITH_SOLID_UDISKS2:BOOL=ON} \
..
popd
@ -394,18 +365,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
%{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
# kmailservice symlink
# Mailto not working in Firefox: can't find kmailservice
# http://bugzilla.redhat.com/773414
ln -s %{_kde4_libexecdir}/kmailservice %{buildroot}%{_kde4_bindir}/kmailservice
# create/own stuff
# see http://bugzilla.redhat.com/483318
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
%if 0%{?fedora} && 0%{?fedora} < 15
# moved to kde-filesystem f15+
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/plugins/{gui_platform,styles}
%endif
## use ca-certificates' ca-bundle.crt, symlink as what most other
## distros do these days (http://bugzilla.redhat.com/521902)
@ -477,11 +439,6 @@ update-desktop-database -q &> /dev/null
update-mime-database %{_kde4_datadir}/mime >& /dev/null
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%clean
rm -rf %{buildroot}
%files
%doc AUTHORS README TODO
%doc COPYING.LIB
@ -499,6 +456,7 @@ rm -rf %{buildroot}
%{_kde4_bindir}/kmailservice
%{_kde4_bindir}/kross
%{_kde4_bindir}/kshell4
%{_kde4_bindir}/ktelnetservice
%{_kde4_bindir}/kunittestmodrunner
%{_kde4_bindir}/kwrapper4
%{_kde4_bindir}/nepomuk-rcgen
@ -543,11 +501,9 @@ rm -rf %{buildroot}
%{_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
@ -586,9 +542,7 @@ rm -rf %{buildroot}
%{_mandir}/man1/preparetips.1*
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
%if 0%{?libplasma_pk}
%{_kde4_bindir}/plasma-dataengine-depextractor
%endif
%{_kde4_bindir}/kde4-doxygen.sh
%{_kde4_appsdir}/cmake/
%{_kde4_includedir}/*
@ -607,31 +561,54 @@ rm -rf %{buildroot}
%changelog
* Thu Feb 28 2013 Than Ngo <than@redhat.com> - 6:4.9.5-4
- abrt by default for RHEL
* Sat Mar 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.10.1-1
- 4.10.1
* Fri Feb 01 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.5-3
* Thu Feb 28 2013 Than Ngo <than@redhat.com> - 6:4.10.0-4
- rhel condition:
adapt webkit patch
abrt by default
disable dot to reduce doc size
* Thu Feb 07 2013 Lukáš Tinkl <ltinkl@redhat.com> 6:4.10.0-3
- complete kdelibs-udisks2_2_stage.patch
* Tue Feb 05 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.10.0-2
- kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection)
* Tue Jan 01 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.5-2
* Thu Jan 31 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.10.0-1
- 4.10.0
* Sat Jan 19 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.9.98-1
- 4.9.98
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 6:4.9.97-2
- rebuild due to "jpeg8-ABI" feature drop
* Thu Jan 03 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.9.97-1
- 4.9.97
* Sat Dec 29 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.95-3
- FindKdcraw.cmake fixes(kde#311936)
* Fri Dec 28 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.5-1
- 4.9.5
* Thu Dec 20 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.95-2
- Conflicts: kdelibs3 < 3.5.10-42
* Wed Dec 11 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.4-5
* Wed Dec 19 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.9.95-1
- 4.9.95
* Thu Dec 13 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.90-4
- prune/fix changelog
* Wed Dec 12 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.90-3
- fix udisks2 conditional, so -DWITH_SOLID_UDISKS2:BOOL=ON really gets set
* Wed Dec 12 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.9.90-2
- sync with latest solid/udisks2 upstream bits
- Debug output in kdelibs-udisks2-backend.patch should be disabled (#882731)
* Thu Dec 06 2012 Than Ngo <than@redhat.com> - 6:4.9.4-4
- apply upstream patch to fix crash when no service was selected
* Thu Dec 06 2012 Than Ngo <than@redhat.com> - 6:4.9.4-3
- apply upstream patch to revert the check parent mimetypes in
protocolForArchiveMimetype() (kde#311214)
* Tue Dec 04 2012 Than Ngo <than@redhat.com> - 6:4.9.4-2
- disable kfileplacesdevicecache which causes bad regression
- add rhel condition
* Mon Dec 03 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.90-1
- 4.9.90 (4.10beta2)
* Mon Dec 03 2012 Than Ngo <than@redhat.com> - 6:4.9.4-1
- 4.9.4
@ -1141,7 +1118,7 @@ rm -rf %{buildroot}
* Tue Aug 03 2010 Than Ngo <than@redhat.com> - 4.5.0-1
- 4.5.0
* Sat Jul 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.95-1
* Sun Jul 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.95-1
- 4.5 RC3 (4.4.95)
* Wed Jul 21 2010 Than Ngo <than@redhat.com> - 6:4.4.92-4
@ -1549,7 +1526,7 @@ rm -rf %{buildroot}
* Mon Mar 09 2009 Than Ngo <than@redhat.com> - 4.2.1-5
- apply patch to fix issue in CSS style that causes konqueror shows a blank page
* Wed Mar 05 2009 Rex Dieter <rdieter@fedorproject.org> - 4.2.1-4
* Thu Mar 05 2009 Rex Dieter <rdieter@fedorproject.org> - 4.2.1-4
- move designer plugins to main/runtime (#487622)
* Sun Mar 01 2009 Than Ngo <than@redhat.com> - 4.2.1-2
@ -1980,243 +1957,3 @@ rm -rf %{buildroot}
* Mon Jan 07 2008 Than Ngo <than@redhat.com> 4.0.0-1
- 4.0.0
* Fri Jan 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-11
- force Phonon to use the ALSA default device by default
* Wed Jan 02 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-10
- apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake
* Sat Dec 22 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-9
- drop BR aspell-devel on F9+, use only enchant (FeatureDictionary)
* Tue Dec 18 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-8
- don't put binaries into kdelibs-common, they drag in kdelibs (#417251)
* Mon Dec 17 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-7
- split out kdelibs-common on F9+ (shared with KDE 3) (#417251)
- Requires: kdelibs-common (F9+) (#417251)
* Tue Dec 11 2007 Than Ngo <than@redhat.com> 3.97.0-6
- enable subversion again
* Tue Dec 11 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-5
- rebuild for changed _kde4_includedir
* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-4
- drop Req: kdebase-runtime oxygen-icon-theme (at least for now)
* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-2
- drop BR: subversion temporarily (due to rawhide breakage)
* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
- kde-3.97.0
* Tue Dec 04 2007 Than Ngo <than@redhat.com> 3.96.2-4
- rebuilt against new openssl/openldap
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.96.2-3
- install profile scripts as 644 instead of 755 (Ville Skyttä, #407521)
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.96.2-2
- BR openssh-clients and subversion (Sebastian Vahl)
- make this the default kdelibs for F9 again
* Tue Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-1
- kde-3.96.2
* Tue Nov 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.1-1
- kde-3.96.1
* Tue Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-4
- Requires: kdebase-runtime oxygen-icon-theme (where available)
* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-3
- Requires: dbus-x11 (#390851)
* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-2
- -devel: (Build)Requires: libXcomposite-devel libXdamage-devel
libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel
libXv-devel libXxf86misc-devel
- devel: Requires: strigi-devel >= 0.5.7
- (Build)Requires: kde-filesystem >= 4
* Thu Nov 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-1
- kde-3.96.0
* Sat Nov 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.2-2
- BR: strigi-devel >= 0.5.7, soprano-devel >= 1.97.1
- License: LGPLv2 (only)
* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.2-1
- kde-3.95.2
* Tue Nov 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.0-2
- fix parallel_devel patch (typo in KDE4_KPARTS_LIBRARY)
* Sun Nov 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.0-1
- kde-3.95.0 (kde4 dev platform rc1)
* Thu Oct 18 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.94.0-2
- drop optional BR hspell-devel again due to broken x86_64 static library
* Thu Oct 18 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.94.0-1
- update to 3.94.0
- BR soprano-devel >= 1.95.0
- don't rename js to kjs after installation, fixed upstream
- update parallel-devel patch
- drop kde#149704 patch, fixed upstream
- drop colorscheme-hack patch
- backport upstream fix for unversioned kpty library (rev 724528)
- add new BRs hspell-devel and jasper-devel
- 3.94.0 generates some manpages, add them to the file list
* Thu Oct 4 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-11
- don't make this the default kdelibs on F9 yet
- retry ppc64 build (#300571)
* Fri Sep 21 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-10
- ExcludeArch: ppc64 (#300571)
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.93.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch
* Fri Sep 14 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-8
- rename js to kjs because of file conflict (kde#149840)
* Thu Sep 13 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-7
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
(workaround for #244065 no longer needed, fixed in 3.93.0)
* Thu Sep 13 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-6
- set QT_PLUGIN_PATH in kde4.sh and kde4.csh
* Wed Sep 12 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-5
- fix strange coloring due to incomplete changes to KColorScheme
* Mon Sep 10 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-4
- use upstream fix (by David Faure) for kde#149704
* Mon Sep 10 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-3
- fix kde#149703, kde#149704, kde#149705
* Sun Sep 9 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel
* Sun Sep 9 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)
* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- -devel: omit most (hopefully) extraneous Requires:
- use macros.kde4
- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
- License clarification
* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- name kdelibs4, don't mess with %%_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2
- Requires: shared-mime-info
* Mon Jul 30 2007 Than Ngo <than@redhat.com> 3.92.0-2
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR
* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92.0 (kde4-beta1)
* Thu Jul 19 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.91.0-6
- add missing epoch to main package Requires for -devel if name is kdelibs
* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- BR: soprano-devel
- prefix=/usr cleanups
* Wed Jul 11 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.91.0-4
- apply upstream bugfix for KatePart syntax highlighting (kde #145571)
* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.
* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)
* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug
* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
- specfile cleanup (%%prefix issues mostly)
* Wed May 30 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.90.1-2
- add missing BR shared-mime-info
* Sun May 13 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- drop backported upstream fixes already in 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- add BR strigi-devel, alsa-lib-devel, avahi-devel
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4
* Mon Mar 26 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.80.3-5
- apply upstream fixes to build with Qt 4.3 Beta
* Sat Mar 24 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirements for cmake and qt4-devel
- drop visibility hack (no longer needed with latest qt4 package)
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
- apply upstream bugfixes:
- * khtml segfault fix
- * message box cancel button fix
- * kprocio received buffer truncation fix (backported)
- * KatePart keyboard shortcut (Ctrl+Right, Shift+Right) fix
* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*
* Fri Feb 23 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.80.3-2
- apply upstream patch to fix klauncher crash
- hack around Qt 4 being built with no visibility support
- install Qt Designer plugin
* Wed Feb 21 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- move libkdeinit_*.so from -devel to main package
- symlink kde4-config into /usr/bin so it can be used for path setting
* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.4.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS
* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- Added foolishly dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel again as BR
* Thu Nov 23 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel as BR
- dropped duplicate libattr-devel in BR
- spec file cleanups and added clean up in %%install
- fixed missing dependency : libkdeinit_knotify.so
* Sat Oct 07 2006 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdelibs 4 RPM and the Fedora kdelibs 3 RPM)
- apply parallel-installability patch

2
sources
View File

@ -1 +1 @@
2155d7ae075a1c7e9c6398b381c67177 kdelibs-4.9.5.tar.xz
c90b95d95e7e5cbe92017ee957b5d691 kdelibs-4.10.1.tar.xz