Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2022-11-15 13:16:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Tue Nov 15 13:16:54 2022 rev:107 rq:1035364 version:5.100.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2022-10-11 18:01:05.989653187 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1597/extra-cmake-modules.changes
2022-11-15 13:18:45.260357282 +0100
@@ -1,0 +2,16 @@
+Tue Nov 8 08:34:49 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.100.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.100.0
+- Changes since 5.99.0:
+ * Fix building "executables" on Android with Qt 6
+ * Revert "Restore the Android Threads workaround for Qt
+ * Make the expiry of these artifacts more reasonable, 3 months is a bit
excessive
+ * avoid lib64 directory on NixOS
+ * Restore the Android Threads workaround for Qt 6
+ * Add quotes, otherwise if is malformed when envvar not defined
+ * Allow KF_IGNORE_PLATFORM_CHECK to be set through an environment variable
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.99.0.tar.xz
extra-cmake-modules-5.99.0.tar.xz.sig
New:
----
extra-cmake-modules-5.100.0.tar.xz
extra-cmake-modules-5.100.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.Dnur3x/_old 2022-11-15 13:18:45.804356761 +0100
+++ /var/tmp/diff_new_pack.Dnur3x/_new 2022-11-15 13:18:45.812356753 +0100
@@ -21,7 +21,7 @@
%global pkg_suffix -doc
%endif
-%define _tar_path 5.99
+%define _tar_path 5.100
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -30,7 +30,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: extra-cmake-modules%{?pkg_suffix}
-Version: 5.99.0
+Version: 5.100.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.99.0.tar.xz -> extra-cmake-modules-5.100.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.99.0/.gitlab-ci.yml
new/extra-cmake-modules-5.100.0/.gitlab-ci.yml
--- old/extra-cmake-modules-5.99.0/.gitlab-ci.yml 2022-10-01
13:42:31.000000000 +0200
+++ new/extra-cmake-modules-5.100.0/.gitlab-ci.yml 2022-11-05
16:07:16.000000000 +0100
@@ -14,8 +14,6 @@
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
docs:
- # only:
- # - tags
stage: build
image: debian:bullseye-slim
before_script:
@@ -25,7 +23,7 @@
- mkdir ../ecm-docs && mv docs/html/* ../ecm-docs/
artifacts:
name: ecm-docs-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
- expire_in: 3 months
+ expire_in: 1 week
when: on_success
paths:
- ecm-docs/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.99.0/CMakeLists.txt
new/extra-cmake-modules-5.100.0/CMakeLists.txt
--- old/extra-cmake-modules-5.99.0/CMakeLists.txt 2022-10-01
13:42:31.000000000 +0200
+++ new/extra-cmake-modules-5.100.0/CMakeLists.txt 2022-11-05
16:07:16.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.99.0") # handled by release scripts
+set(VERSION "5.100.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.99.0/kde-modules/KDEInstallDirsCommon.cmake
new/extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
--- old/extra-cmake-modules-5.99.0/kde-modules/KDEInstallDirsCommon.cmake
2022-10-01 13:42:31.000000000 +0200
+++ new/extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
2022-11-05 16:07:16.000000000 +0100
@@ -19,6 +19,7 @@
# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
# - we are NOT on debian
# - we are NOT on flatpak
+# - we are NOT on NixOS
# - we are on a 64 bits system
# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
@@ -27,7 +28,8 @@
if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL
"GNU")
AND NOT CMAKE_CROSSCOMPILING
AND NOT EXISTS "/etc/arch-release"
- AND NOT DEFINED ENV{FLATPAK_ID})
+ AND NOT DEFINED ENV{FLATPAK_ID}
+ AND NOT EXISTS "/etc/NIXOS")
if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE)
set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.99.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
new/extra-cmake-modules-5.100.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
--- old/extra-cmake-modules-5.99.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
2022-10-01 13:42:31.000000000 +0200
+++ new/extra-cmake-modules-5.100.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
2022-11-05 16:07:16.000000000 +0100
@@ -19,6 +19,10 @@
#]=======================================================================]
option(KF_IGNORE_PLATFORM_CHECK "Ignore the supported platform check against
metainfo.yaml" OFF)
+if ("$ENV{KF_IGNORE_PLATFORM_CHECK}" STREQUAL "ON")
+ message(WARNING "KF_IGNORE_PLATFORM_CHECK set to ON from the environment")
+ set(KF_IGNORE_PLATFORM_CHECK ON)
+endif()
if (NOT "${KF_IGNORE_PLATFORM_CHECK}")
file(STRINGS metainfo.yaml MetaInfoContents)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.99.0/toolchain/Android.cmake
new/extra-cmake-modules-5.100.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.99.0/toolchain/Android.cmake 2022-10-01
13:42:31.000000000 +0200
+++ new/extra-cmake-modules-5.100.0/toolchain/Android.cmake 2022-11-05
16:07:16.000000000 +0100
@@ -179,11 +179,15 @@
# armv7 really doesn't like mixing PIC/PIE code.
# Since we only have to care about a single compiler,
# hard-code the values here.
-# Qt6 fixes this and breaks if we define Threads::Threads here.
+# Qt6 fixes this and breaks in nested CMake calls (e.g. try_compile) if we
+# define Threads::Threads here, at least if the "C" language is enabled. In
+# CXX-only projects we still need to do this unconditionally...
+#
# We cannot use our usual Qt version check at this point though yet,
# se check whether we are chainloaded by the Qt toolchain as an indicator
# for Qt6.
-if (NOT TARGET Threads::Threads AND NOT DEFINED __qt_chainload_toolchain_file)
+get_property(_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
+if (NOT TARGET Threads::Threads AND (NOT DEFINED __qt_chainload_toolchain_file
OR NOT "C" IN_LIST _languages))
set(Threads_FOUND TRUE)
set(CMAKE_THREAD_LIBS_INIT "-pthread")
add_library(Threads::Threads INTERFACE IMPORTED)
@@ -253,6 +257,18 @@
"<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o
<TARGET> <OBJECTS> <LINK_LIBRARIES>"
)
+# As our executables are shared libraries, we also need them build with
position independent code (PIC).
+# Qt 5 forces that anyway, but in Qt 6 that is no longer the case for
exectuables (which we pretend to build here),
+# and so we end up with just PIE (coming from CMake).
+# And as subsequent steps overwrite that setting again, we have to watch for
that and redo our change.
+set(CMAKE_CXX_COMPILE_OPTIONS_PIE "-fPIC")
+macro(resetPieOption _var _access)
+ if (${_access} STREQUAL "MODIFIED_ACCESS")
+ set(CMAKE_CXX_COMPILE_OPTIONS_PIE "-fPIC")
+ endif()
+endmacro()
+variable_watch(CMAKE_CXX_COMPILE_OPTIONS_PIE resetPieOption)
+
set(ECM_DIR "${CMAKE_CURRENT_LIST_DIR}/../cmake" CACHE STRING "")
######### generation
