diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /dev-libs/libical/files | |
parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) |
gentoo resync : 12.01.2019
Diffstat (limited to 'dev-libs/libical/files')
-rw-r--r-- | dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch | 58 | ||||
-rw-r--r-- | dev-libs/libical/files/libical-3.0.4-tests.patch | 25 |
2 files changed, 25 insertions, 58 deletions
diff --git a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch deleted file mode 100644 index 7f0ffc4b4280..000000000000 --- a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5c682db0dd1cfd7090dd191e89613ad5fb9fc078 Mon Sep 17 00:00:00 2001 -From: Allen Winter <allen.winter@kdab.com> -Date: Sat, 26 May 2018 09:06:10 -0400 -Subject: [PATCH] cmake/modules/FindICU.cmake - allow pkgconfig to get is a - hint - ---- - cmake/modules/FindICU.cmake | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake -index 12a1812d..53213efe 100644 ---- a/cmake/modules/FindICU.cmake -+++ b/cmake/modules/FindICU.cmake -@@ -23,16 +23,12 @@ if(WIN32) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) - endif() - --if(ICU_INCLUDE_DIR AND ICU_LIBRARY) -- # Already in cache, be silent -- set(ICU_FIND_QUIETLY TRUE) --endif() -- --#set the root from the ICU_BASE environment - file(TO_NATIVE_PATH "$ENV{ICU_BASE}" icu_root) --#override the root from ICU_BASE defined to cmake - if(DEFINED ICU_BASE) - file(TO_NATIVE_PATH "${ICU_BASE}" icu_root) -+else() -+ find_package(PkgConfig QUIET) -+ pkg_check_modules(PC_LibICU QUIET icu-i18n) - endif() - - # Look for the header file. -@@ -42,6 +38,7 @@ find_path( - HINTS - ${icu_root}/include - ${_program_FILES_DIR}/icu/include -+ ${PC_LibICU_INCLUDEDIR} - /usr/local/opt/icu4c/include - DOC "Include directory for the ICU library" - ) -@@ -56,6 +53,7 @@ find_library( - ${icu_root}/lib/ - ${_program_FILES_DIR}/icu/lib64/ - ${_program_FILES_DIR}/icu/lib/ -+ ${PC_LibICU_LIBDIR} - /usr/local/opt/icu4c/lib/ - DOC "Libraries to link against for the common parts of ICU" - ) -@@ -98,6 +96,7 @@ if(ICU_INCLUDE_DIR AND ICU_LIBRARY) - HINTS - ${icu_root}/lib/ - ${_program_FILES_DIR}/icu/lib/ -+ ${PC_LibICU_LIBDIR} - /usr/local/opt/icu4c/lib/ - DOC "Libraries to link against for ICU internationalization" - ) diff --git a/dev-libs/libical/files/libical-3.0.4-tests.patch b/dev-libs/libical/files/libical-3.0.4-tests.patch new file mode 100644 index 000000000000..7ecf6e1f2d76 --- /dev/null +++ b/dev-libs/libical/files/libical-3.0.4-tests.patch @@ -0,0 +1,25 @@ +From 3066463eb407853626277442eba725ddde58b843 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 6 Jan 2019 17:41:10 +0100 +Subject: [PATCH] Try to fix test dir path + +--- + src/test/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index b1179c2c..af7ce3fc 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -27,7 +27,7 @@ add_definitions(-DTEST_DATADIR=${TEST_DATADIR}) + macro(setprops _name) + if(UNIX) + set_tests_properties(${_name} PROPERTIES +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin" ++ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/test" + ) + endif() + if(WIN32) +-- +2.20.1 + |