From 05ed4171326dfd1ec6f068b2f9afce5feaf4a5c9 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 28 2014 10:29:29 +0000 Subject: import kdelibs-4.10.5-6.el7.src.rpm --- diff --git a/SOURCES/0001-Add-an-API-currently-private-for-installing-missing-.patch b/SOURCES/0001-Add-an-API-currently-private-for-installing-missing-.patch deleted file mode 100644 index a2e5efd..0000000 --- a/SOURCES/0001-Add-an-API-currently-private-for-installing-missing-.patch +++ /dev/null @@ -1,286 +0,0 @@ -diff -up kdelibs-4.7.80/plasma/CMakeLists.txt.libplasma-pk-0001 kdelibs-4.7.80/plasma/CMakeLists.txt ---- kdelibs-4.7.80/plasma/CMakeLists.txt.libplasma-pk-0001 2011-11-17 21:54:56.000000000 +0100 -+++ kdelibs-4.7.80/plasma/CMakeLists.txt 2011-11-18 13:16:23.243039344 +0100 -@@ -6,10 +6,15 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL - 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) -+ - include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${KDE4_KDECORE_INCLUDES} - ${KDE4_KDEUI_INCLUDES} -@@ -44,6 +49,11 @@ if(NOT PLASMA_NO_SOLID) - set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) - endif(NOT PLASMA_NO_SOLID) - -+if(NOT PLASMA_NO_PACKAGEKIT) -+ add_definitions(-DPLASMA_ENABLE_PACKAGEKIT_SUPPORT=1) -+ set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${QT_QTDBUS_LIBRARY}) -+endif(NOT PLASMA_NO_PACKAGEKIT) -+ - if (NOT PLASMA_NO_KUTILS) - include_directories(${CMAKE_SOURCE_DIR}/kutils) - set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS}) -@@ -117,6 +127,7 @@ set(plasma_LIB_SRCS - private/animablegraphicswebview.cpp - private/applethandle.cpp - private/associatedapplicationmanager.cpp -+ private/componentinstaller.cpp - private/datacontainer_p.cpp - private/dataenginebindings.cpp - private/dataengineconsumer.cpp -diff -up kdelibs-4.7.80/plasma/dataenginemanager.cpp.libplasma-pk-0001 kdelibs-4.7.80/plasma/dataenginemanager.cpp ---- kdelibs-4.7.80/plasma/dataenginemanager.cpp.libplasma-pk-0001 2011-08-22 15:13:55.000000000 +0200 -+++ kdelibs-4.7.80/plasma/dataenginemanager.cpp 2011-11-18 12:48:37.513008572 +0100 -@@ -29,6 +29,7 @@ - - #include "datacontainer.h" - #include "pluginloader.h" -+#include "private/componentinstaller_p.h" - #include "private/dataengine_p.h" - #include "private/datacontainer_p.h" - #include "scripting/scriptengine.h" -@@ -130,6 +131,9 @@ Plasma::DataEngine *DataEngineManager::l - - DataEngine *engine = PluginLoader::pluginLoader()->loadDataEngine(name); - if (!engine) { -+ // Try installing the engine. However, it's too late for this request. -+ ComponentInstaller::self()->installMissingComponent("dataengine", name); -+ - return d->nullEngine(); - } - -diff -up kdelibs-4.7.80/plasma/private/componentinstaller.cpp.libplasma-pk-0001 kdelibs-4.7.80/plasma/private/componentinstaller.cpp ---- kdelibs-4.7.80/plasma/private/componentinstaller.cpp.libplasma-pk-0001 2011-11-18 12:48:37.513008572 +0100 -+++ kdelibs-4.7.80/plasma/private/componentinstaller.cpp 2011-11-18 12:48:37.513008572 +0100 -@@ -0,0 +1,103 @@ -+/* -+ * Copyright 2011 Kevin Kofler -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Library General Public License as -+ * published by the Free Software Foundation; either version 2, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#include "private/componentinstaller_p.h" -+ -+#include -+ -+#ifdef PLASMA_ENABLE_PACKAGEKIT_SUPPORT -+#include -+#include -+#include -+#include -+#include -+#include -+#endif -+ -+namespace Plasma -+{ -+ -+class ComponentInstallerPrivate -+{ -+ public: -+#ifdef PLASMA_ENABLE_PACKAGEKIT_SUPPORT -+ QSet alreadyPrompted; -+#endif -+}; -+ -+class ComponentInstallerSingleton -+{ -+ public: -+ ComponentInstaller self; -+}; -+ -+K_GLOBAL_STATIC(ComponentInstallerSingleton, privateComponentInstallerSelf) -+ -+ComponentInstaller *ComponentInstaller::self() -+{ -+ return &privateComponentInstallerSelf->self; -+} -+ -+ComponentInstaller::ComponentInstaller() -+ : d(new ComponentInstallerPrivate) -+{ -+} -+ -+ComponentInstaller::~ComponentInstaller() -+{ -+ delete d; -+} -+ -+void ComponentInstaller::installMissingComponent(const QString &type, -+ const QString &name, -+ QWidget *parent, bool force) -+{ -+#ifdef PLASMA_ENABLE_PACKAGEKIT_SUPPORT -+ QString searchString = type + '-' + name; -+ -+ if (!force) { -+ if (d->alreadyPrompted.contains(searchString)) { -+ return; -+ } -+ } -+ -+ d->alreadyPrompted.insert(searchString); -+ -+ QDBusInterface packageKit(QLatin1String("org.freedesktop.PackageKit"), -+ QLatin1String("/org/freedesktop/PackageKit"), -+ QLatin1String("org.freedesktop.PackageKit.Modify")); -+ // We don't check packageKit.isValid() because the service is activated on -+ // demand, so it will show up as "not valid". -+ WId wid = 0; -+ if (parent) { -+ wid = parent->winId(); -+ } -+ QStringList resources; -+ resources.append(searchString); -+ packageKit.asyncCall(QLatin1String("InstallResources"), (unsigned int) wid, -+ QLatin1String("plasma-service"), resources, QString()); -+#else -+ Q_UNUSED(type); -+ Q_UNUSED(name); -+ Q_UNUSED(parent); -+ Q_UNUSED(force); -+#endif -+} -+ -+} // namespace Plasma -diff -up kdelibs-4.7.80/plasma/private/componentinstaller_p.h.libplasma-pk-0001 kdelibs-4.7.80/plasma/private/componentinstaller_p.h ---- kdelibs-4.7.80/plasma/private/componentinstaller_p.h.libplasma-pk-0001 2011-11-18 12:48:37.514008574 +0100 -+++ kdelibs-4.7.80/plasma/private/componentinstaller_p.h 2011-11-18 12:48:37.514008574 +0100 -@@ -0,0 +1,94 @@ -+/* -+ * Copyright 2011 Kevin Kofler -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Library General Public License as -+ * published by the Free Software Foundation; either version 2, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef PLASMA_COMPONENTINSTALLER_H -+#define PLASMA_COMPONENTINSTALLER_H -+ -+class QString; -+class QWidget; -+ -+namespace Plasma -+{ -+ -+class ComponentInstallerPrivate; -+ -+/** -+ * @class ComponentInstaller plasma/private/componentinstaller_p.h -+ * -+ * @short This class provides a generic API for installation of components. -+ * -+ * @internal -+ * -+ * Plasma::ComponentInstaller allows searching for a missing data or script -+ * engine by name, and allowing the user to install the missing service. -+ * Currently, PackageKit is supported as the mechanism to install components, -+ * but more mechanisms could be supported in the future through the same API. -+ * -+ * @since 4.8 -+ */ -+class ComponentInstaller -+{ -+ public: -+ /** -+ * Singleton pattern accessor. -+ */ -+ static ComponentInstaller *self(); -+ -+ /** -+ * Installs a missing component asynchronously. -+ * -+ * By default, this method will cache requested components and not -+ * prompt again for the same engine in the same session. The force -+ * parameter can be used to disable this mechanism, e.g. when the user -+ * just installed a new widget written in a scripting language, and so -+ * is likely to want the script engine installed after all. -+ * -+ * In the case of on-demand installation, this will unfortunately not -+ * allow the call which triggered the missing component lookup to -+ * succeed, but we cannot afford to block all of Plasma until the -+ * mechanism is done installing the service. -+ * -+ * This function does nothing if PackageKit integration was disabled at -+ * compile time. -+ * -+ * @param type the type of the component, should be "scriptengine" or -+ * "dataengine" -+ * @param name the name of the component -+ * @param parent a parent widget, used to set the wid for PackageKit -+ * @param force whether to always prompt, even if recently prompted -+ */ -+ void installMissingComponent(const QString &type, const QString &name, -+ QWidget *parent = 0, bool force = false); -+ -+ private: -+ /** -+ * Default constructor. The singleton method self() is the -+ * preferred access mechanism. -+ */ -+ ComponentInstaller(); -+ ~ComponentInstaller(); -+ -+ ComponentInstallerPrivate *const d; -+ -+ friend class ComponentInstallerSingleton; -+}; -+ -+} // namespace Plasma -+ -+#endif // multiple inclusion guard -diff -up kdelibs-4.7.80/plasma/scripting/scriptengine.cpp.libplasma-pk-0001 kdelibs-4.7.80/plasma/scripting/scriptengine.cpp ---- kdelibs-4.7.80/plasma/scripting/scriptengine.cpp.libplasma-pk-0001 2011-09-26 11:41:11.000000000 +0200 -+++ kdelibs-4.7.80/plasma/scripting/scriptengine.cpp 2011-11-18 12:48:37.514008574 +0100 -@@ -27,6 +27,7 @@ - #include "applet.h" - #include "dataengine.h" - #include "package.h" -+#include "private/componentinstaller_p.h" - #include "scripting/appletscript.h" - #include "scripting/dataenginescript.h" - #include "scripting/runnerscript.h" -@@ -196,6 +197,9 @@ ScriptEngine *loadEngine(const QString & - << "! error reported: " << error; - } - -+ // Try installing the engine. However, it's too late for this request. -+ ComponentInstaller::self()->installMissingComponent("scriptengine", language); -+ - return 0; - } - diff --git a/SOURCES/kdelibs-4.10.5-cmake-multilib.patch b/SOURCES/kdelibs-4.10.5-cmake-multilib.patch new file mode 100644 index 0000000..62f0523 --- /dev/null +++ b/SOURCES/kdelibs-4.10.5-cmake-multilib.patch @@ -0,0 +1,23 @@ +--- kdelibs-4.10.5/CreateKDELibsDependenciesFile.cmake.multilib 2014-01-08 17:30:42.270885255 +0100 ++++ kdelibs-4.10.5/CreateKDELibsDependenciesFile.cmake 2014-01-08 17:30:49.082868267 +0100 +@@ -57,13 +57,18 @@ make_install_path_absolute(KDE4_DBUS_SER + make_install_path_absolute(KDE4_SERVICES_INSTALL_DIR ${SERVICES_INSTALL_DIR}) + make_install_path_absolute(KDE4_SERVICETYPES_INSTALL_DIR ${SERVICETYPES_INSTALL_DIR}) + ++STRING(REGEX REPLACE "/lib64" "/lib" KDE4_LIB_INSTALL_DIR_STRIPPED ${KDE4_LIB_INSTALL_DIR}) ++STRING(REGEX REPLACE "/lib64" "/lib" KDE4_IMPORTS_INSTALL_DIR_STRIPPED ${KDE4_IMPORTS_INSTALL_DIR}) ++STRING(REGEX REPLACE "/lib" "/lib\${LIB_SUFFIX}" KDE4_LIB_INSTALL_DIR_EXTENDED ${KDE4_LIB_INSTALL_DIR_STRIPPED}) ++STRING(REGEX REPLACE "/lib" "/lib\${LIB_SUFFIX}" KDE4_IMPORTS_INSTALL_DIR_EXTENDED ${KDE4_IMPORTS_INSTALL_DIR_STRIPPED}) ++ + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake " + if (NOT KDE4_INSTALL_DIR) + set(KDE4_INSTALL_DIR \"${CMAKE_INSTALL_PREFIX}\") + endif (NOT KDE4_INSTALL_DIR) + +-set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR}\") +-set(KDE4_IMPORTS_INSTALL_DIR \"${KDE4_IMPORTS_INSTALL_DIR}\") ++set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR_EXTENDED}\") ++set(KDE4_IMPORTS_INSTALL_DIR \"${KDE4_IMPORTS_INSTALL_DIR_EXTENDED}\") + set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\") + set(KDE4_INCLUDE_INSTALL_DIR \"${KDE4_INCLUDE_INSTALL_DIR}\") + set(KDE4_BIN_INSTALL_DIR \"${KDE4_BIN_INSTALL_DIR}\") diff --git a/SOURCES/kdelibs-4.10.5-kpac-relro.patch b/SOURCES/kdelibs-4.10.5-kpac-relro.patch new file mode 100644 index 0000000..1a01457 --- /dev/null +++ b/SOURCES/kdelibs-4.10.5-kpac-relro.patch @@ -0,0 +1,10 @@ +--- kdelibs-4.10.5/kio/misc/kpac/CMakeLists.txt.relro 2014-01-08 17:30:13.109957977 +0100 ++++ kdelibs-4.10.5/kio/misc/kpac/CMakeLists.txt 2014-01-08 17:30:16.124950458 +0100 +@@ -40,6 +40,7 @@ install(TARGETS kded_proxyscout DESTINA + set(kpac_dhcp_helper_SRCS kpac_dhcp_helper.c) + + kde4_add_executable(kpac_dhcp_helper NOGUI ${kpac_dhcp_helper_SRCS}) ++SET_TARGET_PROPERTIES(kpac_dhcp_helper PROPERTIES LINK_FLAGS "-Wl,-z,relro,-z,now") + + if (HAVE_NSL_LIBRARY) + # Assume Solaris diff --git a/SOURCES/kdelibs-4.10.5-type-punning.patch b/SOURCES/kdelibs-4.10.5-type-punning.patch new file mode 100644 index 0000000..78b4f44 --- /dev/null +++ b/SOURCES/kdelibs-4.10.5-type-punning.patch @@ -0,0 +1,32 @@ +--- ./kdelibs-4.10.5/kimgio/CMakeLists.txt 2014-01-24 16:40:49.341274501 +0100 ++++ ./kdelibs-4.10.5/kimgio/CMakeLists.txt 2014-01-24 16:41:14.783208049 +0100 +@@ -75,6 +75,7 @@ install(TARGETS kimg_xcf DESTINATION ${ + ################################## + + set(kimg_dds_LIB_SRCS dds.cpp) ++set_property(SOURCE dds.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -fno-strict-aliasing ") + kde4_add_plugin(kimg_dds ${kimg_dds_LIB_SRCS}) + target_link_libraries(kimg_dds ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) + +--- ./kdelibs-4.10.5/kdeui/CMakeLists.txt 2014-01-24 16:41:31.938163283 +0100 ++++ ./kdelibs-4.10.5/kdeui/CMakeLists.txt 2014-01-24 16:41:56.394099521 +0100 +@@ -298,6 +298,8 @@ set(kdeui_LIB_SRCS + xmlgui/kxmlguiversionhandler.cpp + ) + ++set_property(SOURCE util/kcrash.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -fno-strict-aliasing ") ++ + if(NOT KDE_NO_DEPRECATED) + set(kdeui_LIB_SRCS + ${kdeui_LIB_SRCS} +--- ./kdelibs-4.10.5/kdecore/CMakeLists.txt 2014-01-24 16:37:45.921751058 +0100 ++++ ./kdelibs-4.10.5/kdecore/CMakeLists.txt 2014-01-24 16:40:17.417357991 +0100 +@@ -292,6 +292,8 @@ set(kdecore_LIB_SRCS + sonnet/globals.cpp + ) + ++set_property(SOURCE services/kmimetyperepository.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -fno-strict-aliasing ") ++ + if (NOT KDECORE_NO_KDE3SUPPORT) + set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} + network/k3socketdevice.cpp # must be before the rest of network/, for enable-final diff --git a/SPECS/kdelibs.spec b/SPECS/kdelibs.spec index 0aac19e..4ec2803 100644 --- a/SPECS/kdelibs.spec +++ b/SPECS/kdelibs.spec @@ -34,7 +34,7 @@ Summary: KDE Libraries Version: 4.10.5 -Release: 1%{?dist} +Release: 6%{?dist} Name: kdelibs Epoch: 6 @@ -109,11 +109,6 @@ Patch20: kdelibs-4.10.0-cmake.patch # -DCMAKE_SKIP_RPATH:BOOL=ON (finally) Patch27: kdelibs-4.10.0-no_rpath.patch -## libplasma PackageKit integration -# Add an API (currently private) for installing missing Plasma engines. -# https://git.reviewboard.kde.org/r/102175/ -Patch40: 0001-Add-an-API-currently-private-for-installing-missing-.patch - # 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 @@ -151,6 +146,15 @@ Patch59: kdelibs-4.9.3-kcm_ssl.patch # disable dot to reduce apidoc size Patch61: kdelibs-4.9.3-dot.patch +# make kpac dhcp helper full relro +Patch62: kdelibs-4.10.5-kpac-relro.patch + +# make cmake generated files multilib friendly +Patch63: kdelibs-4.10.5-cmake-multilib.patch + +# disable strict aliasing for type punned sources +Patch64: kdelibs-4.10.5-type-punning.patch + ## upstream # revert these commits for @@ -347,6 +351,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch55 -p1 -b .FindSamba-samba4 %patch59 -p1 -b .filter %patch61 -p1 -b .dot +%patch62 -p1 -b .relro +%patch63 -p1 -b .multilib +%patch64 -p2 -b .type_pun # upstream patches %patch090 -p1 -R -b .return-not-break.-copy-paste-error @@ -379,7 +386,7 @@ make %{?_smp_mflags} -C %{_target_platform} # build apidocs %if 0%{?apidocs} -export QTDOCDIR="%{?_qt4_docdir}%{?!_qt4_docdir:%(pkg-config --variable=docdir Qt)}" +export QTDOCDIR="%{?_qt4_docdir}%{?!_qt4_docdir:%(pkg-config --variable=docdir Qt 2>/dev/null)}" %if 0%{?apidocs_qch} export PROJECT_NAME="%{name}" export PROJECT_VERSION="%{version}%{?alphatag}" @@ -452,6 +459,10 @@ done %endif %endif +#the targets are different for each arch, evaluated all at once +mv "%{buildroot}%{_kde4_appsdir}/cmake/modules/KDELibs4LibraryTargets-release.cmake" \ + "%{buildroot}%{_kde4_appsdir}/cmake/modules/KDELibs4LibraryTargets-%{_arch}.cmake" + %post /sbin/ldconfig @@ -593,6 +604,29 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Tue Jan 28 2014 Daniel Mach - 6:4.10.5-6 +- Mass rebuild 2014-01-24 + +* Wed Jan 08 2014 Martin Briza - 4.10.5-5 +- fixed a typo in Summary +- removed an unused patch +- Resolves: #884052 + +* Wed Jan 08 2014 Martin Briza - 4.10.5-4 +- use a better way to figure out if lib or lib64 should be used +- use -fno-strict-aliasing for type punned source files +- Resolves: #884052 + +* Wed Jan 08 2014 Martin Briza - 4.10.5-3 +- make kpac_dhcp_helper full relro +- set the variables in the generated cmake files to contain both 64b and 32b paths +- hide "command not found" for one pkg-config invocation in the spec +- fix macro expansion in the spec changelog +- Resolves: #884052 + +* Fri Dec 27 2013 Daniel Mach - 6:4.10.5-2 +- Mass rebuild 2013-12-27 + * Sun Jun 30 2013 Than Ngo - 4.10.5-1 - 4.10.5 @@ -1402,7 +1436,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - KDE 4.4 beta1 (4.3.80) * Wed Nov 25 2009 Rex Dieter - 4.3.75-0.2.svn1048496 -- -devel: Provides: kdelibs4-devel%{?_isa} ... +- -devel: Provides: kdelibs4-devel%%{?_isa} ... - Obsoletes: kdelibs-experimental(-devel) < 4.3.75 * Fri Nov 20 2009 Ben Boeckel - 4.3.75-0.1.svn1048496