Hello community, here is the log from the commit of package extra-cmake-modules for openSUSE:Factory checked in at 2016-07-15 12:29:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-07-03 12:18:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes 2016-07-15 12:29:43.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jul 6 15:01:05 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.24.0 + * Integrate relative library paths to APK + * Use "/data" for DATAROOTDIR on Windows + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.24.0.php + +------------------------------------------------------------------- Old: ---- extra-cmake-modules-5.23.0.tar.xz New: ---- extra-cmake-modules-5.24.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extra-cmake-modules.spec ++++++ --- /var/tmp/diff_new_pack.HI4Iom/_old 2016-07-15 12:29:44.000000000 +0200 +++ /var/tmp/diff_new_pack.HI4Iom/_new 2016-07-15 12:29:44.000000000 +0200 @@ -16,13 +16,13 @@ # -%define _tar_path 5.23 +%define _tar_path 5.24 Name: extra-cmake-modules Summary: CMake modules License: BSD-3-Clause Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules -Version: 5.23.0 +Version: 5.24.0 Release: 0 Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ extra-cmake-modules-5.23.0.tar.xz -> extra-cmake-modules-5.24.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-5.23.0/CMakeLists.txt new/extra-cmake-modules-5.24.0/CMakeLists.txt --- old/extra-cmake-modules-5.23.0/CMakeLists.txt 2016-06-06 08:47:56.000000000 +0200 +++ new/extra-cmake-modules-5.24.0/CMakeLists.txt 2016-06-15 15:40:34.000000000 +0200 @@ -16,7 +16,7 @@ # Preliminary setup # -set(VERSION "5.23.0") # handled by release scripts +set(VERSION "5.24.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.23.0/kde-modules/KDEInstallDirs.cmake new/extra-cmake-modules-5.24.0/kde-modules/KDEInstallDirs.cmake --- old/extra-cmake-modules-5.23.0/kde-modules/KDEInstallDirs.cmake 2016-06-06 08:47:56.000000000 +0200 +++ new/extra-cmake-modules-5.24.0/kde-modules/KDEInstallDirs.cmake 2016-06-15 15:40:34.000000000 +0200 @@ -489,10 +489,15 @@ - -_define_absolute(DATAROOTDIR "share" - "read-only architecture-independent data root" - SHARE_INSTALL_PREFIX) +if (WIN32) + _define_relative(DATAROOTDIR BINDIR "data" + "read-only architecture-independent data root" + SHARE_INSTALL_PREFIX) +else() + _define_absolute(DATAROOTDIR "share" + "read-only architecture-independent data root" + SHARE_INSTALL_PREFIX) +endif() _define_relative(DATADIR DATAROOTDIR "" "read-only architecture-independent data" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-5.23.0/tests/CMakeLists.txt new/extra-cmake-modules-5.24.0/tests/CMakeLists.txt --- old/extra-cmake-modules-5.23.0/tests/CMakeLists.txt 2016-06-06 08:47:56.000000000 +0200 +++ new/extra-cmake-modules-5.24.0/tests/CMakeLists.txt 2016-06-15 15:40:34.000000000 +0200 @@ -40,6 +40,7 @@ add_subdirectory(ECMGenerateHeadersTest) add_subdirectory(ECMSetupVersionTest) add_subdirectory(ECMGeneratePkgConfigFile) +add_subdirectory(ECMToolchainAndroidTest) # a macro for tests that have a simple format where the name matches the # directory and project @@ -139,6 +140,8 @@ ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/ECMInstallIconsTest/check_tree.cmake" ) +add_test_macro(ECMToolchainAndroidTest dummy) + set(KDEPackageAppTemplatesTest_EXTRA_OPTIONS --build-target install --build-options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/CMakeLists.txt new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/CMakeLists.txt --- old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/CMakeLists.txt 2016-06-15 15:40:34.000000000 +0200 @@ -0,0 +1,23 @@ +project(AndroidToolchainTest) +cmake_minimum_required(VERSION 2.8.12) + +set(CMAKE_MODULE_PATH + ${CMAKE_CURRENT_SOURCE_DIR}/../../modules + ${CMAKE_CURRENT_SOURCE_DIR}/../../toolchain +) + +set(TARGET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/testlinkfile") +set(TARGET_NAME "testtarget") +set(OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/androidtest_output.txt") +set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/testlinkfile/outputfake.json") + +# test correct include resolution +include(specifydependencies) + +file(READ "${OUTPUT_FILE}" TEST_RESULT) +string(FIND ${TEST_RESULT} "libKF5Attica.so" CMP_RESULT) +if (${CMP_RESULT} EQUAL -1) + message(SEND_ERROR "Could not find relative library libKF5Attica.so") +endif() + +add_executable(dummy main.c) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/main.c new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/main.c --- old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/main.c 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/main.c 2016-06-15 15:40:34.000000000 +0200 @@ -0,0 +1,4 @@ +int main() +{ + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt --- old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt 2016-06-15 15:40:34.000000000 +0200 @@ -0,0 +1 @@ +/usr/bin/c++ -pipe -DQT_STRICT_ITERATORS -DQURL_NO_CAST_FROM_STRING -DQT_NO_HTTP -DQT_NO_FTP -Wformat -Werror=format-security -Werror=return-type -Wno-variadic-macros -Wlogical-op -std=c++0x -fno-exceptions -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type -pedantic -g -Wl,--enable-new-dtags CMakeFiles/persontest.dir/persontest.cpp.o CMakeFiles/persontest.dir/persontest_automoc.cpp.o -o testtarget -rdynamic /opt/qt5/qtbase/lib/libQt5Test.so.5.6.1 ../src/libKF5Attica.so.5.23.0 /opt/qt5/qtbase/lib/libQt5Network.so.5.6.1 /opt/qt5/qtbase/lib/libQt5Core.so.5.6.1 -Wl,-rpath,/opt/qt5/qtbase/lib:/opt/kde/build/frameworks/attica/src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json --- old/extra-cmake-modules-5.23.0/tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json 1970-01-01 01:00:00.000000000 +0100 +++ new/extra-cmake-modules-5.24.0/tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json 2016-06-15 15:40:34.000000000 +0200 @@ -0,0 +1 @@ +##EXTRALIBS## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extra-cmake-modules-5.23.0/toolchain/specifydependencies.cmake new/extra-cmake-modules-5.24.0/toolchain/specifydependencies.cmake --- old/extra-cmake-modules-5.23.0/toolchain/specifydependencies.cmake 2016-06-06 08:47:56.000000000 +0200 +++ new/extra-cmake-modules-5.24.0/toolchain/specifydependencies.cmake 2016-06-15 15:40:34.000000000 +0200 @@ -2,13 +2,17 @@ string(FIND "${out}" "-o ${TARGET_NAME}" POS) #we trim the initial arguments, we want the ones in the end. we find the target string(SUBSTRING "${out}" ${POS} -1 out) #we -string(REGEX MATCHALL " /.+\\.so" outout "${out}") +string(REGEX MATCHALL "(/|\\.\\./|\\./)[^ ]+\\.so" outout "${out}") string(STRIP "${outout}" outout) string(REPLACE " /" ";/" outout "${outout}") set(extralibs) foreach(lib IN LISTS outout) #now we filter Qt5 libraries, because Qt wants to take care about these itself if(NOT ${lib} MATCHES ".*/libQt5.*") + # resolve relative paths + if(${lib} MATCHES "^(\\.\\./|\\./)") + set(lib "${TARGET_DIR}/${lib}") + endif() if(extralibs) set(extralibs "${extralibs},${lib}") else()