CVS commit: pkgsrc/textproc/libhighlight

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Aug 28 14:38:43 UTC 2019

Modified Files:
        pkgsrc/textproc/libhighlight: distinfo
        pkgsrc/textproc/libhighlight/patches: patch-src_core_platform__fs.cpp

Log Message:
Extend patch to a new function, re-fixing the Illumos build.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.12 pkgsrc/textproc/libhighlight/distinfo:1.13
--- pkgsrc/textproc/libhighlight/distinfo:1.12  Tue Aug 13 01:48:49 2019
+++ pkgsrc/textproc/libhighlight/distinfo       Wed Aug 28 14:38:42 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2019/08/13 01:48:49 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2019/08/28 14:38:42 schmonz Exp $
 
 SHA1 (highlight-3.53.tar.bz2) = bef7dac08125cfaa0b1f201b68163e90c261d433
 RMD160 (highlight-3.53.tar.bz2) = 7eeb4e122be2a1f808936cfb1f32cb1b65cd2418
@@ -6,7 +6,7 @@ SHA512 (highlight-3.53.tar.bz2) = b25340
 Size (highlight-3.53.tar.bz2) = 1408173 bytes
 SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
 SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
-SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
+SHA1 (patch-src_core_platform__fs.cpp) = 94e4b2aef89e48e104be57acf6dd9ce4b5917e21
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
 SHA1 (patch-src_makefile) = e7c4d0e8e79101ef0bb94556619b6e2a3283005b

Index: pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.2 pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.3
--- pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.2    Sun Oct 14 12:17:50 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp        Wed Aug 28 14:38:42 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_core_platform__fs.cpp,v 1.2 2018/10/14 12:17:50 schmonz Exp $
+$NetBSD: patch-src_core_platform__fs.cpp,v 1.3 2019/08/28 14:38:42 schmonz Exp $
 
 Fix build on (at least) SmartOS.
 
---- src/core/platform_fs.cpp.orig      2018-10-13 19:26:45.000000000 +0000
+--- src/core/platform_fs.cpp.orig      2019-07-31 21:48:56.000000000 +0000
 +++ src/core/platform_fs.cpp
-@@ -79,13 +79,13 @@ int isColorEscCapable() {
+@@ -91,13 +91,13 @@ std::string getTempFilePath(){
  
  const char pathSeparator = '/';
  
@@ -20,3 +20,14 @@ Fix build on (at least) SmartOS.
  {
      struct passwd *pw = getpwuid(getuid());
      return string(pw->pw_dir);
+@@ -127,8 +127,8 @@ int isColorEscCapable() {
+     return 0;
+ }
+ 
+-std::string getTempFilePath(){
+-    std::string path("/tmp");
++::std::string getTempFilePath(){
++    ::std::string path("/tmp");
+     
+     char* tempOption=getenv("TEMP");
+     if (tempOption) path=string(tempOption);