From c4f5bcb1112ecb82109c52466bbfe024167d69a3 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 29 Apr 2020 18:50:36 +0300
Subject: [PATCH] doxygen: Update to 1.8.18

---
 doxygen/1.7.4-iconv.patch              | 11 -----------
 doxygen/PKGBUILD                       | 13 +++++--------
 doxygen/doxygen-segfault.patch         | 12 ------------
 doxygen/msys2-change-debug-flags.patch | 11 -----------
 doxygen/remove-extra-slashes.patch     | 15 ---------------
 5 files changed, 5 insertions(+), 57 deletions(-)
 delete mode 100644 doxygen/1.7.4-iconv.patch
 delete mode 100644 doxygen/doxygen-segfault.patch
 delete mode 100644 doxygen/msys2-change-debug-flags.patch
 delete mode 100644 doxygen/remove-extra-slashes.patch

diff --git a/doxygen/1.7.4-iconv.patch b/doxygen/1.7.4-iconv.patch
deleted file mode 100644
index ab46f727..00000000
--- a/doxygen/1.7.4-iconv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/doxygen-1.7.4/tmake/lib/linux-g++/tmake.conf	2008-12-06 06:16:20.000000000 -0700
-+++ src/doxygen-1.7.4/tmake/lib/linux-g++/tmake.conf	2011-07-26 15:48:50.130200000 -0600
-@@ -42,7 +42,7 @@ TMAKE_LFLAGS_DEBUG	= -g
- TMAKE_LFLAGS_SHLIB	= -shared
- TMAKE_LFLAGS_SONAME	= -Wl,-soname,
- 
--TMAKE_LIBS		=
-+TMAKE_LIBS		= -liconv
- TMAKE_LIBS_X11		= -lXext -lX11 -lm
- TMAKE_LIBS_X11SM	= -lICE -lSM
- TMAKE_LIBS_QT		= -lqt
diff --git a/doxygen/PKGBUILD b/doxygen/PKGBUILD
index 27c41a7e..5282761c 100644
--- a/doxygen/PKGBUILD
+++ b/doxygen/PKGBUILD
@@ -2,20 +2,18 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 pkgname=doxygen
-pkgver=1.8.17
-pkgrel=2
+pkgver=1.8.18
+pkgrel=1
 pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
 arch=('i686' 'x86_64')
 url="http://www.doxygen.org/"
 options=('strip' 'staticlibs')
 license=('GPL')
 depends=("gcc-libs" "libsqlite" "libiconv")
-makedepends=("cmake" "gcc" "flex" "python3" "libsqlite-devel" "libiconv-devel")
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz
-        "doxygen-segfault.patch")
+makedepends=("cmake" "gcc" "flex" "python" "libsqlite-devel" "libiconv-devel")
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz)
 #noextract=("${pkgname}-${pkgver}.tar.gz")
-sha256sums=('1b5d337e4b73ef1357a88cbd06fc4c301f08f279dac0adb99e876f4d72361f4f'
-            '220f5446dd2712cb043ced03cb2927596ed25a5e60150499be9213acba5b5c25')
+sha256sums=('9c88f733396dca16139483045d5afa5bbf19d67be0b8f0ea43c4e813ecfb2aa2')
 
 build() {
   local extra_config=Release
@@ -37,6 +35,5 @@ build() {
 
 package() {
   cd ${srcdir}/build-${CHOST}
-
   make DESTDIR="${pkgdir}" install
 }
diff --git a/doxygen/doxygen-segfault.patch b/doxygen/doxygen-segfault.patch
deleted file mode 100644
index b5bb5258..00000000
--- a/doxygen/doxygen-segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur doxygen-1.8.13.orig/src/xmlgen.cpp doxygen-1.8.13/src/xmlgen.cpp
---- doxygen-1.8.13.orig/src/xmlgen.cpp	2017-03-07 21:59:57.687388659 +0100
-+++ doxygen-1.8.13/src/xmlgen.cpp	2017-03-07 22:00:43.043413181 +0100
-@@ -620,7 +620,7 @@
-     if (md->isInline()) t << "yes"; else t << "no";
-     t << "\"";
- 
--    if (al->refQualifier!=RefQualifierNone)
-+    if (al!=0 && al->refQualifier!=RefQualifierNone)
-     {
-       t << " refqual=\"";
-       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
diff --git a/doxygen/msys2-change-debug-flags.patch b/doxygen/msys2-change-debug-flags.patch
deleted file mode 100644
index 18e25f25..00000000
--- a/doxygen/msys2-change-debug-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doxygen-1.8.9/tmake/lib/linux-g++/tmake.conf.orig	2014-11-07 21:22:37.755309800 +0000
-+++ doxygen-1.8.9/tmake/lib/linux-g++/tmake.conf	2014-11-07 21:22:42.518582300 +0000
-@@ -12,7 +12,7 @@
- TMAKE_CFLAGS_WARN_ON	= -Wall -W 
- TMAKE_CFLAGS_WARN_OFF	=
- TMAKE_CFLAGS_RELEASE	= -O3
--TMAKE_CFLAGS_DEBUG	= -g
-+TMAKE_CFLAGS_DEBUG	= -g -Wa,-mbig-obj
- TMAKE_CFLAGS_SHLIB	= -fPIC
- TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
- 
diff --git a/doxygen/remove-extra-slashes.patch b/doxygen/remove-extra-slashes.patch
deleted file mode 100644
index 3cf797f6..00000000
--- a/doxygen/remove-extra-slashes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- doxygen-1.8.8/src/libdoxygen.t.in.orig	2014-08-15 02:46:42.000000000 +0900
-+++ doxygen-1.8.8/src/libdoxygen.t.in	2014-09-02 11:39:39.364028800 +0900
-@@ -105,10 +105,10 @@
- #$ GenerateLex("constexp",0);
- 
- #$ GenerateDep("\$(GENERATED_SRC)/ce_parse.cpp","constexp.y");
--	$(YACC) -l -p constexpYY constexp.y -o \$(GENERATED_SRC)/ce_parse.cpp 
-+	$(YACC) -l -p constexpYY constexp.y -o $(GENERATED_SRC)/ce_parse.cpp 
- 
- #$ GenerateDep("\$(GENERATED_SRC)/ce_parse.h","constexp.y");
--	$(YACC) -l -d -p ce_parsexpYY constexp.y -o \$(GENERATED_SRC)/ce_parse.c 
-+	$(YACC) -l -d -p ce_parsexpYY constexp.y -o $(GENERATED_SRC)/ce_parse.c 
- 	-rm $(GENERATED_SRC)/ce_parse.c
- 
-