Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2020-04-15 20:00:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Wed Apr 15 20:00:33 2020 rev:76 rq:793124 version:5.69.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2020-03-19 19:43:27.895958088 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2738/extra-cmake-modules.changes
2020-04-15 20:01:57.729909543 +0200
@@ -1,0 +2,10 @@
+Sun Apr 5 19:45:16 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.69.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/kde-frameworks-5.69.0
+- Changes since 5.68.0:
+ * ECMPoQmToolsTest: have separate moc files for tr_thread_test 1 & 2
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.68.0.tar.xz
extra-cmake-modules-5.68.0.tar.xz.sig
New:
----
extra-cmake-modules-5.69.0.tar.xz
extra-cmake-modules-5.69.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.8JI3U4/_old 2020-04-15 20:01:58.317909985 +0200
+++ /var/tmp/diff_new_pack.8JI3U4/_new 2020-04-15 20:01:58.317909985 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.68
+%define _tar_path 5.69
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -29,7 +29,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: extra-cmake-modules
-Version: 5.68.0
+Version: 5.69.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.68.0.tar.xz -> extra-cmake-modules-5.69.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.68.0/CMakeLists.txt
new/extra-cmake-modules-5.69.0/CMakeLists.txt
--- old/extra-cmake-modules-5.68.0/CMakeLists.txt 2020-03-07
09:34:00.000000000 +0100
+++ new/extra-cmake-modules-5.69.0/CMakeLists.txt 2020-03-24
20:47:59.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.68.0") # handled by release scripts
+set(VERSION "5.69.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.68.0/tests/ECMPoQmToolsTest/CMakeLists.txt
new/extra-cmake-modules-5.69.0/tests/ECMPoQmToolsTest/CMakeLists.txt
--- old/extra-cmake-modules-5.68.0/tests/ECMPoQmToolsTest/CMakeLists.txt
2020-03-07 09:34:00.000000000 +0100
+++ new/extra-cmake-modules-5.69.0/tests/ECMPoQmToolsTest/CMakeLists.txt
2020-03-24 20:47:59.000000000 +0100
@@ -121,14 +121,20 @@
# loading a module on a thread other than the main thread
# (different catalog, no AUTOMOC)
#
-qt5_generate_moc(tr_thread_test.cpp
"${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test.moc")
+# make sure the moc file is only visible to this test/target
+set(MOC_DIR "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test_2_moc")
+qt5_generate_moc(tr_thread_test.cpp "${MOC_DIR}/tr_thread_test.moc")
+# Unset SKIP_AUTOMOC again, to not interfer with AUTOMOC as set for
tr_thread_test
+set_source_files_properties(tr_thread_test PROPERTIES SKIP_AUTOMOC OFF)
+
set(tr_thread_test_2_SRCS
tr_thread_test.cpp
- "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test.moc"
+ "${MOC_DIR}/tr_thread_test.moc"
)
ecm_create_qm_loader(tr_thread_test_2_SRCS catalog2)
add_executable(tr_thread_test_2 ${tr_thread_test_2_SRCS})
-target_include_directories(tr_thread_test_2 PRIVATE
"${CMAKE_CURRENT_BINARY_DIR}")
+set_target_properties(tr_thread_test_2 PROPERTIES AUTOMOC OFF)
+target_include_directories(tr_thread_test_2 PRIVATE
"${CMAKE_CURRENT_BINARY_DIR}" "${MOC_DIR}")
target_compile_definitions(tr_thread_test_2 PRIVATE
"MODULE_PATH=\"$<TARGET_FILE:tr_thread_module>\"")
target_link_libraries(tr_thread_test_2 PRIVATE Qt5::Core)
