pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/time/libical (time/libical) Fix (local) build with #de...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fd43da8d403
branches:  trunk
changeset: 441608:6fd43da8d403
user:      mef <mef%pkgsrc.org@localhost>
date:      Sat Nov 07 09:06:32 2020 +0000

description:
(time/libical) Fix (local) build with #define FALSE (0). Please correct if wrong

diffstat:

 time/libical/Makefile                              |   4 ++--
 time/libical/distinfo                              |   3 ++-
 time/libical/patches/patch-src_libical_icalrecur.c |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 9a0ecfcb34ad -r 6fd43da8d403 time/libical/Makefile
--- a/time/libical/Makefile     Sat Nov 07 07:17:25 2020 +0000
+++ b/time/libical/Makefile     Sat Nov 07 09:06:32 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/11/05 09:07:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2020/11/07 09:06:32 mef Exp $
 
 DISTNAME=      libical-3.0.8
 PKGREVISION=   3
@@ -14,7 +14,7 @@
 USE_TOOLS+=    perl pkg-config
 USE_CMAKE=     yes
 
-CMAKE_ARGS+=   -DUSE_BUILTIN_TZDATA=OFF
+CMAKE_ARGS+=   -DUSE_BUILTIN_TZDATA=OFF
 CMAKE_ARGS+=   -DICAL_BUILD_DOCS=OFF
 CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_BDB=ON
 
diff -r 9a0ecfcb34ad -r 6fd43da8d403 time/libical/distinfo
--- a/time/libical/distinfo     Sat Nov 07 07:17:25 2020 +0000
+++ b/time/libical/distinfo     Sat Nov 07 09:06:32 2020 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2020/05/19 15:33:10 nia Exp $
+$NetBSD: distinfo,v 1.14 2020/11/07 09:06:32 mef Exp $
 
 SHA1 (libical-3.0.8.tar.gz) = d2a9cecb9b8d825d5b6989e44b424235a27173a7
 RMD160 (libical-3.0.8.tar.gz) = 1b5fa93675e74e6721107214202ab922fd5a164c
 SHA512 (libical-3.0.8.tar.gz) = ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 Size (libical-3.0.8.tar.gz) = 881462 bytes
+SHA1 (patch-src_libical_icalrecur.c) = 1ae42a3cad1a662f37001b3de056bbeb30b9a9fa
 SHA1 (patch-src_libical_icaltz-util.c) = eb3b6d1d63faf138897968d4e2c4ee8da4ada15a
diff -r 9a0ecfcb34ad -r 6fd43da8d403 time/libical/patches/patch-src_libical_icalrecur.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/time/libical/patches/patch-src_libical_icalrecur.c        Sat Nov 07 09:06:32 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_libical_icalrecur.c,v 1.1 2020/11/07 09:06:32 mef Exp $
+
+Adhoc fix:  FALSE is not defined
+
+/tmp/time/libical/work/libical-3.0.8/src/libical/icalrecur.c:1021:59: error: 'FALSE' undeclared (first use in this function); did you mean 'FILE'?
+     en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
+                                                           ^~~~~
+                                                           FILE
+/tmp/time/libical/work/libical-3.0.8/src/libical/icalrecur.c:1021:59: note: each undeclared identifier is reported only once for each function it appears in
+
+--- src/libical/icalrecur.c.orig       2020-03-07 14:42:42.000000000 +0000
++++ src/libical/icalrecur.c
+@@ -127,6 +127,9 @@
+   end_of_data to 1x. This signals next_month to increment the month.
+ 
+  ======================================================================*/
++#ifndef FALSE
++#define FALSE (0)
++#endif
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>



Home | Main Index | Thread Index | Old Index