Skip to content
Permalink
Browse files

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

  • Loading branch information...
schmonz committed Aug 28, 2019
1 parent 7bf2773 commit d2df91c32212ba5710dded0f1ea2194d9044432a
Showing with 16 additions and 5 deletions.
  1. +2 −2 textproc/libhighlight/distinfo
  2. +14 −3 textproc/libhighlight/patches/patch-src_core_platform__fs.cpp
@@ -1,12 +1,12 @@
$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
SHA512 (highlight-3.53.tar.bz2) = b25340aa881e5188fb9862d4858fab17627a80329835723a75de95bbf523f2453f42fa4e6ed842345b5e2842d66a40f16b03c19fbbbea4a226e247a93130a5e3
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
@@ -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);

0 comments on commit d2df91c

Please sign in to comment.
You can’t perform that action at this time.