Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2016-02-24 18:52:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-20 09:39:54.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2016-02-24 18:52:31.000000000 +0100
@@ -1,0 +2,11 @@
+Sat Feb 6 17:57:39 UTC 2016 - [email protected]
+
+- Update to 5.19.0 (boo#967668)
+ * ECMAddAppIcon: Use absolute path when operating on icons
+ * Make sure the prefix is looked-up on Android
+ * Add a FindPoppler module
+ * Use PATH_SUFFIXES in ecm_find_package_handle_library_components()
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.19.0.php
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.18.0.tar.xz
New:
----
extra-cmake-modules-5.19.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.3pBZWX/_old 2016-02-24 18:52:32.000000000 +0100
+++ /var/tmp/diff_new_pack.3pBZWX/_new 2016-02-24 18:52:32.000000000 +0100
@@ -16,13 +16,13 @@
#
-%define _tar_path 5.18
+%define _tar_path 5.19
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.18.0
+Version: 5.19.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.18.0.tar.xz -> extra-cmake-modules-5.19.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.18.0/CMakeLists.txt
new/extra-cmake-modules-5.19.0/CMakeLists.txt
--- old/extra-cmake-modules-5.18.0/CMakeLists.txt 2015-12-29
10:33:34.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/CMakeLists.txt 2016-01-31
15:55:29.000000000 +0100
@@ -16,7 +16,7 @@
# Preliminary setup
#
-set(VERSION "5.18.0") # handled by release scripts
+set(VERSION "5.19.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.18.0/docs/find-module/FindPoppler.rst
new/extra-cmake-modules-5.19.0/docs/find-module/FindPoppler.rst
--- old/extra-cmake-modules-5.18.0/docs/find-module/FindPoppler.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/docs/find-module/FindPoppler.rst
2016-01-31 15:55:29.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindPoppler.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.18.0/find-modules/FindPoppler.cmake
new/extra-cmake-modules-5.19.0/find-modules/FindPoppler.cmake
--- old/extra-cmake-modules-5.18.0/find-modules/FindPoppler.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/find-modules/FindPoppler.cmake
2016-01-31 15:55:29.000000000 +0100
@@ -0,0 +1,151 @@
+#.rst:
+# FindPoppler
+# -----------
+#
+# Try to find Poppler.
+#
+# This is a component-based find module, which makes use of the COMPONENTS
+# and OPTIONAL_COMPONENTS arguments to find_module. The following components
+# are available::
+#
+# Core Cpp Qt5 Qt4 Glib
+#
+# If no components are specified, this module will act as though all components
+# were passed to OPTIONAL_COMPONENTS.
+#
+# This module will define the following variables, independently of the
+# components searched for or found:
+#
+# ``Poppler_FOUND``
+# TRUE if (the requested version of) Poppler is available
+# ``Poppler_VERSION``
+# Found Poppler version
+# ``Poppler_TARGETS``
+# A list of all targets imported by this module (note that there may be
more
+# than the components that were requested)
+# ``Poppler_LIBRARIES``
+# This can be passed to target_link_libraries() instead of the imported
+# targets
+# ``Poppler_INCLUDE_DIRS``
+# This should be passed to target_include_directories() if the targets are
+# not used for linking
+# ``Poppler_DEFINITIONS``
+# This should be passed to target_compile_options() if the targets are not
+# used for linking
+#
+# For each searched-for components, ``Poppler_<component>_FOUND`` will be set
to
+# TRUE if the corresponding Poppler library was found, and FALSE otherwise. If
+# ``Poppler_<component>_FOUND`` is TRUE, the imported target
+# ``Poppler::<component>`` will be defined. This module will also attempt to
+# determine ``Poppler_*_VERSION`` variables for each imported target, although
+# ``Poppler_VERSION`` should normally be sufficient.
+#
+# In general we recommend using the imported targets, as they are easier to use
+# and provide more control. Bear in mind, however, that if any target is in
the
+# link interface of an exported library, it must be made available by the
+# package config file.
+#
+# Since 5.17
+
+#=============================================================================
+# Copyright 2015 Alex Richardson <[email protected]>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+
+ecm_find_package_version_check(Poppler)
+
+set(Poppler_known_components
+ Cpp
+ Qt4
+ Qt5
+ Glib
+)
+foreach(_comp ${Poppler_known_components})
+ string(TOLOWER "${_comp}" _lc_comp)
+ set(Poppler_${_comp}_component_deps "Core")
+ set(Poppler_${_comp}_pkg_config "poppler-${_lc_comp}")
+ set(Poppler_${_comp}_lib "poppler-${_lc_comp}")
+ set(Poppler_${_comp}_header_subdir "poppler/${_lc_comp}")
+endforeach()
+set(Poppler_known_components Core ${Poppler_known_components})
+
+set(Poppler_Core_component_deps "")
+set(Poppler_Core_pkg_config "poppler")
+# poppler-config.h header is only installed with --enable-xpdf-headers
+# fall back to using any header from a submodule with a path to make it work
in that case too
+set(Poppler_Core_header "poppler-config.h" "cpp/poppler-version.h"
"qt5/poppler-qt5.h" "qt4/poppler-qt4.h" "glib/poppler.h")
+set(Poppler_Core_header_subdir "poppler")
+set(Poppler_Core_lib "poppler")
+
+set(Poppler_Cpp_header "poppler-version.h")
+set(Poppler_Qt5_header "poppler-qt5.h")
+set(Poppler_Qt4_header "poppler-qt4.h")
+set(Poppler_Glib_header "poppler.h")
+
+ecm_find_package_parse_components(Poppler
+ RESULT_VAR Poppler_components
+ KNOWN_COMPONENTS ${Poppler_known_components}
+)
+ecm_find_package_handle_library_components(Poppler
+ COMPONENTS ${Poppler_components}
+)
+
+# If pkg-config didn't provide us with version information,
+# try to extract it from poppler-version.h or poppler-config.h
+if(NOT Poppler_VERSION)
+ find_file(Poppler_VERSION_HEADER
+ NAMES "poppler-config.h" "cpp/poppler-version.h"
+ HINTS ${Poppler_INCLUDE_DIRS}
+ PATH_SUFFIXES ${Poppler_Core_header_subdir}
+ )
+ mark_as_advanced(Poppler_VERSION_HEADER)
+ if(Poppler_VERSION_HEADER)
+ file(READ ${Poppler_VERSION_HEADER} _poppler_version_header_contents)
+ string(REGEX REPLACE
+ "^.*[ \t]+POPPLER_VERSION[ \t]+\"([0-9d.]*)\".*$"
+ "\\1"
+ Poppler_VERSION
+ "${_poppler_version_header_contents}"
+ )
+ unset(_poppler_version_header_contents)
+ endif()
+endif()
+
+find_package_handle_standard_args(Poppler
+ FOUND_VAR
+ Poppler_FOUND
+ REQUIRED_VARS
+ Poppler_LIBRARIES
+ VERSION_VAR
+ Poppler_VERSION
+ HANDLE_COMPONENTS
+)
+
+include(FeatureSummary)
+set_package_properties(Poppler PROPERTIES
+ DESCRIPTION "A PDF rendering library"
+ URL "http://poppler.freedesktop.org";
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.18.0/find-modules/FindWayland.cmake
new/extra-cmake-modules-5.19.0/find-modules/FindWayland.cmake
--- old/extra-cmake-modules-5.18.0/find-modules/FindWayland.cmake
2015-12-29 10:33:34.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/find-modules/FindWayland.cmake
2016-01-31 15:55:29.000000000 +0100
@@ -17,7 +17,7 @@
# components searched for or found:
#
# ``Wayland_FOUND``
-# True if (the requestion version of) Wayland is available
+# TRUE if (the requested version of) Wayland is available
# ``Wayland_VERSION``
# Found Wayland version
# ``Wayland_TARGETS``
@@ -34,8 +34,8 @@
# used for linking
#
# For each searched-for components, ``Wayland_<component>_FOUND`` will be set
to
-# true if the corresponding Wayland library was found, and false otherwise. If
-# ``Wayland_<component>_FOUND`` is true, the imported target
+# TRUE if the corresponding Wayland library was found, and FALSE otherwise. If
+# ``Wayland_<component>_FOUND`` is TRUE, the imported target
# ``Wayland::<component>`` will be defined. This module will also attempt to
# determine ``Wayland_*_VERSION`` variables for each imported target, although
# ``Wayland_VERSION`` should normally be sufficient.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.18.0/modules/ECMAddAppIcon.cmake
new/extra-cmake-modules-5.19.0/modules/ECMAddAppIcon.cmake
--- old/extra-cmake-modules-5.18.0/modules/ECMAddAppIcon.cmake 2015-12-29
10:33:34.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/modules/ECMAddAppIcon.cmake 2016-01-31
15:55:29.000000000 +0100
@@ -83,21 +83,23 @@
endforeach()
foreach(icon ${ARG_ICONS})
- if (NOT EXISTS "${icon}")
- message(AUTHOR_WARNING "${icon} does not exist, ignoring")
+ get_filename_component(icon_full ${icon} ABSOLUTE)
+ if (NOT EXISTS "${icon_full}")
+ message(AUTHOR_WARNING "${icon_full} does not exist, ignoring")
else()
+ get_filename_component(icon_name ${icon} NAME)
string(REGEX MATCH "([0-9]+)\\-[^/]+\\.([a-z]+)$"
- _dummy "${icon}")
+ _dummy "${icon_name}")
set(size "${CMAKE_MATCH_1}")
set(ext "${CMAKE_MATCH_2}")
if (NOT size)
- message(AUTHOR_WARNING "${icon} is not named correctly for
ecm_add_app_icon - ignoring")
+ message(AUTHOR_WARNING "${icon_full} is not named correctly
for ecm_add_app_icon - ignoring")
elseif (NOT ext STREQUAL "png")
- message(AUTHOR_WARNING "${icon} is not a png file - ignoring")
+ message(AUTHOR_WARNING "${icon_full} is not a png file -
ignoring")
else()
list(FIND known_sizes "${size}" offset)
if (offset GREATER -1)
- list(APPEND icons_at_${size}px "${icon}")
+ list(APPEND icons_at_${size}px "${icon_full}")
endif()
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.18.0/modules/ECMFindModuleHelpers.cmake
new/extra-cmake-modules-5.19.0/modules/ECMFindModuleHelpers.cmake
--- old/extra-cmake-modules-5.18.0/modules/ECMFindModuleHelpers.cmake
2015-12-29 10:33:34.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/modules/ECMFindModuleHelpers.cmake
2016-01-31 15:55:29.000000000 +0100
@@ -47,7 +47,9 @@
# The <name>_<component>_lib variable should contain the name of this library,
# and <name>_<component>_header variable should contain the name of a header
# file associated with it (whatever relative path is normally passed to
-# '#include'). ecm_find_package_components() will then search for the library
+# '#include'). <name>_<component>_header_subdir variable can be used to specify
+# which subdirectory of the include path the headers will be found in.
+# ecm_find_package_components() will then search for the library
# and include directory (creating appropriate cache variables) and create an
# imported library target named <name>::<component>.
#
@@ -218,6 +220,7 @@
find_path(${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR
NAMES ${${module_name}_${ecm_fpwc_comp}_header}
HINTS ${PKG_${module_name}_${ecm_fpwc_comp}_INCLUDE_DIRS}
+ PATH_SUFFIXES ${${module_name}_${ecm_fpwc_comp}_header_subdir}
)
find_library(${module_name}_${ecm_fpwc_comp}_LIBRARY
NAMES ${${module_name}_${ecm_fpwc_comp}_lib}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.18.0/tests/CMakeLists.txt
new/extra-cmake-modules-5.19.0/tests/CMakeLists.txt
--- old/extra-cmake-modules-5.18.0/tests/CMakeLists.txt 2015-12-29
10:33:34.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/tests/CMakeLists.txt 2016-01-31
15:55:29.000000000 +0100
@@ -121,6 +121,15 @@
add_test_macro(FindModules dummy)
add_test_macro(UseFindModules dummy)
+set(ECMAddAppIconTest_EXTRA_OPTIONS
+ --build-target all
+ --build-options
+
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/ECMAddAppIconTest/InstallDirectory"
+)
+add_test_macro(ECMAddAppIconTest
+ ${CMAKE_COMMAND} -P
"${CMAKE_CURRENT_BINARY_DIR}/ECMAddAppIconTest/check_files.cmake"
+)
+
set(ECMInstallIconsTest_EXTRA_OPTIONS
--build-target install
--build-options
Files
old/extra-cmake-modules-5.18.0/tests/ECMAddAppIconTest/128-category-name.png
and
new/extra-cmake-modules-5.19.0/tests/ECMAddAppIconTest/128-category-name.png
differ
Files
old/extra-cmake-modules-5.18.0/tests/ECMAddAppIconTest/16-category-name.png and
new/extra-cmake-modules-5.19.0/tests/ECMAddAppIconTest/16-category-name.png
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.18.0/tests/ECMAddAppIconTest/CMakeLists.txt
new/extra-cmake-modules-5.19.0/tests/ECMAddAppIconTest/CMakeLists.txt
--- old/extra-cmake-modules-5.18.0/tests/ECMAddAppIconTest/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/tests/ECMAddAppIconTest/CMakeLists.txt
2016-01-31 15:55:29.000000000 +0100
@@ -0,0 +1,24 @@
+project(ECMAddAppIconTest)
+cmake_minimum_required(VERSION 2.8.12)
+
+set(CMAKE_MODULE_PATH
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../modules
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules
+)
+
+include(ECMAddAppIcon)
+
+set(ICONS 16-category-name.png 128-category-name.png)
+
+ecm_add_app_icon(OUT ICONS ${ICONS})
+
+if(WIN32 OR APPLE)
+ if(${OUT} STREQUAL "")
+ message(FATAL_ERROR "ecm_add_app_icon() haven't produced anything")
+ endif()
+endif()
+
+add_custom_target(t ALL DEPENDS ${OUT})
+
+# this will be run by CTest
+configure_file(check_files.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/check_files.cmake" @ONLY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.18.0/tests/ECMAddAppIconTest/check_files.cmake.in
new/extra-cmake-modules-5.19.0/tests/ECMAddAppIconTest/check_files.cmake.in
--- old/extra-cmake-modules-5.18.0/tests/ECMAddAppIconTest/check_files.cmake.in
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/tests/ECMAddAppIconTest/check_files.cmake.in
2016-01-31 15:55:29.000000000 +0100
@@ -0,0 +1,9 @@
+set(FILES "@OUT@")
+
+if(WIN32 OR APPLE)
+foreach(f ${FILES})
+ if(NOT EXISTS "${f}")
+ message(SEND_ERROR "${f} was not found")
+ endif()
+endforeach()
+endif()
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.18.0/toolchain/Android.cmake
new/extra-cmake-modules-5.19.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.18.0/toolchain/Android.cmake 2015-12-29
10:33:34.000000000 +0100
+++ new/extra-cmake-modules-5.19.0/toolchain/Android.cmake 2016-01-31
15:55:29.000000000 +0100
@@ -149,8 +149,8 @@
SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK})
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
set(CMAKE_EXE_LINKER_FLAGS "${GNUSTL_SHARED}
-Wl,-rpath-link,${ANDROID_LIBRARIES_PATH} -llog -lz -lm -ldl -lc -lgcc" CACHE
STRING "")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "")
