diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-23 20:48:53 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-23 20:48:53 +0000 |
commit | 51536d2fe4697ba9114d611178bb9e20d3d5b729 (patch) | |
tree | 30b91d98e65985a575940ed49e756697c1f049c2 /dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch | |
parent | 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (diff) |
gentoo resync : 23.12.2017
Diffstat (limited to 'dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch')
-rw-r--r-- | dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch new file mode 100644 index 000000000000..08cf51f94082 --- /dev/null +++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch @@ -0,0 +1,44 @@ +commit 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d +Author: Allen Winter <allen.winter@kdab.com> +Date: Sat Sep 3 16:56:29 2016 -0400 + + CMakeLists.txt, libical.pc.in - fix iculibs (remove full path) + ISSUE: 227 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0173e1a8..0c903ee5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -145,6 +145,7 @@ endif() + # RSCALE info at http://tools.ietf.org/html/rfc7529 + find_package(ICU) + if(ICU_FOUND) ++ set(ICUUC_LIBS "-licuuc") #for libical.pc + set(HAVE_LIBICU 1) + if(ICU_MAJOR_VERSION VERSION_GREATER 50) + set(HAVE_ICU_DANGI TRUE) +@@ -154,6 +155,7 @@ if(ICU_FOUND) + endif() + if(ICU_I18N_FOUND) + set(HAVE_LIBICU_I18N 1) ++ set(ICUI18N_LIBS "-licui18n") #for libical.pc + endif() + + # MSVC specific definitions +diff --git a/libical.pc.in b/libical.pc.in +index 5c2debd8..8899f430 100644 +--- a/libical.pc.in ++++ b/libical.pc.in +@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ + threadslib=@PTHREAD_LIBS@ +-iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ ++iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@ + + Name: libical + Description: An implementation of basic iCAL protocols + Version: @LIBICAL_LIB_VERSION_STRING@ +-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} ++Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs} + Cflags: -I${includedir} |