[csw-devel] SF.net SVN: gar:[11692] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Nov 22 17:13:34 CET 2010
Revision: 11692
http://gar.svn.sourceforge.net/gar/?rev=11692&view=rev
Author: dmichelsen
Date: 2010-11-22 16:13:34 +0000 (Mon, 22 Nov 2010)
Log Message:
-----------
libemf: Initial commit
Added Paths:
-----------
csw/mgar/pkg/libemf/
csw/mgar/pkg/libemf/branches/
csw/mgar/pkg/libemf/tags/
csw/mgar/pkg/libemf/trunk/
csw/mgar/pkg/libemf/trunk/Makefile
csw/mgar/pkg/libemf/trunk/checksums
csw/mgar/pkg/libemf/trunk/files/
csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch
csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch
csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch
csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch
Property changes on: csw/mgar/pkg/libemf/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/libemf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libemf/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/libemf/trunk/Makefile 2010-11-22 16:13:34 UTC (rev 11692)
@@ -0,0 +1,32 @@
+# $Id$
+GARNAME = libemf
+GARVERSION = 1.0.4
+CATEGORIES = lib
+
+DESCRIPTION = Library implementation of ECMA-234 API for the generation of enhanced metafiles
+define BLURB
+endef
+
+MASTER_SITES = $(SF_MIRROR)
+DISTNAME = libEMF-$(GARVERSION)
+DISTFILES = $(DISTNAME).tar.gz
+
+PATCHFILES = 0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch
+PATCHFILES += 0002-Remove-unneeded-definition-causing-link-errors.patch
+PATCHFILES += 0003-Always-use-csw-libtool.patch
+PATCHFILES += 0004-Do-not-use-link-against-libstdc.patch
+
+VENDOR_URL = http://libemf.sourceforge.net/
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# *We* can do 64 bit, but the tests dump core in CSWglib2 2.23.5,REV=2010.03.09
+# Re-enable when glib2 gets refreshed.
+# BUILD64 = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+
+TEST_TARGET = check
+
+include gar/category.mk
+
Property changes on: csw/mgar/pkg/libemf/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/libemf/trunk/checksums
===================================================================
--- csw/mgar/pkg/libemf/trunk/checksums (rev 0)
+++ csw/mgar/pkg/libemf/trunk/checksums 2010-11-22 16:13:34 UTC (rev 11692)
@@ -0,0 +1 @@
+23effe03c1b2eeb5229f14e461204198 libEMF-1.0.4.tar.gz
Added: csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch (rev 0)
+++ csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch 2010-11-22 16:13:34 UTC (rev 11692)
@@ -0,0 +1,93 @@
+From ce43acc3cf6e579264d7333221deb7c81bb29b54 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 22 Nov 2010 16:51:08 +0100
+Subject: [PATCH] Add __sparc and __i386 in addition to __*__
+
+---
+ include/libEMF/wine/winnt.h | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h
+index a455290..5aed45f 100644
+--- a/include/libEMF/wine/winnt.h
++++ b/include/libEMF/wine/winnt.h
+@@ -29,11 +29,11 @@
+
+ /* Architecture dependent settings. */
+ /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__i386)
+ # undef WORDS_BIGENDIAN
+ # undef BITFIELDS_BIGENDIAN
+ # define ALLOW_UNALIGNED_ACCESS
+-#elif defined(__sparc__)
++#elif defined(__sparc__) || defined(__sparc)
+ # define WORDS_BIGENDIAN
+ # define BITFIELDS_BIGENDIAN
+ # undef ALLOW_UNALIGNED_ACCESS
+@@ -48,7 +48,7 @@
+
+ /* Calling conventions definitions */
+
+-#ifdef __i386__
++#if defined(__i386__) || defined(__i386)
+ # ifndef _X86_
+ # define _X86_
+ # endif
+@@ -639,7 +639,7 @@ typedef struct _CONTEXT86
+ #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS)
+
+ /* i386 context definitions */
+-#ifdef __i386__
++#if defined(__i386__) || defined(__i386)
+
+ #define CONTEXT_CONTROL CONTEXT86_CONTROL
+ #define CONTEXT_INTEGER CONTEXT86_INTEGER
+@@ -969,7 +969,7 @@ typedef struct _STACK_FRAME_HEADER
+
+ #endif /* __PPC__ */
+
+-#ifdef __sparc__
++#if defined(__sparc__) || defined(__sparc)
+
+ /*
+ * FIXME:
+@@ -1138,7 +1138,7 @@ typedef CONTEXT *PCONTEXT;
+
+ #endif /* __i386__ */
+
+-#ifdef __sparc__
++#if defined(__sparc__) || defined(__sparc)
+ /* FIXME: use getcontext() to retrieve full context */
+ #define _GET_CONTEXT \
+ CONTEXT context; \
+@@ -1204,7 +1204,7 @@ typedef CONTEXT *PCONTEXT;
+ static void func(void) __attribute__((constructor)); \
+ static void func(void)
+ #else /* __GNUC__ */
+-# ifdef __i386__
++# if defined(__i386__) || defined(__i386)
+ # define DECL_GLOBAL_CONSTRUCTOR(func) \
+ static void __dummy_init_##func(void) { \
+ asm(".section .init,\"ax\"\n\t" \
+@@ -1218,7 +1218,7 @@ typedef CONTEXT *PCONTEXT;
+
+ /* Segment register access */
+
+-#ifdef __i386__
++#if defined(__i386__) || defined(__i386)
+ # ifdef __GNUC__
+ # define __DEFINE_GET_SEG(seg) \
+ extern inline unsigned short __get_##seg(void) \
+@@ -2347,7 +2347,7 @@ typedef struct _NT_TIB
+
+ struct _TEB;
+
+-#if defined(__i386__) && defined(__GNUC__) && !defined(__CHECKER__)
++#if (defined(__i386__) || defined(__i386)) && defined(__GNUC__) && !defined(__CHECKER__)
+ extern inline struct _TEB WINAPI *NtCurrentTeb(void);
+ extern inline struct _TEB WINAPI *NtCurrentTeb(void)
+ {
+--
+1.7.3
+
Added: csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch (rev 0)
+++ csw/mgar/pkg/libemf/trunk/files/0002-Remove-unneeded-definition-causing-link-errors.patch 2010-11-22 16:13:34 UTC (rev 11692)
@@ -0,0 +1,32 @@
+From 313b74dc289993a8a41974545df95d2e41f16978 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 22 Nov 2010 15:43:35 +0100
+Subject: [PATCH 2/2] Remove unneeded definition causing link errors
+
+---
+ include/libEMF/wine/winbase.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/include/libEMF/wine/winbase.h b/include/libEMF/wine/winbase.h
+index 366a777..3abb6b1 100644
+--- a/include/libEMF/wine/winbase.h
++++ b/include/libEMF/wine/winbase.h
+@@ -1802,6 +1802,7 @@ LONG WINAPI InterlockedIncrement(PLONG);
+ VOID WINAPI SetLastError(DWORD);
+ #endif /* __i386__ && __GNUC__ */
+
++#if 0
+ /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
+ static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare )
+ {
+@@ -1812,6 +1813,7 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val )
+ {
+ return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
+ }
++#endif
+
+ #ifdef __WINE__
+ #define GetCurrentProcess() ((HANDLE)0xffffffff)
+--
+1.7.3
+
Added: csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch (rev 0)
+++ csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch 2010-11-22 16:13:34 UTC (rev 11692)
@@ -0,0 +1,25 @@
+From 36faee190243cdb3e44b3f9a6f2898fb54eba387 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 22 Nov 2010 15:56:47 +0100
+Subject: [PATCH 3/3] Always use csw libtool
+
+---
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index d419f8f..6a8cc02 100755
+--- a/configure
++++ b/configure
+@@ -8419,7 +8419,7 @@ fi
+ LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) /usr/bin/libtool'
++LIBTOOL='$(SHELL) /opt/csw/bin/libtool'
+
+
+
+--
+1.7.3
+
Added: csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch (rev 0)
+++ csw/mgar/pkg/libemf/trunk/files/0004-Do-not-use-link-against-libstdc.patch 2010-11-22 16:13:34 UTC (rev 11692)
@@ -0,0 +1,39 @@
+From 110d57854830c674d7dbacb65331df0995d0d3ee Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 22 Nov 2010 16:40:39 +0100
+Subject: [PATCH 4/4] Do not use link against libstdc++
+
+---
+ src/Makefile.in | 2 +-
+ tests/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 2d7c678..7bd2c79 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -186,7 +186,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/include
+-LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++ -lm
++LDADD = $(top_builddir)/libemf/libEMF.la -lm
+ all: all-am
+
+ .SUFFIXES:
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 4e5ecfb..5c8fdb4 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -202,7 +202,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/include
+-LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++
++LDADD = $(top_builddir)/libemf/libEMF.la
+ TESTS = docheck1 docheck2 docheck3
+ EXTRA_DIST = docheck1 docheck2 docheck3 emfs/check1.emf emfs/check3.emf
+ MOSTLYCLEANFILES = check1.emf check2.emf check3.emf
+--
+1.7.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list