X-Git-Url: http://git.draconx.ca/gitweb/gentoo-draconx.git/blobdiff_plain/f8fa2488b9b722695c313de631c5dbea2af2521f..8baa32c025e1157739b718554dbf4c7b7f719dcb:/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch

diff --git a/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch b/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch
index 2a7f834..22a76b6 100644
--- a/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch
+++ b/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch
@@ -1,27 +1,52 @@
-From 0ce58e3f3c78760aa1f2204325862113a71ef763 Mon Sep 17 00:00:00 2001
+From abd57e6f4300dd10e13930076f7d11ca3f08c2cd Mon Sep 17 00:00:00 2001
 From: Nick Bowler <nbowler@draconx.ca>
-Date: Sat, 28 Jan 2012 16:01:01 -0500
-Subject: [PATCH] Add Gentoo font path to default search dir.
+Subject: [PATCH] Add Gentoo font paths to default search dir.
 
 This allows Xpdf to automatically find the required type-1 fonts on
-Gentoo.  The font paths can also be set in xpdfrc, but this approach is
-more robust as the user's xpdfrc overrides the system-wide one.
+Gentoo.  The font paths can also be set in xpdfrc, but this approach
+is more robust as the user's xpdfrc overrides the system-wide one.
+
+The newly added paths respect datarootdir to better support prefixed
+installations.
 ---
- xpdf/GlobalParams.cc |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ xpdf/GlobalParams.cc | 2 ++
+ xpdf/Makefile.in     | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/xpdf/GlobalParams.cc b/xpdf/GlobalParams.cc
-index 63e932b..7b7dc41 100644
+index ea7e9fd9d142..19e04114adb4 100644
 --- a/xpdf/GlobalParams.cc
 +++ b/xpdf/GlobalParams.cc
-@@ -110,6 +110,7 @@ static const char *displayFontDirs[] = {
+@@ -120,6 +120,8 @@ static const char *displayFontDirs[] = {
  };
  #else
  static const char *displayFontDirs[] = {
-+  "/usr/share/fonts/urw-fonts",
++  DATAROOTDIR "/fonts/urw-fonts",
++  DATAROOTDIR "/fonts/Type1",
    "/usr/share/ghostscript/fonts",
    "/usr/local/share/ghostscript/fonts",
    "/usr/share/fonts/default/Type1",
+diff --git a/xpdf/Makefile.in b/xpdf/Makefile.in
+index de3e6766e60a..d7118b7053a1 100644
+--- a/xpdf/Makefile.in
++++ b/xpdf/Makefile.in
+@@ -9,6 +9,7 @@
+ SHELL = /bin/sh
+ 
+ prefix = @prefix@
++datarootdir = @datarootdir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+@@ -19,7 +20,7 @@ FOFILIBDIR = ../fofi
+ SPLASHSRCDIR = $(srcdir)/../splash
+ SPLASHLIBDIR = ../splash
+ 
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @libpng_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@ @EXTRA_CFLAGS@
++CXXFLAGS = @CXXFLAGS@ @DEFS@ -DDATAROOTDIR=\"$(datarootdir)\" -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @libpng_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@ @EXTRA_CFLAGS@
+ 
+ LDFLAGS = @LDFLAGS@
+ 
 -- 
-1.7.3.4
+2.24.1