From 127e0380776731fecb6e15f00e2b1ab5d9b53b9c Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Mar 13 2017 15:45:30 +0000
Subject: backport to fix behavior of @ref const matching (#776988)


---

diff --git a/doxygen-1.8.13-#776988.patch b/doxygen-1.8.13-#776988.patch
new file mode 100644
index 0000000..f02cc8f
--- /dev/null
+++ b/doxygen-1.8.13-#776988.patch
@@ -0,0 +1,38 @@
+diff --git a/src/doctokenizer.l b/src/doctokenizer.l
+index a89570e..7545cba 100644
+--- a/src/doctokenizer.l
++++ b/src/doctokenizer.l
+@@ -395,10 +395,14 @@ HTMLTAG   "<"(("/")?){ID}({WS}+{ATTRIB})*{WS}*(("/")?)">"
+ HTMLKEYL  "strong"|"center"|"table"|"caption"|"small"|"code"|"dfn"|"var"|"img"|"pre"|"sub"|"sup"|"tr"|"td"|"th"|"ol"|"ul"|"li"|"tt"|"kbd"|"em"|"hr"|"dl"|"dt"|"dd"|"br"|"i"|"a"|"b"|"p"
+ HTMLKEYU  "STRONG"|"CENTER"|"TABLE"|"CAPTION"|"SMALL"|"CODE"|"DFN"|"VAR"|"IMG"|"PRE"|"SUB"|"SUP"|"TR"|"TD"|"TH"|"OL"|"UL"|"LI"|"TT"|"KBD"|"EM"|"HR"|"DL"|"DT"|"DD"|"BR"|"I"|"A"|"B"|"P"
+ HTMLKEYW  {HTMLKEYL}|{HTMLKEYU}
+-REFWORD2  ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?){FUNCARG2}?
+-REFWORD3  ({ID}":")*{ID}":"?
+-REFWORD4  (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOP2})){CVSPEC}?
+-REFWORD   {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
++REFWORD2_PRE   ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?)
++REFWORD2       {REFWORD2_PRE}{FUNCARG2}?
++REFWORD2_NOCV  {REFWORD2_PRE}("("{FUNCPART}")")?
++REFWORD3       ({ID}":")*{ID}":"?
++REFWORD4_NOCV  (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOP2}))
++REFWORD4       {REFWORD4_NOCV}{CVSPEC}?
++REFWORD        {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
++REFWORD_NOCV   {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
+ 
+ %option noyywrap
+ %option yylineno
+@@ -1011,6 +1015,14 @@ REFWORD   {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
+                          unput(*yytext);
+   			 return 0;
+   		       }
++<St_Ref>{REFWORD_NOCV}/{BLANK}("const")[a-z_A-Z0-9] { // see bug776988
++  			 g_token->name=yytext;
++			 return TK_WORD;
++                       }
++<St_Ref>{REFWORD_NOCV}/{BLANK}("volatile")[a-z_A-Z0-9] { // see bug776988
++  			 g_token->name=yytext;
++			 return TK_WORD;
++                       }
+ <St_Ref>{REFWORD}      { // label to refer to
+   			 g_token->name=yytext;
+ 			 return TK_WORD;
diff --git a/doxygen.spec b/doxygen.spec
index 73c7bf7..8c77ce2 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -2,7 +2,7 @@ Summary: A documentation system for C/C++
 Name:    doxygen
 Epoch:   1
 Version: 1.8.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # No version is specified.
 License: GPL+
@@ -15,6 +15,7 @@ Source2: doxywizard.desktop
 # upstream patches
 Patch100: https://github.com/doxygen/doxygen/pull/555.patch#/doxygen-xmlgen-regression.patch
 Patch101: doxygen-1.8.13-#775493.patch
+Patch102: doxygen-1.8.13-#776988.patch
 
 BuildRequires: perl
 BuildRequires: tex(dvips)
@@ -134,6 +135,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 # intentionally left blank
 
 %changelog
+* Mon Mar 13 2017 Than Ngo <than@redhat.com> - 1:1.8.13-5
+- backport to fix behavior of @ref const matching (#776988)
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild