[csw-devel] SF.net SVN: gar:[21322] csw/mgar/pkg/poppler/trunk

[slowfranklin at users.sourceforge.net]

Revision: 21322
          http://gar.svn.sourceforge.net/gar/?rev=21322&view=rev
Author:   slowfranklin
Date:     2013-06-11 16:08:23 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
poppler/trunk: Re-enable inadvertently disabled 64 bit libs and delete unused patch

Modified Paths:
--------------
    csw/mgar/pkg/poppler/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/poppler/trunk/files/missing-includes.patch

Modified: csw/mgar/pkg/poppler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/poppler/trunk/Makefile	2013-06-11 15:26:27 UTC (rev 21321)
+++ csw/mgar/pkg/poppler/trunk/Makefile	2013-06-11 16:08:23 UTC (rev 21322)
@@ -17,14 +17,13 @@
 GARCOMPILER = SOS12U3
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-# PATCHFILES += missing-includes.patch
 PATCHFILES += ltmain.patch
 
 # UPSTREAM_MASTER_SITES = 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # BUILD64_LIBS_ONLY = 1
-# BUILD64 = 1
+BUILD64 = 1
 
 PACKAGES += CSWlibpoppler-cpp0
 PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.2\.0)

Deleted: csw/mgar/pkg/poppler/trunk/files/missing-includes.patch
===================================================================
--- csw/mgar/pkg/poppler/trunk/files/missing-includes.patch	2013-06-11 15:26:27 UTC (rev 21321)
+++ csw/mgar/pkg/poppler/trunk/files/missing-includes.patch	2013-06-11 16:08:23 UTC (rev 21322)
@@ -1,17 +0,0 @@
---- poppler-0.12.4/goo/gstrtod.cc.orig	2010-03-11 09:12:33.246797323 +0100
-+++ poppler-0.12.4/goo/gstrtod.cc	2010-03-11 09:13:57.881353247 +0100
-@@ -22,10 +22,10 @@
- 
- #include "gstrtod.h"
- 
--#include <clocale>
--#include <cerrno>
--#include <cstdlib>
--#include <cstring>
-+#include <locale.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- #define ascii_isspace(c) \
-   (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')

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