Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2016-08-29 14:53:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-07-15 12:29:43.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2016-08-29 14:53:46.000000000 +0200
@@ -1,0 +2,13 @@
+Sun Aug 7 21:49:07 UTC 2016 - [email protected]
+
+- Update to 5.25.0
+ * Qt >= 5.5 is now required
+ * Fix inclusion when there's no Qt5
+ * Add a fallback method for query_qmake() when there's no
+ Qt5 installation
+ * Make sure ECMGeneratePriFile.cmake behaves like the rest of ECM
+ * Appstream data changed its preferred location
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.25.0.php
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.24.0.tar.xz
New:
----
extra-cmake-modules-5.25.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.qNH60r/_old 2016-08-29 14:53:47.000000000 +0200
+++ /var/tmp/diff_new_pack.qNH60r/_new 2016-08-29 14:53:47.000000000 +0200
@@ -16,13 +16,13 @@
#
-%define _tar_path 5.24
+%define _tar_path 5.25
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: 5.24.0
+Version: 5.25.0
Release: 0
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ extra-cmake-modules-5.24.0.tar.xz -> extra-cmake-modules-5.25.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.24.0/CMakeLists.txt
new/extra-cmake-modules-5.25.0/CMakeLists.txt
--- old/extra-cmake-modules-5.24.0/CMakeLists.txt 2016-06-15
15:40:34.000000000 +0200
+++ new/extra-cmake-modules-5.25.0/CMakeLists.txt 2016-07-27
01:44:31.000000000 +0200
@@ -16,7 +16,7 @@
# Preliminary setup
#
-set(VERSION "5.24.0") # handled by release scripts
+set(VERSION "5.25.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.24.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-5.25.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-5.24.0/kde-modules/KDEInstallDirs.cmake
2016-06-15 15:40:34.000000000 +0200
+++ new/extra-cmake-modules-5.25.0/kde-modules/KDEInstallDirs.cmake
2016-07-27 01:44:31.000000000 +0200
@@ -557,7 +557,7 @@
_define_relative(MIMEDIR DATAROOTDIR "mime/packages"
"mime description files"
XDG_MIME_INSTALL_DIR)
-_define_relative(METAINFODIR DATAROOTDIR "appdata"
+_define_relative(METAINFODIR DATAROOTDIR "metainfo"
"AppStream component metadata")
_define_relative(MANDIR DATAROOTDIR "man"
"man documentation"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.24.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-5.25.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-5.24.0/modules/ECMGeneratePriFile.cmake
2016-06-15 15:40:34.000000000 +0200
+++ new/extra-cmake-modules-5.25.0/modules/ECMGeneratePriFile.cmake
2016-07-27 01:44:31.000000000 +0200
@@ -84,11 +84,23 @@
# (To distribute this file outside of extra-cmake-modules, substitute the full
# License text for the above reference.)
-if(KDE_INSTALL_USE_QT_SYS_PATHS)
+
+# Replicate the logic from KDEInstallDirs.cmake as we can't depend on it
+# Ask qmake if we're using the same prefix as Qt
+set(_askqmake OFF)
+if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
+ include(ECMQueryQmake)
+ query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX)
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ set(_askqmake ON)
+ endif()
+endif()
+
+if(KDE_INSTALL_USE_QT_SYS_PATHS OR _askqmake)
include(ECMQueryQmake)
query_qmake(qt_host_data_dir QT_HOST_DATA)
set(ECM_MKSPECS_INSTALL_DIR ${qt_host_data_dir}/mkspecs/modules CACHE PATH
"The directory where mkspecs will be installed to.")
-else ()
+else()
set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where
mkspecs will be installed to.")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.24.0/modules/ECMQueryQmake.cmake
new/extra-cmake-modules-5.25.0/modules/ECMQueryQmake.cmake
--- old/extra-cmake-modules-5.24.0/modules/ECMQueryQmake.cmake 2016-06-15
15:40:34.000000000 +0200
+++ new/extra-cmake-modules-5.25.0/modules/ECMQueryQmake.cmake 2016-07-27
01:44:31.000000000 +0200
@@ -1,6 +1,8 @@
find_package(Qt5Core QUIET)
-set(_qmake_executable_default "qmake-qt5")
+if (Qt5Core_FOUND)
+ set(_qmake_executable_default "qmake-qt5")
+endif ()
if (TARGET Qt5::qmake)
get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
endif()
@@ -9,6 +11,11 @@
# This is not public API (yet)!
function(query_qmake result_variable qt_variable)
+ if(NOT QMAKE_EXECUTABLE)
+ set(${result_variable} "" PARENT_SCOPE)
+ message(WARNING "Should specify a qmake Qt5 binary. Can't check
${qt_variable}")
+ return()
+ endif()
execute_process(
COMMAND ${QMAKE_EXECUTABLE} -query "${qt_variable}"
RESULT_VARIABLE return_code
