dev-libs/libical: Update pkgconfig-libdir patch for 3.0.5

3.0.5 fixed a typo which breaks our existing patch from 3.0.4.
We never install libical-glib.pc anyway so this just being over-precise.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
new file mode 100644 (file)
index 0000000..1ef0817
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
@@ -0,0 +1,24 @@
+From 111ee5ff9daf7db21ad0b6874c4b7cc05baf4703 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 8 Jan 2019 22:13:47 +0100
+Subject: [PATCH] Fix typo in libical-glib.pc.in
+
+Missing '$' causes compiler warnings about missing-include-dirs, due to
+the {includedir} not being properly replaced with the variable value.
+
+Signed-off-by: Allen Winter <allen.winter@kdab.com>
+---
+ src/libical-glib/libical-glib.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libical-glib/libical-glib.pc.in b/src/libical-glib/libical-glib.pc.in
+index 42f1ffe5..e164cfb5 100644
+--- a/src/libical-glib/libical-glib.pc.in
++++ b/src/libical-glib/libical-glib.pc.in
+@@ -7,5 +7,5 @@ Name: libical-glib
+ Description: A GObject interface of the libical library
+ Version: @LIBICAL_LIB_VERSION_STRING@
+ Requires: glib-2.0, gobject-2.0, libical
+-Cflags: -I{includedir}
++Cflags: -I${includedir}
+ Libs: -L${libdir} -lical-glib

diff --git a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
similarity index 97%
rename from dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch
rename to dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
index aae02abc537d28f4c4772cfadef31c2e87641833..a3a80e9f76f52e2846ff901313b13cda8d712dc4 100644 (file)
--- a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch
+++ b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
@@ -38,7 +38,7 @@ Fix pkgconfig libdir paths.
 @@ -8,4 +8,4 @@
  Version: @LIBICAL_LIB_VERSION_STRING@
  Requires: glib-2.0, gobject-2.0, libical
- Cflags: -I{includedir}
+ Cflags: -I${includedir}
 -Libs: -L${libdir} -lical-glib
 +Libs: -lical-glib
  

diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index 2dbe0b25537de01ebfbf0ed100717aed44e83396..3e1efabd39b7cd82de62aff350bc2cab9657e4da 100644 (file)
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -41,8 +41,8 @@ DOCS=(
 )
 
 PATCHES=(
-       "${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
-       "${FILESDIR}/${P}-tests.patch"
+       "${FILESDIR}"/${PN}-3.0.{4,5}-pkgconfig-libdir.patch
+       "${FILESDIR}"/${P}-tests.patch
 )
 
 pkg_setup() {