summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-12-21 23:56:23 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-12-22 11:25:14 +0100
commite8342b7d186957ffbfff5485625761645ba61b6c (patch)
treefed0799e5de2b6c47d7d3e86f25c9fa971daf9ca /dev-libs/libical/files
parentprofiles: mask sci-calculators/qalculator for removal (diff)
downloadgentoo-e8342b7d186957ffbfff5485625761645ba61b6c.tar.gz
gentoo-e8342b7d186957ffbfff5485625761645ba61b6c.tar.bz2
gentoo-e8342b7d186957ffbfff5485625761645ba61b6c.zip
dev-libs/libical: 3.0.1 version bump
Closes: https://bugs.gentoo.org/641970 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-libs/libical/files')
-rw-r--r--dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch44
1 files changed, 44 insertions, 0 deletions
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
+