Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2019-05-21 10:23:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Tue May 21 10:23:33 2019 rev:65 rq:703324 version:5.58.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2019-04-19 21:21:56.563687665 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.5148/extra-cmake-modules.changes
2019-05-21 10:24:51.363564498 +0200
@@ -1,0 +2,12 @@
+Wed May 15 18:16:15 UTC 2019 - [email protected]
+
+- Update to 5.58.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.58.0.php
+- Changes since 5.57.0:
+ * Bug fix: find c++ stl using regex
+ * Detect duplicate ANDROID_EXTRA_LIBS and minor bug fix
+ * Unconditionally enable -DQT_STRICT_ITERATORS, not just in debug mode
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.57.0.tar.xz
New:
----
extra-cmake-modules-5.58.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.uMlfkD/_old 2019-05-21 10:24:51.855564308 +0200
+++ /var/tmp/diff_new_pack.uMlfkD/_new 2019-05-21 10:24:51.859564307 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.57
+%define _tar_path 5.58
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -27,7 +27,7 @@
%bcond_with doc
%endif
Name: extra-cmake-modules
-Version: 5.57.0
+Version: 5.58.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.57.0.tar.xz -> extra-cmake-modules-5.58.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.57.0/CMakeLists.txt
new/extra-cmake-modules-5.58.0/CMakeLists.txt
--- old/extra-cmake-modules-5.57.0/CMakeLists.txt 2019-03-31
20:30:16.000000000 +0200
+++ new/extra-cmake-modules-5.58.0/CMakeLists.txt 2019-04-17
17:56:52.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.57.0") # handled by release scripts
+set(VERSION "5.58.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.57.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.58.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.57.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2019-03-31 20:30:16.000000000 +0200
+++
new/extra-cmake-modules-5.58.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2019-04-17 17:56:52.000000000 +0200
@@ -55,12 +55,9 @@
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_USE_QSTRINGBUILDER
-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+ -DQT_STRICT_ITERATORS
)
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- add_definitions(-DQT_STRICT_ITERATORS)
-endif()
-
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.57.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.58.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.57.0/toolchain/ECMAndroidDeployQt.cmake
2019-03-31 20:30:16.000000000 +0200
+++ new/extra-cmake-modules-5.58.0/toolchain/ECMAndroidDeployQt.cmake
2019-04-17 17:56:52.000000000 +0200
@@ -1,3 +1,4 @@
+cmake_minimum_required (VERSION 3.7 FATAL_ERROR)
find_package(Qt5Core REQUIRED)
function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET
ECM_ADDITIONAL_FIND_ROOT_PATH)
@@ -38,10 +39,9 @@
function(havestl var access VALUE)
if (NOT VALUE STREQUAL "")
- string(FIND "${VALUE}" ".so\"" OUT)
- math(EXPR OUT "${OUT}+4")
- string(SUBSTRING "${VALUE}" 0 ${OUT} OUTSTR)
- file(WRITE ${CMAKE_BINARY_DIR}/stl "${OUTSTR}")
+ # look for ++ and .so as in libc++.so
+ string (REGEX MATCH "\"[^ ]+\\+\\+[^ ]*\.so\"" OUT ${VALUE})
+ file(WRITE ${CMAKE_BINARY_DIR}/stl "${OUT}")
endif()
endfunction()
function(haveranlib var access VALUE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.57.0/toolchain/specifydependencies.cmake
new/extra-cmake-modules-5.58.0/toolchain/specifydependencies.cmake
--- old/extra-cmake-modules-5.57.0/toolchain/specifydependencies.cmake
2019-03-31 20:30:16.000000000 +0200
+++ new/extra-cmake-modules-5.58.0/toolchain/specifydependencies.cmake
2019-04-17 17:56:52.000000000 +0200
@@ -21,10 +21,29 @@
endif()
endforeach()
+function(contains_library libpath IS_EQUAL)
+ get_filename_component (name ${libpath} NAME)
+ unset (IS_EQUAL PARENT_SCOPE)
+
+ foreach (extralib ${extralibs})
+ get_filename_component (extralibname ${extralib} NAME)
+ if (${extralibname} STREQUAL ${name})
+ set (IS_EQUAL TRUE PARENT_SCOPE)
+ break()
+ endif()
+ endforeach()
+endfunction()
+
if (ANDROID_EXTRA_LIBS)
foreach (extralib ${ANDROID_EXTRA_LIBS})
- message(STATUS "manually specified extra library: " ${extralib})
- list(APPEND extralibs ${extralib})
+ contains_library(${extralib} IS_EQUAL)
+
+ if (IS_EQUAL)
+ message (STATUS "found duplicate, skipping: " ${extralib})
+ else()
+ message(STATUS "manually specified extra library: " ${extralib})
+ list(APPEND extralibs ${extralib})
+ endif()
endforeach()
endif()
