diff options
Diffstat (limited to 'dev-libs/libical/files')
5 files changed, 182 insertions, 0 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 new file mode 100644 index 000000000000..6044d133749d --- /dev/null +++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 000000000000..e19dc0379028 --- /dev/null +++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch @@ -0,0 +1,47 @@ +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 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} 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 new file mode 100644 index 000000000000..403ee84cd651 --- /dev/null +++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch @@ -0,0 +1,19 @@ +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-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch new file mode 100644 index 000000000000..aae02abc537d --- /dev/null +++ b/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch @@ -0,0 +1,44 @@ +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 + |