From 7d841d424dbd922f977787d73475eee28eed94e5 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 26 Aug 2013 18:38:18 +0200 Subject: [PATCH] drop, it's included in 1.8.5 --- doxygen-1.4.8-endless-loop.patch | 27 --------------------------- doxygen.spec | 5 ++--- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 doxygen-1.4.8-endless-loop.patch diff --git a/doxygen-1.4.8-endless-loop.patch b/doxygen-1.4.8-endless-loop.patch deleted file mode 100644 index a62428b..0000000 --- a/doxygen-1.4.8-endless-loop.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 5e056236c9ef3b3675d014cab43480700027d60b -Author: Dimitri van Heesch -Date: Thu May 30 20:01:15 2013 +0200 - - Bug 701295 - Doxygen 1.8.4 goes into an endless loop - -diff --git a/src/util.cpp b/src/util.cpp -index 0d70d43..0c36fc0 100644 ---- a/src/util.cpp -+++ b/src/util.cpp -@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name) - ++templateDepth; - pos=nextOpenPos-1; - } -- else -+ else if (nextClosePos!=-1) - { - --templateDepth; - pos=nextClosePos-1; - } -+ else // more >'s than <'s, see bug701295 -+ { -+ return -1; -+ } - } - else - { diff --git a/doxygen.spec b/doxygen.spec index f67ad62..1834249 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -13,9 +13,8 @@ Source1: doxywizard.png Source2: doxywizard.desktop Patch1: doxygen-1.8.4-config.patch -Patch2: doxygen-1.8.1.1-html_timestamp_default_false.patch +Patch2: doxygen-1.8.5-html_timestamp_default_false.patch Patch3: doxygen-1.8.3-multilib.patch -Patch4: doxygen-1.4.8-endless-loop.patch BuildRequires: perl BuildRequires: tex(dvips) @@ -65,7 +64,7 @@ Requires: tex(xtab.sty) %patch1 -p1 -b .config %patch2 -p1 -b .html_timestamp_default_false %patch3 -p1 -b .multilib -%patch4 -p1 -b .endless-loop + # convert into utf-8 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new