[csw-devel] SF.net SVN: gar:[19992] csw/mgar/pkg/libemf/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 1 20:55:25 CET 2013
Revision: 19992
http://gar.svn.sourceforge.net/gar/?rev=19992&view=rev
Author: dmichelsen
Date: 2013-01-01 19:55:24 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
libemf/trunk: Update to 1.0.7, restructure Makefile
Modified Paths:
--------------
csw/mgar/pkg/libemf/trunk/Makefile
csw/mgar/pkg/libemf/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch
csw/mgar/pkg/libemf/trunk/files/0003-Keep-norunpath-during-libtool.patch
Removed Paths:
-------------
csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch
csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch
Modified: csw/mgar/pkg/libemf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libemf/trunk/Makefile 2013-01-01 19:08:09 UTC (rev 19991)
+++ csw/mgar/pkg/libemf/trunk/Makefile 2013-01-01 19:55:24 UTC (rev 19992)
@@ -1,6 +1,6 @@
# $Id$
NAME = libemf
-VERSION = 1.0.4
+VERSION = 1.0.7
GARTYPE = v2
DESCRIPTION = Library implementation of ECMA-234 API for the generation of enhanced metafiles
@@ -11,44 +11,38 @@
DISTNAME = libEMF-$(VERSION)
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
+PATCHFILES += 0001-Use-__sparc-and-__i386-for-Solaris.patch
+PATCHFILES += 0003-Keep-norunpath-during-libtool.patch
-PACKAGES = CSWlibemf CSWlibemf1 CSWlibemf-devel
+#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
-CATALOGNAME_CSWlibemf = libemf
-CAtALOGNAME_CSWlibemf1 = libemf1
-CATALOGNAME_CSWlibemf-devel = libemf_devel
-
+PACKAGES += CSWlibemf
SPKG_DESC_CSWlibemf = $(DESCRIPTION)
-SPKG_DESC_CSWlibemf1 = Runtime library for libEMF 1.x
-SPKG_DESC_CSWlibemf-devel = Development files for libEMF
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibemf += CSWlibemf1
-RUNTIME_DEP_PKGS_CSWlibemf = CSWlibemf1 CSWlibemf-devel
-RUNTIME_DEP_PKGS_CSWlibemf-devel = CSWlibemf1
+PACKAGES += CSWlibemf1
+SPKG_DESC_CSWlibemf1 = Runtime library libEMF.so.1
+PKGFILES_CSWlibemf1 += $(call pkgfiles_lib,libEMF.so.1)
+PACKAGES += CSWlibemf-dev
+SPKG_DESC_CSWlibemf-dev = Development files for libEMF.so.1
+PKGFILES_CSWlibemf-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibemf-dev = CSWlibemf1
+OBSOLETED_BY_CSWlibemf-dev += CSWlibemf-devel
+
VENDOR_URL = http://libemf.sourceforge.net/
# File name regex to get notifications about upstream software releases
UFILES_REGEX = $(NAME)-(\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_LIBS_ONLY = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_LINKER_FLAGS += -norunpath
-PKGFILES_CSWlibemf1 = $(PKGFILES_RT)
-PKGFILES_CSWlibemf-devel = $(PKGFILES_DEVEL)
+# 64 bit on Sparc is problematic as documented in include/libEMF/wine/winnt.h:
+# * This structure is valid only for 32-bit SPARC architectures, not for 64-bit SPARC.
+BUILD64_LIBS_ONLY = 1
-CHECKPKG_OVERRIDES_CSWlibemf += surplus-dependency|CSWlibemf-devel
-
-# This needs a fixed libtool first
-CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/lib|opt/csw/lib/libEMF.so.1.0.0
-CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libEMF.so.1.0.0
-CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libEMF.so.1.0.0
-CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libEMF.so.1.0.0
-
include gar/category.mk
Modified: csw/mgar/pkg/libemf/trunk/checksums
===================================================================
--- csw/mgar/pkg/libemf/trunk/checksums 2013-01-01 19:08:09 UTC (rev 19991)
+++ csw/mgar/pkg/libemf/trunk/checksums 2013-01-01 19:55:24 UTC (rev 19992)
@@ -1 +1 @@
-23effe03c1b2eeb5229f14e461204198 libEMF-1.0.4.tar.gz
+f1011f5cc254aa228be78704fe5f9960 libEMF-1.0.7.tar.gz
Deleted: 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 2013-01-01 19:08:09 UTC (rev 19991)
+++ csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch 2013-01-01 19:55:24 UTC (rev 19992)
@@ -1,103 +0,0 @@
-From 1df10ad110f4661217c2f68bbfbdcaa7b1cde2cf Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 23 Nov 2010 14:37:55 +0100
-Subject: [PATCH] Add __sparc and __i386 in addition to __*__
-
----
- include/libEMF/wine/winnt.h | 21 +++++++++++----------
- 1 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h
-index a455290..b052679 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
-@@ -56,7 +56,8 @@
- # define __stdcall __attribute__((__stdcall__))
- # define __cdecl __attribute__((__cdecl__))
- # else
--# error You need gcc >= 2.7 to build Wine on a 386
-+# define __stdcall
-+# define __cdecl
- # endif /* __GNUC__ */
- #else /* __i386__ */
- # define __stdcall
-@@ -639,7 +640,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 +970,7 @@ typedef struct _STACK_FRAME_HEADER
-
- #endif /* __PPC__ */
-
--#ifdef __sparc__
-+#if defined(__sparc__) || defined(__sparc)
-
- /*
- * FIXME:
-@@ -1138,7 +1139,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 +1205,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 +1219,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 +2348,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/0001-Use-__sparc-and-__i386-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch (rev 0)
+++ csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch 2013-01-01 19:55:24 UTC (rev 19992)
@@ -0,0 +1,58 @@
+From 023a228660a6cdb955db4d4a5b3da3b5edfcde30 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 1 Jan 2013 19:18:22 +0100
+Subject: [PATCH] Use __sparc and __i386 for Solaris
+
+---
+ include/libEMF/wine/winnt.h | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h
+index f76c08a..3a8d6f2 100644
+--- a/include/libEMF/wine/winnt.h
++++ b/include/libEMF/wine/winnt.h
+@@ -29,7 +29,11 @@
+
+ /* Architecture dependent settings. */
+ /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
+-#if defined(__i386__)
++#if defined(__i386)
++# undef WORDS_BIGENDIAN
++# undef BITFIELDS_BIGENDIAN
++# define ALLOW_UNALIGNED_ACCESS
++#elif defined(__i386__)
+ # undef WORDS_BIGENDIAN
+ # undef BITFIELDS_BIGENDIAN
+ # define ALLOW_UNALIGNED_ACCESS
+@@ -45,6 +49,10 @@
+ # undef WORDS_BIGENDIAN
+ # undef BITFIELDS_BIGENDIAN
+ # undef ALLOW_UNALIGNED_ACCESS
++#elif defined(__sparc)
++# define WORDS_BIGENDIAN
++# define BITFIELDS_BIGENDIAN
++# undef ALLOW_UNALIGNED_ACCESS
+ #elif defined(__sparc__)
+ # define WORDS_BIGENDIAN
+ # define BITFIELDS_BIGENDIAN
+@@ -676,7 +684,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
+@@ -1225,7 +1233,7 @@ typedef struct _STACK_FRAME_HEADER
+
+ #endif /* __PPC__ */
+
+-#ifdef __sparc__
++#if defined(__sparc__) || defined(__sparc)
+
+ /*
+ * FIXME:
+--
+1.8.0
+
Deleted: csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch 2013-01-01 19:08:09 UTC (rev 19991)
+++ csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch 2013-01-01 19:55:24 UTC (rev 19992)
@@ -1,25 +0,0 @@
-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/0003-Keep-norunpath-during-libtool.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0003-Keep-norunpath-during-libtool.patch (rev 0)
+++ csw/mgar/pkg/libemf/trunk/files/0003-Keep-norunpath-during-libtool.patch 2013-01-01 19:55:24 UTC (rev 19992)
@@ -0,0 +1,25 @@
+From 5f2b03954cc134a3cfaef09b358ff3fdbcb417a0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 1 Jan 2013 20:43:14 +0100
+Subject: [PATCH] Keep -norunpath during libtool
+
+---
+ config/ltmain.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/ltmain.sh b/config/ltmain.sh
+index a72f2fd..6b8bee1 100644
+--- a/config/ltmain.sh
++++ b/config/ltmain.sh
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+--
+1.8.0
+
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