Accepting request 352005 from devel:tools

- fix build after update - Update to 1.8.11 See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html - Update patch vhdlparser-no-return.patch - Remove patch doxygen-no-shared-libs.patch which is included in upstream - Update to 1.8.11 See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html - Update patch vhdlparser-no-return.patch - Remove patch doxygen-no-shared-libs.patch which is included in upstream - fix build after update - Update to 1.8.11 See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html - Update patch vhdlparser-no-return.patch - Remove patch doxygen-no-shared-libs.patch which is included in upstream OBS-URL: https://build.opensuse.org/request/show/352005 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=62
2016-01-08 14:22:07 +00:00 · 2016-01-08 14:22:07 +00:00 · e675c6214a
commit e675c6214a
parent 8a3330759e a80cd8d774
10 changed files with 170 additions and 198 deletions
--- a/doxygen-1.8.10.src.tar.gz
+++ b/doxygen-1.8.10.src.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93
-size 4818276
--- a/doxygen-1.8.11.src.tar.gz
+++ b/doxygen-1.8.11.src.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049
+size 4834291
--- a/doxygen-doc.changes
+++ b/doxygen-doc.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jan  5 10:05:23 UTC 2016 - pgajdos@suse.com
+
+- fix build after update
+
+-------------------------------------------------------------------
+Tue Jan  5 07:31:22 UTC 2016 - foss@grueninger.de
+
+- Update to 1.8.11
+  See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html
+- Update patch vhdlparser-no-return.patch
+- Remove patch doxygen-no-shared-libs.patch which is included
+  in upstream
+
 -------------------------------------------------------------------
 Fri Aug 21 10:01:07 UTC 2015 - tchvatal@suse.com

--- a/doxygen-doc.spec
+++ b/doxygen-doc.spec
@ -1,7 +1,7 @@
 #
 # spec file for package doxygen-doc
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,16 +17,13 @@


 Name:           doxygen-doc
-Version:        1.8.10
+Version:        1.8.11
 Release:        0
 Summary:        Automated C, C++, and Java Documentation Generator
 License:        GPL-2.0+
 Group:          Development/Tools/Doc Generators
 Url:            http://www.stack.nl/~dimitri/doxygen/
 Source0:        http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
-# PATCH-FIX-UPSTREAM: declare static library where we don't want to provide
-# shared one
-Patch2:         doxygen-no-shared-libs.patch
 # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
 Patch3:         vhdlparser-no-return.patch
 # suse specific, for ppc64le, workaround for bnc#921577
@ -42,6 +39,7 @@ BuildRequires:  graphviz-gnome
 BuildRequires:  poppler-tools
 BuildRequires:  python-base
 BuildRequires:  python-xml
+BuildRequires:  texlive-appendix
 BuildRequires:  texlive-colortbl
 BuildRequires:  texlive-courier
 BuildRequires:  texlive-dvips
@ -49,6 +47,7 @@ BuildRequires:  texlive-epstopdf
 BuildRequires:  texlive-fancyhdr
 BuildRequires:  texlive-float
 BuildRequires:  texlive-helvetic
+BuildRequires:  texlive-import
 BuildRequires:  texlive-latex
 BuildRequires:  texlive-makeindex
 BuildRequires:  texlive-metafont
@ -58,6 +57,7 @@ BuildRequires:  texlive-psnfss
 BuildRequires:  texlive-rsfs
 BuildRequires:  texlive-sectsty
 BuildRequires:  texlive-symbol
+BuildRequires:  texlive-tabu
 BuildRequires:  texlive-times
 BuildRequires:  texlive-tocloft
 BuildRequires:  texlive-wasy
@ -77,7 +77,6 @@ This package contains only documentation

 %prep
 %setup -q -n doxygen-%{version} 
-%patch2 -p1
 %patch3 -p1
 %ifarch ppc64le
 # see bnc#921577
@ -101,7 +100,7 @@ make docs %{?_smp_mflags}
 %install
 %cmake_install docs
 rm %{buildroot}%{_bindir}/doxygen
