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

[Dan McGee]

    Date: Sunday, September 18, 2016 @ 18:12:36
  Author: dan
Revision: 276682

upgpkg: doxygen 1.8.12-1

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

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

Deleted: 0001-Partial-revert-of-commit-080a465b1321.patch
===================================================================
--- 0001-Partial-revert-of-commit-080a465b1321.patch	2016-09-18 18:01:12 UTC (rev 276681)
+++ 0001-Partial-revert-of-commit-080a465b1321.patch	2016-09-18 18:12:36 UTC (rev 276682)
@@ -1,33 +0,0 @@
-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	2016-09-18 18:01:12 UTC (rev 276681)
+++ PKGBUILD	2016-09-18 18:12:36 UTC (rev 276682)
@@ -3,19 +3,16 @@
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.11
-pkgrel=4
+pkgver=1.8.12
+pkgrel=1
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
 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
-        0001-Partial-revert-of-commit-080a465b1321.patch)
-md5sums=('f4697a444feaed739cfa2f0644abc19b'
-         '93cc5bb3f18c73a3e2b53d6276d87a11')
-sha1sums=('c0841007cf8a7910ccf0d8e4f7a5dd8fd2d9fc18'
-          'aa03a6a51ff691ffef11d96bb25236f2f7655b6b')
+source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
+md5sums=('08e0f7850c4d22cb5188da226b209a96')
+sha1sums=('eacf83859a5bd7f3f71b46f34759cefe1a05babc')
 
 prepare() {
   mkdir build
@@ -24,9 +21,6 @@
   # 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
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=759241
-  patch -Np1 -i ../0001-Partial-revert-of-commit-080a465b1321.patch
 }
 
 build() {