Hello community, here is the log from the commit of package kguiaddons for openSUSE:Factory checked in at 2014-03-10 12:17:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kguiaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kguiaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kguiaddons/kguiaddons.changes 2014-02-24 06:53:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kguiaddons.new/kguiaddons.changes 2014-03-10 12:17:28.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:36:26 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: ---- kguiaddons-4.96.0.tar.xz New: ---- kguiaddons-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.kHLtg9/_old 2014-03-10 12:17:29.000000000 +0100 +++ /var/tmp/diff_new_pack.kHLtg9/_new 2014-03-10 12:17:29.000000000 +0100 @@ -16,19 +16,19 @@ # -%define lname libKF5GuiAddons4 +%define lname libKF5GuiAddons5 Name: kguiaddons -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(Qt5Gui) >= 5.2.0 # Tests BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -# [ 142s] /home/abuild/rpmbuild/BUILD/kguiaddons-4.96.0/src/util/kmodifierkeyinfoprovider_x11.cpp:26:42: +# [ 142s] /home/abuild/rpmbuild/BUILD/kguiaddons-4.97.0/src/util/kmodifierkeyinfoprovider_x11.cpp:26:42: # fatal error: qpa/qplatformnativeinterface.h: No such file or directory #BuildRequires: libQt5Gui-private-headers-devel # TODO change to above once latest Qt5 is in O:F ++++++ kguiaddons-4.96.0.tar.xz -> kguiaddons-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-4.96.0/CMakeLists.txt new/kguiaddons-4.97.0/CMakeLists.txt --- old/kguiaddons-4.96.0/CMakeLists.txt 2014-02-05 01:40:52.000000000 +0100 +++ new/kguiaddons-4.97.0/CMakeLists.txt 2014-03-01 12:50:50.000000000 +0100 @@ -2,7 +2,7 @@ project(KGuiAddons) -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}) @@ -12,18 +12,21 @@ set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -find_package(X11 MODULE) -find_package(XCB MODULE COMPONENTS XCB) +if (NOT APPLE) + find_package(X11 MODULE) + find_package(XCB MODULE COMPONENTS XCB) +endif() include(FeatureSummary) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KGUIADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kguiaddons_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5GuiAddonsConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5GuiAddonsConfigVersion.cmake" + SOVERSION 5) add_subdirectory(src) add_subdirectory(autotests) @@ -32,9 +35,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5GuiAddons") -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5GuiAddonsConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5GuiAddonsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5GuiAddonsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-4.96.0/src/CMakeLists.txt new/kguiaddons-4.97.0/src/CMakeLists.txt --- old/kguiaddons-4.96.0/src/CMakeLists.txt 2014-02-05 01:40:52.000000000 +0100 +++ new/kguiaddons-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:50.000000000 +0100 @@ -14,7 +14,7 @@ util/urlhandler.cpp ) -if (X11_FOUND AND X11_Xkb_FOUND AND XCB_XCB_FOUND) +if (NOT APPLE AND X11_FOUND AND X11_Xkb_FOUND AND XCB_XCB_FOUND) include_directories ( ${X11_Xkb_INCLUDE_PATH} ${X11_Xlib_INCLUDE_PATH} @@ -51,7 +51,8 @@ EXPORT_NAME GuiAddons ) -ecm_generate_headers( +ecm_generate_headers(KGuiAddons_HEADERS + HEADER_NAMES KColorUtils KColorCollection KColorMimeData @@ -59,20 +60,23 @@ RELATIVE colors REQUIRED_HEADERS KGuiAddons_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KGuiAddons_HEADERS + HEADER_NAMES KDateValidator KWordWrap RELATIVE text REQUIRED_HEADERS KGuiAddons_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KGuiAddons_HEADERS + HEADER_NAMES KFontUtils RELATIVE fonts REQUIRED_HEADERS KGuiAddons_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KGuiAddons_HEADERS + HEADER_NAMES KIconUtils KImageCache KModifierKeyInfo @@ -80,7 +84,6 @@ RELATIVE util REQUIRED_HEADERS KGuiAddons_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) install(TARGETS KF5GuiAddons EXPORT KF5GuiAddonsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