-rm -r %{buildroot}/usr/man/man1/
+rm -r %{buildroot}%{_mandir}/man1/
 %fdupes -s %{buildroot}%{_docdir}/%{name}-doc

 %files
--- a/doxygen-no-shared-libs.patch
+++ b/doxygen-no-shared-libs.patch
@ -1,54 +0,0 @@
-Index: doxygen-1.8.10/libmd5/CMakeLists.txt
-===================================================================
--- doxygen-1.8.10.orig/libmd5/CMakeLists.txt
-+++ doxygen-1.8.10/libmd5/CMakeLists.txt
-@@ -1,3 +1,3 @@
-add_library(md5
-+add_library(md5 STATIC
- md5.c
- )
-Index: doxygen-1.8.10/qtools/CMakeLists.txt
-===================================================================
--- doxygen-1.8.10.orig/qtools/CMakeLists.txt
-+++ doxygen-1.8.10/qtools/CMakeLists.txt
-@@ -52,6 +52,6 @@ qwaitcondition_win32.cpp
- )
- endif()
- 
-add_library(qtools
-+add_library(qtools STATIC
- ${qtools_src}
- )
-Index: doxygen-1.8.10/src/CMakeLists.txt
-===================================================================
--- doxygen-1.8.10.orig/src/CMakeLists.txt
-+++ doxygen-1.8.10/src/CMakeLists.txt
-@@ -106,7 +106,7 @@ FLEX_TARGET(config         config.l
- BISON_TARGET(vhdlparser    vhdlparser.y     ${GENERATED_SRC}/vhdlparser.cpp     COMPILE_FLAGS "-l -p vhdlscannerYY")
- BISON_TARGET(constexp      constexp.y       ${GENERATED_SRC}/ce_parse.cpp       COMPILE_FLAGS "-l -p constexpYY")
- 
-add_library(doxycfg
-+add_library(doxycfg STATIC
-     ${GENERATED_SRC}/lang_cfg.h
-     ${GENERATED_SRC}/config.cpp
-     ${GENERATED_SRC}/configoptions.cpp
-@@ -114,7 +114,7 @@ add_library(doxycfg
-     portable_c.c
- )
- 
-add_library(_doxygen
-+add_library(_doxygen STATIC
-     # custom generated files
-     ${GENERATED_SRC}/lang_cfg.h
-     ${GENERATED_SRC}/settings.h
-Index: doxygen-1.8.10/vhdlparser/CMakeLists.txt
-===================================================================
--- doxygen-1.8.10.orig/vhdlparser/CMakeLists.txt
-+++ doxygen-1.8.10/vhdlparser/CMakeLists.txt
-@@ -1,5 +1,5 @@
- include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools)
-add_library(vhdlparser
-+add_library(vhdlparser STATIC
- CharStream.cc
- ParseException.cc
- Token.cc
--- a/doxygen.changes
+++ b/doxygen.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jan  5 07:31:22 UTC 2016 - foss@grueninger.de
+
+- Update to 1.8.11
+  See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html
+- Update patch vhdlparser-no-return.patch
+- Remove patch doxygen-no-shared-libs.patch which is included
+  in upstream
+
 -------------------------------------------------------------------
 Mon Oct  5 14:05:14 UTC 2015 - pgajdos@suse.com

--- a/doxygen.spec
+++ b/doxygen.spec
@ -1,7 +1,7 @@
 #
 # spec file for package doxygen
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@


 Name:           doxygen
-Version:        1.8.10
+Version:        1.8.11
 Release:        0
 Summary:        Automated C, C++, and Java Documentation Generator
 License:        GPL-2.0+
@ -28,9 +28,6 @@ Source0:        http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar
 Patch0:         %{name}-modify_footer.patch
 # suse specific
 Patch1:         %{name}-no-lowercase-man-names.patch
-# PATCH-FIX-UPSTREAM: declare static library where we don't want to provide
-# shared one
-Patch2:         doxygen-no-shared-libs.patch
 # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
 Patch3:         vhdlparser-no-return.patch
 # suse specific, for ppc64le, workaround for bnc#921577
@ -55,7 +52,6 @@ as well.
 %setup -q
 %patch0
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %ifarch ppc64le
 %patch4 -p1
--- a/doxywizard.changes
+++ b/doxywizard.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jan  5 09:35:48 UTC 2016 - pgajdos@suse.com
+
+- fix build after update
+
+-------------------------------------------------------------------
+Tue Jan  5 07:31:22 UTC 2016 - foss@grueninger.de
+
+- Update to 1.8.11
+  See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html
+- Update patch vhdlparser-no-return.patch
+- Remove patch doxygen-no-shared-libs.patch which is included
+  in upstream
+
 -------------------------------------------------------------------
 Thu Aug 27 07:34:32 UTC 2015 - mpluskal@suse.com

--- a/doxywizard.spec
+++ b/doxywizard.spec
@ -1,7 +1,7 @@
 #
 # spec file for package doxywizard
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@


 Name:           doxywizard
-Version:        1.8.10
+Version:        1.8.11
 Release:        0
 Summary:        Graphical User Interface for Doxygen
 License:        GPL-2.0+
@ -25,9 +25,6 @@ Group:          Development/Tools/Doc Generators
 Url:            http://www.stack.nl/~dimitri/doxygen/
 Source:         http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
 Source1:        doxywizard.desktop
-# PATCH-FIX-UPSTREAM: declare static library where we don't want to provide
-# shared one
-Patch2:         doxygen-no-shared-libs.patch
 # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
 Patch3:         vhdlparser-no-return.patch
 BuildRequires:  bison
@ -51,7 +48,6 @@ configuration files.

 %prep
 %setup -q -n doxygen-%{version}
-%patch2 -p1
 %patch3 -p1

 %build
--- a/vhdlparser-no-return.patch
+++ b/vhdlparser-no-return.patch
@ -1,476 +1,474 @@
-Index: doxygen-1.8.10/vhdlparser/VhdlParser.cc
-===================================================================
--- doxygen-1.8.10.orig/vhdlparser/VhdlParser.cc
-+++ doxygen-1.8.10/vhdlparser/VhdlParser.cc
-@@ -62,6 +62,7 @@ return tok->image.c_str();
+--- doxygen-1.8.11.orig/vhdlparser/VhdlParser.cc
+++ doxygen-1.8.11/vhdlparser/VhdlParser.cc
+@@ -62,6 +62,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -118,6 +119,7 @@ return str;
+@@ -118,6 +119,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -187,6 +189,7 @@ s+="(";s+=s1+")";return s;
+@@ -187,6 +189,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -231,6 +234,7 @@ return "&";
+@@ -231,6 +234,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -403,6 +407,7 @@ return s;
+@@ -403,6 +407,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -634,6 +639,7 @@ return s;
+@@ -634,6 +639,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -847,6 +853,7 @@ return tok->image.c_str();
+@@ -847,6 +853,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -1718,6 +1725,7 @@ return " others ";
+@@ -1718,6 +1725,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -2009,6 +2017,7 @@ return s+"#";
+@@ -2009,6 +2017,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -2621,6 +2630,7 @@ return s;
+@@ -2621,6 +2630,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -2712,6 +2722,7 @@ return s+" inertial ";
+@@ -2712,6 +2722,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -2813,6 +2824,7 @@ return s;
+@@ -2813,6 +2824,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -2846,6 +2858,7 @@ return tok->image.c_str();
+@@ -2846,6 +2858,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -2913,6 +2926,7 @@ return s;
+@@ -2913,6 +2926,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -3043,6 +3057,7 @@ return tok->image.c_str();
+@@ -3043,6 +3057,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -3241,6 +3256,7 @@ return "file";
+@@ -3241,6 +3256,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -3728,6 +3744,7 @@ return "all";
+@@ -3728,6 +3744,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -3844,6 +3861,7 @@ return s;
+@@ -3844,6 +3861,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -3878,6 +3896,7 @@ return s;
+@@ -3878,6 +3896,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -4116,6 +4135,7 @@ return "or" ;
+@@ -4116,6 +4135,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -4212,6 +4232,7 @@ s1="not ";return s1+s;
+@@ -4212,6 +4232,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -4363,6 +4384,7 @@ return tok->image.c_str();
+@@ -4363,6 +4384,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -4683,6 +4705,7 @@ return s;
+@@ -4683,6 +4705,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -4844,6 +4867,7 @@ return tok->image.c_str();
+@@ -4844,6 +4867,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5130,6 +5154,7 @@ return s;
+@@ -5130,6 +5154,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5248,6 +5273,7 @@ s1="configuration ";return s;
+@@ -5263,6 +5288,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5293,6 +5319,7 @@ return tok->image.c_str();
+@@ -5308,6 +5334,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5401,6 +5428,7 @@ if (parse_sec==GEN_SEC)
+@@ -5416,6 +5443,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5666,6 +5694,7 @@ QCString q=lab+" for "+s;
+@@ -5681,6 +5709,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5743,6 +5772,7 @@ return s;
+@@ -5758,6 +5787,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5805,6 +5835,7 @@ return "null";
+@@ -5820,6 +5850,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -5950,6 +5981,7 @@ return "not";
+@@ -5965,6 +5996,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -6016,6 +6048,7 @@ return "linkage";
+@@ -6031,6 +6063,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -6071,6 +6104,7 @@ return tok->image.c_str();
+@@ -6086,6 +6119,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -6511,6 +6545,7 @@ return s;
+@@ -6526,6 +6560,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -6592,6 +6627,7 @@ return "type";
+@@ -6607,6 +6642,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -7402,6 +7438,7 @@ return s;
+@@ -7417,6 +7453,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -7674,6 +7711,7 @@ return s;
+@@ -7689,6 +7726,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -8033,6 +8071,7 @@ return s;
+@@ -8048,6 +8086,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -8212,6 +8251,7 @@ return "/=";
+@@ -8227,6 +8266,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -8384,6 +8424,7 @@ return s+" "+s1+"%";
+@@ -8399,6 +8439,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -8745,6 +8786,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_
+@@ -8760,6 +8801,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -8856,6 +8898,7 @@ return "ror";
+@@ -8871,6 +8913,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -8889,6 +8932,7 @@ return "-";
+@@ -8904,6 +8947,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -8983,6 +9027,7 @@ return s+s1+"<="+s2+s3+";";
+@@ -8998,6 +9042,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -9087,6 +9132,7 @@ return "bus";
+@@ -9102,6 +9147,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -9157,6 +9203,7 @@ return "all";
+@@ -9172,6 +9218,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -9630,6 +9677,7 @@ return s;
+@@ -9645,6 +9692,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -10045,6 +10093,7 @@ return " all ";
+@@ -10060,6 +10108,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -10081,6 +10130,7 @@ return s;
+@@ -10096,6 +10145,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -10183,6 +10233,7 @@ return s;
+@@ -10198,6 +10248,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -10267,6 +10318,7 @@ return "";
+@@ -10282,6 +10333,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -10458,6 +10510,7 @@ return "";
+@@ -10473,6 +10525,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -10692,6 +10745,7 @@ return " unaffected ";
+@@ -10707,6 +10760,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -11176,6 +11230,7 @@ return s;
+@@ -11191,6 +11245,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -11666,6 +11721,7 @@ return t->image.data();
+@@ -11681,6 +11736,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -11710,6 +11766,7 @@ return s;
+@@ -11725,6 +11781,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -11755,6 +11812,7 @@ return "."+s;
+@@ -11770,6 +11827,7 @@
       }
     }
 assert(false);
 +return QCString();
-   }
+ }
 
 
-@@ -12557,6 +12615,7 @@ return s;
+@@ -12572,6 +12630,7 @@
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
 +return QCString();
-   }
+ }