Package: sylpheed-claws-vcalendar-plugin
Version: 0.9-1
Severity: serious
Tags: patch
Hi,
sylpheed-claws-vcalendar-plugin ftbfs with gcc 4.0
Attached are a couple of patches :
-fixing gcc 4.0 errors
-updating config.{sub,guess} and disabling building of shared library
and python bindings for libical
-setting 2 variables as static in libical, this could be tried to fix
#300573
HTH
Regards
Regis
--
"While a monkey can be a manager, it takes a human to be an engineer"
Erik Zapletal
diff -urN sylpheed-claws-vcalendar-plugin-0.9_orig/debian/rules sylpheed-claws-vcalendar-plugin-0.9/debian/rules
--- sylpheed-claws-vcalendar-plugin-0.9_orig/debian/rules 2005-07-28 22:47:25.354564872 +0100
+++ sylpheed-claws-vcalendar-plugin-0.9/debian/rules 2005-07-28 23:42:08.724416784 +0100
@@ -30,7 +30,8 @@
touch build-stamp
libical-build-install:
- cd $(ICAL) && ./configure --prefix=$(CURDIR)/$(ICALINST)
+ cd $(ICAL) && ./configure --prefix=$(CURDIR)/$(ICALINST) \
+ --disable-shared --enable-python-bindings=no
cd $(ICAL) && $(MAKE)
cd $(ICAL) && $(MAKE) install
touch libical-build-install
@@ -54,9 +55,11 @@
-$(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.sub $(ICAL)/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
+ cp -f /usr/share/misc/config.guess $(ICAL)/config.guess
endif
dh_clean
diff -urN sylpheed-claws-vcalendar-plugin-0.9_orig/libical-0.23/src/libical/icalderivedparameter.c.in sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalderivedparameter.c.in
--- sylpheed-claws-vcalendar-plugin-0.9_orig/libical-0.23/src/libical/icalderivedparameter.c.in 2001-04-01 21:08:19.000000000 +0100
+++ sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalderivedparameter.c.in 2005-07-28 22:51:34.874632056 +0100
@@ -55,7 +55,7 @@
};
-extern struct icalparameter_kind_map parameter_map[];
+static struct icalparameter_kind_map parameter_map[];
const char* icalparameter_kind_to_string(icalparameter_kind kind)
@@ -129,7 +129,7 @@
};
-extern struct icalparameter_map icalparameter_map[];
+static struct icalparameter_map icalparameter_map[];
const char* icalparameter_enum_to_string(int e)
diff -urN sylpheed-claws-vcalendar-plugin-0.9_orig/libical-0.23/src/libical/icalderivedproperty.c.in sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalderivedproperty.c.in
--- sylpheed-claws-vcalendar-plugin-0.9_orig/libical-0.23/src/libical/icalderivedproperty.c.in 2001-04-01 21:08:19.000000000 +0100
+++ sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalderivedproperty.c.in 2005-07-28 22:54:12.743632320 +0100
@@ -59,7 +59,7 @@
};
-extern struct icalproperty_map property_map[];
+static struct icalproperty_map property_map[];
const char* icalproperty_kind_to_string(icalproperty_kind kind)
{
@@ -139,7 +139,7 @@
const char* str;
};
-extern struct icalproperty_enum_map enum_map[];
+static struct icalproperty_enum_map enum_map[];
const char* icalproperty_enum_to_string(int e)
diff -urN sylpheed-claws-vcalendar-plugin-0.9_orig/libical-0.23/src/libical/icalderivedvalue.c.in sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalderivedvalue.c.in
--- sylpheed-claws-vcalendar-plugin-0.9_orig/libical-0.23/src/libical/icalderivedvalue.c.in 2001-04-01 21:08:19.000000000 +0100
+++ sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalderivedvalue.c.in 2005-07-28 22:58:29.722565584 +0100
@@ -60,7 +60,7 @@
char name[20];
};
-extern struct icalvalue_kind_map value_map[];
+static struct icalvalue_kind_map value_map[];
const char* icalvalue_kind_to_string(icalvalue_kind kind)
{
diff -urN sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalmemory.c sylpheed-claws-vcalendar-plugin-0.9.work/libical-0.23/src/libical/icalmemory.c
--- sylpheed-claws-vcalendar-plugin-0.9/libical-0.23/src/libical/icalmemory.c 2001-02-09 07:31:08.000000000 +0000
+++ sylpheed-claws-vcalendar-plugin-0.9.work/libical-0.23/src/libical/icalmemory.c 2005-08-06 21:06:40.704174128 +0100
@@ -68,8 +68,8 @@
/* HACK. Not threadsafe */
void* buffer_ring[BUFFER_RING_SIZE];
-int buffer_pos = -1;
-int initialized = 0;
+static int buffer_pos = -1;
+static int initialized = 0;
/* Add an existing buffer to the buffer ring */
void icalmemory_add_tmp_buffer(void* buf)
