CVS commit: [pkgsrc-2017Q1] pkgsrc/devel/woboq_codebrowser

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Wed Apr  5 06:36:45 UTC 2017

Modified Files:
        pkgsrc/devel/woboq_codebrowser [pkgsrc-2017Q1]: distinfo
Added Files:
        pkgsrc/devel/woboq_codebrowser/patches [pkgsrc-2017Q1]:
            patch-generator_annotator.cpp

Log Message:
Pullup ticket #5233 - requested by sevan
devel/woboq_codebrowser: build fix

Revisions pulled up:
- devel/woboq_codebrowser/distinfo                              1.2
- devel/woboq_codebrowser/patches/patch-generator_annotator.cpp 1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Sat Apr  1 12:38:54 UTC 2017

   Modified Files:
           pkgsrc/devel/woboq_codebrowser: distinfo
   Added Files:
           pkgsrc/devel/woboq_codebrowser/patches: patch-generator_annotator.cpp

   Log Message:
   Fix building with newer LLVM

   To generate a diff of this commit:
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/woboq_codebrowser/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/devel/woboq_codebrowser/patches/patch-generator_annotator.cpp


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.4.1 pkgsrc/devel/woboq_codebrowser/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/devel/woboq_codebrowser/patches/patch-generator_annotator.cpp

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

Modified files:

Index: pkgsrc/devel/woboq_codebrowser/distinfo
diff -u pkgsrc/devel/woboq_codebrowser/distinfo:1.1 pkgsrc/devel/woboq_codebrowser/distinfo:1.1.4.1
--- pkgsrc/devel/woboq_codebrowser/distinfo:1.1 Thu Nov 24 01:10:16 2016
+++ pkgsrc/devel/woboq_codebrowser/distinfo     Wed Apr  5 06:36:45 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/11/24 01:10:16 joerg Exp $
+$NetBSD: distinfo,v 1.1.4.1 2017/04/05 06:36:45 spz Exp $
 
 SHA1 (woboq_codebrowser-2.0.1.tar.gz) = 750bc4d71cec7ff1213624ce54d3c658a2ab6351
 RMD160 (woboq_codebrowser-2.0.1.tar.gz) = 275d033674580db7b7bd9eda954a0311a745cfce
 SHA512 (woboq_codebrowser-2.0.1.tar.gz) = ce9254c22e88678cc7938bea85ae95c5abef55fbceb53ed7ff5a7c1231eedc0f2564e63be436ee61576bfc2d9dbb0f6d12674eaf5362abd15bb234c55e7785ab
 Size (woboq_codebrowser-2.0.1.tar.gz) = 194624 bytes
+SHA1 (patch-generator_annotator.cpp) = d5cd90260584b52e9321ad89af4add5adf6f7c7c

Added files:

Index: pkgsrc/devel/woboq_codebrowser/patches/patch-generator_annotator.cpp
diff -u /dev/null pkgsrc/devel/woboq_codebrowser/patches/patch-generator_annotator.cpp:1.1.2.2
--- /dev/null   Wed Apr  5 06:36:45 2017
+++ pkgsrc/devel/woboq_codebrowser/patches/patch-generator_annotator.cpp        Wed Apr  5 06:36:45 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-generator_annotator.cpp,v 1.1.2.2 2017/04/05 06:36:45 spz Exp $
+
+Fix building.
+
+--- generator/annotator.cpp.orig       2017-04-01 12:24:27.000000000 +0000
++++ generator/annotator.cpp
+@@ -194,7 +194,7 @@ std::string Annotator::htmlNameForFile(c
+     }
+ 
+     const clang::FileEntry* entry = getSourceMgr().getFileEntryForID(id);
+-    if (!entry || !entry->getName())
++    if (!entry)
+     {
+         cache[id] = {false, {} };
+         return {};
+@@ -520,7 +520,7 @@ std::string Annotator::pathTo(clang::Fil
+ {
+   //this is a bit duplicated with the other pathTo and htmlNameForFile
+ 
+-    if (!To || !To->getName())
++    if (!To)
+         return {};
+ 
+     std::string fromFN = htmlNameForFile(From);