[arch-commits] Commit in doxygen/repos/extra-x86_64 (3 files)

[Levente Polyak]

    Date: Thursday, January 18, 2018 @ 21:03:54
  Author: anthraxx
Revision: 315110

archrelease: copy trunk to extra-x86_64

Added:
  doxygen/repos/extra-x86_64/PKGBUILD
    (from rev 315109, doxygen/trunk/PKGBUILD)
Deleted:
  doxygen/repos/extra-x86_64/PKGBUILD
  doxygen/repos/extra-x86_64/doxygen-segfault.patch

------------------------+
 PKGBUILD               |  140 +++++++++++++++++++++++------------------------
 doxygen-segfault.patch |   12 ----
 2 files changed, 70 insertions(+), 82 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-18 21:03:39 UTC (rev 315109)
+++ PKGBUILD	2018-01-18 21:03:54 UTC (rev 315110)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgbase=doxygen
-pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.13
-pkgrel=3
-license=('GPL')
-arch=(i686 x86_64)
-url="http://www.doxygen.org/"
-makedepends=('cmake' 'gcc-libs' 'flex' 'qt5-base' 'texlive-core' 'ghostscript'
-             'texlive-latexextra' 'graphviz' 'python2')
-source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz doxygen-segfault.patch)
-md5sums=('0fa414975f8cd6d30e126c28327c1f7c'
-         '168442765e75a07602632a691b7e6d8e')
-sha1sums=('a3c812346d2ebd7b2e79ed1fec3a6aa3aedd5f7b'
-          '58d927f6b5c63ffa12692e862ec439c527680413')
-
-prepare() {
-  mkdir build
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # 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 -i $srcdir/doxygen-segfault.patch
-}
-
-build() {
-  cd build
-
-  cmake "../${pkgbase}-${pkgver}" \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
-    -DPYTHON_EXECUTABLE:FILE=/usr/bin/python2 \
-    -Dbuild_doc:BOOL=ON \
-    -Dbuild_wizard:BOOL=ON
-
-  make
-  make docs
-}
-
-check(){
-  cd build
-  make tests
-}
-
-package_doxygen() {
-  pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
-  depends=('gcc-libs')
-  optdepends=('graphviz: for caller/callee graph generation'
-              'qt5-base: for doxywizard')
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  # Docs are in 'doxygen-docs'
-  rm -rf "${pkgdir}/usr/share/doc"
-}
-
-package_doxygen-docs() {
-  pkgdesc="Developer documentation for doxygen"
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-}

Copied: doxygen/repos/extra-x86_64/PKGBUILD (from rev 315109, doxygen/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-18 21:03:54 UTC (rev 315110)
@@ -0,0 +1,70 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+pkgver=1.8.14
+pkgrel=1
+pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
+url='http://www.doxygen.org/'
+arch=('x86_64')
+license=('GPL')
+makedepends=('cmake' 'gcc-libs' 'flex' 'qt5-base' 'texlive-core' 'ghostscript'
+             'texlive-latexextra' 'graphviz' 'python2')
+source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz)
+sha256sums=('18bc3790b4d5f4d57cb8ee0a77dd63a52518f3f70d7fdff868a7ce7961a6edc3')
+sha512sums=('e19d706be64f8c1d35d3cd12b8c35f09503213bb3f5a4aa311ef0a6a953843ebed5ac4eca52ca908222543fb9794d545bb6d88c9fc8f39e66ef22c1919c120b0')
+
+prepare() {
+  cd ${pkgbase}-Release_${pkgver//./_}
+
+  mkdir 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
+}
+
+build() {
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
+    -DPYTHON_EXECUTABLE:FILE=/usr/bin/python2 \
+    -Dbuild_doc:BOOL=ON \
+    -Dbuild_wizard:BOOL=ON
+
+  make
+  make docs
+}
+
+check(){
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+  make tests
+}
+
+package_doxygen() {
+  pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
+  depends=('gcc-libs')
+  optdepends=('graphviz: for caller/callee graph generation'
+              'qt5-base: for doxywizard')
+
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+  make DESTDIR="${pkgdir}" install
+
+  # Docs are in 'doxygen-docs'
+  rm -rf "${pkgdir}/usr/share/doc"
+}
+
+package_doxygen-docs() {
+  pkgdesc='Developer documentation for doxygen'
+
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/bin"
+  rm -rf "${pkgdir}/usr/share/man"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: doxygen-segfault.patch
===================================================================
--- doxygen-segfault.patch	2018-01-18 21:03:39 UTC (rev 315109)
+++ doxygen-segfault.patch	2018-01-18 21:03:54 UTC (rev 315110)
@@ -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";