diff --git a/talos-data/Makefile b/talos-data/Makefile index cbd1afa7d55987308fdc0033039418a016bf0baf..4a1cf45ebbee9e599de4cd8d4f7457eb6ba73a79 100644 --- a/talos-data/Makefile +++ b/talos-data/Makefile @@ -4,8 +4,7 @@ ORG= pyrene-dev NAME= talos-data -VERSION= 1.1.0 -PKGREVISION= 2 +VERSION= 1.2.0 ROSNAME= $(subst -,_,${NAME}) PKGNAME= ${NAME}-${VERSION} diff --git a/talos-data/distinfo b/talos-data/distinfo index e1b1711e8601faa3eef9fd015b5b4f09a6f39f96..9f6930cf2924a04394ed2ba55f5a3614cd46f273 100644 --- a/talos-data/distinfo +++ b/talos-data/distinfo @@ -1,5 +1,4 @@ -SHA1 (talos_data-1.1.0.tar.gz) = c3c1f7d572d8a862d4619bcb21664e363256abcd -RMD160 (talos_data-1.1.0.tar.gz) = 05ec6c1914a20e832341febf07ba4d84b9fa50cb -Size (talos_data-1.1.0.tar.gz) = 8844249 bytes -SHA1 (patch-aa) = 8c18fcbcfbe5dbdff22bd75b845145816132b4ff -SHA1 (patch-ab) = 3725dd74db1f66c7a4a57d87e890c400254408a8 +SHA1 (talos_data-1.2.0.tar.gz) = 6b1ace90d6d4b566514a07835d1fff86240a6ff5 +RMD160 (talos_data-1.2.0.tar.gz) = f48e12e9426afb32fac61291e4719ee443922e20 +Size (talos_data-1.2.0.tar.gz) = 8860846 bytes +SHA1 (patch-aa) = 3725dd74db1f66c7a4a57d87e890c400254408a8 diff --git a/talos-data/patches/patch-aa b/talos-data/patches/patch-aa index 66b92a780299c214a635676b0a94cd885879d5e8..ef7095574a65f7f3282d472240650115b0c11183 100644 --- a/talos-data/patches/patch-aa +++ b/talos-data/patches/patch-aa @@ -1,13 +1,21 @@ -Fix package version - ---- package.xml.orig 2019-12-18 10:44:33.000000000 +0100 -+++ package.xml 2020-01-21 15:06:20.853115700 +0100 -@@ -1,7 +1,7 @@ - <?xml version="1.0"?> - <package format="2"> - <name>talos_data</name> -- <version>1.0.4</version> -+ <version>1.1.0</version> - <description>The talos_data package</description> +Enable C language. Fix configure on Arch at: + +-- FreeImage test failed to compile - This may indicate a build system bug +CMake Error at /usr/lib64/cmake/ignition-cmake0/cmake0/FindFreeImage.cmake:46 (try_run): +Unknown extension ".c" for file + +/home/nim/local/robotpkg/robotpkg/wip/talos-data/work.Nausicaa/talos_data-1.1.0/CMakeTmp/test_freeimage.c + +try_compile() works only for enabled languages. + +--- CMakeLists.txt.orig 2019-12-18 10:44:33.000000000 +0100 ++++ CMakeLists.txt 2020-01-25 21:44:05.988941613 +0100 +@@ -13,7 +13,7 @@ + INCLUDE(cmake/base.cmake) + + # Specify the project. +-COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) ++COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX C) + PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) - <maintainer email="olivier.stasse@laas.fr">Olivier Stasse</maintainer> + find_package(catkin REQUIRED COMPONENTS diff --git a/talos-data/patches/patch-ab b/talos-data/patches/patch-ab deleted file mode 100644 index ef7095574a65f7f3282d472240650115b0c11183..0000000000000000000000000000000000000000 --- a/talos-data/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -Enable C language. Fix configure on Arch at: - --- FreeImage test failed to compile - This may indicate a build system bug -CMake Error at /usr/lib64/cmake/ignition-cmake0/cmake0/FindFreeImage.cmake:46 (try_run): -Unknown extension ".c" for file - -/home/nim/local/robotpkg/robotpkg/wip/talos-data/work.Nausicaa/talos_data-1.1.0/CMakeTmp/test_freeimage.c - -try_compile() works only for enabled languages. - ---- CMakeLists.txt.orig 2019-12-18 10:44:33.000000000 +0100 -+++ CMakeLists.txt 2020-01-25 21:44:05.988941613 +0100 -@@ -13,7 +13,7 @@ - INCLUDE(cmake/base.cmake) - - # Specify the project. --COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) -+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX C) - PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) - - find_package(catkin REQUIRED COMPONENTS