diff options
Diffstat (limited to 'source/l/libical')
| -rwxr-xr-x | source/l/libical/libical.SlackBuild | 6 | ||||
| -rw-r--r-- | source/l/libical/libical.true.false.diff | 17 |
2 files changed, 3 insertions, 20 deletions
diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild index 85589cc75..64225acc9 100755 --- a/source/l/libical/libical.SlackBuild +++ b/source/l/libical/libical.SlackBuild @@ -86,13 +86,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/libical.true.false.diff.gz | patch -p1 --verbose || exit 1 +# -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise. mkdir build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc \ diff --git a/source/l/libical/libical.true.false.diff b/source/l/libical/libical.true.false.diff deleted file mode 100644 index c1dda350b..000000000 --- a/source/l/libical/libical.true.false.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- ./src/libical/icalrecur.c.orig 2020-03-07 08:42:42.000000000 -0600 -+++ ./src/libical/icalrecur.c 2020-10-30 03:56:12.509914568 -0500 -@@ -142,6 +142,14 @@ - #include <stddef.h> /* For offsetof() macro */ - #include <stdlib.h> - -+#ifndef FALSE -+#define FALSE (0) -+#endif -+ -+#ifndef TRUE -+#define TRUE (!FALSE) -+#endif -+ - #if defined(HAVE_LIBICU) - #include <unicode/ucal.h> - #include <unicode/ustring.h> |