From 75b1bc45a0e39074e42b6a26a9f72ac2e049bdc1 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Thu, 7 Jul 2011 04:59:01 +0000
Subject: Thu Jul  7 04:59:01 UTC 2011

---
 community/root/PKGBUILD                        | 18 ++++++++++--------
 community/root/reorder-lzma-search-r40128.diff | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 community/root/reorder-lzma-search-r40128.diff

(limited to 'community/root')

diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index cf4f92432..643c7b379 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=root
 pkgver=5.30.00
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -16,16 +16,22 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
         'root.desktop'
-        'root.xml')
+        'root.xml'
+        'reorder-lzma-search-r40128.diff')
 md5sums=('b4e00f419f63d5ec6b7f1aace33c0c6f'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
          'ac61b17395d75a2705fefa2ef841a6bf'
-         'e2cf69b204192b5889ceb5b4dedc66f7')
+         'e2cf69b204192b5889ceb5b4dedc66f7'
+         '6b5d5b875913d8468940b9fbb1ceeb60')
 
 build() {
   cd ${pkgname}
 
+  # causes an error because it includes lzma/lzma.h directly
+  # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=13013&p=55971
+  patch -Np2 -i ${srcdir}/reorder-lzma-search-r40128.diff
+
   if [ ${CARCH} == 'i686' ]; then
     TARGET=linux;
   else
@@ -44,7 +50,7 @@ build() {
     --disable-builtin-glew \
     --disable-builtin-pcre \
     --disable-builtin-zlib \
-    --enable-builtin-lzma \
+    --disable-builtin-lzma \
     --enable-gdml \
     --enable-gsl-shared \
     --enable-minuit2 \
@@ -57,10 +63,6 @@ build() {
     # move from aur
     #--disable-builtin-afterimage \
 
-    # causes an error because it includes lzma/lzma.h directly.. need to file a BR for this
-    # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=13013&p=55971
-    #--disable-builtin-lzma \
-
   make
 }
 
diff --git a/community/root/reorder-lzma-search-r40128.diff b/community/root/reorder-lzma-search-r40128.diff
new file mode 100644
index 000000000..1dd0fc56e
--- /dev/null
+++ b/community/root/reorder-lzma-search-r40128.diff
@@ -0,0 +1,14 @@
+--- branches/v5-30-00-patches/configure	2011/06/27 13:38:32	39993
++++ branches/v5-30-00-patches/configure	2011/07/04 15:43:59	40128
+@@ -2430,8 +2430,9 @@
+     check_header "lzma.h" "" \
+         $LZMA ${LZMA:+$LZMA/include} \
+         ${finkdir:+$finkdir/include} \
+-        /usr/local/include /usr/include/lzma /usr/local/include/lzma \
+-        /opt/lzma/include /usr/include
++        /usr/local/include /usr/include \
++        /usr/local/include/lzma /usr/include/lzma \
++        /opt/lzma/include
+     if test "x$found_dir" = "x" ; then
+         enable_builtin_lzma=yes
+     else
-- 
cgit v1.2.3-54-g00ecf