[arch-commits] Commit in doxygen/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Dec 9 16:40:48 UTC 2015
Date: Wednesday, December 9, 2015 @ 17:40:48
Author: foutrelis
Revision: 255023
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
doxygen/repos/testing-i686/0001-Partial-revert-of-commit-080a465b1321.patch
(from rev 255022, doxygen/trunk/0001-Partial-revert-of-commit-080a465b1321.patch)
doxygen/repos/testing-i686/PKGBUILD
(from rev 255022, doxygen/trunk/PKGBUILD)
doxygen/repos/testing-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch
(from rev 255022, doxygen/trunk/0001-Partial-revert-of-commit-080a465b1321.patch)
doxygen/repos/testing-x86_64/PKGBUILD
(from rev 255022, doxygen/trunk/PKGBUILD)
Deleted:
doxygen/repos/testing-i686/PKGBUILD
doxygen/repos/testing-x86_64/PKGBUILD
-----------------------------------------------------------------+
/PKGBUILD | 158 ++++++++++
testing-i686/0001-Partial-revert-of-commit-080a465b1321.patch | 33 ++
testing-i686/PKGBUILD | 73 ----
testing-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch | 33 ++
testing-x86_64/PKGBUILD | 73 ----
5 files changed, 224 insertions(+), 146 deletions(-)
Copied: doxygen/repos/testing-i686/0001-Partial-revert-of-commit-080a465b1321.patch (from rev 255022, doxygen/trunk/0001-Partial-revert-of-commit-080a465b1321.patch)
===================================================================
--- testing-i686/0001-Partial-revert-of-commit-080a465b1321.patch (rev 0)
+++ testing-i686/0001-Partial-revert-of-commit-080a465b1321.patch 2015-12-09 16:40:48 UTC (rev 255023)
@@ -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
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2015-12-09 16:40:36 UTC (rev 255022)
+++ testing-i686/PKGBUILD 2015-12-09 16:40:48 UTC (rev 255023)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgbase=doxygen
-pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.10
-pkgrel=3
-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
- flex-2.6.patch::"https://github.com/heirecka/doxygen/commit/5fcb1357.patch")
-md5sums=('79767ccd986f12a0f949015efb5f058f'
- 'b282c91bac1888f607a3676a236d2828')
-sha1sums=('6bad93cbdb1b2efacba14769d39bcc7bc9c0753b'
- 'aeeb45547de0f659789588b563210d9511c6a291')
-
-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
-
- # Fix build with flex 2.6
- patch -p1 -i ../flex-2.6.patch
-}
-
-build() {
- cd build
-
- cmake "../${pkgbase}-${pkgver}" \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
- -DQT_QMAKE_EXECUTABLE:FILE=/usr/lib/qt4/bin/qmake \
- -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'
- 'qt4: 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/testing-i686/PKGBUILD (from rev 255022, doxygen/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-12-09 16:40:48 UTC (rev 255023)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+pkgver=1.8.10
+pkgrel=4
+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
+ flex-2.6.patch::"https://github.com/heirecka/doxygen/commit/5fcb1357.patch")
+md5sums=('79767ccd986f12a0f949015efb5f058f'
+ '93cc5bb3f18c73a3e2b53d6276d87a11'
+ 'b282c91bac1888f607a3676a236d2828')
+sha1sums=('6bad93cbdb1b2efacba14769d39bcc7bc9c0753b'
+ 'aa03a6a51ff691ffef11d96bb25236f2f7655b6b'
+ 'aeeb45547de0f659789588b563210d9511c6a291')
+
+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
+
+ # 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
+}
+
+build() {
+ cd build
+
+ cmake "../${pkgbase}-${pkgver}" \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
+ -DQT_QMAKE_EXECUTABLE:FILE=/usr/lib/qt4/bin/qmake \
+ -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'
+ 'qt4: 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/testing-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch (from rev 255022, doxygen/trunk/0001-Partial-revert-of-commit-080a465b1321.patch)
===================================================================
--- testing-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch (rev 0)
+++ testing-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch 2015-12-09 16:40:48 UTC (rev 255023)
@@ -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
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2015-12-09 16:40:36 UTC (rev 255022)
+++ testing-x86_64/PKGBUILD 2015-12-09 16:40:48 UTC (rev 255023)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgbase=doxygen
-pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.10
-pkgrel=3
-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
- flex-2.6.patch::"https://github.com/heirecka/doxygen/commit/5fcb1357.patch")
-md5sums=('79767ccd986f12a0f949015efb5f058f'
- 'b282c91bac1888f607a3676a236d2828')
-sha1sums=('6bad93cbdb1b2efacba14769d39bcc7bc9c0753b'
- 'aeeb45547de0f659789588b563210d9511c6a291')
-
-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
-
- # Fix build with flex 2.6
- patch -p1 -i ../flex-2.6.patch
-}
-
-build() {
- cd build
-
- cmake "../${pkgbase}-${pkgver}" \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
- -DQT_QMAKE_EXECUTABLE:FILE=/usr/lib/qt4/bin/qmake \
- -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'
- 'qt4: 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/testing-x86_64/PKGBUILD (from rev 255022, doxygen/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-12-09 16:40:48 UTC (rev 255023)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+pkgver=1.8.10
+pkgrel=4
+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
+ flex-2.6.patch::"https://github.com/heirecka/doxygen/commit/5fcb1357.patch")
+md5sums=('79767ccd986f12a0f949015efb5f058f'
+ '93cc5bb3f18c73a3e2b53d6276d87a11'
+ 'b282c91bac1888f607a3676a236d2828')
+sha1sums=('6bad93cbdb1b2efacba14769d39bcc7bc9c0753b'
+ 'aa03a6a51ff691ffef11d96bb25236f2f7655b6b'
+ 'aeeb45547de0f659789588b563210d9511c6a291')
+
+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
+
+ # 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
+}
+
+build() {
+ cd build
+
+ cmake "../${pkgbase}-${pkgver}" \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
+ -DQT_QMAKE_EXECUTABLE:FILE=/usr/lib/qt4/bin/qmake \
+ -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'
+ 'qt4: 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"
+}
More information about the arch-commits
mailing list