[csw-devel] SF.net SVN: gar:[19972] csw/mgar/pkg/texlive/trunk

[pfelecan at users.sourceforge.net]

Revision: 19972
          http://gar.svn.sourceforge.net/gar/?rev=19972&view=rev
Author:   pfelecan
Date:     2012-12-28 18:49:14 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
texlive/trunk: patched the internal poppler mess --- 2 instances, no less!

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

Added Paths:
-----------
    csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch
    csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch

Modified: csw/mgar/pkg/texlive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texlive/trunk/Makefile	2012-12-27 17:48:16 UTC (rev 19971)
+++ csw/mgar/pkg/texlive/trunk/Makefile	2012-12-28 18:49:14 UTC (rev 19972)
@@ -30,6 +30,8 @@
 PATCHFILES		+=	0003-Adapt-texmf-configuration.patch
 PATCHFILES		+=	0004-Activate-formats.patch
 PATCHFILES		+=	0005-Fix-dvi2tty-buffer-overflow.patch
+PATCHFILES		+=	0006-Fix-internal-poppler-library-paths.patch
+PATCHFILES		+=	0007-Fix-internal-poppler-library-paths-second-instance.patch
 
 PACKAGING_PLATFORMS	=	solaris10-sparc
 PACKAGING_PLATFORMS	+=	solaris10-i386
@@ -887,6 +889,8 @@
 PKGFILES_CSWtexlive-binaries			+=	/opt/csw/bin/xmltex
 RUNTIME_DEP_PKGS_CSWtexlive-binaries	+=	CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWtexlive-binaries	+=	CSWgs
+RUNTIME_DEP_PKGS_CSWtexlive-binaries	+=	CSWgsfonts
+CHECKPKG_OVERRIDES_CSWtexlive-binaries	+=	surplus-dependency|CSWgsfonts
 RUNTIME_DEP_PKGS_CSWtexlive-binaries	+=	CSWtexlive-common
 RUNTIME_DEP_PKGS_CSWtexlive-binaries	+=	CSWlibgd2
 RUNTIME_DEP_PKGS_CSWtexlive-binaries	+=	CSWlibptexenc1

Added: csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch
===================================================================
--- csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch	                        (rev 0)
+++ csw/mgar/pkg/texlive/trunk/files/0006-Fix-internal-poppler-library-paths.patch	2012-12-28 18:49:14 UTC (rev 19972)
@@ -0,0 +1,31 @@
+From d0ee28d1e61f2177f0eaacb65e898eee7524dacd Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 28 Dec 2012 16:06:46 +0100
+Subject: [PATCH] Fix internal poppler library paths
+
+to use Open CSW provide GhostScript fonts; remove all the other
+alternatives (maybe not the best option...)
+---
+ libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc b/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc
+index 0189784..9117ec1 100644
+--- a/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc
++++ b/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc
+@@ -119,11 +119,7 @@ static const char *displayFontDirs[] = {
+ };
+ #else
+ static const char *displayFontDirs[] = {
+-  "/usr/share/ghostscript/fonts",
+-  "/usr/local/share/ghostscript/fonts",
+-  "/usr/share/fonts/default/Type1",
+-  "/usr/share/fonts/default/ghostscript",
+-  "/usr/share/fonts/type1/gsfonts",
++  "/opt/csw/share/ghostscript/fonts",
+   NULL
+ };
+ #endif
+-- 
+1.7.12
+

Added: csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch
===================================================================
--- csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch	                        (rev 0)
+++ csw/mgar/pkg/texlive/trunk/files/0007-Fix-internal-poppler-library-paths-second-instance.patch	2012-12-28 18:49:14 UTC (rev 19972)
@@ -0,0 +1,31 @@
+From f2b820ad643577177bac7a89f093cc57d8f21ded Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 28 Dec 2012 18:56:13 +0100
+Subject: [PATCH] Fix internal poppler library paths -  second instance
+
+to use Open CSW provide GhostScript fonts; remove all the other
+alternatives (maybe not the best option...)
+---
+ libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc b/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc
+index 64d6133..5054c96 100644
+--- a/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc
++++ b/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc
+@@ -1370,11 +1370,7 @@ static struct {
+ };
+ 
+ static const char *displayFontDirs[] = {
+-  "/usr/share/ghostscript/fonts",
+-  "/usr/local/share/ghostscript/fonts",
+-  "/usr/share/fonts/default/Type1",
+-  "/usr/share/fonts/default/ghostscript",
+-  "/usr/share/fonts/type1/gsfonts",
++  "/opt/csw/share/ghostscript/fonts",
+   NULL
+ };
+ 
+-- 
+1.7.12
+

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