[arch-commits] Commit in doxygen/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, December 9, 2015 @ 17:40:36
  Author: foutrelis
Revision: 255022

upgpkg: doxygen 1.8.10-4

Add temporary fix for issue in doxygen 1.8.10 that breaks generation of
libstdc++ man pages.

Added:
  doxygen/trunk/0001-Partial-revert-of-commit-080a465b1321.patch
Modified:
  doxygen/trunk/PKGBUILD

--------------------------------------------------+
 0001-Partial-revert-of-commit-080a465b1321.patch |   33 +++++++++++++++++++++
 PKGBUILD                                         |   10 +++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

Added: 0001-Partial-revert-of-commit-080a465b1321.patch
===================================================================
--- 0001-Partial-revert-of-commit-080a465b1321.patch	                        (rev 0)
+++ 0001-Partial-revert-of-commit-080a465b1321.patch	2015-12-09 16:40:36 UTC (rev 255022)
@@ -0,0 +1,33 @@
+From 7725d0a48aee2928dc0544ccbb0aa79ddb3a74d4 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Wed, 9 Dec 2015 18:16:09 +0200
+Subject: [PATCH] Partial revert of commit 080a465b1321
+
+Fixes generation of libstd++ man pages.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759241
+---
+ src/util.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/util.cpp b/src/util.cpp
+index 3ee7ae5..0bf9940 100644
+--- a/src/util.cpp
++++ b/src/util.cpp
+@@ -1741,11 +1741,9 @@ nextChar:
+     }
+     else if (i>0 &&
+          (
+-          (s.at(i-1)==')' && isId(c)) // ")id" -> ") id"
++          (s.at(i-1)==')' && isId(c))
+           ||
+-          (c=='\''  && s.at(i-1)==' ')  // "'id" -> "' id"
+-          ||
+-          (i>1 && s.at(i-2)==' ' && s.at(i-1)==' ') // "  id" -> " id"
++          (c=='\''  && s.at(i-1)==' ')
+          )
+         )
+     {
+-- 
+2.6.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-09 15:45:05 UTC (rev 255021)
+++ PKGBUILD	2015-12-09 16:40:36 UTC (rev 255022)
@@ -4,7 +4,7 @@
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
 pkgver=1.8.10
-pkgrel=3
+pkgrel=4
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
@@ -11,10 +11,13 @@
 makedepends=('cmake' 'gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz' 'python2')
 source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz
-	flex-2.6.patch::"https://github.com/heirecka/doxygen/commit/5fcb1357.patch")
+        0001-Partial-revert-of-commit-080a465b1321.patch
+        flex-2.6.patch::"https://github.com/heirecka/doxygen/commit/5fcb1357.patch")
 md5sums=('79767ccd986f12a0f949015efb5f058f'
+         '93cc5bb3f18c73a3e2b53d6276d87a11'
          'b282c91bac1888f607a3676a236d2828')
 sha1sums=('6bad93cbdb1b2efacba14769d39bcc7bc9c0753b'
+          'aa03a6a51ff691ffef11d96bb25236f2f7655b6b'
           'aeeb45547de0f659789588b563210d9511c6a291')
 
 prepare() {
@@ -25,6 +28,9 @@
   sed -i 's:DESTINATION man/man1:DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1":g' \
     doc/CMakeLists.txt
 
+  # https://bugzilla.gnome.org/show_bug.cgi?id=759241
+  patch -Np1 -i ../0001-Partial-revert-of-commit-080a465b1321.patch
+
   # Fix build with flex 2.6
   patch -p1 -i ../flex-2.6.patch
 }