[arch-commits] Commit in doxygen/trunk (PKGBUILD doxygen-1.8.16-compat.patch)

[Levente Polyak]

    Date: Thursday, January 2, 2020 @ 20:42:00
  Author: anthraxx
Revision: 372481

upgpkg: doxygen 1.8.17-1

Modified:
  doxygen/trunk/PKGBUILD
Deleted:
  doxygen/trunk/doxygen-1.8.16-compat.patch

-----------------------------+
 PKGBUILD                    |   16 +++++---------
 doxygen-1.8.16-compat.patch |   48 ------------------------------------------
 2 files changed, 6 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-02 20:23:31 UTC (rev 372480)
+++ PKGBUILD	2020-01-02 20:42:00 UTC (rev 372481)
@@ -3,8 +3,8 @@
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.16
-pkgrel=2
+pkgver=1.8.17
+pkgrel=1
 pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
 url='http://www.doxygen.nl'
 arch=('x86_64')
@@ -11,20 +11,16 @@
 license=('GPL')
 makedepends=('cmake' 'gcc-libs' 'flex' 'qt5-base' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz' 'python2' 'git')
-source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz
-        doxygen-1.8.16-compat.patch)
-sha256sums=('75b18117f88ca1930ab74c05f6712690a26dd4fdcfc9d7d5324be43160645fb4'
-            'bb0d5a9baa9ee364da6ba51f5501d5a882572ae15055dc2db41593f3a19cb0e1')
-sha512sums=('546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f'
-            'c41d5dd0e69d42119c025582ea9beb2bb09cf37f654e5d02aa2f68fea4ecb3465dc1b47d8e6202da1188b44e61ca3b90e848dfdf8464d33674bdc2645ae21144')
+source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz)
+sha256sums=('1b5d337e4b73ef1357a88cbd06fc4c301f08f279dac0adb99e876f4d72361f4f')
+sha512sums=('c8315c0e2a22e339e8c6e6a8f2992440989b7164bab1996036cb8ab1b917f8d0f7b352b3ce7ff54944a0c51edd6af779653b8c13721647ba3c168e231655afa0')
 
 prepare() {
   cd ${pkgbase}-Release_${pkgver//./_}
-  mkdir build
+  mkdir -p build
   # Install the man pages in the right place
   sed -i 's:DESTINATION man/man1:DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1":g' \
     doc/CMakeLists.txt
-  patch -Np1 < ../doxygen-1.8.16-compat.patch
 }
 
 build() {

Deleted: doxygen-1.8.16-compat.patch
===================================================================
--- doxygen-1.8.16-compat.patch	2020-01-02 20:23:31 UTC (rev 372480)
+++ doxygen-1.8.16-compat.patch	2020-01-02 20:42:00 UTC (rev 372481)
@@ -1,48 +0,0 @@
-From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests at gmail.com>
-Date: Mon, 9 Sep 2019 13:28:28 +0200
-Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
- broken index.qhp
-
-Ignore automatically generated anchor names when importing a tag file.
----
- src/tagreader.cpp | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/tagreader.cpp b/src/tagreader.cpp
-index 56dbe7df9..d79d9b5c5 100644
---- a/src/tagreader.cpp
-+++ b/src/tagreader.cpp
-@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
- 
-     void endDocAnchor()
-     {
-+      // Check whether or not the tag is automatically generate, in that case ignore the tag.
-+      switch(m_state)
-+      {
-+        case InClass:
-+        case InFile:
-+        case InNamespace:
-+        case InGroup:
-+        case InPage:
-+        case InMember:
-+        case InPackage:
-+        case InDir:
-+          if (QString(m_curString).startsWith("autotoc_md")) return;
-+          break;
-+        default:
-+          warn("Unexpected tag 'docanchor' found");
-+          return;
-+      }
-       switch(m_state)
-       {
-         case InClass:     m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
-         case InMember:    m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-         case InPackage:   m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-         case InDir:       m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
--        default:   warn("Unexpected tag 'docanchor' found"); break; 
-+        default:   warn("Unexpected tag 'docanchor' found"); break;  // Not really necessary anymore
-       }
-     }
-