Date: Sunday, September 18, 2016 @ 18:13:02
  Author: dan
Revision: 276683

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

Added:
  doxygen/repos/extra-i686/PKGBUILD
    (from rev 276682, doxygen/trunk/PKGBUILD)
  doxygen/repos/extra-x86_64/PKGBUILD
    (from rev 276682, doxygen/trunk/PKGBUILD)
Deleted:
  doxygen/repos/extra-i686/0001-Partial-revert-of-commit-080a465b1321.patch
  doxygen/repos/extra-i686/PKGBUILD
  doxygen/repos/extra-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch
  doxygen/repos/extra-x86_64/PKGBUILD

---------------------------------------------------------------+
 /PKGBUILD                                                     |  134 ++++++++++
 extra-i686/0001-Partial-revert-of-commit-080a465b1321.patch   |   33 --
 extra-i686/PKGBUILD                                           |   73 -----
 extra-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch |   33 --
 extra-x86_64/PKGBUILD                                         |   73 -----
 5 files changed, 134 insertions(+), 212 deletions(-)

Deleted: extra-i686/0001-Partial-revert-of-commit-080a465b1321.patch
===================================================================
--- extra-i686/0001-Partial-revert-of-commit-080a465b1321.patch 2016-09-18 
18:12:36 UTC (rev 276682)
+++ extra-i686/0001-Partial-revert-of-commit-080a465b1321.patch 2016-09-18 
18:13:02 UTC (rev 276683)
@@ -1,33 +0,0 @@
-From 7725d0a48aee2928dc0544ccbb0aa79ddb3a74d4 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evange...@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: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-09-18 18:12:36 UTC (rev 276682)
+++ extra-i686/PKGBUILD 2016-09-18 18:13:02 UTC (rev 276683)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <d...@archlinux.org>
-
-pkgbase=doxygen
-pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.11
-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)
-md5sums=('f4697a444feaed739cfa2f0644abc19b'
-         '93cc5bb3f18c73a3e2b53d6276d87a11')
-sha1sums=('c0841007cf8a7910ccf0d8e4f7a5dd8fd2d9fc18'
-          'aa03a6a51ff691ffef11d96bb25236f2f7655b6b')
-
-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
-}
-
-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/extra-i686/PKGBUILD (from rev 276682, 
doxygen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD                         (rev 0)
+++ extra-i686/PKGBUILD 2016-09-18 18:13:02 UTC (rev 276683)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Dan McGee <d...@archlinux.org>
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+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)
+md5sums=('08e0f7850c4d22cb5188da226b209a96')
+sha1sums=('eacf83859a5bd7f3f71b46f34759cefe1a05babc')
+
+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 \
+    -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"
+}

Deleted: extra-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch
===================================================================
--- extra-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch       
2016-09-18 18:12:36 UTC (rev 276682)
+++ extra-x86_64/0001-Partial-revert-of-commit-080a465b1321.patch       
2016-09-18 18:13:02 UTC (rev 276683)
@@ -1,33 +0,0 @@
-From 7725d0a48aee2928dc0544ccbb0aa79ddb3a74d4 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evange...@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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD       2016-09-18 18:12:36 UTC (rev 276682)
+++ extra-x86_64/PKGBUILD       2016-09-18 18:13:02 UTC (rev 276683)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <d...@archlinux.org>
-
-pkgbase=doxygen
-pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.11
-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)
-md5sums=('f4697a444feaed739cfa2f0644abc19b'
-         '93cc5bb3f18c73a3e2b53d6276d87a11')
-sha1sums=('c0841007cf8a7910ccf0d8e4f7a5dd8fd2d9fc18'
-          'aa03a6a51ff691ffef11d96bb25236f2f7655b6b')
-
-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
-}
-
-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/extra-x86_64/PKGBUILD (from rev 276682, 
doxygen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD                               (rev 0)
+++ extra-x86_64/PKGBUILD       2016-09-18 18:13:02 UTC (rev 276683)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Dan McGee <d...@archlinux.org>
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+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)
+md5sums=('08e0f7850c4d22cb5188da226b209a96')
+sha1sums=('eacf83859a5bd7f3f71b46f34759cefe1a05babc')
+
+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 \
+    -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"
+}

Reply via email to