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

[guengel at users.sourceforge.net]

Revision: 16486
          http://gar.svn.sourceforge.net/gar/?rev=16486&view=rev
Author:   guengel
Date:     2011-12-13 21:06:40 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
libfpx/trunk: Approach to possible solution to http://lists.opencsw.org/pipermail/maintainers/2011-December/015808.html

Added Paths:
-----------
    csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch
    csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch

Added: csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch
===================================================================
--- csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch	                        (rev 0)
+++ csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch	2011-12-13 21:06:40 UTC (rev 16486)
@@ -0,0 +1,30 @@
+From bad4e83495a98fdf000e92a6d485968d54ef35ae Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Tue, 13 Dec 2011 20:28:05 +0100
+Subject: [PATCH] Fix unresolved symbols part 1
+
+diff --git a/ole/olehstrm.cpp b/ole/olehstrm.cpp
+index 5669734..7118ba7 100644
+--- a/ole/olehstrm.cpp
++++ b/ole/olehstrm.cpp
+@@ -167,12 +167,14 @@ Boolean OLEHeaderStream::WriteHeader( )
+ // CAUTION: the Seek(), GetEndOfFile() and SetSize() functions take the stream offset into account
+ // and call the parent stream function.
+ // Set the stream pointer to desired position. The default mode is from the begining
+-Boolean OLEHeaderStream::Seek( long offset, const unsigned long mode )
++Boolean OLEHeaderStream::Seek( const long offset, const unsigned long mode )
+ {
++  long tmp = offset;
++
+   // If the mode is from the begining of the stream, include the header length
+   if ( mode == STREAM_SEEK_SET )
+-    offset += streamStartPos;
+-  return OLEStream::Seek(offset,mode);
++    tmp += streamStartPos;
++  return OLEStream::Seek(tmp,mode);
+ }
+ 
+ // Get the end pointer of the stream, excluding the header length
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch
===================================================================
--- csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch	                        (rev 0)
+++ csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch	2011-12-13 21:06:40 UTC (rev 16486)
@@ -0,0 +1,27 @@
+From ed235e0b84bec580bd135d78b07a521f5c20a269 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Tue, 13 Dec 2011 21:10:54 +0100
+Subject: [PATCH] Fix unresolved symbols part 2
+
+---
+ oless/ascii.cxx |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/oless/ascii.cxx b/oless/ascii.cxx
+index 4eaa836..4b935ba 100644
+--- a/oless/ascii.cxx
++++ b/oless/ascii.cxx
+@@ -335,8 +335,8 @@ EH_Err:
+ //
+ //---------------------------------------------------------------
+ 
+-STDMETHODIMP CExposedDocFile::RenameElement(char const *pszOldName,
+-                                            char const *pszNewName)
++STDMETHODIMP CExposedDocFile::RenameElement(TCHAR const *pszOldName,
++                                            TCHAR const *pszNewName)
+ {
+     SCODE sc;
+     WCHAR wcsOldName[CWCSTORAGENAME], wcsNewName[CWCSTORAGENAME];
+-- 
+1.7.6.1
+

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