Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2014-03-10 12:17:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2014-02-28 16:23:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2014-03-10 12:17:27.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:36:08 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: ---- kglobalaccel-4.96.0.tar.xz New: ---- kglobalaccel-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.ZJCHkU/_old 2014-03-10 12:17:28.000000000 +0100 +++ /var/tmp/diff_new_pack.ZJCHkU/_new 2014-03-10 12:17:28.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5GlobalAccel4 +%define lname libKF5GlobalAccel5 Name: kglobalaccel -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: pkgconfig(Qt5DBus) >= 5.2.0 ++++++ kglobalaccel-4.96.0.tar.xz -> kglobalaccel-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-4.96.0/CMakeLists.txt new/kglobalaccel-4.97.0/CMakeLists.txt --- old/kglobalaccel-4.96.0/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kglobalaccel-4.97.0/CMakeLists.txt 2014-03-01 12:50:49.000000000 +0100 @@ -3,20 +3,21 @@ project(KGlobalAccel) # ECM setup -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}) include(FeatureSummary) include(GenerateExportHeader) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KGLOBALACCEL VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kglobalaccel_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5GlobalAccelConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5GlobalAccelConfigVersion.cmake" + SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION 5.2.0) @@ -26,7 +27,9 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -find_package(X11) +if (NOT APPLE) + find_package(X11) +endif() set(HAVE_X11 ${X11_FOUND}) if(HAVE_X11) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) @@ -39,7 +42,7 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5GlobalAccel") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5GlobalAccelConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5GlobalAccelConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5GlobalAccelConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-4.96.0/autotests/kglobalshortcuttest.cpp new/kglobalaccel-4.97.0/autotests/kglobalshortcuttest.cpp --- old/kglobalaccel-4.96.0/autotests/kglobalshortcuttest.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kglobalaccel-4.97.0/autotests/kglobalshortcuttest.cpp 2014-03-01 12:50:49.000000000 +0100 @@ -24,10 +24,11 @@ #include <qdbusinterface.h> #include <QTest> #include <QAction> +#include <QThread> #include <kglobalaccel.h> #include <qstandardpaths.h> -#include <unistd.h> +#include <qplatformdefs.h> #include <QtDBus/QDBusConnectionInterface> @@ -373,7 +374,7 @@ // kglobalacceld collects registrations and shows the together. Give it // time to kick in. - sleep(2); + QThread::sleep(2); KGlobalAccel::self()->removeAllShortcuts(action); } @@ -396,7 +397,7 @@ KGlobalAccel::self()->removeAllShortcuts(m_actionB); KGlobalAccel::self()->removeAllShortcuts(m_actionA); // kglobalaccel writes asynchronous. - sleep(1); + QThread::sleep(1); KGlobalAccel *kga = KGlobalAccel::self(); #ifndef KDE_NO_DEPRECATED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-4.96.0/src/CMakeLists.txt new/kglobalaccel-4.97.0/src/CMakeLists.txt --- old/kglobalaccel-4.96.0/src/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kglobalaccel-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:49.000000000 +0100 @@ -40,14 +40,13 @@ EXPORT_NAME "GlobalAccel" ) -ecm_generate_headers( +ecm_generate_headers(KGlobalAccel_HEADERS + HEADER_NAMES KGlobalAccel KGlobalShortcutInfo - MODULE_NAME KGlobalAccel REQUIRED_HEADERS KGlobalAccel_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KGlobalAccel DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5GlobalAccel EXPORT KF5GlobalAccelTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
