Hello community, here is the log from the commit of package extra-cmake-modules for openSUSE:Factory checked in at 2015-04-13 20:22:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old) and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules" Changes: -------- --- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes 2015-03-16 09:26:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes 2015-04-13 20:22:35.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Apr 4 14:40:29 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.9.0 + * Extra CMake Modules (ECM) is now versioned like KDE Frameworks, + therefore it is now 5.9, while it was 1.8 previously. + * Allow configuration of SHARE_INSTALL_DIR, to handle multi-arch + layouts better + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php + +------------------------------------------------------------------- Old: ---- extra-cmake-modules-1.8.0.tar.xz New: ---- extra-cmake-modules-5.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extra-cmake-modules.spec ++++++ --- /var/tmp/diff_new_pack.ihlfZu/_old 2015-04-13 20:22:36.000000000 +0200 +++ /var/tmp/diff_new_pack.ihlfZu/_new 2015-04-13 20:22:36.000000000 +0200 @@ -16,14 +16,15 @@ # +%define _tar_path 5.9 Name: extra-cmake-modules Summary: CMake modules License: BSD-3-Clause Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules -Version: 1.8.0 +Version: 5.9.0 Release: 0 -Source: http://download.kde.org/stable/frameworks/5.8/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ ++++++ extra-cmake-modules-1.8.0.tar.xz -> extra-cmake-modules-5.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.8.0/CMakeLists.txt new/extra-cmake-modules-5.9.0/CMakeLists.txt --- old/extra-cmake-modules-1.8.0/CMakeLists.txt 2015-03-06 12:14:56.000000000 +0100 +++ new/extra-cmake-modules-5.9.0/CMakeLists.txt 2015-04-04 10:52:03.000000000 +0200 @@ -2,8 +2,8 @@ project(extra-cmake-modules NONE) -set(ECM_MAJOR_VERSION 1) -set(ECM_MINOR_VERSION 8) +set(ECM_MAJOR_VERSION 5) +set(ECM_MINOR_VERSION 9) set(ECM_PATCH_VERSION 0) set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION}) @@ -14,7 +14,7 @@ add_subdirectory(tests) endif() -set(SHARE_INSTALL_DIR share) +set(SHARE_INSTALL_DIR share CACHE PATH "read-only architecture-independent data") set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/) set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/modules/) set(KDE_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/kde-modules/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.8.0/find-modules/FindEGL.cmake new/extra-cmake-modules-5.9.0/find-modules/FindEGL.cmake --- old/extra-cmake-modules-1.8.0/find-modules/FindEGL.cmake 2015-03-06 12:14:56.000000000 +0100 +++ new/extra-cmake-modules-5.9.0/find-modules/FindEGL.cmake 2015-04-04 10:52:03.000000000 +0200 @@ -98,14 +98,14 @@ # finding all these defines and selecting the highest numbered. file(READ "${EGL_INCLUDE_DIR}/egl.h" _EGL_header_contents) string(REGEX MATCHALL - "[ \\t]EGL_VERSION_[0-9_]+" + "[ \t]EGL_VERSION_[0-9_]+" _EGL_version_lines "${_EGL_header_contents}" ) unset(_EGL_header_contents) foreach(_EGL_version_line ${_EGL_version_lines}) string(REGEX REPLACE - "[ \\t]EGL_VERSION_([0-9_]+)" + "[ \t]EGL_VERSION_([0-9_]+)" "\\1" _version_candidate "${_EGL_version_line}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.8.0/find-modules/FindWayland.cmake new/extra-cmake-modules-5.9.0/find-modules/FindWayland.cmake --- old/extra-cmake-modules-1.8.0/find-modules/FindWayland.cmake 2015-03-06 12:14:56.000000000 +0100 +++ new/extra-cmake-modules-5.9.0/find-modules/FindWayland.cmake 2015-04-04 10:52:03.000000000 +0200 @@ -117,7 +117,7 @@ if(Wayland_VERSION_HEADER) file(READ ${Wayland_VERSION_HEADER} _wayland_version_header_contents) string(REGEX REPLACE - "^.*[ \\t]+WAYLAND_VERSION[ \\t]+\"([0-9.]*)\".*$" + "^.*[ \t]+WAYLAND_VERSION[ \t]+\"([0-9.]*)\".*$" "\\1" Wayland_VERSION "${_wayland_version_header_contents}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.8.0/modules/ECMInstallIcons.cmake new/extra-cmake-modules-5.9.0/modules/ECMInstallIcons.cmake --- old/extra-cmake-modules-1.8.0/modules/ECMInstallIcons.cmake 2015-03-06 12:14:56.000000000 +0100 +++ new/extra-cmake-modules-5.9.0/modules/ECMInstallIcons.cmake 2015-04-04 10:52:03.000000000 +0200 @@ -223,8 +223,9 @@ endif() foreach(icon ${ARG_ICONS}) + get_filename_component(filename "${icon}" NAME) string(REGEX MATCH "([0-9sc]+)\\-([a-z]+)\\-([^/]+)\\.([a-z]+)$" - _dummy "${icon}") + complete_match "${filename}") set(size "${CMAKE_MATCH_1}") set(group "${CMAKE_MATCH_2}") set(name "${CMAKE_MATCH_3}") @@ -234,6 +235,12 @@ elseif(NOT size STREQUAL "sc" AND NOT size GREATER 0) message(WARNING "${icon} size (${size}) is invalid - ignoring") else() + if (NOT complete_match STREQUAL filename) + # We can't stop accepting filenames with leading characters, + # because that would break existing projects, so just warn + # about them instead. + message(AUTHOR_WARNING "\"${icon}\" has characters before the size; it should be renamed to \"${size}-${group}-${name}.${ext}\"") + endif() if(NOT _ECM_ICON_GROUP_${group}) message(WARNING "${icon} group (${group}) is not recognized") endif() Files old/extra-cmake-modules-1.8.0/tests/ECMInstallIconsTest/16-apps-cmake.png and new/extra-cmake-modules-5.9.0/tests/ECMInstallIconsTest/16-apps-cmake.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-1.8.0/tests/ECMInstallIconsTest/CMakeLists.txt new/extra-cmake-modules-5.9.0/tests/ECMInstallIconsTest/CMakeLists.txt --- old/extra-cmake-modules-1.8.0/tests/ECMInstallIconsTest/CMakeLists.txt 2015-03-06 12:14:56.000000000 +0100 +++ new/extra-cmake-modules-5.9.0/tests/ECMInstallIconsTest/CMakeLists.txt 2015-04-04 10:52:03.000000000 +0200 @@ -20,7 +20,7 @@ ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -36,7 +36,7 @@ ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -53,7 +53,7 @@ ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -70,7 +70,7 @@ ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -87,9 +87,10 @@ # all these should be warned about ecm_install_icons( ICONS - aa-actions-badsize.png # ignored - badlynamedfile.png # ignored - 16-actions-badext.txt # copied + aa-actions-badsize.png # ignored + badlynamedfile.png # ignored + 16-actions-badext.txt # copied + hi16-actions-old-style-name.png # copied DESTINATION badly-named-files-test ) Files old/extra-cmake-modules-1.8.0/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/16x16/actions/old-style-name.png and new/extra-cmake-modules-5.9.0/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/16x16/actions/old-style-name.png differ Files old/extra-cmake-modules-1.8.0/tests/ECMInstallIconsTest/hi16-actions-old-style-name.png and new/extra-cmake-modules-5.9.0/tests/ECMInstallIconsTest/hi16-actions-old-style-name.png differ Files old/extra-cmake-modules-1.8.0/tests/ECMInstallIconsTest/subdir/16-apps-cmake.png and new/extra-cmake-modules-5.9.0/tests/ECMInstallIconsTest/subdir/16-apps-cmake.png differ