From 5eec75fe5c79a3550da3ad6eddfcdc945a721997 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 3 Jul 2006 22:34:46 +0000 Subject: [PATCH] use %p for pointer formats added 64bit FHS lookup git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1293 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-ical/NGiCal/ChangeLog | 4 ++++ sope-ical/NGiCal/GNUmakefile.preamble | 4 ++++ sope-ical/NGiCal/NGVCard.m | 2 +- sope-ical/NGiCal/NGVCardValue.m | 2 +- sope-ical/NGiCal/Version | 2 +- sope-ical/NGiCal/fhs.make | 7 ++++++- sope-ical/NGiCal/iCalAlarm.m | 2 +- sope-ical/NGiCal/iCalAttachment.m | 2 +- sope-ical/NGiCal/iCalCalendar.m | 2 +- sope-ical/NGiCal/iCalDateHolder.m | 2 +- sope-ical/NGiCal/iCalEvent.m | 2 +- sope-ical/NGiCal/iCalEventChanges.m | 2 +- sope-ical/NGiCal/iCalFreeBusy.m | 2 +- sope-ical/NGiCal/iCalPerson.m | 2 +- sope-ical/NGiCal/iCalToDo.m | 2 +- sope-ical/NGiCal/iCalTrigger.m | 2 +- sope-ical/versitSaxDriver/ChangeLog | 4 ++++ sope-ical/versitSaxDriver/GNUmakefile.preamble | 4 ++++ sope-ical/versitSaxDriver/VSSaxDriver.m | 4 ++-- sope-ical/versitSaxDriver/Version | 2 +- sope-ical/versitSaxDriver/fhs.make | 4 ++++ 21 files changed, 42 insertions(+), 17 deletions(-) diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog index 66d7e3bb..e2f4e952 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/ChangeLog @@ -1,3 +1,7 @@ +2006-07-04 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.75) + 2006-05-16 Marcus Mueller * iCalDataSource.h, common.h: changed EOControl related includes into diff --git a/sope-ical/NGiCal/GNUmakefile.preamble b/sope-ical/NGiCal/GNUmakefile.preamble index c7e2334c..0a25da1b 100644 --- a/sope-ical/NGiCal/GNUmakefile.preamble +++ b/sope-ical/NGiCal/GNUmakefile.preamble @@ -45,7 +45,11 @@ ADDITIONAL_LIB_DIRS += \ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif # Apple diff --git a/sope-ical/NGiCal/NGVCard.m b/sope-ical/NGiCal/NGVCard.m index 8be6a93a..09176016 100644 --- a/sope-ical/NGiCal/NGVCard.m +++ b/sope-ical/NGiCal/NGVCard.m @@ -330,7 +330,7 @@ static NGVCardSaxHandler *sax = nil; // THREAD NSMutableString *str = nil; str = [NSMutableString stringWithCapacity:64]; - [str appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [str appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [self appendAttributesToDescription:str]; [str appendString:@">"]; return str; diff --git a/sope-ical/NGiCal/NGVCardValue.m b/sope-ical/NGiCal/NGVCardValue.m index 1d9aa6d7..5c63d213 100644 --- a/sope-ical/NGiCal/NGVCardValue.m +++ b/sope-ical/NGiCal/NGVCardValue.m @@ -157,7 +157,7 @@ NSMutableString *str = nil; str = [NSMutableString stringWithCapacity:64]; - [str appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [str appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [self appendAttributesToDescription:str]; [str appendString:@">"]; return str; diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version index b9d4ae75..6667c103 100644 --- a/sope-ical/NGiCal/Version +++ b/sope-ical/NGiCal/Version @@ -2,7 +2,7 @@ MAJOR_VERSION=4 MINOR_VERSION=5 -SUBMINOR_VERSION:=74 +SUBMINOR_VERSION:=75 # v4.5.40 requires NGExtensions v4.5.145 # v4.5.37 requires NGExtensions v4.5.140 diff --git a/sope-ical/NGiCal/fhs.make b/sope-ical/NGiCal/fhs.make index d8d5f9b8..a6525edc 100644 --- a/sope-ical/NGiCal/fhs.make +++ b/sope-ical/NGiCal/fhs.make @@ -5,9 +5,14 @@ ifneq ($(FHS_INSTALL_ROOT),) FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ -FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif + fhs-header-dirs :: $(MKDIRS) $(FHS_INCLUDE_DIR)$(libNGiCal_HEADER_FILES_INSTALL_DIR) diff --git a/sope-ical/NGiCal/iCalAlarm.m b/sope-ical/NGiCal/iCalAlarm.m index 56fd27ac..6afd2837 100644 --- a/sope-ical/NGiCal/iCalAlarm.m +++ b/sope-ical/NGiCal/iCalAlarm.m @@ -92,7 +92,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->action) [ms appendFormat:@" action=%@", self->action]; diff --git a/sope-ical/NGiCal/iCalAttachment.m b/sope-ical/NGiCal/iCalAttachment.m index 7cbda852..ae83eca5 100644 --- a/sope-ical/NGiCal/iCalAttachment.m +++ b/sope-ical/NGiCal/iCalAttachment.m @@ -52,7 +52,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->valueType) [ms appendFormat:@" type=%@", self->valueType]; diff --git a/sope-ical/NGiCal/iCalCalendar.m b/sope-ical/NGiCal/iCalCalendar.m index 93055709..364bc1c6 100644 --- a/sope-ical/NGiCal/iCalCalendar.m +++ b/sope-ical/NGiCal/iCalCalendar.m @@ -270,7 +270,7 @@ static SaxObjectDecoder *sax = nil; // THREAD NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->version) [ms appendFormat:@" v%@", self->version]; if (self->method) [ms appendFormat:@" method=%@", self->method]; diff --git a/sope-ical/NGiCal/iCalDateHolder.m b/sope-ical/NGiCal/iCalDateHolder.m index 9f12d2e7..91c4e0a8 100644 --- a/sope-ical/NGiCal/iCalDateHolder.m +++ b/sope-ical/NGiCal/iCalDateHolder.m @@ -171,7 +171,7 @@ static NSTimeZone *gmt = nil; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [self appendAttributesToDescription:ms]; [ms appendString:@">"]; return ms; diff --git a/sope-ical/NGiCal/iCalEvent.m b/sope-ical/NGiCal/iCalEvent.m index ba48b0a3..dcedc58a 100644 --- a/sope-ical/NGiCal/iCalEvent.m +++ b/sope-ical/NGiCal/iCalEvent.m @@ -228,7 +228,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->uid) [ms appendFormat:@" uid=%@", self->uid]; if (self->startDate) [ms appendFormat:@" from=%@", self->startDate]; diff --git a/sope-ical/NGiCal/iCalEventChanges.m b/sope-ical/NGiCal/iCalEventChanges.m index e0f1b84f..6a7401c1 100644 --- a/sope-ical/NGiCal/iCalEventChanges.m +++ b/sope-ical/NGiCal/iCalEventChanges.m @@ -197,7 +197,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [ms appendFormat:@" updatedProperties=%@", self->updatedProperties]; [ms appendFormat:@" insertedAttendees=%@", self->insertedAttendees]; diff --git a/sope-ical/NGiCal/iCalFreeBusy.m b/sope-ical/NGiCal/iCalFreeBusy.m index bcae2155..53ddceb6 100644 --- a/sope-ical/NGiCal/iCalFreeBusy.m +++ b/sope-ical/NGiCal/iCalFreeBusy.m @@ -108,7 +108,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->startDate) [ms appendFormat:@" from=%@", self->startDate]; if (self->endDate) [ms appendFormat:@" to=%@", self->endDate]; diff --git a/sope-ical/NGiCal/iCalPerson.m b/sope-ical/NGiCal/iCalPerson.m index 13f783a2..6cbba49a 100644 --- a/sope-ical/NGiCal/iCalPerson.m +++ b/sope-ical/NGiCal/iCalPerson.m @@ -246,7 +246,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->cn) [ms appendFormat:@" cn=%@", self->cn]; if (self->email) [ms appendFormat:@" email=%@", self->email]; diff --git a/sope-ical/NGiCal/iCalToDo.m b/sope-ical/NGiCal/iCalToDo.m index 4c8d08af..3b073128 100644 --- a/sope-ical/NGiCal/iCalToDo.m +++ b/sope-ical/NGiCal/iCalToDo.m @@ -90,7 +90,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->uid) [ms appendFormat:@" uid=%@", self->uid]; if (self->startDate) [ms appendFormat:@" start=%@", self->startDate]; diff --git a/sope-ical/NGiCal/iCalTrigger.m b/sope-ical/NGiCal/iCalTrigger.m index 9891168a..236db439 100644 --- a/sope-ical/NGiCal/iCalTrigger.m +++ b/sope-ical/NGiCal/iCalTrigger.m @@ -65,7 +65,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->valueType) [ms appendFormat:@" type=%@", self->valueType]; diff --git a/sope-ical/versitSaxDriver/ChangeLog b/sope-ical/versitSaxDriver/ChangeLog index 666788da..b2644436 100644 --- a/sope-ical/versitSaxDriver/ChangeLog +++ b/sope-ical/versitSaxDriver/ChangeLog @@ -1,3 +1,7 @@ +2006-07-04 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.24) + 2006-04-21 Marcus Mueller * GNUmakefile: properly declare principal class (v4.5.23) diff --git a/sope-ical/versitSaxDriver/GNUmakefile.preamble b/sope-ical/versitSaxDriver/GNUmakefile.preamble index 95fbfac6..5f1698d1 100644 --- a/sope-ical/versitSaxDriver/GNUmakefile.preamble +++ b/sope-ical/versitSaxDriver/GNUmakefile.preamble @@ -40,4 +40,8 @@ ADDITIONAL_LIB_DIRS += \ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif diff --git a/sope-ical/versitSaxDriver/VSSaxDriver.m b/sope-ical/versitSaxDriver/VSSaxDriver.m index df94370f..afe7e90c 100644 --- a/sope-ical/versitSaxDriver/VSSaxDriver.m +++ b/sope-ical/versitSaxDriver/VSSaxDriver.m @@ -972,7 +972,7 @@ static VSStringFormatter *stringFormatter = nil; id source; if (debugOn) { - NSLog(@"%s: trying to decode data (0x%08X,len=%d) ...", + NSLog(@"%s: trying to decode data (0x%p,len=%d) ...", __PRETTY_FUNCTION__, _data, [_data length]); } @@ -1075,7 +1075,7 @@ static VSStringFormatter *stringFormatter = nil; /* start parsing */ if (debugOn) { - NSLog(@"%s: trying to parse string (0x%08X,len=%d) ...", + NSLog(@"%s: trying to parse string (0x%p,len=%d) ...", __PRETTY_FUNCTION__, _source, [_source length]); } if (_sysId == nil) _sysId = @""; diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version index 163b203a..cc1a956c 100644 --- a/sope-ical/versitSaxDriver/Version +++ b/sope-ical/versitSaxDriver/Version @@ -1,3 +1,3 @@ # Version file -SUBMINOR_VERSION:=23 +SUBMINOR_VERSION:=24 diff --git a/sope-ical/versitSaxDriver/fhs.make b/sope-ical/versitSaxDriver/fhs.make index 56604151..1c478180 100644 --- a/sope-ical/versitSaxDriver/fhs.make +++ b/sope-ical/versitSaxDriver/fhs.make @@ -4,7 +4,11 @@ ifneq ($(FHS_INSTALL_ROOT),) +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/ +else FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +endif FHS_SAX_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxdrivers/ fhs-sax-dirs :: -- 2.39.5