diff --git a/.gitignore b/.gitignore index 65303f7..04290b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/kdelibs-4.10.5.tar.xz +SOURCES/kdelibs-4.14.8.tar.xz diff --git a/.kdelibs.metadata b/.kdelibs.metadata index c338985..df304e0 100644 --- a/.kdelibs.metadata +++ b/.kdelibs.metadata @@ -1 +1 @@ -6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb SOURCES/kdelibs-4.10.5.tar.xz +98b174dbbbef340bcfc11b819405d8e838cac34c SOURCES/kdelibs-4.14.8.tar.xz diff --git a/SOURCES/Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch b/SOURCES/Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch new file mode 100644 index 0000000..985281f --- /dev/null +++ b/SOURCES/Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch @@ -0,0 +1,27 @@ +From 02966e348e37ebf6269aaed238e7ce67fbe958e7 Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan +Date: Sun, 25 May 2014 00:36:08 +0200 +Subject: [PATCH 1/1] Drop Nepomuk from KParts' LINK_INTERFACE_LIBRARIES + +Nepomuk is only used in a private header, browserrun_p.h, +thus it is not needed as KParts public dependancy +Makes it possible to drop libsoprano-devel from libkde4-devel Requires +--- + kparts/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt +index 2eab2e8..e17ef5e 100644 +--- a/kparts/CMakeLists.txt ++++ b/kparts/CMakeLists.txt +@@ -39,7 +39,6 @@ target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio) + target_link_libraries(kparts LINK_INTERFACE_LIBRARIES kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) + if(HAVE_NEPOMUK) + target_link_libraries(kparts nepomuk nepomukutils) +- target_link_libraries(kparts LINK_INTERFACE_LIBRARIES nepomuk nepomukutils ) + endif(HAVE_NEPOMUK) + + set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} +-- +1.9.3 + diff --git a/SOURCES/FindSamba.cmake-help-find-samba4-more-reliably.patch b/SOURCES/FindSamba.cmake-help-find-samba4-more-reliably.patch deleted file mode 100644 index 24ade3c..0000000 --- a/SOURCES/FindSamba.cmake-help-find-samba4-more-reliably.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aaeae76bc3e5fa02601608bae85cdd1478843678 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Sat, 6 Apr 2013 05:10:39 -0500 -Subject: [PATCH] FindSamba.cmake: help find samba4 more reliably - -add PATH_SUFFIXES samba-4.0 and pkgconfig hints ---- - cmake/modules/FindSamba.cmake | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/FindSamba.cmake b/cmake/modules/FindSamba.cmake -index 16522c6..ec1179d 100644 ---- a/cmake/modules/FindSamba.cmake -+++ b/cmake/modules/FindSamba.cmake -@@ -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 PATH_SUFFIXES samba-4.0 -+ 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) --- -1.8.1.4 - diff --git a/SOURCES/SOLID_HAL_LEGACY.sh b/SOURCES/SOLID_HAL_LEGACY.sh new file mode 100644 index 0000000..fc27874 --- /dev/null +++ b/SOURCES/SOLID_HAL_LEGACY.sh @@ -0,0 +1,6 @@ + +if [ -z "${SOLID_HAL_LEGACY}" ] ; then + SOLID_HAL_LEGACY=1 + export SOLID_HAL_LEGACY +fi + diff --git a/SOURCES/kdelibs-4.10.0-kstandarddirs.patch b/SOURCES/kdelibs-4.10.0-kstandarddirs.patch deleted file mode 100644 index c5de6df..0000000 --- a/SOURCES/kdelibs-4.10.0-kstandarddirs.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) - { -- if((*pit)!=installprefix||installdir.isEmpty()) -+ // "exe" never has a custom install path, and the check triggers -+ // a false positive due to the libexecdir patch -+ if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type)) - { - for (QStringList::ConstIterator it = dirs.constBegin(); - it != dirs.constEnd(); ++it) -@@ -1171,6 +1173,11 @@ QStringList KStandardDirs::KStandardDirs - if ((local || testdir.exists()) && !candidates.contains(path)) - candidates.append(path); - } -+ // special-case "config" (forward porting Chris Cheney's -+ // hack) - we want /etc/kde after the local config paths -+ // and before the ones in /usr (including kde-profile) -+ if (local && !strcmp("config", type)) -+ candidates.append(QLatin1String("/etc/kde/")); - local = false; - } - else diff --git a/SOURCES/kdelibs-4.11.3-arm.patch b/SOURCES/kdelibs-4.11.3-arm.patch new file mode 100644 index 0000000..b812e55 --- /dev/null +++ b/SOURCES/kdelibs-4.11.3-arm.patch @@ -0,0 +1,15 @@ +diff -up kdelibs-4.11.3/plasma/corona.cpp.than kdelibs-4.11.3/plasma/corona.cpp +--- kdelibs-4.11.3/plasma/corona.cpp.than 2013-12-02 16:46:19.542820822 +0100 ++++ kdelibs-4.11.3/plasma/corona.cpp 2013-12-02 17:53:04.919830893 +0100 +@@ -388,7 +388,11 @@ void Corona::addOffscreenWidget(QGraphic + } + + d->offscreenWidgets[i] = widget; ++#if defined(arm) || defined(__arm__) ++ widget->setPos((-i - 1) * 2000, -2000); ++#else + widget->setPos((-i - 1) * QWIDGETSIZE_MAX, -QWIDGETSIZE_MAX); ++#endif + + QGraphicsWidget *pw = widget->parentWidget(); + widget->setParentItem(0); diff --git a/SOURCES/kdelibs-4.11.3-klauncher-no-glib.patch b/SOURCES/kdelibs-4.11.3-klauncher-no-glib.patch new file mode 100644 index 0000000..bdc209c --- /dev/null +++ b/SOURCES/kdelibs-4.11.3-klauncher-no-glib.patch @@ -0,0 +1,25 @@ +diff -ur kdelibs-4.11.3/kinit/klauncher_main.cpp kdelibs-4.11.3-klauncher-no-glib/kinit/klauncher_main.cpp +--- kdelibs-4.11.3/kinit/klauncher_main.cpp 2013-06-28 19:03:41.000000000 +0200 ++++ kdelibs-4.11.3-klauncher-no-glib/kinit/klauncher_main.cpp 2013-12-09 00:32:12.000000000 +0100 +@@ -75,10 +75,21 @@ + // WABA: Make sure not to enable session management. + putenv(strdup("SESSION_MANAGER=")); + ++ // Disable the GLib event loop (rh#983110) ++ bool wasQtNoGlibSet = (getenv("QT_NO_GLIB") != 0); ++ if (!wasQtNoGlibSet) { ++ setenv("QT_NO_GLIB", "1", true); ++ } ++ + // We need a QCoreApplication to get a DBus event loop + QCoreApplication app(argc, argv); + app.setApplicationName( componentData.componentName() ); + ++ // Now get rid of QT_NO_GLIB again so launched processes don't inherit it ++ if (!wasQtNoGlibSet) { ++ unsetenv("QT_NO_GLIB"); ++ } ++ + int maxTry = 3; + while(true) + { diff --git a/SOURCES/kdelibs-4.11.3-libexecdir.patch b/SOURCES/kdelibs-4.11.3-libexecdir.patch new file mode 100644 index 0000000..627dad7 --- /dev/null +++ b/SOURCES/kdelibs-4.11.3-libexecdir.patch @@ -0,0 +1,54 @@ +diff -up kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp +--- kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp.libexecdir 2013-06-28 12:03:40.883340083 -0500 ++++ kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp 2013-11-01 15:44:00.780783690 -0500 +@@ -1871,7 +1871,7 @@ void KStandardDirs::addKDEDefaults() + addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); + index+=2; + } +- addResourceType("exe", "lib", "kde4/libexec", true ); ++ addResourceType("exe", 0, "libexec/kde4", true ); + + addResourceDir("home", QDir::homePath(), false); + +diff -up kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp +--- kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2013-06-28 12:03:40.884340190 -0500 ++++ kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp 2013-11-01 15:44:00.782783770 -0500 +@@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const + if (strcmp("lib", type) == 0) + return QFile::decodeName(LIB_INSTALL_DIR "/"); + if (strcmp("libexec", type) == 0) +- return QFile::decodeName(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/"); ++ return QFile::decodeName(LIBEXEC_INSTALL_DIR "/"); + if (strcmp("locale", type) == 0) + return QFile::decodeName(LOCALE_INSTALL_DIR "/"); + break; +diff -up kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp +--- kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp.libexecdir 2013-11-01 10:45:56.409145508 -0500 ++++ kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp 2013-11-01 15:50:20.473658147 -0500 +@@ -96,8 +96,9 @@ void KStandarddirsTest::testFindResource + #define KIOSLAVE "bin/kioslave.exe" + #else + #define EXT "" +-#define KIOSLAVE "kde4/libexec/kioslave" ++#define KIOSLAVE "libexec/kde4/kioslave" + #endif ++ + const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); + QVERIFY( !bin.isEmpty() ); + QVERIFY( bin.endsWith( KIOSLAVE ) ); +@@ -248,11 +249,13 @@ void KStandarddirsTest::testFindExe() + // findExe with a result in libexec + const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); + QVERIFY( !lnusertemp.isEmpty() ); +- QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) ); ++ QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) ++ || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) ); + + // locate("exe") with a result in libexec + const QString locateExeResult = KGlobal::dirs()->locate("exe", "lnusertemp"); +- QVERIFY(locateExeResult.endsWith("lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY)); ++ QVERIFY(locateExeResult.endsWith("lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY) ++ || locateExeResult.endsWith("libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY) ); + + // findExe with relative path + const QString pwd = QDir::currentPath(); diff --git a/SOURCES/kdelibs-4.11.97-kstandarddirs.patch b/SOURCES/kdelibs-4.11.97-kstandarddirs.patch new file mode 100644 index 0000000..f6b8ecd --- /dev/null +++ b/SOURCES/kdelibs-4.11.97-kstandarddirs.patch @@ -0,0 +1,25 @@ +diff -up kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp +--- kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs 2013-11-30 21:24:01.637163800 -0600 ++++ kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp 2013-11-30 21:35:27.166292739 -0600 +@@ -1149,7 +1149,8 @@ QStringList KStandardDirs::KStandardDirs + pit != prefixList->end(); + ++pit) + { +- if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty()) ++ // "exe" never has a custom install path, and the check triggers a false positive due to the libexecdir patch ++ if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty() || !strcmp("exe", type)) + { + for (QStringList::ConstIterator it = dirs.constBegin(); + it != dirs.constEnd(); ++it) +@@ -1163,6 +1164,11 @@ QStringList KStandardDirs::KStandardDirs + if ((local || testdir.exists()) && !candidates.contains(path, cs)) + candidates.append(path); + } ++ // special-case "config" (forward porting Chris Cheney's ++ // hack) - we want /etc/kde after the local config paths ++ // and before the ones in /usr (including kde-profile) ++ if (local && !strcmp("config", type)) ++ candidates.append(QLatin1String("/etc/kde/")); + local = false; + } + else diff --git a/SOURCES/kdelibs-4.12.90-dot.patch b/SOURCES/kdelibs-4.12.90-dot.patch new file mode 100644 index 0000000..fed6713 --- /dev/null +++ b/SOURCES/kdelibs-4.12.90-dot.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-4.12.90/doc/common/Doxyfile.global.dot kdelibs-4.12.90/doc/common/Doxyfile.global +--- kdelibs-4.12.90/doc/common/Doxyfile.global.dot 2014-03-17 13:15:23.252517997 -0500 ++++ kdelibs-4.12.90/doc/common/Doxyfile.global 2014-03-17 13:16:02.472100942 -0500 +@@ -1360,7 +1360,7 @@ HIDE_UNDOC_RELATIONS = NO + # toolkit from AT&T and Lucent Bell Labs. The other options in this section + # have no effect if this option is set to NO (the default) + +-HAVE_DOT = YES ++HAVE_DOT = NO + + # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. + # The default size is 10pt. diff --git a/SOURCES/kdelibs-4.13.2-invokeTerminal.patch b/SOURCES/kdelibs-4.13.2-invokeTerminal.patch new file mode 100644 index 0000000..9e73826 --- /dev/null +++ b/SOURCES/kdelibs-4.13.2-invokeTerminal.patch @@ -0,0 +1,17 @@ +diff -up kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp.orig kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp +--- kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp.orig 2014-07-11 16:54:51.000000000 +0200 ++++ kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp 2014-07-11 16:57:31.000000000 +0200 +@@ -412,11 +412,9 @@ void KToolInvocation::invokeTerminal(con + // directory before launching them, see below. + } + +- QString error; +- if (self()->startServiceInternal("kdeinit_exec_with_workdir", +- cmd, cmdTokens, &error, 0, NULL, startup_id, false, workdir)) { ++ if (!QProcess::startDetached(cmd, cmdTokens)) { + KMessage::message(KMessage::Error, +- i18n("Could not launch the terminal client:\n\n%1", error), ++ i18n("Could not launch the terminal client"), + i18n("Could not launch Terminal Client")); + } + } diff --git a/SOURCES/kdelibs-4.3.4-bz#587016.patch b/SOURCES/kdelibs-4.3.4-bz#587016.patch new file mode 100644 index 0000000..71d3726 --- /dev/null +++ b/SOURCES/kdelibs-4.3.4-bz#587016.patch @@ -0,0 +1,72 @@ +diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp +index 37cdb38..ab47a8e 100644 +--- a/khtml/khtml_printsettings.cpp ++++ b/khtml/khtml_printsettings.cpp +@@ -106,5 +106,19 @@ bool KHTMLPrintSettings::printHeader() + return m_printheader->isChecked(); + } + ++void KHTMLPrintSettings::setprintFriendly(bool b) ++{ ++ m_printfriendly->setChecked(b); ++} ++ ++void KHTMLPrintSettings::setprintImages(bool b) ++{ ++ m_printimages->setChecked(b); ++} ++ ++void KHTMLPrintSettings::setprintHeader(bool b) ++{ ++ m_printheader->setChecked(b); ++} + + #include "khtml_printsettings.moc" +diff --git a/khtml/khtml_printsettings.h b/khtml/khtml_printsettings.h +index 0ed825e..562ace8 100644 +--- a/khtml/khtml_printsettings.h ++++ b/khtml/khtml_printsettings.h +@@ -35,6 +35,10 @@ public: + bool printImages(); + bool printHeader(); + ++ void setprintFriendly(bool); ++ void setprintImages(bool); ++ void setprintHeader(bool); ++ + private: + QCheckBox *m_printfriendly; + QCheckBox *m_printimages; +diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp +index 1ac2339..6c9750e 100644 +--- a/khtml/khtmlview.cpp ++++ b/khtml/khtmlview.cpp +@@ -3031,6 +3031,14 @@ void KHTMLView::print(bool quick) + if(!root) return; + + QPointer printSettings(new KHTMLPrintSettings); //XXX: doesn't save settings between prints like this ++ ++ // read print settings ++ KSharedConfigPtr config = KGlobal::config(); ++ KConfigGroup group(config, "KHTML Print Settings"); ++ printSettings->setprintFriendly(group.readEntry("PrintFriendly", true)); ++ printSettings->setprintImages(group.readEntry("PrintImages", true)); ++ printSettings->setprintHeader(group.readEntry("PrintHeader", true)); ++ + const QPointerDeleter settingsDeleter(printSettings); //the printdialog takes ownership of the settings widget, thus this workaround to avoid double deletion + QPrinter printer; + QPointer dialog = KdePrint::createPrintDialog(&printer, KdePrint::SystemSelectsPages, QList() << printSettings.data(), this); +@@ -3042,6 +3050,13 @@ void KHTMLView::print(bool quick) + docname = KStringHandler::csqueeze(docname, 80); + + if(quick || (dialog->exec() && dialog)) { /*'this' and thus dialog might have been deleted while exec()!*/ ++ // write HTML settings ++ KSharedConfigPtr config = KGlobal::config(); ++ KConfigGroup group(config, "KHTML Print Settings"); ++ group.writeEntry("PrintFriendly", printSettings->printFriendly()); ++ group.writeEntry("PrintImages", printSettings->printImages()); ++ group.writeEntry("PrintHeader", printSettings->printHeader()); ++ + viewport()->setCursor( Qt::WaitCursor ); // only viewport(), no QApplication::, otherwise we get the busy cursor in kdeprint's dialogs + // set up KPrinter + printer.setFullPage(false); diff --git a/SOURCES/kdelibs-4.9.3-dot.patch b/SOURCES/kdelibs-4.9.3-dot.patch deleted file mode 100644 index 2bca78d..0000000 --- a/SOURCES/kdelibs-4.9.3-dot.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdelibs-4.9.3/doc/common/Doxyfile.global.me kdelibs-4.9.3/doc/common/Doxyfile.global ---- kdelibs-4.9.3/doc/common/Doxyfile.global.me 2012-12-04 16:57:09.239184154 +0100 -+++ kdelibs-4.9.3/doc/common/Doxyfile.global 2012-12-04 16:57:13.157191451 +0100 -@@ -1392,7 +1392,7 @@ HIDE_UNDOC_RELATIONS = NO - # toolkit from AT&T and Lucent Bell Labs. The other options in this section - # have no effect if this option is set to NO (the default) - --HAVE_DOT = YES -+HAVE_DOT = NO - - # By default doxygen will write a font called FreeSans.ttf to the output - # directory and reference it in all dot files that doxygen generates. This diff --git a/SOURCES/kdelibs-4.9.97-libexecdir.patch b/SOURCES/kdelibs-4.9.97-libexecdir.patch deleted file mode 100644 index b34b6e8..0000000 --- a/SOURCES/kdelibs-4.9.97-libexecdir.patch +++ /dev/null @@ -1,49 +0,0 @@ -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; - } -- addResourceType("exe", "lib", "kde4/libexec", true ); -+ addResourceType("exe", 0, "libexec/kde4", true ); - - addResourceDir("home", QDir::homePath(), false); - -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 "/"); - if (strcmp("libexec", type) == 0) -- return QFile::decodeName(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/"); -+ return QFile::decodeName(LIBEXEC_INSTALL_DIR "/"); - if (strcmp("locale", type) == 0) - return QFile::decodeName(LOCALE_INSTALL_DIR "/"); - break; -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 - #define EXT "" --#define KIOSLAVE "kde4/libexec/kioslave" -+#define KIOSLAVE "libexec/kde4/kioslave" - #endif -+ - const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); - QVERIFY( !bin.isEmpty() ); - QVERIFY( bin.endsWith( KIOSLAVE ) ); -@@ -231,7 +232,8 @@ void KStandarddirsTest::testFindExe() - // findExe with a result in libexec - const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); - QVERIFY( !lnusertemp.isEmpty() ); -- QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) ); -+ QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) -+ || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) ); - #endif - - #ifndef Q_OS_MAC // kdeinit4 is a bundle on Mac, so the below doesn't work -diff -up kdelibs-4.9.97/kio/tests/krununittest.cpp.libexecdir kdelibs-4.9.97/kio/tests/krununittest.cpp diff --git a/SOURCES/kdelibs-kdebug288410.patch b/SOURCES/kdelibs-kdebug288410.patch new file mode 100644 index 0000000..fc80f84 --- /dev/null +++ b/SOURCES/kdelibs-kdebug288410.patch @@ -0,0 +1,44 @@ +diff --git a/solid/solid/backends/upower/upowerbattery.cpp b/solid/solid/backends/upower/upowerbattery.cpp +index 7b5bdc4..8bd9343 100644 +--- a/solid/solid/backends/upower/upowerbattery.cpp ++++ b/solid/solid/backends/upower/upowerbattery.cpp +@@ -123,6 +123,7 @@ Solid::Battery::ChargeState Battery::chargeState() const + void Battery::slotChanged() + { + if (m_device) { ++ const QString udi = m_device.data()->udi(); + const int old_chargePercent = m_chargePercent; + const int old_capacity = m_capacity; + const Solid::Battery::ChargeState old_chargeState = m_chargeState; +@@ -132,26 +133,26 @@ void Battery::slotChanged() + + if (old_chargePercent != m_chargePercent) + { +- emit chargePercentChanged(m_chargePercent, m_device.data()->udi()); ++ emit chargePercentChanged(m_chargePercent, udi); + } + + if (old_capacity != m_capacity) { +- emit capacityChanged(m_capacity, m_device.data()->udi()); ++ emit capacityChanged(m_capacity, udi); + } + + if (old_chargeState != m_chargeState) + { +- emit chargeStateChanged(m_chargeState, m_device.data()->udi()); ++ emit chargeStateChanged(m_chargeState, udi); + } + + if (old_isPlugged != m_isPlugged) + { +- emit plugStateChanged(m_isPlugged, m_device.data()->udi()); ++ emit plugStateChanged(m_isPlugged, udi); + } + + if (old_isPowerSupply != m_isPowerSupply) + { +- emit powerSupplyStateChanged(m_isPowerSupply, m_device.data()->udi()); ++ emit powerSupplyStateChanged(m_isPowerSupply, udi); + } + } + } diff --git a/SOURCES/macros.kdelibs4 b/SOURCES/macros.kdelibs4 new file mode 100644 index 0000000..49277ed --- /dev/null +++ b/SOURCES/macros.kdelibs4 @@ -0,0 +1,14 @@ +%kdelibs4 @@NAME@@ +%kdelibs4_epoch @@EPOCH@@ +%kdelibs4_version @@VERSION@@ +%kdelibs4_evr @@EVR@@ + +%kdelibs4_requires \ +Requires: kdelibs4%{?_isa} >= %{kdelibs4_version} \ +%{nil} + +%kde_applications_version @@KDE_APPLICATIONS_VERSION@@ + +%kde_runtime_requires \ +Requires: kde-runtime >= %{kde_applications_version} \ +%{nil} diff --git a/SOURCES/solid-upower-0.99.patch b/SOURCES/solid-upower-0.99.patch new file mode 100644 index 0000000..7850dca --- /dev/null +++ b/SOURCES/solid-upower-0.99.patch @@ -0,0 +1,67 @@ +diff --git a/solid/solid/backends/upower/upowerdevice.cpp b/solid/solid/backends/upower/upowerdevice.cpp +index 94f59bf..7c70a31 100644 +--- a/solid/solid/backends/upower/upowerdevice.cpp ++++ b/solid/solid/backends/upower/upowerdevice.cpp +@@ -1,6 +1,6 @@ + /* + Copyright 2010 Michael Zanetti +- Copyright 2010 Lukas Tinkl ++ Copyright 2010-2015 Lukas Tinkl + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + using namespace Solid::Backends::UPower; + +@@ -44,11 +45,16 @@ UPowerDevice::UPowerDevice(const QString &udi) + , m_udi(udi) + { + if (m_device.isValid()) { +- connect(&m_device, SIGNAL(Changed()), this, SLOT(slotChanged())); ++ if (m_device.metaObject()->indexOfSignal("Changed()") != -1) { ++ connect(&m_device, SIGNAL(Changed()), this, SLOT(slotChanged())); ++ } else { ++ // for UPower >= 0.99.0, missing Changed() signal ++ QDBusConnection::systemBus().connect(UP_DBUS_SERVICE, m_udi, "org.freedesktop.DBus.Properties", "PropertiesChanged", this, ++ SLOT(onPropertiesChanged(QString,QVariantMap,QStringList))); ++ } + +- // for UPower >= 0.99.0, missing Changed() signal +- QDBusConnection::systemBus().connect(UP_DBUS_SERVICE, m_udi, "org.freedesktop.DBus.Properties", "PropertiesChanged", this, +- SLOT(onPropertiesChanged(QString,QVariantMap,QStringList))); ++ QDBusConnection::systemBus().connect("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", ++ this, SLOT(login1Resuming(bool))); + } + } + +@@ -238,3 +244,13 @@ void UPowerDevice::slotChanged() + m_cache.clear(); + emit changed(); + } ++ ++void UPowerDevice::login1Resuming(bool active) ++{ ++ if (!active) { ++ QDBusReply refreshCall = m_device.asyncCall("Refresh"); ++ if (refreshCall.isValid()) { ++ slotChanged(); ++ } ++ } ++} +diff --git a/solid/solid/backends/upower/upowerdevice.h b/solid/solid/backends/upower/upowerdevice.h +index 805b9b2..7694d05 100644 +--- a/solid/solid/backends/upower/upowerdevice.h ++++ b/solid/solid/backends/upower/upowerdevice.h +@@ -64,6 +64,7 @@ Q_SIGNALS: + private Q_SLOTS: + void onPropertiesChanged(const QString &ifaceName, const QVariantMap &changedProps, const QStringList &invalidatedProps); + void slotChanged(); ++ void login1Resuming(bool active); + + private: + QString batteryTechnology() const; diff --git a/SOURCES/turn-the-packagekit-support-feature-off-by-default.patch b/SOURCES/turn-the-packagekit-support-feature-off-by-default.patch new file mode 100644 index 0000000..57c1856 --- /dev/null +++ b/SOURCES/turn-the-packagekit-support-feature-off-by-default.patch @@ -0,0 +1,35 @@ +From e87117d7074b112f46a7c9ebc66422c581c64fc1 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Wed, 5 Jun 2013 15:26:47 +0200 +Subject: [PATCH] turn the packagekit support feature off by default + +it only works on fedora, there is no way to tell the dialog to not show +again. these are fixable, but they aren't fixed yet and may not be for +a while and i'd rather not annoy people for the lifetime of 4.11 +--- + plasma/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt +index 674550d..eeda974 100644 +--- a/plasma/CMakeLists.txt ++++ b/plasma/CMakeLists.txt +@@ -6,14 +6,11 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + set(PLASMA_NO_KNEWSTUFF TRUE) + set(PLASMA_NO_SOLID TRUE) + set(PLASMA_NO_KIO TRUE) +- set(PLASMA_NO_PACKAGEKIT TRUE) + set(PLASMA_NO_KUTILS TRUE) + set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) + endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + +-if(NOT Q_WS_X11) +- set(PLASMA_NO_PACKAGEKIT TRUE) +-endif(NOT Q_WS_X11) ++set(PLASMA_NO_PACKAGEKIT TRUE) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${KDE4_KDECORE_INCLUDES} +-- +1.8.3.1 + diff --git a/SPECS/kdelibs.spec b/SPECS/kdelibs.spec index 4ec2803..d83e93b 100644 --- a/SPECS/kdelibs.spec +++ b/SPECS/kdelibs.spec @@ -1,4 +1,4 @@ -%define attica_ver 0.4.0 +%define attica_ver 0.4.2 %define dbusmenu_qt_ver 0.9.0 %define phonon_ver 4.6.0 %define qt4_ver 4.8.1 @@ -6,8 +6,10 @@ %define soprano_ver 2.8.0 %define strigi_ver 0.7.0 %define apidocs 1 -%if 0%{?fedora} +%if 0%{?epel} || 0%{?fedora} %define webkit 1 +%endif +%if 0%{?fedora} %define herqq 1 %endif # to build/include QCH apidocs or not (currently broken) @@ -20,9 +22,7 @@ %endif %if 0%{?rhel} == 6 %define hal 1 -%define cmake cmake28 %else -%define cmake cmake %define upower 1 %endif @@ -31,10 +31,16 @@ %global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver}) %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver}) %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver}) +%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) + +# trim changelog included in binary rpms +%global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.10.5 -Release: 6%{?dist} +# shipped with kde applications, version... +%global apps_version 15.04.1 +Version: 4.14.8 +Release: 4%{?dist} Name: kdelibs Epoch: 6 @@ -51,7 +57,11 @@ URL: http://www.kde.org/ %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/%{version}/src/kdelibs-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/applications/%{apps_version}/src/kdelibs-%{version}.tar.xz + +Source1: macros.kdelibs4 + +Source10: SOLID_HAL_LEGACY.sh BuildRequires: kde4-macros(api) >= 2 BuildRequires: kde-filesystem >= 4-23 @@ -70,12 +80,15 @@ Requires: hunspell Requires: media-player-info # beware of possible bootstrapping problems # moved back to kde-runtime -#Requires: oxygen-icon-theme >= %{version} -Requires: phonon%{?_isa} >= %{phonon_version} -Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version} +#Requires: oxygen-icon-theme >= %{version} +Requires: phonon%{?_isa} >= %{phonon_version} Requires: shared-mime-info -Requires: soprano%{?_isa} >= %{soprano_version} -Requires: strigi-libs%{?_isa} >= %{strigi_version} +Requires: strigi-libs%{?_isa} >= %{strigi_version} +%if ! 0%{?nepomuk} +Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version} +Requires: soprano%{?_isa} >= %{soprano_version} +%endif + # make kdelibs-devel parallel-installable with kdelibs3-devel Patch0: kdelibs-4.9.95-parallel_devel.patch @@ -95,10 +108,10 @@ Patch9: kdelibs-4.10.0-branding.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 +Patch14: kdelibs-4.11.3-libexecdir.patch # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir} -Patch18: kdelibs-4.10.0-kstandarddirs.patch +Patch18: kdelibs-4.11.97-kstandarddirs.patch # set build type Patch20: kdelibs-4.10.0-cmake.patch @@ -109,6 +122,7 @@ Patch20: kdelibs-4.10.0-cmake.patch # -DCMAKE_SKIP_RPATH:BOOL=ON (finally) Patch27: kdelibs-4.10.0-no_rpath.patch +## libplasma PackageKit integration # Trigger installation of missing components when installing a package. # https://git.reviewboard.kde.org/r/102291/ Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch @@ -136,15 +150,19 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch # return valid locale (RFC 1766) 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: FindSamba.cmake-help-find-samba4-more-reliably.patch +# borrow from opensuse +# https://build-test.opensuse.org/package/view_file/home:coolo:test/kdelibs4/0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch +Patch55: Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch + +# candidate fix for: kde deamon crash on wakeup +# https://bugs.kde.org/show_bug.cgi?id=288410 +Patch56: kdelibs-kdebug288410.patch # make filter working, TODO: upstream? -- rex Patch59: kdelibs-4.9.3-kcm_ssl.patch # disable dot to reduce apidoc size -Patch61: kdelibs-4.9.3-dot.patch +Patch61: kdelibs-4.12.90-dot.patch # make kpac dhcp helper full relro Patch62: kdelibs-4.10.5-kpac-relro.patch @@ -155,7 +173,17 @@ Patch63: kdelibs-4.10.5-cmake-multilib.patch # disable strict aliasing for type punned sources Patch64: kdelibs-4.10.5-type-punning.patch +# workaround for bz#969524 on arm +Patch65: kdelibs-4.11.3-arm.patch + +# set QT_NO_GLIB in klauncher_main.cpp as a possible fix/workaround for #983110 +Patch66: kdelibs-4.11.3-klauncher-no-glib.patch + +# opening a terminal in Konqueror / Dolphin does not inherit environment variables +Patch67: kdelibs-4.13.2-invokeTerminal.patch + ## upstream +# 4.14 branch # revert these commits for #https://bugs.kde.org/315578 @@ -165,9 +193,14 @@ Patch090: return-not-break.-copy-paste-error.patch Patch091: coding-style-fixes.patch Patch092: return-application-icons-properly.patch +# revert disabling of packagekit +Patch093: turn-the-packagekit-support-feature-off-by-default.patch + ## security fix # rhel patches +Patch100: solid-upower-0.99.patch +Patch101: kdelibs-4.3.4-bz#587016.patch # disable webkit Patch300: kdelibs-4.10.0-webkit.patch @@ -191,7 +224,7 @@ Requires(postun): /sbin/ldconfig BuildRequires: automoc4 >= 0.9.88 BuildRequires: bison flex BuildRequires: bzip2-devel -BuildRequires: %{cmake} >= 2.8.9 +BuildRequires: cmake >= 2.8.9 BuildRequires: cups-devel cups BuildRequires: gettext-devel BuildRequires: giflib-devel @@ -220,10 +253,10 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0) BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(phonon) >= %{phonon_ver} +BuildRequires: pkgconfig(phonon) >= %{phonon_ver} BuildRequires: pkgconfig(polkit-qt-1) BuildRequires: pkgconfig(qca2) -BuildRequires: pkgconfig(shared-desktop-ontologies) >= %{shared_desktop_ontologies_ver} +BuildRequires: pkgconfig(shared-desktop-ontologies) >= %{shared_desktop_ontologies_ver} BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(soprano) >= %{soprano_ver} BuildRequires: pkgconfig(zlib) @@ -235,7 +268,7 @@ BuildRequires: pkgconfig(zlib) %{?upower:Requires: upower} %if 0%{?hal:1} BuildRequires: hal-devel -Requires: hal +Requires: hal-storage-addon %endif %if 0%{?apidocs} @@ -246,6 +279,12 @@ BuildRequires: graphviz BuildRequires: qt4-doc %endif +%if 0%{?tests} +%global _kde4_build_tests -DKDE4_BUILD_TESTS:BOOL=ON +# %%%check +BuildRequires: dbus-x11 xorg-x11-server-Xvfb +%endif + Provides: katepart = %{version}-%{release} Provides: katepart%{?_isa} = %{version}-%{release} Provides: kross(javascript) = %{version}-%{release} @@ -269,8 +308,8 @@ This package includes the common files for the KDE 3 and KDE 4 libraries. %package devel Summary: Header files for compiling KDE 4 applications Provides: plasma-devel = %{version}-%{release} -Provides: nepomuk-devel = %{version}-%{release} -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-ktexteditor%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} Provides: kdelibs4-devel%{?_isa} = %{version}-%{release} @@ -280,22 +319,57 @@ Obsoletes: kdelibs-experimental-devel < 4.3.75 Provides: kdelibs-experimental-devel = %{version}-%{release} %endif Requires: automoc4 >= 0.9.88 -Requires: %{cmake} >= 2.8.9 -Requires: pkgconfig(libattica) >= %{attica_ver} +Requires: cmake >= 2.8.9 +Requires: pkgconfig(libattica) >= %{attica_ver} Requires: pkgconfig(openssl) Requires: pkgconfig(phonon) +%if ! 0%{?nepomuk} # considered part of nepomuk-devel +Provides: nepomuk-devel = %{version}-%{release} Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano) Requires: qt4-devel %if 0%{?webkit} Requires: pkgconfig(QtWebKit) %endif +%endif %{?x_deps:Requires: %{x_deps}} %description devel This package includes the header files you will need to compile applications for KDE 4. +## TODO: split out ktexteditor-devel bits too? -- rex +%package ktexteditor +Summary: KDE4 Text Editor component library +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%if ! 0%{?bootstrap} +Requires: kate-part%{?_isa} +%endif +%description ktexteditor +%{summary} + +%package webkit +Summary: KDE WebKit support library +# upgrade path, when -webkit subpkg landed +Obsoletes: kdelibs < 6:4.13.2-6 +Provides: kdelibs4-webkit = %{version}-%{release} +%{?_isa:Provides: kdelibs4-webkit%{?_isa} = %{version}-%{release}} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%description webkit +%{summary}. + +%package webkit-devel +Summary: Development files for KDE WebKit support library +# upgrade path, when -webkit subpkg landed +Obsoletes: kdelibs-devel < 6:4.13.2-6 +Provides: kdelibs4-webkit-devel = %{version}-%{release} +%{?_isa:Provides: kdelibs4-webkit-devel%{?_isa} = %{version}-%{release}} +Requires: %{name}-webkit%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pkgconfig(QtWebKit) +%description webkit-devel +%{summary}. + %package apidocs Summary: KDE 4 API documentation Requires: kde-filesystem @@ -334,8 +408,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch27 -p1 -b .no_rpath # libplasma PackageKit integration -## 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 @@ -348,21 +420,28 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch52 -p1 -b .SOLID_UPNP %patch53 -p1 -b .kjs-s390 %patch54 -p1 -b .kjs-locale -%patch55 -p1 -b .FindSamba-samba4 +%patch55 -p1 -b .Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES +%patch56 -p1 -b .kdebug288410 %patch59 -p1 -b .filter %patch61 -p1 -b .dot %patch62 -p1 -b .relro %patch63 -p1 -b .multilib %patch64 -p2 -b .type_pun +%patch65 -p1 -b .arm-plasma +%patch66 -p1 -b .klauncher-no-glib +%patch67 -p1 -b .invokeTerminal # upstream patches %patch090 -p1 -R -b .return-not-break.-copy-paste-error %patch091 -p1 -R -b .coding-style-fixes.patch %patch092 -p1 -R -b .return-application-icons-properly +%patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default # security fixes # rhel patches +%patch100 -p1 -b .solid-upower099 +%patch101 -p1 -b .kdelibs-4.3.4-bz#587016 %if ! 0%{?webkit} %patch300 -p1 -b .webkit %endif @@ -376,6 +455,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ + -DHUPNP_ENABLED:BOOL=ON \ -DKAUTH_BACKEND:STRING="PolkitQt-1" \ -DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \ %{?udisks2:-DWITH_SOLID_UDISKS2:BOOL=ON} \ @@ -386,7 +466,7 @@ make %{?_smp_mflags} -C %{_target_platform} # build apidocs %if 0%{?apidocs} -export QTDOCDIR="%{?_qt4_docdir}%{?!_qt4_docdir:%(pkg-config --variable=docdir Qt 2>/dev/null)}" +export QTDOCDIR="%{?_qt4_docdir}%{?!_qt4_docdir:%(pkg-config --variable=docdir Qt)}" %if 0%{?apidocs_qch} export PROJECT_NAME="%{name}" export PROJECT_VERSION="%{version}%{?alphatag}" @@ -407,13 +487,15 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ # create/own stuff # see http://bugzilla.redhat.com/483318 mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin +# own fake mimetype dirs (#907667) +mkdir -p %{buildroot}%{_datadir}/mime/all ## use ca-certificates' ca-bundle.crt, symlink as what most other ## distros do these days (http://bugzilla.redhat.com/521902) if [ -f %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt -a \ -f /etc/pki/tls/certs/ca-bundle.crt ]; then ln -sf /etc/pki/tls/certs/ca-bundle.crt \ - %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt + %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt fi # move devel symlinks @@ -463,28 +545,57 @@ done mv "%{buildroot}%{_kde4_appsdir}/cmake/modules/KDELibs4LibraryTargets-release.cmake" \ "%{buildroot}%{_kde4_appsdir}/cmake/modules/KDELibs4LibraryTargets-%{_arch}.cmake" +%if 0%{?hal:1} +install -p -m644 -D %{SOURCE10} %{buildroot}/etc/kde/env/SOLID_HAL_LEGACY.sh +%endif + +# this gets installed conditionally if using cmake < 2.8.12.1 +# let's just simplify matters and make it unconditional +rm -fv %{buildroot}%{_mandir}/man1/kdecmake.1* + +# rpm macros +install -p -m644 -D %{SOURCE1} \ + %{buildroot}%{rpm_macros_dir}/macros.kdelibs4 +sed -i \ + -e "s|@@NAME@@|%{name}|g" \ + -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \ + -e "s|@@VERSION@@|%{version}|g" \ + -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \ + -e "s|@@KDE_APPLICATIONS_VERSION@@|%{apps_version}|g" \ + %{buildroot}%{rpm_macros_dir}/macros.kdelibs4 + + +%check +%if 0%{?tests} +time xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform}/ test ARGS="--output-on-failure" ||: +%endif %post /sbin/ldconfig -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : +touch --no-create %{_datadir}/mime/packages &> /dev/null || : %postun /sbin/ldconfig ||: if [ $1 -eq 0 ] ; then - update-desktop-database -q &> /dev/null - update-mime-database %{_kde4_datadir}/mime &> /dev/null - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : + update-desktop-database -q &> /dev/null + touch --no-create %{_datadir}/mime/packages &> /dev/null || : + update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : fi %posttrans + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null -update-mime-database %{_kde4_datadir}/mime >& /dev/null -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : %files %doc AUTHORS README TODO %doc COPYING.LIB +%if 0%{?hal:1} +/etc/kde/env/SOLID_HAL_LEGACY.sh +%endif +%{rpm_macros_dir}/macros.kdelibs4 %{_kde4_bindir}/checkXML %{_kde4_bindir}/kbuildsycoca4 %{_kde4_bindir}/kcookiejar4 @@ -525,13 +636,49 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_sysconfdir}/dbus-1/system.d/* %{_kde4_datadir}/applications/kde4/kmailservice.desktop %{_kde4_datadir}/applications/kde4/ktelnetservice.desktop -%{_kde4_datadir}/mime/packages/kde.xml +%{_datadir}/mime/packages/kde.xml +%dir %{_datadir}/mime/all %{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/servicetypes/* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_docdir}/HTML/en/kioslave/ -%{_kde4_libdir}/lib*.so.* +%{_kde4_libdir}/libkcmutils.so.4* +%{_kde4_libdir}/libkde3support.so.4* +%{_kde4_libdir}/libkdeclarative.so.5* +%{_kde4_libdir}/libkdecore.so.5* +%{_kde4_libdir}/libkdefakes.so.5* +%{_kde4_libdir}/libkdesu.so.5* +%{_kde4_libdir}/libkdeui.so.5* +%{_kde4_libdir}/libkdnssd.so.4* +%{_kde4_libdir}/libkemoticons.so.4* +%{_kde4_libdir}/libkfile.so.4* +%{_kde4_libdir}/libkhtml.so.5* +%{_kde4_libdir}/libkidletime.so.4* +%{_kde4_libdir}/libkimproxy.so.4* +%{_kde4_libdir}/libkio.so.5* +%{_kde4_libdir}/libkjsapi.so.4* +%{_kde4_libdir}/libkjsembed.so.4* +%{_kde4_libdir}/libkjs.so.4* +%{_kde4_libdir}/libkmediaplayer.so.4* +%{_kde4_libdir}/libknewstuff2.so.4* +%{_kde4_libdir}/libknewstuff3.so.4* +%{_kde4_libdir}/libknotifyconfig.so.4* +%{_kde4_libdir}/libkntlm.so.4* +%{_kde4_libdir}/libkparts.so.4* +%{_kde4_libdir}/libkprintutils.so.4* +%{_kde4_libdir}/libkpty.so.4* +%{_kde4_libdir}/libkrosscore.so.4* +%{_kde4_libdir}/libkrossui.so.4* +%{_kde4_libdir}/libkunitconversion.so.4* +%{_kde4_libdir}/libkunittest.so.4* +%{_kde4_libdir}/libkutils.so.4* +%{_kde4_libdir}/libnepomukquery.so.4* +%{_kde4_libdir}/libnepomuk.so.4* +%{_kde4_libdir}/libnepomukutils.so.4* +%{_kde4_libdir}/libplasma.so.3* +%{_kde4_libdir}/libsolid.so.4* +%{_kde4_libdir}/libthreadweaver.so.4* %{_kde4_libdir}/libkdeinit4_*.so %{_kde4_libdir}/kconf_update_bin/ %dir %{_kde4_libdir}/kde4/ @@ -544,13 +691,20 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_kde4_libexecdir}/kio_http_cache_cleaner %{_kde4_libexecdir}/kioslave %{_kde4_libexecdir}/klauncher -# see kio/misc/kpac/README.wpad +# see kio/misc/kpac/README.wpad %attr(4755,root,root) %{_kde4_libexecdir}/kpac_dhcp_helper %{_kde4_libexecdir}/ksendbugmail %{_kde4_libexecdir}/lnusertemp %{_kde4_libexecdir}/start_kdeinit %{_kde4_libexecdir}/start_kdeinit_wrapper -%{_kde4_libdir}/kde4/plugins/ +%dir %{_kde4_libdir}/kde4/plugins/ +%dir %{_kde4_libdir}/kde4/plugins/designer/ +%{_kde4_libdir}/kde4/plugins/designer/kde3supportwidgets.so +%{_kde4_libdir}/kde4/plugins/designer/kdedeprecated.so +%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.so +%{_kde4_libdir}/kde4/plugins/imageformats/ +%{_kde4_libdir}/kde4/plugins/kauth/ +%{_kde4_libdir}/kde4/plugins/script/ %{_kde4_sysconfdir}/xdg/menus/*.menu %{_mandir}/man1/checkXML.1* %{_mandir}/man1/kde4-config.1* @@ -565,6 +719,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_mandir}/man8/kdeinit4.8* %{_mandir}/man8/meinproc4.8* +%if 0%{?webkit} +%post webkit -p /sbin/ldconfig +%postun webkit -p /sbin/ldconfig + +%files webkit +%{_kde4_libdir}/libkdewebkit.so.5* +%{_kde4_libdir}/kde4/plugins/designer/kdewebkitwidgets.so +%endif + + %files common %{_kde4_bindir}/preparetips %{_kde4_configdir}/colors/ @@ -579,7 +743,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %files devel %doc KDE4PORTING.html -%{_mandir}/man1/kdecmake.1* %{_mandir}/man1/makekdewidgets.1* %{_mandir}/man1/kconfig_compiler.1* %{_mandir}/man1/preparetips.1* @@ -592,6 +755,32 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_kde4_libdir}/cmake/KDeclarative/ %{_kde4_libdir}/kde4/devel/ +%if 0%{?webkit} +%exclude %{_kde4_includedir}/kdewebkit_export.h +%exclude %{_kde4_includedir}/kgraphicswebview.h +%exclude %{_kde4_includedir}/kwebpage.h +%exclude %{_kde4_includedir}/kwebpluginfactory.h +%exclude %{_kde4_includedir}/kwebview.h +%exclude %{_kde4_includedir}/kwebwallet.h +%exclude %{_kde4_libdir}/kde4/devel/libkdewebkit.so + +%files webkit-devel +%{_kde4_includedir}/kdewebkit_export.h +%{_kde4_includedir}/kgraphicswebview.h +%{_kde4_includedir}/kwebpage.h +%{_kde4_includedir}/kwebpluginfactory.h +%{_kde4_includedir}/kwebview.h +%{_kde4_includedir}/kwebwallet.h +%{_kde4_libdir}/kde4/devel/libkdewebkit.so +%endif + +%post ktexteditor -p /sbin/ldconfig +%postun ktexteditor -p /sbin/ldconfig + +%files ktexteditor +%{_kde4_libdir}/libktexteditor.so.4* + + %if 0%{?apidocs} %files apidocs %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ @@ -604,6 +793,22 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Tue Jul 21 2015 Jan Grulich - 6:4.14.9-4 +- Restore old patch for proper restoring of print setting + Resolves: bz#1197804 + +* Fri Jun 05 2015 Jan Grulich - 6:4.14.9-3 +- Drop nepomuk subpackages + +* Wed May 27 2015 Jan Grulich - 6:4.14.8-2 +- Rebuild, we need also aarch64 build + +* Mon May 25 2015 Jan Grulich - 6:4.14.8-1 +- Re-base to 4.14.8 (sync with F21) + +* Mon Apr 13 2015 Lukáš Tinkl - 6:4.10.5-7 +- Resolves: #1202801 - Backport patch to with upower 1.0 API + * Tue Jan 28 2014 Daniel Mach - 6:4.10.5-6 - Mass rebuild 2014-01-24 @@ -1147,7 +1352,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - fix build failure triggered by "build fix" (patch by Jonathan Riddell) * Mon Nov 22 2010 Lukas Tinkl - 4.5.80-3 -- don't build Solid HAL backend, rely on udisks/upower/udev only +- don't build Solid HAL backend, rely on udisks/upower/udev only (aka project HALsectomy) * Sat Nov 20 2010 Rex Dieter - 4.5.80-2 @@ -1169,7 +1374,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - backport configChanged() for wallpaper * Fri Oct 15 2010 Rex Dieter - 4.5.2-6 -- kio/krun patch so kde services can open urls directly too +- kio/krun patch so kde services can open urls directly too * Fri Oct 08 2010 Rex Dieter - 4.5.2-5 - switching comic in comic applet crashes plasma (kde#253387,rh#640619) @@ -1315,11 +1520,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - make Requires: kdelibs-common versioned * Sun Feb 28 2010 Rex Dieter - 6:4.4.1-3 -- put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid +- put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid %%_libdir/kde/devel rpaths (#568495) * Sun Feb 28 2010 Rex Dieter - 6:4.4.1-2 -- update no_rpath patch, revert back to +- update no_rpath patch, revert back to CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE (#568495) * Sat Feb 27 2010 Rex Dieter - 6:4.4.1-1 @@ -1340,10 +1545,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : * Fri Feb 12 2010 Rex Dieter - 6:4.4.0-5 - khtml_scrolling patch -- drop khtml_svg_no_var_tracking_assignments patch +- drop khtml_svg_no_var_tracking_assignments patch * Tue Feb 09 2010 Rex Dieter - 6:4.4.0-4 -- depend on version of phonon,strigi,soprano built against +- depend on version of phonon,strigi,soprano built against * Tue Feb 09 2010 Rex Dieter - 6:4.4.0-3 - respin @@ -1358,7 +1563,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - -apidocs: build as normal noarch subpkg * Tue Feb 02 2010 Rex Dieter - 4.3.98-3 -- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in +- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in CMAKE_SYSTEM_LIBRARY_PATH. added some status messages to help debug. * Mon Feb 01 2010 Rex Dieter - 4.3.98-2 @@ -1621,7 +1826,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - Provides: kross(javascript) kross(qtscript) (#490586) * Thu Mar 12 2009 Than Ngo - 4.2.1-6 -- apply patch to fix encoding for Qt-4.5.0 +- apply patch to fix encoding for Qt-4.5.0 * Mon Mar 09 2009 Than Ngo - 4.2.1-5 - apply patch to fix issue in CSS style that causes konqueror shows a blank page @@ -1668,7 +1873,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - kded/kdirwatch patch (kde#182472) * Fri Jan 30 2009 Lukáš Tinkl 4.2.0-6 -- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, +- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, otherwise it can result in confusion and data loss (overwriting files with files that don't exist). kdebug:118593 - Fix "klauncher hangs when kdeinit4 dies" -- this happened because