[arch-commits] Commit in doxygen/trunk (PKGBUILD doxygen-configure-python2.patch)

[Dan McGee]

    Date: Wednesday, December 25, 2013 @ 22:14:41
  Author: dan
Revision: 202707

upgpkg: doxygen 1.8.6-1

fix detection of python and qt; this should go upstream

Added:
  doxygen/trunk/doxygen-configure-python2.patch
Modified:
  doxygen/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 ++++++++++------
 doxygen-configure-python2.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-25 18:23:44 UTC (rev 202706)
+++ PKGBUILD	2013-12-25 21:14:41 UTC (rev 202707)
@@ -3,21 +3,25 @@
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.5
+pkgver=1.8.6
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
-             'texlive-latexextra' 'graphviz')
-source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('db51274568755e2c75c2657e30a78a55')
-sha1sums=('1fc5ceec21122fe5037edee4c308ac94b59ee33e')
+             'texlive-latexextra' 'graphviz' 'python2')
+source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz
+        doxygen-configure-python2.patch)
+md5sums=('9385dc52f0627875f8fa758e754ec674'
+         'a16ef06cd207292eda73801ea3835f1e')
+sha1sums=('204f1b3695c73efac44a521609c5360241d64045'
+          '98f9f473f906c5cd363b29c65b54bbe998c0793e')
 
 build() {
   export PATH=$PATH:/usr/lib/qt4/bin
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  QTDIR=/usr ./configure --prefix /usr --with-doxywizard
+  patch -Np1 < ../doxygen-configure-python2.patch
+  QTDIR=/usr/lib/qt4 ./configure --prefix /usr --with-doxywizard
   make
 }
 

Added: doxygen-configure-python2.patch
===================================================================
--- doxygen-configure-python2.patch	                        (rev 0)
+++ doxygen-configure-python2.patch	2013-12-25 21:14:41 UTC (rev 202707)
@@ -0,0 +1,11 @@
+--- doxygen-1.8.6/configure.orig	2013-12-25 20:54:22.171988706 +0000
++++ doxygen-1.8.6/configure	2013-12-25 20:54:33.405247482 +0000
+@@ -560,7 +560,7 @@
+ 
+ printf "  Checking for python... "
+ if test "$f_python" = NO; then
+-  python_names="python"
++  python_names="python2 python"
+   python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
+   python_prog=NO
+   python_found=NO