Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2014-03-10 12:17:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2014-02-24 06:53:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2014-03-10 12:17:25.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:38:45 UTC 2014 - [email protected] + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kcoreaddons-4.96.0.tar.xz New: ---- kcoreaddons-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.8aFSof/_old 2014-03-10 12:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.8aFSof/_new 2014-03-10 12:17:26.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5CoreAddons4 +%define lname libKF5CoreAddons5 Name: kcoreaddons -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: shared-mime-info ++++++ kcoreaddons-4.96.0.tar.xz -> kcoreaddons-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/CMakeLists.txt new/kcoreaddons-4.97.0/CMakeLists.txt --- old/kcoreaddons-4.96.0/CMakeLists.txt 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/CMakeLists.txt 2014-03-01 12:50:21.000000000 +0100 @@ -2,13 +2,13 @@ project(KCoreAddons) -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(FeatureSummary) include(GenerateExportHeader) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) @@ -35,11 +35,12 @@ # Generate io/config-kdirwatch.h configure_file(src/lib/io/config-kdirwatch.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/lib/io/config-kdirwatch.h) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCOREADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake" + SOVERSION 5) add_subdirectory(src) @@ -49,7 +50,7 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5CoreAddons") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddonsConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddonsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/autotests/kdirwatch_unittest.cpp new/kcoreaddons-4.97.0/autotests/kdirwatch_unittest.cpp --- old/kcoreaddons-4.96.0/autotests/kdirwatch_unittest.cpp 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/autotests/kdirwatch_unittest.cpp 2014-03-01 12:50:21.000000000 +0100 @@ -569,6 +569,11 @@ // Just touch another file to trigger a findSubEntry - this where the crash happened waitUntilMTimeChange(m_path); createFile(filetemp); +#ifdef Q_OS_WIN + if (watch.internalMethod() == KDirWatch::QFSWatch) { + QEXPECT_FAIL(nullptr, "QFSWatch fails here on Windows!", Continue); + } +#endif QVERIFY(waitForOneSignal(watch, SIGNAL(dirty(QString)), m_path)); } @@ -689,6 +694,11 @@ //qDebug() << "create file 3 at" << QDateTime::currentDateTime().toTime_t(); const QString file3 = createFile(3); +#ifdef Q_OS_WIN + if (watch.internalMethod() == KDirWatch::QFSWatch) { + QEXPECT_FAIL(nullptr, "QFSWatch fails here on Windows!", Continue); + } +#endif QVERIFY(waitForOneSignal(watch, SIGNAL(dirty(QString)), m_path)); QFile::remove(file2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/cmake/FindSharedMimeInfo.cmake new/kcoreaddons-4.97.0/cmake/FindSharedMimeInfo.cmake --- old/kcoreaddons-4.96.0/cmake/FindSharedMimeInfo.cmake 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/cmake/FindSharedMimeInfo.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -# - Try to find the shared-mime-info package -# -# Once done this will define -# -# SHAREDMIMEINFO_FOUND - system has the shared-mime-info package -# UPDATE_MIME_DATABASE_EXECUTABLE - the update-mime-database executable -# -# The minimum required version of SharedMimeInfo can be specified using the -# standard syntax, e.g. find_package(SharedMimeInfo 0.20) -# -# For backward compatibility, the following two variables are also supported: -# SHARED_MIME_INFO_FOUND - same as SHAREDMIMEINFO_FOUND -# SHARED_MIME_INFO_MINIMUM_VERSION - set to the minimum version you need, default is 0.18. -# When both are used, i.e. the version is set in the find_package() call and -# SHARED_MIME_INFO_MINIMUM_VERSION is set, the version specified in the find_package() -# call takes precedence. - - -# Copyright (c) 2007, Pino Toscano, <[email protected]> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -# Support SHARED_MIME_INFO_MINIMUM_VERSION for compatibility: -if(NOT SharedMimeInfo_FIND_VERSION) - set(SharedMimeInfo_FIND_VERSION "${SHARED_MIME_INFO_MINIMUM_VERSION}") -endif(NOT SharedMimeInfo_FIND_VERSION) - -# the minimum version of shared-mime-database we require -if(NOT SharedMimeInfo_FIND_VERSION) - set(SharedMimeInfo_FIND_VERSION "0.18") -endif(NOT SharedMimeInfo_FIND_VERSION) - -find_program(UPDATE_MIME_DATABASE_EXECUTABLE NAMES update-mime-database) - -# Store the version number in the cache, so we don't have to search the next time again: -if (UPDATE_MIME_DATABASE_EXECUTABLE AND NOT SHAREDMIMEINFO_VERSION) - execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} -v RETURN_VALUE _null OUTPUT_VARIABLE _smiVersionRaw ERROR_VARIABLE _smiVersionRaw) - - string(REGEX REPLACE "update-mime-database \\([a-zA-Z\\-]+\\) ([0-9]\\.[0-9]+).*" - "\\1" smiVersion "${_smiVersionRaw}") - - set(SHAREDMIMEINFO_VERSION "${smiVersion}" CACHE STRING "Version number of SharedMimeInfo" FORCE) -endif (UPDATE_MIME_DATABASE_EXECUTABLE AND NOT SHAREDMIMEINFO_VERSION) - -# Use the new FPHSA() syntax: -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(SharedMimeInfo REQUIRED_VARS UPDATE_MIME_DATABASE_EXECUTABLE - VERSION_VAR SHAREDMIMEINFO_VERSION ) - -# For backward compatibility: -set(SHARED_MIME_INFO_FOUND ${SHAREDMIMEINFO_FOUND} ) - -# This should go into MacroLogFeature/FeatureSummary: -# message(FATAL_ERROR "Could NOT find shared-mime-info. See http://freedesktop.org/wiki/Software/shared-mime-info.";) - - -mark_as_advanced(UPDATE_MIME_DATABASE_EXECUTABLE) - - -macro(UPDATE_XDG_MIMETYPES _path) - get_filename_component(_xdgmimeDir "${_path}" NAME) - if("${_xdgmimeDir}" STREQUAL packages ) - get_filename_component(_xdgmimeDir "${_path}" PATH) - else("${_xdgmimeDir}" STREQUAL packages ) - set(_xdgmimeDir "${_path}") - endif("${_xdgmimeDir}" STREQUAL packages ) - - install(CODE " -set(DESTDIR_VALUE \"\$ENV{DESTDIR}\") -if (NOT DESTDIR_VALUE) - # under Windows relative paths are used, that's why it runs from CMAKE_INSTALL_PREFIX - execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${_xdgmimeDir} - WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\") -endif (NOT DESTDIR_VALUE) -") -endmacro (UPDATE_XDG_MIMETYPES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/src/lib/CMakeLists.txt new/kcoreaddons-4.97.0/src/lib/CMakeLists.txt --- old/kcoreaddons-4.96.0/src/lib/CMakeLists.txt 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/src/lib/CMakeLists.txt 2014-03-01 12:50:21.000000000 +0100 @@ -105,60 +105,57 @@ EXPORT_NAME CoreAddons ) -ecm_generate_headers( - KAboutData - - REQUIRED_HEADERS KCoreAddons_HEADERS -) -ecm_generate_headers( - KSharedDataCache - - RELATIVE caching - REQUIRED_HEADERS KCoreAddons_HEADERS -) -ecm_generate_headers( - KAutoSaveFile - KDirWatch - KMessage - KProcess - KBackup - KUrlMimeData - - RELATIVE io - REQUIRED_HEADERS KCoreAddons_HEADERS -) -ecm_generate_headers( - KCompositeJob - KJob - KJobTrackerInterface - KJobUiDelegate - - RELATIVE jobs - REQUIRED_HEADERS KCoreAddons_HEADERS -) -ecm_generate_headers( - KRandom - KRandomSequence - - RELATIVE randomness - REQUIRED_HEADERS KCoreAddons_HEADERS -) -ecm_generate_headers( - KMacroExpander - KStringHandler - - RELATIVE text - REQUIRED_HEADERS KCoreAddons_HEADERS -) -ecm_generate_headers( - KFormat - KUser - KShell - - RELATIVE util - REQUIRED_HEADERS KCoreAddons_HEADERS +ecm_generate_headers(KCoreAddons_HEADERS + HEADER_NAMES KAboutData + REQUIRED_HEADERS KCoreAddons_HEADERS +) +ecm_generate_headers(KCoreAddons_HEADERS + HEADER_NAMES KSharedDataCache + RELATIVE caching + REQUIRED_HEADERS KCoreAddons_HEADERS +) +ecm_generate_headers(KCoreAddons_HEADERS + HEADER_NAMES + KAutoSaveFile + KDirWatch + KMessage + KProcess + KBackup + KUrlMimeData + RELATIVE io + REQUIRED_HEADERS KCoreAddons_HEADERS +) +ecm_generate_headers(KCoreAddons_HEADERS + HEADER_NAMES + KCompositeJob + KJob + KJobTrackerInterface + KJobUiDelegate + RELATIVE jobs + REQUIRED_HEADERS KCoreAddons_HEADERS +) +ecm_generate_headers(KCoreAddons_HEADERS + HEADER_NAMES + KRandom + KRandomSequence + RELATIVE randomness + REQUIRED_HEADERS KCoreAddons_HEADERS +) +ecm_generate_headers(KCoreAddons_HEADERS + HEADER_NAMES + KMacroExpander + KStringHandler + RELATIVE text + REQUIRED_HEADERS KCoreAddons_HEADERS +) +ecm_generate_headers(KCoreAddons_HEADERS + HEADER_NAMES + KFormat + KUser + KShell + RELATIVE util + REQUIRED_HEADERS KCoreAddons_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KCoreAddons DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) install(TARGETS KF5CoreAddons EXPORT KF5CoreAddonsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/src/lib/util/kuser.h new/kcoreaddons-4.97.0/src/lib/util/kuser.h --- old/kcoreaddons-4.96.0/src/lib/util/kuser.h 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/src/lib/util/kuser.h 2014-03-01 12:50:21.000000000 +0100 @@ -176,8 +176,11 @@ * @return the full name of the user or QString() if user is invalid * @deprecated use property(KUser::FullName) instead */ -#ifndef KDE_NO_DEPRECATED - KCOREADDONS_DEPRECATED QString fullName() const; +#ifndef KCOREADDONS_NO_DEPRECATED + KCOREADDONS_DEPRECATED QString fullName() const + { + return property(FullName).toString(); + } #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/src/lib/util/kuser_unix.cpp new/kcoreaddons-4.97.0/src/lib/util/kuser_unix.cpp --- old/kcoreaddons-4.96.0/src/lib/util/kuser_unix.cpp 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/src/lib/util/kuser_unix.cpp 2014-03-01 12:50:21.000000000 +0100 @@ -158,13 +158,6 @@ return d->loginName; } -#ifndef KDE_NO_DEPRECATED -QString KUser::fullName() const -{ - return d->properties[FullName].toString(); -} -#endif - QString KUser::homeDir() const { return d->homeDir; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/src/lib/util/kuser_win.cpp new/kcoreaddons-4.97.0/src/lib/util/kuser_win.cpp --- old/kcoreaddons-4.96.0/src/lib/util/kuser_win.cpp 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/src/lib/util/kuser_win.cpp 2014-03-01 12:50:21.000000000 +0100 @@ -191,13 +191,6 @@ return (d->userInfo ? QString::fromUtf16((ushort *) d->userInfo->usri11_name) : QString()); } -#ifndef KDE_NO_DEPRECATED -QString KUser::fullName() const -{ - return (d->userInfo ? QString::fromUtf16((ushort *) d->userInfo->usri11_full_name) : QString()); -} -#endif - QString KUser::homeDir() const { return QDir::fromNativeSeparators(QString::fromLocal8Bit(qgetenv("USERPROFILE"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/src/mimetypes/CMakeLists.txt new/kcoreaddons-4.97.0/src/mimetypes/CMakeLists.txt --- old/kcoreaddons-4.96.0/src/mimetypes/CMakeLists.txt 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/src/mimetypes/CMakeLists.txt 2014-03-01 12:50:21.000000000 +0100 @@ -1,7 +1,6 @@ # for KDE frameworks 5 we require at least version 0.70 find_package(SharedMimeInfo 0.70) -set_package_properties(SharedMimeInfo PROPERTIES DESCRIPTION "Shared Mime Info" - URL "http://freedesktop.org/wiki/Software/shared-mime-info"; +set_package_properties(SharedMimeInfo PROPERTIES TYPE REQUIRED PURPOSE "Allows KDE applications to determine file types" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-4.96.0/src/mimetypes/kde5.xml new/kcoreaddons-4.97.0/src/mimetypes/kde5.xml --- old/kcoreaddons-4.96.0/src/mimetypes/kde5.xml 2014-02-05 13:13:14.000000000 +0100 +++ new/kcoreaddons-4.97.0/src/mimetypes/kde5.xml 2014-03-01 12:50:21.000000000 +0100 @@ -388,4 +388,15 @@ <match type="string" offset="60" value="BOOKMOBI" /> </magic> </mime-type> + <!-- Will be in s-m-i 1.3, remove when we can depend on it --> + <mime-type type="image/x-webp"> + <comment>WebP image</comment> + <magic priority="50"> + <match type="string" value="RIFF" offset="0"> + <match type="string" value="WEBP" offset="8"/> + </match> + </magic> + <alias type="image/webp"/> + <glob pattern="*.webp"/> + </mime-type> </mime-info> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
