diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
| commit | a420f5c4c2a4eeb411175d086b339b620dba309d (patch) | |
| tree | aa810cc98c17cf30cad06226c22f8256c056430e /community/passenger | |
| parent | 0ec0464a32563349252dda85e9176a9475d6fc34 (diff) | |
| parent | 81de702a6fc79e430129a7d2b708d90f43ae5ba1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community-testing/widelands/PKGBUILD
core/cracklib/PKGBUILD
core/systemd/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/libreoffice/PKGBUILD
testing/mpfr/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
testing/yp-tools/PKGBUILD
Diffstat (limited to 'community/passenger')
| -rw-r--r-- | community/passenger/PKGBUILD | 14 | ||||
| -rw-r--r-- | community/passenger/build-fix.patch | 12 |
2 files changed, 19 insertions, 7 deletions
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index e079d256a..22f568893 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72940 2012-06-25 10:53:59Z spupykin $ +# $Id: PKGBUILD 75759 2012-08-30 21:03:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=3.0.13 +pkgver=3.0.15 pkgrel=1 -_pkgdlnr=76249 +_pkgdlnr=76337 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" @@ -14,13 +14,13 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz - build-fix-git-2012-05-17.diff) -md5sums=('1b3a65c77feee86e64891daae66c0c3d' - 'e2d3409bae3676232f411f03abac440c') + build-fix.patch) +md5sums=('532d977eabb4acd5a831b3526ddd8ac4' + 'ee4699596dffb5357fdac4e3b2c98ee1') build(){ cd $srcdir/passenger-$pkgver -# patch -p1 <$srcdir/build-fix-git-2012-05-17.diff + patch -p1 <$srcdir/build-fix.patch ./bin/passenger-install-apache2-module -a rake nginx diff --git a/community/passenger/build-fix.patch b/community/passenger/build-fix.patch new file mode 100644 index 000000000..cdbb78e68 --- /dev/null +++ b/community/passenger/build-fix.patch @@ -0,0 +1,12 @@ +diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp +--- passenger-3.0.15/ext/boost/thread/xtime.hpp 2012-04-16 11:43:52.000000000 +0400 ++++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp 2012-08-29 11:06:02.000000000 +0400 +@@ -18,6 +18,8 @@ + + namespace boost { + ++#undef TIME_UTC ++ + enum xtime_clock_types + { + TIME_UTC=1 |