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 | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libical/files')
7 files changed, 0 insertions, 278 deletions
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch deleted file mode 100644 index 6044d133749d..000000000000 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch +++ /dev/null @@ -1,28 +0,0 @@ -This is a patch for Gentoo bug 560572, provided by Georgi Georgiev. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 773cf0c..e282ce4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -336,7 +336,7 @@ endif() - set(VERSION "${PROJECT_VERSION}") - set(prefix "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "\${prefix}") --set(libdir "\${exec_prefix}/lib") -+set(libdir "${LIB_INSTALL_DIR}") - set(includedir "\${prefix}/include") - set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}") - -diff --git a/libical.pc.in b/libical.pc.in -index 7774dce..bf88476 100644 ---- a/libical.pc.in -+++ b/libical.pc.in -@@ -8,8 +8,8 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ - Name: libical - Description: An implementation of basic iCAL protocols - Version: @LIBICAL_LIB_VERSION_STRING@ --Libs: -L${libdir} -lical -licalss -licalvcal -+Libs: -lical -licalss -licalvcal - Libs.private: @PTHREAD_LIBS@ - @REQUIRES_PRIVATE_ICU@ - Cflags: -I${includedir} 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} 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 deleted file mode 100644 index 08cf51f94082..000000000000 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch +++ /dev/null @@ -1,44 +0,0 @@ -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} diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch deleted file mode 100644 index 403ee84cd651..000000000000 --- a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit cdc85e9e7a14932808471f823bc974031a0c4842 -Author: Allen Winter <allen.winter@kdab.com> -Date: Mon Jan 25 14:57:20 2016 -0500 - - libical.pc.in - set the version to the full major.minor.patch - as requested by Milan. - -diff --git a/libical.pc.in b/libical.pc.in -index 7774dce2..5c2debd8 100644 ---- a/libical.pc.in -+++ b/libical.pc.in -@@ -7,6 +7,6 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ - - Name: libical - Description: An implementation of basic iCAL protocols --Version: @VERSION@ -+Version: @LIBICAL_LIB_VERSION_STRING@ - Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} - Cflags: -I${includedir} diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch deleted file mode 100644 index a274382b3152..000000000000 --- a/dev-libs/libical/files/libical-2.0.0-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001 -From: Allen Winter <allen.winter@kdab.com> -Date: Thu, 24 Mar 2016 16:28:02 -0400 -Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test - data thereby fixing in-source building ISSUE#228 - https://bugs.gentoo.org/show_bug.cgi?id=532296 - ---- - src/test/recur.c | 2 +- - src/test/testvcal.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test/recur.c b/src/test/recur.c -index d427137a..873ec48a 100644 ---- a/src/test/recur.c -+++ b/src/test/recur.c -@@ -67,7 +67,7 @@ int main(int argc, char *argv[]) - #endif - - if (argc <= 1) { -- file = "../../test-data/recur.txt"; -+ file = TEST_DATADIR "/recur.txt"; - } else if (argc == 2) { - file = argv[1]; - } else { -diff --git a/src/test/testvcal.c b/src/test/testvcal.c -index feee8147..024bbe99 100644 ---- a/src/test/testvcal.c -+++ b/src/test/testvcal.c -@@ -44,7 +44,7 @@ int main(int argc, char *argv[]) - char *file; - - if (argc != 2) { -- file = "../../test-data/user-cal.vcf"; -+ file = TEST_DATADIR "/user-cal.vcf"; - } else { - file = argv[1]; - } diff --git a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch deleted file mode 100644 index aae02abc537d..000000000000 --- a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix pkgconfig libdir paths. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -336,7 +336,7 @@ - set(VERSION "${PROJECT_VERSION}") - set(prefix "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "\${prefix}") --set(libdir "\${exec_prefix}/lib") -+set(libdir "${LIB_INSTALL_DIR}") - set(includedir "\${prefix}/include") - set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}") - ---- a/libical.pc.in -+++ b/libical.pc.in -@@ -8,7 +8,7 @@ - Name: libical - Description: An implementation of basic iCAL protocols - Version: @LIBICAL_LIB_VERSION_STRING@ --Libs: -L${libdir} -lical -licalss -licalvcal -+Libs: -lical -licalss -licalvcal - Libs.private: @PTHREAD_LIBS@ - @REQUIRES_PRIVATE_ICU@ - Cflags: -I${includedir} ---- a/src/libical-glib/CMakeLists.txt -+++ b/src/libical-glib/CMakeLists.txt -@@ -233,7 +233,7 @@ - - set(prefix "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "\${prefix}") --set(libdir "\${exec_prefix}/lib") -+set(libdir "${LIB_INSTALL_DIR}") - set(includedir "\${prefix}/include") - - configure_file( ---- a/src/libical-glib/libical-glib.pc.in -+++ b/src/libical-glib/libical-glib.pc.in -@@ -8,4 +8,4 @@ - Version: @LIBICAL_LIB_VERSION_STRING@ - Requires: glib-2.0, gobject-2.0, libical - Cflags: -I{includedir} --Libs: -L${libdir} -lical-glib -+Libs: -lical-glib - 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" - ) |