[csw-devel] SF.net SVN: gar:[16474] csw/mgar/pkg/libfpx/trunk

[dmichelsen at users.sourceforge.net]

Revision: 16474
          http://gar.svn.sourceforge.net/gar/?rev=16474&view=rev
Author:   dmichelsen
Date:     2011-12-13 08:38:26 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
libfp: Update to 1.3.1, still missing symbols

Modified Paths:
--------------
    csw/mgar/pkg/libfpx/trunk/Makefile
    csw/mgar/pkg/libfpx/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2011-12-12 13:46:41 UTC (rev 16473)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2011-12-13 08:38:26 UTC (rev 16474)
@@ -1,5 +1,5 @@
 NAME = libfpx
-VERSION = 1.3.0
+VERSION = 1.3.1
 CATEGORIES = lib
 
 DESCRIPTION = FlashPIX library
@@ -10,8 +10,10 @@
 DISTFILES  = $(DISTNAME).tar.xz
 
 PATCHFILES += olecomm.h.patch
-PATCHFILES += tchar.patch
+# PATCHFILES += tchar.patch
 
+# PATCHFILES += 0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch
+
 VENDOR_URL = http://www.imagemagick.org
 LICENSE = flashpix.h
 
@@ -35,10 +37,14 @@
 # Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20
 EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1
 
+# Make sure to include path or we link against libCrun.a
+EXTRA_LINKER_FLAGS += -L/opt/SUNWspro/lib -lCrun
+
+# For sqrt, atan2, pow
+EXTRA_LINKER_FLAGS += -lm
+
 BUILD64 = 1
 
-STRIP_LIBTOOL = 1
-
 include gar/category.mk
 
 post-install-modulated:

Modified: csw/mgar/pkg/libfpx/trunk/checksums
===================================================================
--- csw/mgar/pkg/libfpx/trunk/checksums	2011-12-12 13:46:41 UTC (rev 16473)
+++ csw/mgar/pkg/libfpx/trunk/checksums	2011-12-13 08:38:26 UTC (rev 16474)
@@ -1 +1 @@
-cee1256ac7ab0d78ab6e11daad78db06  libfpx-1.3.0.tar.xz
+c66ab2b3e43edfe0ab2ca11ee67c98f3  libfpx-1.3.1.tar.xz

Added: csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch
===================================================================
--- csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch	                        (rev 0)
+++ csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch	2011-12-13 08:38:26 UTC (rev 16474)
@@ -0,0 +1,69 @@
+From b8d8f4b228dd59d60d11a2f99573383fdb198ef3 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 12 Dec 2011 23:55:35 +0100
+Subject: [PATCH] Force one signature for CExposedDocFile::RenameElement(const
+ char*,const char*)
+
+---
+ oless/ascii.cxx |    2 +-
+ oless/expdf.cxx |    8 ++++----
+ oless/expdf.hxx |    4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/oless/ascii.cxx b/oless/ascii.cxx
+index 4eaa836..f90b612 100644
+--- a/oless/ascii.cxx
++++ b/oless/ascii.cxx
+@@ -345,7 +345,7 @@ STDMETHODIMP CExposedDocFile::RenameElement(char const *pszOldName,
+     olChk(CheckAName(pszNewName));
+     _tbstowcs(wcsOldName, pszOldName, CWCSTORAGENAME);
+     _tbstowcs(wcsNewName, pszNewName, CWCSTORAGENAME);
+-    sc = RenameElement(wcsOldName, wcsNewName);
++    sc = RenameElement((char const *) wcsOldName, (char const *) wcsNewName);
+     // Fall through
+ EH_Err:
+     return ResultFromScode(sc);
+diff --git a/oless/expdf.cxx b/oless/expdf.cxx
+index 3f21dd6..8e3d61a 100644
+--- a/oless/expdf.cxx
++++ b/oless/expdf.cxx
+@@ -1021,8 +1021,8 @@ EH_Err:
+ //---------------------------------------------------------------
+ 
+ 
+-TSTDMETHODIMP CExposedDocFile::RenameElement(WCHAR const *pwcsName,
+-                                             WCHAR const *pwcsNewName)
++TSTDMETHODIMP CExposedDocFile::RenameElement(const char *pwcsName,
++                                             const char *pwcsNewName)
+ {
+     SCODE sc;
+     CDfName dfnOld, dfnNew;
+@@ -1035,8 +1035,8 @@ TSTDMETHODIMP CExposedDocFile::RenameElement(WCHAR const *pwcsName,
+     olChk(Validate());
+     olChk(CheckWName(pwcsName));
+     olChk(CheckWName(pwcsNewName));
+-    dfnOld.Set(pwcsName);
+-    dfnNew.Set(pwcsNewName);
++    dfnOld.Set((WCHAR const *)pwcsName);
++    dfnNew.Set((WCHAR const *)pwcsNewName);
+     olChk(RenameEntry(&dfnOld, &dfnNew));
+ 
+     olDebugOut((DEB_ITRACE, "Out CExposedDocFile::RenameElement\n"));
+diff --git a/oless/expdf.hxx b/oless/expdf.hxx
+index 737f259..9f31d4d 100644
+--- a/oless/expdf.hxx
++++ b/oless/expdf.hxx
+@@ -133,8 +133,8 @@ public:
+                              TCHAR const *lpszNewName,
+                              DWORD grfFlags);
+     STDMETHOD(DestroyElement)(TCHAR const *pwcsName);
+-    STDMETHOD(RenameElement)(TCHAR const *pwcsOldName,
+-                             TCHAR const *pwcsNewName);
++    STDMETHOD(RenameElement)(const char *pwcsOldName,
++                             const char *pwcsNewName);
+     STDMETHOD(SetElementTimes)(const TCHAR *lpszName,
+                                FILETIME const *pctime,
+                                FILETIME const *patime,
+-- 
+1.7.6.1
+

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