[arch-commits] Commit in doxygen/repos (6 files)

Jelle van der Waa jelle at archlinux.org
Sun Apr 9 18:16:22 UTC 2017


    Date: Sunday, April 9, 2017 @ 18:16:21
  Author: jelle
Revision: 292559

archrelease: copy trunk to extra-i686, extra-x86_64

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

-------------------------------------+
 /PKGBUILD                           |  136 ++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD                 |   66 ----------------
 extra-i686/doxygen-segfault.patch   |   12 +++
 extra-x86_64/PKGBUILD               |   66 ----------------
 extra-x86_64/doxygen-segfault.patch |   12 +++
 5 files changed, 160 insertions(+), 132 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-04-09 18:15:00 UTC (rev 292558)
+++ extra-i686/PKGBUILD	2017-04-09 18:16:21 UTC (rev 292559)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgbase=doxygen
-pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.13
-pkgrel=1
-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)
-md5sums=('0fa414975f8cd6d30e126c28327c1f7c')
-sha1sums=('a3c812346d2ebd7b2e79ed1fec3a6aa3aedd5f7b')
-
-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
-}
-
-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-i686/PKGBUILD (from rev 292558, doxygen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-04-09 18:16:21 UTC (rev 292559)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+pkgver=1.8.13
+pkgrel=2
+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
+}
+
+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-i686/doxygen-segfault.patch (from rev 292558, doxygen/trunk/doxygen-segfault.patch)
===================================================================
--- extra-i686/doxygen-segfault.patch	                        (rev 0)
+++ extra-i686/doxygen-segfault.patch	2017-04-09 18:16:21 UTC (rev 292559)
@@ -0,0 +1,12 @@
+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";

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-04-09 18:15:00 UTC (rev 292558)
+++ extra-x86_64/PKGBUILD	2017-04-09 18:16:21 UTC (rev 292559)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgbase=doxygen
-pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.13
-pkgrel=1
-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)
-md5sums=('0fa414975f8cd6d30e126c28327c1f7c')
-sha1sums=('a3c812346d2ebd7b2e79ed1fec3a6aa3aedd5f7b')
-
-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
-}
-
-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 292558, doxygen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-04-09 18:16:21 UTC (rev 292559)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+pkgver=1.8.13
+pkgrel=2
+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
+}
+
+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/doxygen-segfault.patch (from rev 292558, doxygen/trunk/doxygen-segfault.patch)
===================================================================
--- extra-x86_64/doxygen-segfault.patch	                        (rev 0)
+++ extra-x86_64/doxygen-segfault.patch	2017-04-09 18:16:21 UTC (rev 292559)
@@ -0,0 +1,12 @@
+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";



More information about the arch-commits mailing list