[gentoo-commits] gentoo-x86 commit in media-libs/netpbm/files: netpbm-10.44.00-fontdir.patch

[Mike Frysinger (vapier)]

vapier      09/01/21 22:56:05

  Added:                netpbm-10.44.00-fontdir.patch
  Log:
  Apply fix from upstream for fontdir bug #249384.
  (Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

Revision  Changes    Path
1.1                  media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch?rev=1.1&content-type=text/plain

Index: netpbm-10.44.00-fontdir.patch
===================================================================
fix from upstream

http://bugs.gentoo.org/249384#c6

Index: converter/ppm/picttoppm.c
===================================================================
--- converter/ppm/picttoppm.c	(revision 811)
+++ converter/ppm/picttoppm.c	(revision 812)
@@ -4056,6 +4056,23 @@
 
 
 
+static void
+loadDefaultFontDir(void) {
+/*----------------------------------------------------------------------------
+   Load the fonts from the font directory file "fontdir" (in the current
+   directory), if it exists.
+-----------------------------------------------------------------------------*/
+    struct stat statbuf;
+    int rc;
+
+    rc = stat("fontdir", &statbuf);
+    
+    if (rc == 0)
+        load_fontdir("fontdir");
+}
+
+
+
 int
 main(int argc, char * argv[]) {
     int argn;
@@ -4092,8 +4109,6 @@
         ++argn;
     }
 
-    load_fontdir("fontdir");
-
     if (argn < argc) {
         ifp = pm_openr(argv[argn]);
         ++argn;
@@ -4103,6 +4118,8 @@
     if (argn != argc)
         pm_usage(usage);
 
+    loadDefaultFontDir();
+
     if (header) {
         stage = "Reading 512 byte header";
         skip(512);