From ecb23ae7c3c42e840cd34e6bd7000899fccf5226 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 31 Jan 2013 07:50:05 -0600 Subject: [PATCH] rebase patches rebase patches to avoid fuzz --- .gitignore | 2 -- kdelibs-4.1.70-cmake.patch | 11 -------- ...atch => kdelibs-4.10.0-CVE-2009-2702.patch | 28 +++++++++---------- ...P.patch => kdelibs-4.10.0-SOLID_UPNP.patch | 8 +++--- kdelibs-4.10.0-branding.patch | 11 ++++++++ kdelibs-4.10.0-cmake.patch | 11 ++++++++ ...05.patch => kdelibs-4.10.0-kde149705.patch | 22 +++++++-------- ...atch => kdelibs-4.10.0-kstandarddirs.patch | 10 +++---- ...ath.patch => kdelibs-4.10.0-no_rpath.patch | 14 +++++----- ...enu.patch => kdelibs-4.10.0-xdg-menu.patch | 10 +++---- kdelibs-4.6.80-branding.patch | 11 -------- kdelibs.spec | 16 +++++------ 12 files changed, 76 insertions(+), 78 deletions(-) delete mode 100644 kdelibs-4.1.70-cmake.patch rename kdelibs-4.3.1-CVE-2009-2702.patch => kdelibs-4.10.0-CVE-2009-2702.patch (61%) rename kdelibs-4.7.4-SOLID_UPNP.patch => kdelibs-4.10.0-SOLID_UPNP.patch (53%) create mode 100644 kdelibs-4.10.0-branding.patch create mode 100644 kdelibs-4.10.0-cmake.patch rename kdelibs-4.2.85-kde149705.patch => kdelibs-4.10.0-kde149705.patch (58%) rename kdelibs-4.6.90-kstandarddirs.patch => kdelibs-4.10.0-kstandarddirs.patch (71%) rename kdelibs-4.5.80-no_rpath.patch => kdelibs-4.10.0-no_rpath.patch (88%) rename kdelibs-4.1.0-xdg-menu.patch => kdelibs-4.10.0-xdg-menu.patch (87%) delete mode 100644 kdelibs-4.6.80-branding.patch diff --git a/.gitignore b/.gitignore index 9a6c3e3..cd9e177 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /kdelibs-4.8.5.tar.xz /kdelibs-4.9.5.tar.xz -/kdelibs-4.9.97.tar.xz -/kdelibs-4.9.98.tar.xz /kdelibs-4.10.0.tar.xz diff --git a/kdelibs-4.1.70-cmake.patch b/kdelibs-4.1.70-cmake.patch deleted file mode 100644 index faffd56..0000000 --- a/kdelibs-4.1.70-cmake.patch +++ /dev/null @@ -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) - - diff --git a/kdelibs-4.3.1-CVE-2009-2702.patch b/kdelibs-4.10.0-CVE-2009-2702.patch similarity index 61% rename from kdelibs-4.3.1-CVE-2009-2702.patch rename to kdelibs-4.10.0-CVE-2009-2702.patch index d95a012..9aee863 100644 --- a/kdelibs-4.3.1-CVE-2009-2702.patch +++ b/kdelibs-4.10.0-CVE-2009-2702.patch @@ -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); diff --git a/kdelibs-4.7.4-SOLID_UPNP.patch b/kdelibs-4.10.0-SOLID_UPNP.patch similarity index 53% rename from kdelibs-4.7.4-SOLID_UPNP.patch rename to kdelibs-4.10.0-SOLID_UPNP.patch index 06d6f86..4809a85 100644 --- a/kdelibs-4.7.4-SOLID_UPNP.patch +++ b/kdelibs-4.10.0-SOLID_UPNP.patch @@ -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) diff --git a/kdelibs-4.10.0-branding.patch b/kdelibs-4.10.0-branding.patch new file mode 100644 index 0000000..d760122 --- /dev/null +++ b/kdelibs-4.10.0-branding.patch @@ -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 + { diff --git a/kdelibs-4.10.0-cmake.patch b/kdelibs-4.10.0-cmake.patch new file mode 100644 index 0000000..52f99ae --- /dev/null +++ b/kdelibs-4.10.0-cmake.patch @@ -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) + + diff --git a/kdelibs-4.2.85-kde149705.patch b/kdelibs-4.10.0-kde149705.patch similarity index 58% rename from kdelibs-4.2.85-kde149705.patch rename to kdelibs-4.10.0-kde149705.patch index 9e7af74..a7d5179 100644 --- a/kdelibs-4.2.85-kde149705.patch +++ b/kdelibs-4.10.0-kde149705.patch @@ -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 @@ The name of the widget style, for example "keramik" or "plastik". Without quotes. keramik diff --git a/kdelibs-4.6.90-kstandarddirs.patch b/kdelibs-4.10.0-kstandarddirs.patch similarity index 71% rename from kdelibs-4.6.90-kstandarddirs.patch rename to kdelibs-4.10.0-kstandarddirs.patch index 7fab2db..c5de6df 100644 --- a/kdelibs-4.6.90-kstandarddirs.patch +++ b/kdelibs-4.10.0-kstandarddirs.patch @@ -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); } diff --git a/kdelibs-4.5.80-no_rpath.patch b/kdelibs-4.10.0-no_rpath.patch similarity index 88% rename from kdelibs-4.5.80-no_rpath.patch rename to kdelibs-4.10.0-no_rpath.patch index 23a95c0..7e4808e 100644 --- a/kdelibs-4.5.80-no_rpath.patch +++ b/kdelibs-4.10.0-no_rpath.patch @@ -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}) diff --git a/kdelibs-4.1.0-xdg-menu.patch b/kdelibs-4.10.0-xdg-menu.patch similarity index 87% rename from kdelibs-4.1.0-xdg-menu.patch rename to kdelibs-4.10.0-xdg-menu.patch index fa87400..b9f7f98 100644 --- a/kdelibs-4.1.0-xdg-menu.patch +++ b/kdelibs-4.10.0-xdg-menu.patch @@ -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 @@ Core KDE @@ -50,7 +50,7 @@ diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applic Development kde-development.directory -@@ -358,7 +360,11 @@ +@@ -369,7 +371,11 @@ Settingsmenu kde-settingsmenu.directory @@ -63,7 +63,7 @@ diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applic -@@ -367,7 +373,9 @@ +@@ -378,7 +384,9 @@ System diff --git a/kdelibs-4.6.80-branding.patch b/kdelibs-4.6.80-branding.patch deleted file mode 100644 index ca378ad..0000000 --- a/kdelibs-4.6.80-branding.patch +++ /dev/null @@ -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 - { diff --git a/kdelibs.spec b/kdelibs.spec index 680f567..3e35ac6 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -70,14 +70,14 @@ Requires: strigi-libs%{?_isa} >= %{strigi_version} Patch0: kdelibs-4.9.95-parallel_devel.patch # fix http://bugs.kde.org/149705 -Patch2: kdelibs-4.2.85-kde149705.patch +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 @@ -85,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.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. @@ -126,7 +126,7 @@ Patch49: kdelibs-solid_qt_no_debug_output.patch Patch50: kdelibs-4.7.0-knewstuff2_gpg2.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 @@ -145,7 +145,7 @@ Patch59: kdelibs-4.9.3-kcm_ssl.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