Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-10-22 11:08:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon Oct 22 11:08:06 2018 rev:58 rq:642291 version:5.51.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-10-01 08:04:53.262401874 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-10-22 11:08:52.935995196 +0200
@@ -1,0 +2,28 @@
+Tue Oct 16 08:01:44 UTC 2018 - Luca Beltrame <lbeltr...@kde.org>
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Mon Oct 15 11:51:45 UTC 2018 - lbeltr...@kde.org
+
+- Update to 5.51.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.51.0.php
+- Changes since 5.50.0:
+ * Compile python bindings with the same sip flags used by PyQt
+ * Android: Allow passing a relative path as the apk dir
+ * Android: Properly offer a fallback to applications that don't have a
manifest
+ * l10n: Fix matching digits in the repository name
+ * Android: Make sure Qm translations get loaded
+ * Fix Android builds using cmake 3.12.1
+ * Add QT_NO_NARROWING_CONVERSIONS_IN_CONNECT as default compile flags
+ * Python bindings: use cmake_parse_arguments, fix documentation
+ * Bindings: Correct handling of sources containing utf-8
+ * autotests: actually iterate over the list, rather than checking item 0 all
the time
+ * Actually iterate over CF_GENERATED, rather than checking item 0 all the
time
+ * Fix minor EBN issues
+- Refresh patches:
+ * bundle-lang.patch
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.50.0.tar.xz
New:
----
extra-cmake-modules-5.51.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.IuoV8W/_old 2018-10-22 11:08:53.363994844 +0200
+++ /var/tmp/diff_new_pack.IuoV8W/_new 2018-10-22 11:08:53.367994840 +0200
@@ -12,11 +12,11 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define _tar_path 5.50
+%define _tar_path 5.51
# 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,12 +27,12 @@
%bcond_with doc
%endif
Name: extra-cmake-modules
-Version: 5.50.0
+Version: 5.51.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
-URL: http://www.kde.org
+URL: https://www.kde.org
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch0: bundle-lang.patch
++++++ bundle-lang.patch ++++++
--- /var/tmp/diff_new_pack.IuoV8W/_old 2018-10-22 11:08:53.379994830 +0200
+++ /var/tmp/diff_new_pack.IuoV8W/_new 2018-10-22 11:08:53.379994830 +0200
@@ -1,24 +1,30 @@
-From 8c4c416228acf30862792b4a0da24d865988ea0f Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wba...@tmo.at>
-Date: Thu, 13 Jul 2017 16:53:08 +0200
-Subject: [PATCH] Also search in /usr/share/locale-bundle/ for translations
-
-openSUSE's bundle-lang packages install the translations in
-/usr/share/locale-bundle/ to not conflict with the standard -lang
-packages.
+From d68190a86ac823d64355a33cfd78bd9e8ffd2785 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltr...@kde.org>
+Date: Wed, 26 Sep 2018 22:50:24 +0200
+Subject: [PATCH] openSUSE's bundle-lang packages install the translations in
+ /usr/share/locale-bundle/ to not conflict with the standard -lang packages.
So look there too if a translation was not found in /usr/share/locale/.
---
- modules/ECMQmLoader.cpp.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ modules/ECMQmLoader.cpp.in | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/modules/ECMQmLoader.cpp.in b/modules/ECMQmLoader.cpp.in
-index 12a2d14..81fb6fb 100644
+index 003512d..bc6a4ad 100644
--- a/modules/ECMQmLoader.cpp.in
+++ b/modules/ECMQmLoader.cpp.in
-@@ -43,7 +43,11 @@ namespace {
+@@ -44,14 +44,18 @@ namespace {
QString subPath = QStringLiteral("locale/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
- QString fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
+
+ #if defined(Q_OS_ANDROID)
+- const QString fullPath =
QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath;
++ QString fullPath =
QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath;
+ if (!QFile::exists(fullPath)) {
+ return false;
+ }
+ #else
+- const QString fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
++ QString fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
if (fullPath.isEmpty()) {
- return false;
+ subPath = QStringLiteral("locale-bundle/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
@@ -27,8 +33,7 @@
+ return false;
+ }
}
+ #endif
QTranslator *translator = new
QTranslator(QCoreApplication::instance());
- if (!translator->load(fullPath)) {
---
-2.12.3
-
+--
+2.19.0
++++++ extra-cmake-modules-5.50.0.tar.xz -> extra-cmake-modules-5.51.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.50.0/CMakeLists.txt
new/extra-cmake-modules-5.51.0/CMakeLists.txt
--- old/extra-cmake-modules-5.50.0/CMakeLists.txt 2018-09-01
11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/CMakeLists.txt 2018-09-30
22:46:18.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.50.0") # handled by release scripts
+set(VERSION "5.51.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.50.0/attic/modules/CheckCXXSourceCompiles.cmake
new/extra-cmake-modules-5.51.0/attic/modules/CheckCXXSourceCompiles.cmake
--- old/extra-cmake-modules-5.50.0/attic/modules/CheckCXXSourceCompiles.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/attic/modules/CheckCXXSourceCompiles.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -70,7 +70,7 @@
SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
MESSAGE(STATUS "Performing Test ${VAR} - Success")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing C++ SOURCE FILE Test ${VAR} succeded with the following
output:\n"
+ "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following
output:\n"
"${OUTPUT}\n"
"Source file was:\n${SOURCE}\n")
ELSE(${VAR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/attic/modules/CheckCXXSourceRuns.cmake
new/extra-cmake-modules-5.51.0/attic/modules/CheckCXXSourceRuns.cmake
--- old/extra-cmake-modules-5.50.0/attic/modules/CheckCXXSourceRuns.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/attic/modules/CheckCXXSourceRuns.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -57,7 +57,7 @@
SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
MESSAGE(STATUS "Performing Test ${VAR} - Success")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Performing C++ SOURCE FILE Test ${VAR} succeded with the following
output:\n"
+ "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following
output:\n"
"${OUTPUT}\n"
"Return value: ${${VAR}}\n"
"Source file was:\n${SOURCE}\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/attic/modules/FindExiv2.cmake
new/extra-cmake-modules-5.51.0/attic/modules/FindExiv2.cmake
--- old/extra-cmake-modules-5.50.0/attic/modules/FindExiv2.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/attic/modules/FindExiv2.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -13,7 +13,7 @@
# The minimum required version of Exiv2 can be specified using the
# standard syntax, e.g. find_package(Exiv2 0.17)
#
-# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the
minimum version
+# For compatibility, also the variable EXIV2_MIN_VERSION can be set to the
minimum version
# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
# Copyright (c) 2010, Alexander Neundorf, <neund...@kde.org>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/attic/modules/FindKDEWIN_Packager.cmake
new/extra-cmake-modules-5.51.0/attic/modules/FindKDEWIN_Packager.cmake
--- old/extra-cmake-modules-5.50.0/attic/modules/FindKDEWIN_Packager.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/attic/modules/FindKDEWIN_Packager.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -38,7 +38,7 @@
if (WIN32)
if(NOT KDEWIN_PACKAGER_DIR)
- # check for enviroment variable
+ # check for environment variable
file(TO_CMAKE_PATH "$ENV{KDEWIN_PACKAGER_DIR}" KDEWIN_PACKAGER_DIR)
if(NOT KDEWIN_PACKAGER_DIR)
# search in the default program install folder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/attic/modules/FindPyQt4.cmake
new/extra-cmake-modules-5.51.0/attic/modules/FindPyQt4.cmake
--- old/extra-cmake-modules-5.50.0/attic/modules/FindPyQt4.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/attic/modules/FindPyQt4.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -9,7 +9,7 @@
# Find the installed version of PyQt4. FindPyQt4 should only be called after
# Python has been found.
#
-# This file defines the following variables, which can also be overriden by
+# This file defines the following variables, which can also be overridden by
# users:
#
# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/attic/modules/FindSIP.cmake
new/extra-cmake-modules-5.51.0/attic/modules/FindSIP.cmake
--- old/extra-cmake-modules-5.50.0/attic/modules/FindSIP.cmake 2018-09-01
11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/attic/modules/FindSIP.cmake 2018-09-30
22:46:18.000000000 +0200
@@ -9,7 +9,7 @@
# This file defines the following variables:
#
# SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
-# suitable for comparision as a string.
+# suitable for comparison as a string.
#
# SIP_VERSION_STR - The version of SIP found as a human readable string.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/attic/modules/Qt4Macros.cmake
new/extra-cmake-modules-5.51.0/attic/modules/Qt4Macros.cmake
--- old/extra-cmake-modules-5.50.0/attic/modules/Qt4Macros.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/attic/modules/Qt4Macros.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -130,7 +130,7 @@
QT4_GET_MOC_FLAGS(moc_flags)
GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
- SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) #
dont run automoc on this file
+ SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) #
don't run automoc on this file
MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
ENDMACRO (QT4_GENERATE_MOC)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/find-modules/FindPythonModuleGeneration.cmake
new/extra-cmake-modules-5.51.0/find-modules/FindPythonModuleGeneration.cmake
---
old/extra-cmake-modules-5.50.0/find-modules/FindPythonModuleGeneration.cmake
2018-09-01 11:20:25.000000000 +0200
+++
new/extra-cmake-modules-5.51.0/find-modules/FindPythonModuleGeneration.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -12,6 +12,9 @@
# ecm_generate_python_binding(TARGET <target>
# PYTHONNAMESPACE <namespace>
# MODULENAME <modulename>
+# RULES_FILE <rulesfile>
+# SIP_DEPENDS <dependencies>
+# SIP_INCLUDES <includes>
# HEADERS <headers>)
#
# Invoking the function will create bindings for the <target> for python 2 and
3,
@@ -20,9 +23,9 @@
#
# The optional rules file specifies the rules for creating the bindings
#
-# A simple invokation would be:
+# A simple invocation would be:
#
-# ecm_generate_python_binding(KMyTarget
+# ecm_generate_python_binding(TARGET KMyTarget
# PYTHONNAMESPACE PyKF5
# MODULENAME MyTarget
# SIP_DEPENDS QtCore/QtCoremod.sip
@@ -251,20 +254,6 @@
_report_NOT_FOUND("PyQt module files not found for the
${CMAKE_FIND_PACKAGE_NAME} Module.")
endif()
-file(STRINGS "${SIP_Qt5Core_Mod_FILE}" _SIP_Qt5_VERSIONS
- REGEX "^%Timeline"
-)
-
-string(REGEX MATCHALL "Qt_5_[^ }]+" _SIP_Qt5_VERSIONS "${_SIP_Qt5_VERSIONS}")
-
-set(GPB_Qt5_Tag Qt_5_${Qt5Core_VERSION_MINOR}_${Qt5Core_VERSION_PATCH})
-
-list(FIND _SIP_Qt5_VERSIONS ${GPB_Qt5_Tag} _SIP_Qt5_Version_Index)
-
-if(_SIP_Qt5_Version_Index EQUAL -1)
- _report_NOT_FOUND("PyQt module \"${SIP_Qt5Core_Mod_FILE}\" does not support
Qt version 5.${Qt5Core_VERSION_MINOR}.${Qt5Core_VERSION_PATCH} for the
${CMAKE_FIND_PACKAGE_NAME} Module. Found available Qt5 tags:
\"${_SIP_Qt5_VERSIONS}\".")
-endif()
-
set(PythonModuleGeneration_FOUND TRUE)
include(CMakeParseArguments)
@@ -297,17 +286,16 @@
set(_GPB_IMPLICIT_INCLUDE_DIRS ${_resultIncludeDirs} PARENT_SCOPE)
endfunction()
-function(ecm_generate_python_binding
- target_keyword target_value
- pythonnamespace_keyword pythonnamespace_value
- modulename_keyword modulename_value
- )
+function(ecm_generate_python_binding)
+
+ set(oneValueArgs TARGET PYTHONNAMESPACE MODULENAME RULES_FILE
INSTALL_DIR_SUFFIX)
+ set(multiValueArgs SIP_DEPENDS SIP_INCLUDES HEADERS)
- cmake_parse_arguments(GPB "" "RULES_FILE;INSTALL_DIR_SUFFIX"
"SIP_DEPENDS;SIP_INCLUDES;HEADERS" ${ARGN})
+ cmake_parse_arguments(GPB "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
- file(WRITE
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip"
+ file(WRITE
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${GPB_MODULENAME}mod.sip"
"
-%Module ${pythonnamespace_value}.${modulename_value}
+%Module ${GPB_PYTHONNAMESPACE}.${GPB_MODULENAME}
%ModuleHeaderCode
#pragma GCC visibility push(default)
@@ -326,7 +314,7 @@
if (IS_ABSOLUTE ${dep})
list(APPEND generator_depends "${dep}")
endif()
- file(APPEND
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip"
+ file(APPEND
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${GPB_MODULENAME}mod.sip"
"%Import ${dep}\n\n")
endforeach()
@@ -354,23 +342,23 @@
message(FATAL_ERROR "File not found: ${hdr_file}")
endif()
- set(sip_file
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${hdr}.sip")
+ set(sip_file
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${hdr}.sip")
list(APPEND sip_files ${sip_file})
- set(inc_dirs
"-I$<JOIN:$<TARGET_PROPERTY:${target_value},INTERFACE_INCLUDE_DIRECTORIES>,;-I>")
+ set(inc_dirs
"-I$<JOIN:$<TARGET_PROPERTY:${GPB_TARGET},INTERFACE_INCLUDE_DIRECTORIES>,;-I>")
set(sys_inc_dirs)
foreach(d ${_GPB_IMPLICIT_INCLUDE_DIRS})
list(APPEND sys_inc_dirs "-isystem" "${d}")
endforeach()
- set(comp_defs
"-D$<JOIN:$<TARGET_PROPERTY:${target_value},INTERFACE_COMPILE_DEFINITIONS>,;-D>")
+ set(comp_defs
"-D$<JOIN:$<TARGET_PROPERTY:${GPB_TARGET},INTERFACE_COMPILE_DEFINITIONS>,;-D>")
- # We might like to use
$<TARGET_PROPERTY:${target_value},CXX_STANDARD>, but
+ # We might like to use $<TARGET_PROPERTY:${GPB_TARGET},CXX_STANDARD>,
but
# unfortunately CMake does not populate that property as a side-effect
of evaluating
# COMPILE_FEATURES (Qt specifies feature requirements in its
INTERFACE_COMPILE_FEATURES, and
# those are consumed to set the CXX_STANDARD internally in CMake, but
evidently too late)
set(stdFlag "-std=gnu++14")
- set(comp_flags
"$<JOIN:$<TARGET_PROPERTY:${target_value},INTERFACE_COMPILE_OPTIONS>;${stdFlag},;>")
+ set(comp_flags
"$<JOIN:$<TARGET_PROPERTY:${GPB_TARGET},INTERFACE_COMPILE_OPTIONS>;${stdFlag},;>")
add_custom_command(OUTPUT ${sip_file}
COMMAND ${GPB_PYTHON_COMMAND} ${GPB_MODULE_DIR}/sip_generator.py
@@ -384,15 +372,15 @@
VERBATIM
)
- file(APPEND
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip"
+ file(APPEND
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${GPB_MODULENAME}mod.sip"
"%Include ${hdr}.sip\n")
endforeach()
- file(WRITE
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/module.sbf"
+ file(WRITE
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/module.sbf"
"
-target = ${modulename_value}
-sources = sip${modulename_value}cmodule.cpp
-headers = sipAPI${modulename_value}
+target = ${GPB_MODULENAME}
+sources = sip${GPB_MODULENAME}cmodule.cpp
+headers = sipAPI${GPB_MODULENAME}
"
)
@@ -409,77 +397,68 @@
endif()
endforeach()
- if (WIN32)
- set(GPB_WS_Tag -t WS_WIN)
- elif(APPLE)
- set(GPB_WS_Tag -t WS_MACX)
- else()
- set(GPB_WS_Tag -t WS_X11)
- endif()
-
- add_custom_target(generate_${modulename_value}_sip_files ALL DEPENDS
${sip_files})
+ add_custom_target(generate_${GPB_MODULENAME}_sip_files ALL DEPENDS
${sip_files})
add_custom_command(OUTPUT
-
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/unified${modulename_value}.cpp"
+
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/unified${GPB_MODULENAME}.cpp"
COMMAND ${GPB_PYTHON_COMMAND} "${GPB_MODULE_DIR}/run-sip.py" --sip
${GBP_SIP_COMMAND}
- --unify
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/unified${modulename_value}.cpp"
- --module-name "${modulename_value}"
- -c
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}"
- -b
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/module.sbf"
- -t ${GPB_Qt5_Tag} ${GPB_WS_Tag}
+ --unify
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/unified${GPB_MODULENAME}.cpp"
+ --module-name "${GPB_MODULENAME}"
+ -c
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}"
+ -b
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/module.sbf"
-x VendorID -x Py_v3
- -I
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}"
+ -I
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}"
${sip_includes}
-
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip"
- DEPENDS generate_${modulename_value}_sip_files
"${GPB_MODULE_DIR}/run-sip.py" ${generator_depends}
+
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${GPB_MODULENAME}mod.sip"
+ DEPENDS generate_${GPB_MODULENAME}_sip_files
"${GPB_MODULE_DIR}/run-sip.py" ${generator_depends}
)
- add_custom_target(sip_generated_${modulename_value}_files ALL
- DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/unified${modulename_value}.cpp")
+ add_custom_target(sip_generated_${GPB_MODULENAME}_files ALL
+ DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/unified${GPB_MODULENAME}.cpp")
- file(MAKE_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}"
-
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}")
+ file(MAKE_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}"
+
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}")
foreach(pyversion ${_pyversions})
message(STATUS "Found dependencies for python${pyversion}, generating
bindings")
execute_process(COMMAND "${CMAKE_COMMAND}"
-
"-DPYTHON_UMBRELLA_MODULE_FILE=${CMAKE_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}/__init__.py"
+
"-DPYTHON_UMBRELLA_MODULE_FILE=${CMAKE_BINARY_DIR}/py${pyversion}/${GPB_PYTHONNAMESPACE}/__init__.py"
-P "${GPB_MODULE_DIR}/GeneratePythonBindingUmbrellaModule.cmake"
)
- add_library(Py${pyversion}KF5${modulename_value} MODULE
-
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/unified${modulename_value}.cpp"
+ add_library(Py${pyversion}KF5${GPB_MODULENAME} MODULE
+
"${CMAKE_CURRENT_BINARY_DIR}/pybuild/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/unified${GPB_MODULENAME}.cpp"
)
- add_dependencies(Py${pyversion}KF5${modulename_value}
sip_generated_${modulename_value}_files)
- target_link_libraries(Py${pyversion}KF5${modulename_value} PRIVATE
${target_value} Python::Libs${pyversion})
+ add_dependencies(Py${pyversion}KF5${GPB_MODULENAME}
sip_generated_${GPB_MODULENAME}_files)
+ target_link_libraries(Py${pyversion}KF5${GPB_MODULENAME} PRIVATE
${GPB_TARGET} Python::Libs${pyversion})
- target_compile_options(Py${pyversion}KF5${modulename_value} PRIVATE
-fstack-protector-strong -Wno-deprecated-declarations -Wno-overloaded-virtual)
- target_include_directories(Py${pyversion}KF5${modulename_value}
PRIVATE ${GPB_SIP_INCLUDES})
- target_link_libraries(Py${pyversion}KF5${modulename_value} PRIVATE
-Wl,-Bsymbolic-functions -Wl,-z,relro)
-
- set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
AUTOMOC OFF)
- set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
PREFIX "")
- set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
LIBRARY_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}")
- set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
- OUTPUT_NAME "${modulename_value}")
+ target_compile_options(Py${pyversion}KF5${GPB_MODULENAME} PRIVATE
-fstack-protector-strong -Wno-deprecated-declarations -Wno-overloaded-virtual)
+ target_include_directories(Py${pyversion}KF5${GPB_MODULENAME} PRIVATE
${GPB_SIP_INCLUDES})
+ target_link_libraries(Py${pyversion}KF5${GPB_MODULENAME} PRIVATE
-Wl,-Bsymbolic-functions -Wl,-z,relro)
+
+ set_property(TARGET Py${pyversion}KF5${GPB_MODULENAME} PROPERTY
AUTOMOC OFF)
+ set_property(TARGET Py${pyversion}KF5${GPB_MODULENAME} PROPERTY PREFIX
"")
+ set_property(TARGET Py${pyversion}KF5${GPB_MODULENAME} PROPERTY
LIBRARY_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/py${pyversion}/${GPB_PYTHONNAMESPACE}")
+ set_property(TARGET Py${pyversion}KF5${GPB_MODULENAME} PROPERTY
+ OUTPUT_NAME "${GPB_MODULENAME}")
if (GPB_SIP_DEPENDS MATCHES PyKF5)
set(_kf5_python_prefix
${CMAKE_INSTALL_PREFIX}/lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX})
else()
set(_kf5_python_prefix ${CMAKE_BINARY_DIR}/py${pyversion})
endif()
- add_test(NAME Py${pyversion}Test${modulename_value} COMMAND
+ add_test(NAME Py${pyversion}Test${GPB_MODULENAME} COMMAND
${GPB_PYTHON${pyversion}_COMMAND}
"${CMAKE_SOURCE_DIR}/autotests/pythontest.py"
${_kf5_python_prefix}
)
- install(DIRECTORY
${CMAKE_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}
+ install(DIRECTORY
${CMAKE_BINARY_DIR}/py${pyversion}/${GPB_PYTHONNAMESPACE}
DESTINATION
lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX})
- install(FILES ${sip_files}
"${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip"
- DESTINATION share/sip/${pythonnamespace_value}/${modulename_value}
+ install(FILES ${sip_files}
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${GPB_MODULENAME}mod.sip"
+ DESTINATION share/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}
)
endforeach()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.50.0/find-modules/run-sip.py
new/extra-cmake-modules-5.51.0/find-modules/run-sip.py
--- old/extra-cmake-modules-5.50.0/find-modules/run-sip.py 2018-09-01
11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/find-modules/run-sip.py 2018-09-30
22:46:18.000000000 +0200
@@ -6,6 +6,9 @@
sipArgs = sys.argv[1:]
+from PyQt5.Qt import PYQT_CONFIGURATION
+sipArgs = PYQT_CONFIGURATION["sip_flags"].split(' ') + sipArgs
+
idx = sipArgs.index("--module-name")
modname = sipArgs[idx + 1]
del sipArgs[idx]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/find-modules/sip_generator.py
new/extra-cmake-modules-5.51.0/find-modules/sip_generator.py
--- old/extra-cmake-modules-5.50.0/find-modules/sip_generator.py
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/find-modules/sip_generator.py
2018-09-30 22:46:18.000000000 +0200
@@ -129,7 +129,7 @@
#
source = h_file
self.unpreprocessed_source = []
- with open(source, "rU") as f:
+ with open(source, "rb") as f:
for line in f:
self.unpreprocessed_source.append(line)
@@ -739,6 +739,7 @@
:param extent: The range of text required.
"""
+ # Extent columns are specified in bytes
extract = self.unpreprocessed_source[extent.start.line -
1:extent.end.line]
if extent.start.line == extent.end.line:
extract[0] = extract[0][extent.start.column - 1:extent.end.column
- 1]
@@ -747,8 +748,9 @@
extract[-1] = extract[-1][:extent.end.column - 1]
#
# Return a single line of text.
+ # Replace all kinds of newline variants (DOS, UNIX, MAC style) by
single spaces
#
- return "".join(extract).replace("\n", " ")
+ return b''.join(extract).decode('utf-8').replace("\r\n", "
").replace("\n", " ").replace("\r", " ")
@staticmethod
def _report_ignoring(parent, child, text=None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.51.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.50.0/kde-modules/KDECMakeSettings.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/kde-modules/KDECMakeSettings.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -217,7 +217,7 @@
# put the include dirs which are in the source or build tree
# before all other include dirs, so the headers in the sources
- # are prefered over the already installed ones
+ # are preferred over the already installed ones
# since cmake 2.4.1
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
@@ -231,7 +231,7 @@
# Since CMake 2.8.11
set(CMAKE_LINK_DEPENDS_NO_SHARED ON)
- # Default to shared libs for KDE, if no type is explicitely given to
add_library():
+ # Default to shared libs for KDE, if no type is explicitly given to
add_library():
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If enabled, shared libs will be
built by default, otherwise static libs")
# Enable automoc in cmake
@@ -307,7 +307,7 @@
WORKING_DIRECTORY "${dir}")
if(exitCode EQUAL 0)
- string(REGEX MATCHALL ".+[:\\/]([-A-Za-z\\d]+)(.git)?\\s*" ""
${giturl})
+ string(REGEX MATCHALL ".+[:\\/]([-A-Za-z0-9]+)(.git)?\\s*" ""
${giturl})
set(${reponame} ${CMAKE_MATCH_1})
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.51.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.50.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2018-09-01 11:20:25.000000000 +0200
+++
new/extra-cmake-modules-5.51.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -54,6 +54,7 @@
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_USE_QSTRINGBUILDER
+ -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.50.0/modules/ECMAddQch.cmake
new/extra-cmake-modules-5.51.0/modules/ECMAddQch.cmake
--- old/extra-cmake-modules-5.50.0/modules/ECMAddQch.cmake 2018-09-01
11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/modules/ECMAddQch.cmake 2018-09-30
22:46:18.000000000 +0200
@@ -222,7 +222,7 @@
# installed. It usually is the same as the one where the CMake config files
# for this software are installed.
#
-# COMPONENT specifies the the installation component name with which the
+# COMPONENT specifies the installation component name with which the
# install rule is associated.
#
# Example usage:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/modules/ECMQmLoader.cpp.in
new/extra-cmake-modules-5.51.0/modules/ECMQmLoader.cpp.in
--- old/extra-cmake-modules-5.50.0/modules/ECMQmLoader.cpp.in 2018-09-01
11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/modules/ECMQmLoader.cpp.in 2018-09-30
22:46:18.000000000 +0200
@@ -35,16 +35,25 @@
#include <QStandardPaths>
#include <QThread>
#include <QTranslator>
+#include <QDir>
namespace {
bool loadTranslation(const QString &localeDirName)
{
QString subPath = QStringLiteral("locale/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
- QString fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
+
+#if defined(Q_OS_ANDROID)
+ const QString fullPath =
QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath;
+ if (!QFile::exists(fullPath)) {
+ return false;
+ }
+#else
+ const QString fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
if (fullPath.isEmpty()) {
return false;
}
+#endif
QTranslator *translator = new
QTranslator(QCoreApplication::instance());
if (!translator->load(fullPath)) {
delete translator;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/modules/ECMWinResolveSymlinks.cmake
new/extra-cmake-modules-5.51.0/modules/ECMWinResolveSymlinks.cmake
--- old/extra-cmake-modules-5.50.0/modules/ECMWinResolveSymlinks.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/modules/ECMWinResolveSymlinks.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -52,7 +52,7 @@
endforeach()
message(STATUS "Resolving symlinks in ${dir}... Done.")
- # touch cache every build to force CMake to re-run these functions everytime
+ # touch cache every build to force CMake to re-run these functions every time
if(NOT TARGET wrs_touch_cache)
add_custom_target(wrs_touch_cache ALL
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/CMakeCache.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
new/extra-cmake-modules-5.51.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
---
old/extra-cmake-modules-5.50.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
2018-09-01 11:20:25.000000000 +0200
+++
new/extra-cmake-modules-5.51.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
2018-09-30 22:46:18.000000000 +0200
@@ -11,9 +11,10 @@
set(multiValueArgs)
cmake_parse_arguments(CF "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
list(LENGTH CF_GENERATED count)
- foreach(i RANGE ${count})
- list(GET CF_GENERATED 0 generated_file)
- list(GET CF_ORIGINALS 0 original_file)
+ math(EXPR last "${count}-1")
+ foreach(i RANGE ${last})
+ list(GET CF_GENERATED ${i} generated_file)
+ list(GET CF_ORIGINALS ${i} original_file)
if (NOT EXISTS "${generated_file}")
message(FATAL_ERROR "${generated_file} was not generated")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
new/extra-cmake-modules-5.51.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
---
old/extra-cmake-modules-5.50.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
2018-09-01 11:20:25.000000000 +0200
+++
new/extra-cmake-modules-5.51.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
2018-09-30 22:46:18.000000000 +0200
@@ -15,15 +15,16 @@
set(multiValueArgs)
cmake_parse_arguments(CF "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
list(LENGTH CF_GENERATED count)
- foreach(i RANGE ${count})
- list(GET CF_GENERATED 0 generated_file)
+ math(EXPR last "${count}-1")
+ foreach(i RANGE ${last})
+ list(GET CF_GENERATED ${i} generated_file)
if (NOT EXISTS "${generated_file}")
message(FATAL_ERROR "${generated_file} was not generated")
endif()
file(READ "${generated_file}" file_contents)
string(STRIP "${file_contents}" file_contents)
- list(GET CF_ORIGINALS 0 original_file)
+ list(GET CF_ORIGINALS ${i} original_file)
if (NOT EXISTS "${original_file}")
message(FATAL_ERROR "Original ${original_file} was not found")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/tests/GenerateSipBindings/cpplib.h
new/extra-cmake-modules-5.51.0/tests/GenerateSipBindings/cpplib.h
--- old/extra-cmake-modules-5.50.0/tests/GenerateSipBindings/cpplib.h
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/tests/GenerateSipBindings/cpplib.h
2018-09-30 22:46:18.000000000 +0200
@@ -1,12 +1,12 @@
#pragma once
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QSharedData>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QMap>
+#include <QCoreApplication>
+#include <QSharedData>
#include <functional>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.50.0/toolchain/Android.cmake
new/extra-cmake-modules-5.51.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.50.0/toolchain/Android.cmake 2018-09-01
11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/toolchain/Android.cmake 2018-09-30
22:46:18.000000000 +0200
@@ -203,11 +203,11 @@
foreach(idx RANGE 0 ${last})
list(GET QTANDROID_EXPORTED_TARGET ${idx} exportedTarget)
list(GET ANDROID_APK_DIR ${idx} APK_DIR)
- if(APK_DIR AND NOT EXISTS "${APK_DIR}/AndroidManifest.xml")
+ if(APK_DIR AND NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml" AND
IS_ABSOLUTE ANDROID_APK_DIR)
message(FATAL_ERROR "Cannot find ${APK_DIR}/AndroidManifest.xml
according to ANDROID_APK_DIR. ${ANDROID_APK_DIR} ${exportedTarget}")
elseif(NOT APK_DIR)
get_filename_component(_qt5Core_install_prefix
"${Qt5Core_DIR}/../../../" ABSOLUTE)
- set(ANDROID_APK_DIR
"${_qt5Core_install_prefix}/src/android/templates/")
+ set(APK_DIR "${_qt5Core_install_prefix}/src/android/templates/")
endif()
ecm_androiddeployqt("${exportedTarget}"
"${ECM_ADDITIONAL_FIND_ROOT_PATH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.50.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.51.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.50.0/toolchain/ECMAndroidDeployQt.cmake
2018-09-01 11:20:25.000000000 +0200
+++ new/extra-cmake-modules-5.51.0/toolchain/ECMAndroidDeployQt.cmake
2018-09-30 22:46:18.000000000 +0200
@@ -38,7 +38,10 @@
function(havestl var access VALUE)
if (NOT VALUE STREQUAL "")
- file(WRITE ${CMAKE_BINARY_DIR}/stl "${VALUE}")
+ string(FIND "${VALUE}" ".so\"" OUT)
+ math(EXPR OUT "${OUT}+4")
+ string(SUBSTRING "${VALUE}" 0 ${OUT} OUTSTR)
+ file(WRITE ${CMAKE_BINARY_DIR}/stl "${OUTSTR}")
endif()
endfunction()
variable_watch(CMAKE_CXX_STANDARD_LIBRARIES havestl)
