Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2014-09-12 17:02:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-08-16 15:41:32.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2014-09-12 17:03:09.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 9 09:49:34 UTC 2014 - [email protected]
+
+- Update to 1.2.0
+ * For more details please see:
+ http://kde.org/announcements/kde-frameworks-5.2.php
+- Drop 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch,
+ merged upstream
+
+-------------------------------------------------------------------
Old:
----
0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
extra-cmake-modules-1.1.0.tar.xz
New:
----
extra-cmake-modules-1.2.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.Xc3n99/_old 2014-09-12 17:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.Xc3n99/_new 2014-09-12 17:03:10.000000000 +0200
@@ -21,11 +21,9 @@
License: BSD-3-Clause
Group: Development/Tools/Other
Url:
https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-Version: 1.1.0
+Version: 1.2.0
Release: 0
-Source:
http://download.kde.org/stable/frameworks/5.1.0/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
-Patch0: 0001-Remove-Qt5-debugfull-hack-from-ECMConfig.cmake.patch
+Source:
http://download.kde.org/stable/frameworks/5.2.0/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++
@@ -57,7 +55,6 @@
%prep
%setup -q
-%patch0 -p1
%build
%cmake_kf5 -d build
++++++ extra-cmake-modules-1.1.0.tar.xz -> extra-cmake-modules-1.2.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.1.0/CMakeLists.txt
new/extra-cmake-modules-1.2.0/CMakeLists.txt
--- old/extra-cmake-modules-1.1.0/CMakeLists.txt 2014-08-01
19:07:16.000000000 +0200
+++ new/extra-cmake-modules-1.2.0/CMakeLists.txt 2014-09-06
00:20:45.000000000 +0200
@@ -3,7 +3,7 @@
project(extra-cmake-modules NONE)
set(ECM_MAJOR_VERSION 1)
-set(ECM_MINOR_VERSION 1)
+set(ECM_MINOR_VERSION 2)
set(ECM_PATCH_VERSION 0)
set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-1.1.0/ECMConfig.cmake.in
new/extra-cmake-modules-1.2.0/ECMConfig.cmake.in
--- old/extra-cmake-modules-1.1.0/ECMConfig.cmake.in 2014-08-01
19:07:16.000000000 +0200
+++ new/extra-cmake-modules-1.2.0/ECMConfig.cmake.in 2014-09-06
00:20:45.000000000 +0200
@@ -16,10 +16,3 @@
set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}"
"${ECM_KDE_MODULE_DIR}")
include("${ECM_MODULE_DIR}/ECMUseFindModules.cmake")
-
-if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.13)
- find_package(Qt5Core 5.2.0 REQUIRED)
- set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_DEFINITIONS
QT_CORE_LIB $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:DebugFull>>>:QT_NO_DEBUG>)
-else()
- message(FATAL_ERROR \"Remove this hack. Set
CMAKE_MAP_IMPORTED_TARGET_DEBUGFULL to DEBUG instead.\")
-endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.1.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-1.2.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-1.1.0/kde-modules/KDECompilerSettings.cmake
2014-08-01 19:07:16.000000000 +0200
+++ new/extra-cmake-modules-1.2.0/kde-modules/KDECompilerSettings.cmake
2014-09-06 00:20:45.000000000 +0200
@@ -102,13 +102,9 @@
set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${ARGV})
endmacro()
-if (UNIX)
- # Enable basically everything portable across modern UNIX systems.
- # See http://www.delorie.com/gnu/docs/glibc/libc_13.html, although
- # this define is for the benefit of other libc implementations
- # (since _GNU_SOURCE is defined below).
- _kde_add_platform_definitions(-D_XOPEN_SOURCE=500)
-
+include(CheckSymbolExists)
+check_symbol_exists("__GLIBC__" "stdlib.h" LIBC_IS_GLIBC)
+if (LIBC_IS_GLIBC)
# Enable everything in GNU libc. Any code using non-portable features
# needs to perform feature tests, but this ensures that any such features
# will be found if they exist.
@@ -118,7 +114,9 @@
# functions). This, however, means that strlcat and strlcpy are not
# provided by glibc.
_kde_add_platform_definitions(-D_GNU_SOURCE)
+endif ()
+if (UNIX)
# Enable extra API for using 64-bit file offsets on 32-bit systems.
# FIXME: this is included in _GNU_SOURCE in glibc; do other libc
# implementation recognize it?
@@ -157,7 +155,7 @@
# Use the Unicode versions of Windows API by default
# See
http://msdn.microsoft.com/en-us/library/windows/desktop/dd317766%28v=vs.85%29.aspx
- _kde_add_platform_definitions(-DUNICODE)
+ _kde_add_platform_definitions(-DUNICODE -D_UNICODE)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.1.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-1.2.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-1.1.0/kde-modules/KDEInstallDirs.cmake
2014-08-01 19:07:16.000000000 +0200
+++ new/extra-cmake-modules-1.2.0/kde-modules/KDEInstallDirs.cmake
2014-09-06 00:20:45.000000000 +0200
@@ -162,11 +162,6 @@
# (To distribute this file outside of extra-cmake-modules, substitute the full
# License text for the above reference.)
-
-# TODO:
-# - Try to figure out proper Qt-related dirs when installing to the same
-# prefix as Qt (look for qtpaths)
-
# Figure out what the default install directory for libraries should be.
# This is based on the logic in GNUInstallDirs, but simplified (the
# GNUInstallDirs code deals with re-configuring, but that is dealt with
@@ -199,7 +194,6 @@
endif()
endif()
-
# Macro for variables that are relative to another variable. We store an empty
# value in the cache (for documentation/GUI cache editor purposes), and store
# the default value in a local variable. If the cache variable is ever set to
@@ -287,7 +281,6 @@
_define_relative("${varname}" "" "${dir}" "${docstring}" ${ARGN})
endmacro()
-
if(APPLE)
_define_absolute(BUNDLEDIR "/Applications/KDE"
"application bundles"
@@ -328,22 +321,41 @@
"CMake packages, including config files"
CMAKECONFIG_INSTALL_PREFIX)
+option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, Plugins and
Imports to the Qt 5 install dir")
+if(KDE_INSTALL_USE_QT_SYS_PATHS)
# Qt-specific vars
-_define_relative(QTPLUGINDIR LIBDIR "plugins"
- "Qt plugins"
- QT_PLUGIN_INSTALL_DIR)
+ include(ECMQueryQmake)
+
+ query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS)
+
+ _define_absolute(QTPLUGINDIR ${qt_plugins_dir}
+ "Qt plugins"
+ QT_PLUGIN_INSTALL_DIR)
+
+ query_qmake(qt_imports_dir QT_INSTALL_IMPORTS)
+
+ _define_absolute(QTQUICKIMPORTSDIR QTPLUGINDIR ${qt_imports_dir}
+ "QtQuick1 imports"
+ IMPORTS_INSTALL_DIR)
+
+else()
+ _define_relative(QTPLUGINDIR LIBDIR "plugins"
+ "Qt plugins"
+ QT_PLUGIN_INSTALL_DIR)
+
+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
+ "QtQuick1 imports"
+ IMPORTS_INSTALL_DIR)
+endif()
+
_define_relative(PLUGINDIR QTPLUGINDIR ""
"Plugins"
PLUGIN_INSTALL_DIR)
-_define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
- "QtQuick1 imports"
- IMPORTS_INSTALL_DIR)
+
_define_relative(QMLDIR LIBDIR "qml"
"QtQuick2 imports"
QML_INSTALL_DIR)
-
-
_define_absolute(INCLUDEDIR "include"
"C and C++ header files"
INCLUDE_INSTALL_DIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.1.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-1.2.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-1.1.0/modules/ECMGeneratePriFile.cmake
2014-08-01 19:07:16.000000000 +0200
+++ new/extra-cmake-modules-1.2.0/modules/ECMGeneratePriFile.cmake
2014-09-06 00:20:45.000000000 +0200
@@ -82,7 +82,13 @@
# (To distribute this file outside of extra-cmake-modules, substitute the full
# License text for the above reference.)
-set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where
mkspecs will be installed to.")
+if(KDE_INSTALL_USE_QT_SYS_PATHS)
+ 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 ()
+ set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where
mkspecs will be installed to.")
+endif()
function(ECM_GENERATE_PRI_FILE)
set(options )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-1.1.0/modules/ECMQueryQmake.cmake
new/extra-cmake-modules-1.2.0/modules/ECMQueryQmake.cmake
--- old/extra-cmake-modules-1.1.0/modules/ECMQueryQmake.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-1.2.0/modules/ECMQueryQmake.cmake 2014-09-06
00:20:45.000000000 +0200
@@ -0,0 +1,15 @@
+find_package(Qt5Core QUIET)
+
+if (TARGET Qt5::qmake)
+ get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+else()
+ set(QMAKE_EXECUTABLE "qmake-qt5" CACHE)
+endif()
+
+function(QUERY_QMAKE RESULT VAR)
+ exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE
return_code OUTPUT_VARIABLE output )
+ if(NOT return_code)
+ file(TO_CMAKE_PATH "${output}" output)
+ set(${RESULT} ${output} PARENT_SCOPE)
+ endif()
+endfunction(QUERY_QMAKE)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
