summaryrefslogtreecommitdiff
path: root/dev-libs/libmcal/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
commit1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch)
treee48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/libmcal/files
parentd87262dd706fec50cd150aab3e93883b6337466d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libmcal/files')
-rw-r--r--dev-libs/libmcal/files/libmcal-0.7-flex-2.5.37.patch14
-rw-r--r--dev-libs/libmcal/files/libmcal-0.7-flexfix.patch29
-rw-r--r--dev-libs/libmcal/files/libmcal-0.7-fpic.patch56
-rw-r--r--dev-libs/libmcal/files/libmcal-0.7-gcc4.patch32
-rw-r--r--dev-libs/libmcal/files/libmcal-0.7-libdir.patch25
-rw-r--r--dev-libs/libmcal/files/libmcal-0.7-r6-fpic.patch56
-rw-r--r--dev-libs/libmcal/files/libmcal-0.7-r6-gcc4.patch34
7 files changed, 0 insertions, 246 deletions
diff --git a/dev-libs/libmcal/files/libmcal-0.7-flex-2.5.37.patch b/dev-libs/libmcal/files/libmcal-0.7-flex-2.5.37.patch
deleted file mode 100644
index 8c2e38699876..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-flex-2.5.37.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmcal.orig/icalroutines.h 2003-01-28 18:45:21.000000000 +0100
-+++ libmcal/icalroutines.h 2013-02-04 01:54:27.833995640 +0100
-@@ -48,8 +48,10 @@
-
-
- /* ICAL parser. */
-+#ifndef ical_yytext
- extern char *ical_yytext;
--extern int ical_yyleng;
-+extern size_t ical_yyleng;
-+#endif
- int ical_yylex(void);
- void ical_usebuf(const char *buf, size_t size);
- void ical_preprocess(char *buf, size_t *size);
diff --git a/dev-libs/libmcal/files/libmcal-0.7-flexfix.patch b/dev-libs/libmcal/files/libmcal-0.7-flexfix.patch
deleted file mode 100644
index 0088dce4ccc8..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-flexfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libmcal/icalscanner.lex 2003-01-28 09:45:21.000000000 -0800
-+++ libmcal/icalscanner.lex.new 2006-04-01 22:47:58.515410944 -0800
-@@ -32,13 +32,6 @@
- */
-
- #include "icalroutines.h"
--
--void
--ical_usebuf(const char *buf, size_t size)
--{
-- BEGIN(INITIAL);
-- yy_scan_bytes(buf, size);
--}
- %}
-
-
-@@ -68,3 +61,12 @@
- {LF} BEGIN(INITIAL); return ICALTOK_LF;
- . return ICALTOK_JUNK;
- <<EOF>> return ICALTOK_EOF;
-+
-+%%
-+
-+void
-+ical_usebuf(const char *buf, size_t size)
-+{
-+ BEGIN(INITIAL);
-+ yy_scan_bytes(buf, size);
-+}
diff --git a/dev-libs/libmcal/files/libmcal-0.7-fpic.patch b/dev-libs/libmcal/files/libmcal-0.7-fpic.patch
deleted file mode 100644
index be003d354a4c..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-fpic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in 2003-11-27 15:46:46.887752568 +0000
-+++ Makefile.in 2003-11-27 16:14:17.325847840 +0000
-@@ -7,7 +7,7 @@
-
- INCLUDE=@DRIVER_INCDIR@ ${OTHERINCDIR} -I.
-
--CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
-+CFLAGS=-O0 -Wall -g ${OTHER_CFLAGS}
-
- LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
- ALLOBJS=${LIBOBJS} tester.o
-@@ -17,6 +17,9 @@
- LIBCAL=libmcal.a
- LIBCAL_SO=libmcal.so
-
-+%.o: %.c
-+ gcc $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
- all: libmcal.a libmcal.so
-
- install: libmcal.a libmcal.so
-@@ -38,7 +41,7 @@
-
- libmcal.so: $(LIBOBJS)
- rm -f $(LIBCAL_SO)
-- gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
-+ gcc $(CFLAGS) $(INCLUDE) -shared -o $(LIBCAL_SO) $(LIBOBJS)
-
- lex.ical_yy.c: icalscanner.lex
- $(FLEX) $<
---- mstore/Makefile.old 2004-08-08 16:37:13.641537544 +0100
-+++ mstore/Makefile 2004-08-08 16:37:35.473218624 +0100
-@@ -8,6 +8,10 @@
- ALLOBJS=mstore.o
- TARGET=mstore_driver.o
-
-+%.o: %.c
-+ gcc $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
-
-
---- icap/Makefile.old 2004-08-08 16:38:58.353618888 +0100
-+++ icap/Makefile 2004-08-08 16:39:18.841504256 +0100
-@@ -7,6 +7,10 @@
- ALLOBJS=icap.o icaproutines.o lex.icap_yy.o
- TARGET=icap_driver.o
-
-+%.o: %.c
-+ gcc $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
-
-
diff --git a/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch b/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch
deleted file mode 100644
index d38d0c356dcb..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/icap/icap.c 2003-01-28 18:31:33.000000000 +0100
-+++ b/icap/icap.c 2005-08-12 15:04:36.000000000 +0200
-@@ -159,7 +159,7 @@
- if (!reopen) {
- if ((stream = calloc(1, sizeof(*stream))) == NULL)
- goto fail;
-- if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+ if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- goto fail;
-
- /* Copy host. */
---- a/mstore/mstore.c 2005-08-12 15:30:52.000000000 +0200
-+++ b/mstore/mstore.c 2005-08-12 15:31:38.000000000 +0200
-@@ -308,7 +308,7 @@
- if (!reopen) {
- if ((stream = calloc(1, sizeof(*stream))) == NULL)
- goto fail;
-- if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+ if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- goto fail;
- }
-
-@@ -773,7 +773,7 @@
- while((event=read_event(calfile))) {
- if (event->id == modified_event->id)
- {
-- (const CALEVENT*)event = modified_event;
-+ event = modified_event;
- /*is more required here to assign objects, a loop through all the properties*/
- /* We actually only want to modify any individual property, not the whole thing..
- TODO */
-
diff --git a/dev-libs/libmcal/files/libmcal-0.7-libdir.patch b/dev-libs/libmcal/files/libmcal-0.7-libdir.patch
deleted file mode 100644
index b784993aed01..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-libdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur libmcal.orig/Makefile.in libmcal/Makefile.in
---- libmcal.orig/Makefile.in 2003-01-28 09:45:21.000000000 -0800
-+++ libmcal/Makefile.in 2005-02-06 21:20:58.860199158 -0800
-@@ -20,17 +20,17 @@
- all: libmcal.a libmcal.so
-
- install: libmcal.a libmcal.so
-- mkdir -p ${DESTDIR}@prefix@/lib/
-+ mkdir -p ${DESTDIR}@libdir@
- mkdir -p ${DESTDIR}@prefix@/include/mcal/
-- install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@prefix@/lib
-+ install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@libdir@
- install -m 644 -o 0 -g 0 \
- mcal.h bool.h datetime.h drivers.h cal_misc.h icalroutines.h \
- ${DESTDIR}@prefix@/include/mcal/
- touch installed
-
- install-strip: installed
-- strip ${DESTDIR}@prefix@/lib/libmcal.so
-- strip ${DESTDIR}@prefix@/lib/libmcal.a
-+ strip ${DESTDIR}@libdir@/libmcal.so
-+ strip ${DESTDIR}@libdir@/libmcal.a
-
- libmcal.a: $(LIBOBJS)
- rm -f $(LIBCAL)
diff --git a/dev-libs/libmcal/files/libmcal-0.7-r6-fpic.patch b/dev-libs/libmcal/files/libmcal-0.7-r6-fpic.patch
deleted file mode 100644
index 72a199a3a57e..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-r6-fpic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in 2003-11-27 15:46:46.887752568 +0000
-+++ Makefile.in 2003-11-27 16:14:17.325847840 +0000
-@@ -7,7 +7,7 @@
-
- INCLUDE=@DRIVER_INCDIR@ ${OTHERINCDIR} -I.
-
--CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
-+CFLAGS=-O0 -Wall -g ${OTHER_CFLAGS}
-
- LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
- ALLOBJS=${LIBOBJS} tester.o
-@@ -17,6 +17,9 @@
- LIBCAL=libmcal.a
- LIBCAL_SO=libmcal.so
-
-+%.o: %.c
-+ $(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
- all: libmcal.a libmcal.so
-
- install: libmcal.a libmcal.so
-@@ -38,7 +41,7 @@
-
- libmcal.so: $(LIBOBJS)
- rm -f $(LIBCAL_SO)
-- gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
-+ $(CC) -Wl,-soname=$@ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -o $(LIBCAL_SO) $(LIBOBJS)
-
- lex.ical_yy.c: icalscanner.lex
- $(FLEX) $<
---- mstore/Makefile.old 2004-08-08 16:37:13.641537544 +0100
-+++ mstore/Makefile 2004-08-08 16:37:35.473218624 +0100
-@@ -8,6 +8,10 @@
- ALLOBJS=mstore.o
- TARGET=mstore_driver.o
-
-+%.o: %.c
-+ $(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
-
-
---- icap/Makefile.old 2004-08-08 16:38:58.353618888 +0100
-+++ icap/Makefile 2004-08-08 16:39:18.841504256 +0100
-@@ -7,6 +7,10 @@
- ALLOBJS=icap.o icaproutines.o lex.icap_yy.o
- TARGET=icap_driver.o
-
-+%.o: %.c
-+ $(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
-
-
diff --git a/dev-libs/libmcal/files/libmcal-0.7-r6-gcc4.patch b/dev-libs/libmcal/files/libmcal-0.7-r6-gcc4.patch
deleted file mode 100644
index 065a82dc24c3..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-r6-gcc4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN libmcal-/icap/icap.c icap/icap.c
---- libmcal/icap/icap.c 2003-01-28 18:31:33.000000000 +0100
-+++ icap/icap.c 2005-08-12 15:04:36.000000000 +0200
-@@ -159,7 +159,7 @@
- if (!reopen) {
- if ((stream = calloc(1, sizeof(*stream))) == NULL)
- goto fail;
-- if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+ if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- goto fail;
-
- /* Copy host. */
-diff -urN libmcal/mstore/mstore.c mstore/mstore.c
---- libmcal/mstore/mstore.c 2005-08-12 15:30:52.000000000 +0200
-+++ mstore/mstore.c 2005-08-12 15:31:38.000000000 +0200
-@@ -308,7 +308,7 @@
- if (!reopen) {
- if ((stream = calloc(1, sizeof(*stream))) == NULL)
- goto fail;
-- if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+ if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- goto fail;
- }
-
-@@ -773,7 +773,7 @@
- while((event=read_event(calfile))) {
- if (event->id == modified_event->id)
- {
-- (const CALEVENT*)event = modified_event;
-+ event = modified_event;
- /*is more required here to assign objects, a loop through all the properties*/
- /* We actually only want to modify any individual property, not the whole thing..
- TODO */
-