use %p for pointer formats

added 64bit FHS lookup

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1293 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index 66d7e3bb91f22308da1568eae7fbb0698d49b920..e2f4e952ccd9f0689eab8348f812d0ca98553307 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-04  Helge Hess  <helge.hess@opengroupware.org>
+
+       * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.75)
+
 2006-05-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * iCalDataSource.h, common.h: changed EOControl related includes into

diff --git a/sope-ical/NGiCal/GNUmakefile.preamble b/sope-ical/NGiCal/GNUmakefile.preamble
index c7e2334c3e39941aa4c49665ffe380194e297855..0a25da1b5e5bb7bbf7617036422198ee9a7668c7 100644 (file)
--- 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 8be6a93aaadcc4d65e01100e8d74e80dbe0d9c28..09176016650626394df494d6ddd4648b57d9d6f7 100644 (file)
--- 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 1d9aa6d79d846dccb423b1959b1c2ce9ddd2648f..5c63d213d31ed321304266ffd30c30bbb5aada72 100644 (file)
--- 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 b9d4ae75649ddcdef8b54bd51d503e2f91d31471..6667c10355c12482862a0313ca62b60297efd683 100644 (file)
--- 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 d8d5f9b8b4915468f78d1d83a1d223399c21f61c..a6525edc4620b08ace2bb97066dbb97cd807d31a 100644 (file)
--- 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 56fd27ac064178ea7d69310b09a07db53049b0e7..6afd2837c4ff2ac150b5a6260dfb4d7cf10faed2 100644 (file)
--- 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 7cbda852cb5f64cdcf9b346514de110eb80dd067..ae83eca57649b79aae70d986be0021afd5bd7f89 100644 (file)
--- 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 9305570934e1eb04b2ceae1676d5d8d82d54c22e..364bc1c694e51d94e0b1588988713f6903fc3e0f 100644 (file)
--- 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 9f12d2e72958f5e06a2c63a8a68503fb5d734acc..91c4e0a8c5b9687d363b357fd23483832443a311 100644 (file)
--- 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 ba48b0a3aa8f926b6f85868e90ceaaa919ecd146..dcedc58a4ce1bc9e00cd163b97c2daa2998ed815 100644 (file)
--- 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 e0f1b84f912c37ba0ac70d8dcc2087012eafe626..6a7401c1386953a3eee94274d956dac6b3059c0c 100644 (file)
--- 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 bcae215556421c926f32afba9b985d37a2173ede..53ddceb63f90fd6df08f54d1ff3037f03b468f54 100644 (file)
--- 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 13f783a2a532149c672dcfe9eda6f517e4062929..6cbba49ab49ecbf02293e723290822f621387179 100644 (file)
--- 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 4c8d08af79f398f6de6b1dee8281d21b6b72fbfd..3b07312820bf5e445c204922425729f5a26b37dc 100644 (file)
--- 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 9891168a499d17f3465c3d14721b4e22fc4aefc8..236db4391342df54df3fe7a169ae3f98e8c71a7c 100644 (file)
--- 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 666788daee7a32f51af9f1ab9856fb16d14b7de3..b264443602efa056cfeb99c2192ee7751cc0efbe 100644 (file)
--- a/sope-ical/versitSaxDriver/ChangeLog
+++ b/sope-ical/versitSaxDriver/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-04  Helge Hess  <helge.hess@opengroupware.org>
+
+       * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.24)
+
 2006-04-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * GNUmakefile: properly declare principal class (v4.5.23)

diff --git a/sope-ical/versitSaxDriver/GNUmakefile.preamble b/sope-ical/versitSaxDriver/GNUmakefile.preamble
index 95fbfac6e9d165736603653fd529c79b4ef946bc..5f1698d189ce4da2084d60dbef3adfd23a73d3f3 100644 (file)
--- 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 df94370fd9e1d2a1284db8d7663ae9d146759f69..afe7e90ccd1923fdf67837bd8034e836d0a51b76 100644 (file)
--- 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 = @"<string>";

diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version
index 163b203ad0c7120d58b9ce15c0cc35cd2e41ff48..cc1a956cb50d34460aac41504d01ea67f79a8326 100644 (file)
--- 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 5660415198d149caa3def5ace6273cacbfb42513..1c4781803d73a10551ff674c10a9b5a98d42171d 100644 (file)
--- 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 ::