diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch')
-rw-r--r-- | dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch deleted file mode 100644 index e19dc0379028..000000000000 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit f70a26aaf836da0f9e242945151b49190d682d95 -Author: Allen Winter <allen.winter@kdab.com> -Date: Sat Dec 3 11:11:48 2016 -0500 - - CMakeLists.txt, libical.pc.in - ICU must appear as Requires in pkgconfig - issue#244 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b3d49d0d..0f6dfc34 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,7 +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(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc - set(HAVE_LIBICU 1) - if(ICU_MAJOR_VERSION VERSION_GREATER 50) - set(HAVE_ICU_DANGI TRUE) -@@ -155,7 +155,6 @@ 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 8899f430..c07eb52a 100644 ---- a/libical.pc.in -+++ b/libical.pc.in -@@ -2,11 +2,11 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --threadslib=@PTHREAD_LIBS@ --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} ${iculibs} -+Libs: -L${libdir} -lical -licalss -licalvcal -+Libs.private: @PTHREAD_LIBS@ -+@REQUIRES_PRIVATE_ICU@ - Cflags: -I${includedir} |