[csw-devel] SF.net SVN: gar:[18558] csw/mgar/pkg/exiv2/trunk

[cgrzemba at users.sourceforge.net]

Revision: 18558
          http://gar.svn.sourceforge.net/gar/?rev=18558&view=rev
Author:   cgrzemba
Date:     2012-06-27 06:14:39 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
exiv2/trunk: add studio compiler patches

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

Added Paths:
-----------
    csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch
    csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch
    csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch

Modified: csw/mgar/pkg/exiv2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exiv2/trunk/Makefile	2012-06-27 06:06:56 UTC (rev 18557)
+++ csw/mgar/pkg/exiv2/trunk/Makefile	2012-06-27 06:14:39 UTC (rev 18558)
@@ -1,7 +1,7 @@
 NAME = exiv2
-VERSION = 0.19
+VERSION = 0.23
+GARTYPE = v2
 CATEGORIES = lib
-GARTYPE = v2
 
 DESCRIPTION = Image metadata library and tools
 define BLURB
@@ -13,12 +13,21 @@
 
 MASTER_SITES = http://www.exiv2.org/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = 0001-Remove-unknown-flag-to-Sun-Studio.patch
+PATCHFILES += 0001-Remove-unknown-flag-to-Sun-Studio.patch
+PATCHFILES += 0002-fix-depend-flag-config.mk.in.patch
+PATCHFILES += 0003-type-cast-basicio.cpp.patch
+PATCHFILES += 0004-rsc-remove-error.cpp.patch
 
+GARCOMPILER = SOS12U3
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 BUILD64_LIBS_ONLY = 1
+
+# see: http://solaris.bionicmutton.org/hg/kde4-specs-460/file/26c2cab27bbe/specs/patches/exiv2/0.14/README.STUDIO12
+EXTRA_CXXFLAGS = -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Sun Studio doesn't unerstand g++ features

Modified: csw/mgar/pkg/exiv2/trunk/checksums
===================================================================
--- csw/mgar/pkg/exiv2/trunk/checksums	2012-06-27 06:06:56 UTC (rev 18557)
+++ csw/mgar/pkg/exiv2/trunk/checksums	2012-06-27 06:14:39 UTC (rev 18558)
@@ -1,2 +1 @@
-ac2024c172a70a811b9972cd8b46f3f3  0001-Remove-unknown-flag-to-Sun-Studio.patch
-f52fb75a2cb7512f1484deab76473e13  exiv2-0.19.tar.gz
+dab67c07bb63a4386d4ea607a8e06eaf  exiv2-0.23.tar.gz

Added: csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch	                        (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch	2012-06-27 06:14:39 UTC (rev 18558)
@@ -0,0 +1,20 @@
+--- a/config/config.mk.in
++++ b/config/config.mk.in
+@@ -129,14 +129,14 @@ ifdef DEP_TRACKING
+         # dependencies. If you're not using gcc, you may need to change
+         # this to something suitable for your compiler or simply unset
+         # the variable. See the link above for suggestions.
+-	MAKEDEPEND = $(CXX) -MM $(CPPFLAGS) -o $*.d $<
++	MAKEDEPEND = $(CXX) -xM1 $(CPPFLAGS) -o $*.d $<
+ 
+         # Dependency files post-process commands
+-        POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
++        POSTDEPEND = $(shell if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
+ 	        if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \
+ 	        sed -e 's/^\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+                     -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $(DEPDIR)/$*.d; \
+-                $(RM) $*.d; fi
++                $(RM) $*.d; fi)
+ 
+         # Compiler flags to generate dependency files at the same time 
+         # as object files (for gcc)

Added: csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch	                        (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch	2012-06-27 06:14:39 UTC (rev 18558)
@@ -0,0 +1,13 @@
+diff --git a/src/basicio.cpp b/src/basicio.cpp
+index 0343dff..174e8a7 100644
+--- a/src/basicio.cpp
++++ b/src/basicio.cpp
+@@ -312,7 +312,7 @@ namespace Exiv2 {
+         int rc = 0;
+         if (p_->pMappedArea_ != 0) {
+ #if defined EXV_HAVE_MMAP && defined EXV_HAVE_MUNMAP
+-            if (::munmap(p_->pMappedArea_, p_->mappedLength_) != 0) {
++            if (::munmap((char*)p_->pMappedArea_, p_->mappedLength_) != 0) {
+                 rc = 1;
+             }
+ #elif defined WIN32 && !defined __CYGWIN__

Added: csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch	                        (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch	2012-06-27 06:14:39 UTC (rev 18558)
@@ -0,0 +1,13 @@
+diff --git a/src/error.cpp b/src/error.cpp
+index af588d0..efe2ebf 100644
+--- a/src/error.cpp
++++ b/src/error.cpp
+@@ -26,7 +26,7 @@
+  */
+ // *****************************************************************************
+ #include "rcsid_int.hpp"
+-EXIV2_RCSID("@(#) $Id: error.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
++// EXIV2_RCSID("@(#) $Id: error.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ 
+ // *****************************************************************************
+ // included header files

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