From d0bc2a2f4aa14a62f7d4c3921f520935ba2c151c Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 31 Dec 2015 17:44:45 +0100 Subject: [PATCH] doxygen: update to 1.8.11 --- .../doxygen/patches/fix-version_check.patch | 75 ------------------- srcpkgs/doxygen/template | 10 +-- 2 files changed, 5 insertions(+), 80 deletions(-) delete mode 100644 srcpkgs/doxygen/patches/fix-version_check.patch diff --git a/srcpkgs/doxygen/patches/fix-version_check.patch b/srcpkgs/doxygen/patches/fix-version_check.patch deleted file mode 100644 index bd89b7b482e..00000000000 --- a/srcpkgs/doxygen/patches/fix-version_check.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- src/code.l 2015-05-31 21:01:12.000000000 +0200 -+++ src/code.l 2015-11-21 16:51:03.196986482 +0100 -@@ -3695,7 +3695,7 @@ - extern "C" { // some bogus code to keep the compiler happy - void codeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #endif - ---- src/fortrancode.l 2015-05-31 21:01:12.000000000 +0200 -+++ src/fortrancode.l 2015-11-21 21:50:13.726585997 +0100 -@@ -1306,7 +1306,7 @@ - extern "C" { // some bogus code to keep the compiler happy - void fortrancodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #else - extern "C" { // some bogus code to keep the compiler happy ---- src/vhdlcode.l 2015-05-31 21:01:12.000000000 +0200 -+++ src/vhdlcode.l 2015-11-21 21:52:24.840575768 +0100 -@@ -1613,7 +1613,7 @@ - extern "C" { // some bogus code to keep the compiler happy - void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #endif - ---- src/xmlcode.l 2015-05-31 21:01:12.000000000 +0200 -+++ src/xmlcode.l 2015-11-21 21:53:38.411570028 +0100 -@@ -407,7 +407,7 @@ - extern "C" { // some bogus code to keep the compiler happy - void xmlcodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." - #endif - ---- src/pycode.l 2015-05-31 21:01:12.000000000 +0200 -+++ src/pycode.l 2015-11-21 21:58:01.071549535 +0100 -@@ -1503,7 +1503,7 @@ - extern "C" { // some bogus code to keep the compiler happy - void pycodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." - #endif - ---- src/commentscan.l 2015-05-31 21:01:12.000000000 +0200 -+++ src/commentscan.l 2015-11-21 22:06:11.285511289 +0100 -@@ -1103,7 +1103,7 @@ - // but we need to know the position in the input buffer where this - // rule matched. - // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE --#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 -+#if YY_FLEX_MINOR_VERSION>=6 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33) - inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf); - #else - inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf); -@@ -1165,7 +1165,7 @@ - g_memberGroupHeader.resize(0); - parseMore=TRUE; - needNewEntry = TRUE; --#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 -+#if YY_FLEX_MINOR_VERSION>=6 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33) - inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext); - #else - inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext); diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template index 2d707a59e2d..69e3a3d8d85 100644 --- a/srcpkgs/doxygen/template +++ b/srcpkgs/doxygen/template @@ -1,7 +1,7 @@ # Template file for 'doxygen' pkgname=doxygen -version=1.8.10 -revision=2 +version=1.8.11 +revision=1 build_style=cmake hostmakedepends="cmake perl python flex" short_desc="Source code documentation generator tool" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://www.doxygen.org/" license="GPL-2" distfiles="http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${version}.src.tar.gz" -checksum=cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 +checksum=65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 post_install() { vman doc/doxygen.1 @@ -19,8 +19,8 @@ if [ -z "$CROSS_BUILD" ]; then makedepends="qt-devel" configure_args+=" -Dbuild_wizard=1" doxygen-gui_package() { - depends="doxygen>=${version}" - short_desc+=" - QT GUI configuration tool" + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GUI configuration tool" pkg_install() { vmove usr/bin/doxywizard vman doc/doxywizard.1