SF.net SVN: gar:[22813] csw/mgar/pkg

[dmichelsen at users.sourceforge.net]

Revision: 22813
          http://sourceforge.net/p/gar/code/22813
Author:   dmichelsen
Date:     2014-01-09 16:12:07 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
iksemel/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/iksemel/
    csw/mgar/pkg/iksemel/Makefile
    csw/mgar/pkg/iksemel/branches/
    csw/mgar/pkg/iksemel/tags/
    csw/mgar/pkg/iksemel/trunk/
    csw/mgar/pkg/iksemel/trunk/Makefile
    csw/mgar/pkg/iksemel/trunk/checksums
    csw/mgar/pkg/iksemel/trunk/files/
    csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch

Added: csw/mgar/pkg/iksemel/Makefile
===================================================================
--- csw/mgar/pkg/iksemel/Makefile	                        (rev 0)
+++ csw/mgar/pkg/iksemel/Makefile	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/iksemel/trunk
===================================================================
--- csw/mgar/pkg/iksemel/trunk	2014-01-09 16:08:01 UTC (rev 22812)
+++ csw/mgar/pkg/iksemel/trunk	2014-01-09 16:12:07 UTC (rev 22813)

Property changes on: csw/mgar/pkg/iksemel/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/iksemel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iksemel/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/iksemel/trunk/Makefile	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1,35 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = iksemel
+VERSION = 1.4
+GARTYPE = v2
+
+DESCRIPTION = Fast and portable XML parser and Jabber protocol library
+
+MASTER_SITES = $(GOOGLE_MIRROR)
+DISTFILES  = $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Adjust-alignment.patch
+
+PACKAGES += CSWlibiksemel3
+SPKG_DESC_CSWlibiksemel3 = Fast and portable XML parser and Jabber protocol library, libiksemel.so.3
+PKGFILES_CSWlibiksemel3 += $(call pkgfiles_lib,libiksemel.so.3)
+
+PACKAGES += CSWlibiksemel-dev
+SPKG_DESC_CSWlibiksemel-dev = Development files for libiksemel.so.3
+PKGFILES_CSWlibiksemel-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibiksemel-dev += CSWlibiksemel3
+
+PACKAGES += CSWiksemel
+SPKG_DESC_CSWiksemel = Jabber protocol utilities
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWiksemel += CSWlibiksemel3
+
+BUILD64 = 1
+ISAEXEC = 1
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/iksemel/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/iksemel/trunk/checksums
===================================================================
--- csw/mgar/pkg/iksemel/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/iksemel/trunk/checksums	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1 @@
+532e77181694f87ad5eb59435d11c1ca  iksemel-1.4.tar.gz

Added: csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch
===================================================================
--- csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch	                        (rev 0)
+++ csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1,61 @@
+From a120c658914d3941bd1c82d73e13e1aad256e942 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 9 Jan 2014 16:43:00 +0100
+Subject: [PATCH] Adjust alignment
+
+---
+ src/ikstack.c      | 24 ++++++++++++++++++++----
+ test/tst-ikstack.c | 12 ++++++++++--
+ 2 files changed, 30 insertions(+), 6 deletions(-)
+
+diff --git a/src/ikstack.c b/src/ikstack.c
+index bed4656..9c46cc7 100644
+--- a/src/ikstack.c
++++ b/src/ikstack.c
+@@ -7,9 +7,18 @@
+ #include "common.h"
+ #include "iksemel.h"
+ 
+-struct align_test { char a; double b; };
+-#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++// struct align_test { char a; double b; };
++struct align_test {
++	struct ikschunk_struct *next;
++	size_t size;
++	size_t used;
++	size_t last;
++	char data[4];
++};
++// #define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &(((struct align_test *) 0)->data) - (char *) &(((struct align_test *) 0)->last)))
+ #define ALIGN_MASK ( DEFAULT_ALIGNMENT - 1 )
++
+ #define MIN_CHUNK_SIZE ( DEFAULT_ALIGNMENT * 8 )
+ #define MIN_ALLOC_SIZE DEFAULT_ALIGNMENT
+ #define ALIGN(x) ( (x) + (DEFAULT_ALIGNMENT - ( (x) & ALIGN_MASK)) )
+diff --git a/test/tst-ikstack.c b/test/tst-ikstack.c
+index aba36af..77179b4 100644
+--- a/test/tst-ikstack.c
++++ b/test/tst-ikstack.c
+@@ -10,8 +10,16 @@
+ 
+ #include "iksemel.h"
+ 
+-struct align_test { char a; double b; };
+-#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++// struct align_test { char a; double b; };
++// #define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++struct align_test {
++        struct ikschunk_struct *next;
++        size_t size;
++        size_t used;
++        size_t last;
++        char data[4];
++};
++#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &(((struct align_test *) 0)->data) - (char *) &(((struct align_test *) 0)->last)))
+ #define ALIGN_MASK ( DEFAULT_ALIGNMENT - 1 )
+ 
+ const char buf[] = "1234567890abcdefghijklmnopqrstuv";
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.