diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /community/root | |
parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'community/root')
-rw-r--r-- | community/root/PKGBUILD | 20 | ||||
-rw-r--r-- | community/root/reorder-lzma-search-r40128.diff | 14 |
2 files changed, 7 insertions, 27 deletions
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index d85a132a4..a6ed080c9 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.30.00 -pkgrel=5 +pkgver=5.30.01 +pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' @@ -16,21 +16,15 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'root.sh' 'rootd' 'root.desktop' - 'root.xml' - 'reorder-lzma-search-r40128.diff') -md5sums=('b4e00f419f63d5ec6b7f1aace33c0c6f' + 'root.xml') +md5sums=('be7443a1b243c51b3c1ec435a5a9453e' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' - 'e2cf69b204192b5889ceb5b4dedc66f7' - '6b5d5b875913d8468940b9fbb1ceeb60') + 'e2cf69b204192b5889ceb5b4dedc66f7') 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 + cd root if [ ${CARCH} == 'i686' ]; then TARGET=linux; @@ -76,7 +70,7 @@ build() { } package() { - cd ${pkgname} + cd root make DESTDIR=${pkgdir} install diff --git a/community/root/reorder-lzma-search-r40128.diff b/community/root/reorder-lzma-search-r40128.diff deleted file mode 100644 index 1dd0fc56e..000000000 --- a/community/root/reorder-lzma-search-r40128.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 |