diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-24 23:06:35 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-24 23:06:35 +0000 |
| commit | 71f58605e914de11f3a9b7cc2f27b0c52fb8d4ba (patch) | |
| tree | 948002f901215fa91b99058ec3bfc4a51475018d /testing | |
| parent | 7347bb994a41d021c83e97b503f577f2399302e7 (diff) | |
Fri Jun 24 23:06:35 UTC 2011
Diffstat (limited to 'testing')
44 files changed, 592 insertions, 142 deletions
diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD index d49dc3d6f..b11156af0 100644 --- a/testing/alex/PKGBUILD +++ b/testing/alex/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120390 2011-04-23 17:05:09Z vesa $ +# $Id: PKGBUILD 128111 2011-06-22 10:56:28Z vesa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Philip Nilsson <pnilsson@nullref.se> pkgname=alex pkgver=2.3.5 -pkgrel=1.2 +pkgrel=1.3 pkgdesc='a lexical analyser generator for Haskell' arch=('i686' 'x86_64') url='http://www.haskell.org/alex/' diff --git a/testing/avahi/PKGBUILD b/testing/avahi/PKGBUILD new file mode 100644 index 000000000..812aeeaa0 --- /dev/null +++ b/testing/avahi/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $ +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=avahi +pkgver=0.6.30 +pkgrel=4 +pkgdesc='A multicast/unicast DNS-SD framework' +arch=('i686' 'x86_64') +url='http://www.avahi.org/' +license=('LGPL') +depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' + 'qt3: qt3 bindings' + 'qt: qt bindings' + 'pygtk: avahi-bookmarks, avahi-discover' + 'twisted: avahi-bookmarks' + 'mono: mono bindings' + 'dbus-python: avahi-discover' + 'nss-mdns: NSS support for mDNS') +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) +install=install +conflicts=('howl' 'mdnsresponder') +provides=('howl' 'mdnsresponder') +replaces=('howl' 'mdnsresponder') +options=('!libtool') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'gnome-nettool.png' + 'rc.d.patch') +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../rc.d.patch" + + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) +} diff --git a/testing/avahi/gnome-nettool.png b/testing/avahi/gnome-nettool.png Binary files differnew file mode 100644 index 000000000..227d0678a --- /dev/null +++ b/testing/avahi/gnome-nettool.png diff --git a/testing/avahi/install b/testing/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/testing/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat <<EOF +==> The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/testing/avahi/rc.d.patch b/testing/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/testing/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD new file mode 100644 index 000000000..48cc575e0 --- /dev/null +++ b/testing/blender/PKGBUILD @@ -0,0 +1,93 @@ +# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $ +# Contributor: John Sowiak <john@archlinux.org> +# Maintainer: tobias <tobias@archlinux.org> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only we make a messy PKGBUILD that can checkout svn +# release if necessary. + +#_svn=true +_svn=false + +pkgname=blender +pkgver=2.58 +pkgrel=1 +epoch=1 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ + 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') +makedepends=('cmake') # 'subversion' +install=blender.install +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff) + md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('59e344d4ec48750a86e4ef079c3acbfc') +fi + +# source PKGBUILD && mksource +mksource() { + _svnver=36339 + _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i ../blender-ffmpeg.diff + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=OFF \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER:BOOL=ON \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_CODEC_FFMPEG:BOOL=ON \ + -DWITH_CODEC_SNDFILE:BOOL=ON \ + -DPYTHON_VERSION:STRING=3.2 \ + -DPYTHON_LIBPATH:STRING=/usr/lib \ + -DPYTHON_LIBRARY:STRING=python3.2mu \ + -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + + cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ + "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ + cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi + chmod 755 bmake + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins + install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/testing/blender/blender-ffmpeg.diff b/testing/blender/blender-ffmpeg.diff new file mode 100644 index 000000000..ffef489e2 --- /dev/null +++ b/testing/blender/blender-ffmpeg.diff @@ -0,0 +1,13 @@ +Index: intern/ffmpeg/ffmpeg_compat.h +=================================================================== +--- intern/ffmpeg/ffmpeg_compat.h (revision 37744) ++++ intern/ffmpeg/ffmpeg_compat.h (revision 37745) +@@ -40,7 +40,7 @@ + #define FFMPEG_HAVE_AVIO 1 + #endif + +-#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) ++#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122)) + #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1 + #endif + diff --git a/testing/blender/blender.install b/testing/blender/blender.install new file mode 100644 index 000000000..f4d7cc443 --- /dev/null +++ b/testing/blender/blender.install @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/testing/botan/PKGBUILD b/testing/botan/PKGBUILD new file mode 100644 index 000000000..2d05b70e8 --- /dev/null +++ b/testing/botan/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: d'Ronin <daronin@2600.com> +pkgname=botan +pkgver=1.10.0 +pkgrel=1 +pkgdesc="BSD-licensed crypto library written in C++" +license=('BSD') +arch=('i686' 'x86_64') +url="http://botan.randombit.net/" +depends=('gcc-libs' 'sh') +makedepends=('python2') +source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz) +md5sums=('1f03a6a84f402a12e50665868dddae99') + +build() { + cd ${srcdir}/Botan-${pkgver} + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py + ./configure.py --prefix=/usr + make +} + +package() { + cd ${srcdir}/Botan-${pkgver} + make DESTDIR=${pkgdir}/usr install +} + diff --git a/testing/cabal-install/PKGBUILD b/testing/cabal-install/PKGBUILD new file mode 100644 index 000000000..0529e034c --- /dev/null +++ b/testing/cabal-install/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +pkgname=cabal-install +pkgver=0.10.2 +pkgrel=1.1 +pkgdesc="The command-line interface for Cabal and Hackage." +url="http://hackage.haskell.org/package/cabal-install" +license=('custom:BSD3') +arch=('i686' 'x86_64') +makedepends=('ghc=7.0.3' 'haskell-http>=4000.1.1' 'haskell-zlib') +depends=('gmp' zlib) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) + +build() { + cd $srcdir/cabal-install-$pkgver + runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr + runhaskell Setup build +} + +package() { + cd $srcdir/cabal-install-$pkgver + runhaskell Setup copy --destdir=$pkgdir + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +md5sums=('bc906ef0bed79cbb33fdb36b73514281') diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD index a526404af..9fddba6ca 100644 --- a/testing/ghc/PKGBUILD +++ b/testing/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120001 2011-04-18 09:44:35Z vesa $ +# $Id: PKGBUILD 128106 2011-06-22 10:54:11Z vesa $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Special note for devs looking to upgrade this package: # ghc places a unique hash for each library when it is built. @@ -8,7 +8,7 @@ # do not carry version dependencies. You will have to remember to build them too. pkgname=ghc pkgver=7.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="The Glasgow Haskell Compiler" arch=(i686 x86_64) url="http://www.haskell.org/ghc/" @@ -62,9 +62,6 @@ build() { cp $srcdir/build.mk mk/build.mk - # FS#17875 - sed -i 's/INSTALL_SHELL_WRAPPER = YES/INSTALL_SHELL_WRAPPER = NO/' utils/haddock/ghc.mk - ./configure --prefix=/usr make -j1 || return 1 } @@ -76,11 +73,7 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license install -d $pkgdir/usr/share/haskell - - rm $pkgdir/usr/bin/haddock } -md5sums=('946a18a0dc30437db72c0d3fdf26ca42' - '5a3e0880c80b1dcecf779ff2e63a9c0d') md5sums=('10bc5e9ae1b581404376efb85f260ff3' '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/happy/PKGBUILD b/testing/happy/PKGBUILD new file mode 100644 index 000000000..d5303e80e --- /dev/null +++ b/testing/happy/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 128129 2011-06-22 11:27:01Z vesa $ +# Maintainer: simo <simo@archlinux.org> +# Contributor: Vesa Kaihlavirta <vegai@iki.fi> + +pkgname=happy +pkgver=1.18.6 +pkgrel=1.2 +pkgdesc="The Parser Generator for Haskell" +url="http://www.haskell.org/happy/" +arch=('i686' 'x86_64') +license=("custom:BSD3") +depends=(gmp) +makedepends=(ghc=7.0.3 haskell-mtl=2.0.1.0) +options=(strip) +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('7d4d1425f5068633cd477a2b2216880d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup.lhs configure -O --prefix=/usr + runhaskell Setup.lhs build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup.lhs copy --destdir="${pkgdir}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + diff --git a/testing/haskell-cgi/PKGBUILD b/testing/haskell-cgi/PKGBUILD index ebee2e82e..4b64ba578 100644 --- a/testing/haskell-cgi/PKGBUILD +++ b/testing/haskell-cgi/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=cgi pkgname=haskell-cgi pkgver=3001.1.7.4 -pkgrel=3 +pkgrel=3.1 pkgdesc="A library for writing CGI programs" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2' 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-xhtml=3000.2.0.1-7') +depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-xhtml=3000.2.0.1-7.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-deepseq/PKGBUILD b/testing/haskell-deepseq/PKGBUILD index b89f39f8b..934303f2b 100644 --- a/testing/haskell-deepseq/PKGBUILD +++ b/testing/haskell-deepseq/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=deepseq pkgname=haskell-deepseq pkgver=1.1.0.2 -pkgrel=2 +pkgrel=2.1 pkgdesc="Fully evaluate data structures" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-fgl/PKGBUILD b/testing/haskell-fgl/PKGBUILD index 4a866601d..45f466e91 100644 --- a/testing/haskell-fgl/PKGBUILD +++ b/testing/haskell-fgl/PKGBUILD @@ -2,20 +2,20 @@ _hkgname=fgl pkgname=haskell-fgl pkgver=5.4.2.3 -pkgrel=4 +pkgrel=4.1 pkgdesc="Martin Erwig's Functional Graph Library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2') +depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c') build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock diff --git a/testing/haskell-glut/PKGBUILD b/testing/haskell-glut/PKGBUILD index a42385959..98a30495c 100644 --- a/testing/haskell-glut/PKGBUILD +++ b/testing/haskell-glut/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=GLUT pkgname=haskell-glut pkgver=2.1.2.1 -pkgrel=6 +pkgrel=7.1 pkgdesc="A binding for the OpenGL Utility Toolkit" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.0.2-2' 'haskell-opengl=2.2.3.0-6' 'freeglut') +depends=('ghc=7.0.3-2' 'haskell-opengl=2.2.3.0-7.1' 'freeglut') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install @@ -16,7 +16,7 @@ md5sums=('b97f476a04098701e330e86c1f89ed52') build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock diff --git a/testing/haskell-haskell-src/PKGBUILD b/testing/haskell-haskell-src/PKGBUILD index 8b9340c4f..eeb4844a7 100644 --- a/testing/haskell-haskell-src/PKGBUILD +++ b/testing/haskell-haskell-src/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=haskell-src pkgname=haskell-haskell-src pkgver=1.0.1.4 -pkgrel=2 +pkgrel=2.1 pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' 'haskell-syb=0.3-2' sh) +depends=('ghc=7.0.3-2' 'haskell-syb=0.3-2.1' sh) makedepends=(happy) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) diff --git a/testing/haskell-html/PKGBUILD b/testing/haskell-html/PKGBUILD index 10a04cbdf..1d207117e 100644 --- a/testing/haskell-html/PKGBUILD +++ b/testing/haskell-html/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=html pkgname=haskell-html pkgver=1.0.1.2 -pkgrel=9 +pkgrel=9.1 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD index 80fce6663..d1106c478 100644 --- a/testing/haskell-http/PKGBUILD +++ b/testing/haskell-http/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=HTTP pkgname=haskell-http pkgver=4000.1.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' sh 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-mtl=2.0.1.0-2') +depends=('ghc=7.0.3-2' sh 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-hunit/PKGBUILD b/testing/haskell-hunit/PKGBUILD index 634fd49f3..401887e4e 100644 --- a/testing/haskell-hunit/PKGBUILD +++ b/testing/haskell-hunit/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=HUnit pkgname=haskell-hunit pkgver=1.2.2.3 -pkgrel=2 +pkgrel=2.1 pkgdesc="A unit testing framework for Haskell" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD index ea29d2633..e0ee184de 100644 --- a/testing/haskell-mtl/PKGBUILD +++ b/testing/haskell-mtl/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=mtl pkgname=haskell-mtl pkgver=2.0.1.0 -pkgrel=2 +pkgrel=3.1 pkgdesc="Monad transformer library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-transformers=0.2.2.0-2') +depends=(ghc=7.0.3-2 sh 'haskell-transformers=0.2.2.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD index 685e5fe2b..372cdf623 100644 --- a/testing/haskell-network/PKGBUILD +++ b/testing/haskell-network/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=network pkgname=haskell-network pkgver=2.3.0.2 -pkgrel=2 +pkgrel=2.1 pkgdesc="Networking-related facilities" url="http://hackage.haskell.org/package/network" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-parsec=3.1.1-2') +depends=(ghc=7.0.3-2 sh 'haskell-parsec=3.1.1-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-opengl/PKGBUILD b/testing/haskell-opengl/PKGBUILD index a45b3f303..8d70bbc91 100644 --- a/testing/haskell-opengl/PKGBUILD +++ b/testing/haskell-opengl/PKGBUILD @@ -2,20 +2,20 @@ _hkgname=OpenGL pkgname=haskell-opengl pkgver=2.2.3.0 -pkgrel=6 +pkgrel=7.1 pkgdesc="A binding for the OpenGL graphics system" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -makedepends=() -depends=('ghc=7.0.2-2' 'mesa') +depends=('ghc=7.0.3-2' 'mesa') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('f4e3ccb471034a6a74921d4dab9dd32d') + build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock diff --git a/testing/haskell-parallel/PKGBUILD b/testing/haskell-parallel/PKGBUILD index 1191611e8..0e46c2c93 100644 --- a/testing/haskell-parallel/PKGBUILD +++ b/testing/haskell-parallel/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=parallel pkgname=haskell-parallel pkgver=3.1.0.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Parallel programming library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-deepseq=1.1.0.2-2') +depends=(ghc=7.0.3-2 sh 'haskell-deepseq=1.1.0.2-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD index 516621979..0810df75b 100644 --- a/testing/haskell-parsec/PKGBUILD +++ b/testing/haskell-parsec/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=parsec pkgname=haskell-parsec pkgver=3.1.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') +depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-platform/PKGBUILD b/testing/haskell-platform/PKGBUILD index 0b6c908d2..2534d95c2 100644 --- a/testing/haskell-platform/PKGBUILD +++ b/testing/haskell-platform/PKGBUILD @@ -1,39 +1,38 @@ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=haskell-platform pkgver=2011.2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="The Haskell Platform" url="http://hackage.haskell.org/platform/" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' - 'haskell-glut=2.1.2.1-6' - 'haskell-http=4000.1.1-3' - 'haskell-hunit=1.2.2.3-2' - 'haskell-opengl=2.2.3.0-6' - 'haskell-quickcheck=2.4.0.1-3' - 'haskell-cgi=3001.1.7.4-3' - 'haskell-deepseq=1.1.0.2-2' - 'haskell-fgl=5.4.2.3-4' - 'haskell-haskell-src=1.0.1.4-2' - 'haskell-html=1.0.1.2-9' - 'haskell-mtl=2.0.1.0-2' - 'haskell-network=2.3.0.2-2' - 'haskell-parallel=3.1.0.1-3' - 'haskell-parsec=3.1.1-2' - 'haskell-regex-base=0.93.2-4' - 'haskell-regex-compat=0.93.1-4' - 'haskell-regex-posix=0.94.4-2' - 'haskell-stm=2.2.0.1-2' - 'haskell-syb=0.3-2' - 'haskell-text=0.11.0.5-2' - 'haskell-transformers=0.2.2.0-2' - 'haskell-xhtml=3000.2.0.1-7' - 'haskell-zlib=0.5.3.1-2' +depends=('ghc=7.0.3-2' + 'haskell-glut=2.1.2.1-7.1' + 'haskell-http=4000.1.1-3.1' + 'haskell-hunit=1.2.2.3-2.1' + 'haskell-opengl=2.2.3.0-7.1' + 'haskell-quickcheck=2.4.0.1-3.1' + 'haskell-cgi=3001.1.7.4-3.1' + 'haskell-deepseq=1.1.0.2-2.1' + 'haskell-fgl=5.4.2.3-4.1' + 'haskell-haskell-src=1.0.1.4-2.1' + 'haskell-html=1.0.1.2-9.1' + 'haskell-mtl=2.0.1.0-3.1' + 'haskell-network=2.3.0.2-2.1' + 'haskell-parallel=3.1.0.1-3.1' + 'haskell-parsec=3.1.1-2.1' + 'haskell-regex-base=0.93.2-4.1' + 'haskell-regex-posix=0.94.4-2.1' + 'haskell-regex-compat=0.93.1-4.1' + 'haskell-stm=2.2.0.1-2.1' + 'haskell-syb=0.3-2.1' + 'haskell-text=0.11.0.5-2.1' + 'haskell-transformers=0.2.2.0-3.1' + 'haskell-xhtml=3000.2.0.1-7.1' + 'haskell-zlib=0.5.3.1-2.1' 'cabal-install=0.10.2' 'alex=2.3.5' - 'happy=1.18.6' - 'haddock=2.9.2') + 'happy=1.18.6' ) build() { return 0 diff --git a/testing/haskell-quickcheck/PKGBUILD b/testing/haskell-quickcheck/PKGBUILD index 3da28a0cb..ab05c75f7 100644 --- a/testing/haskell-quickcheck/PKGBUILD +++ b/testing/haskell-quickcheck/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck pkgver=2.4.0.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Automatic testing of Haskell programs" url="http://hackage.haskell.org/package/QuickCheck" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 haskell-mtl=2.0.1.0-2 sh) +depends=(ghc=7.0.3-2 haskell-mtl=2.0.1.0-3.1 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-regex-base/PKGBUILD b/testing/haskell-regex-base/PKGBUILD index a28c3daa0..57721d39b 100644 --- a/testing/haskell-regex-base/PKGBUILD +++ b/testing/haskell-regex-base/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=4 +pkgrel=4.1 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') +depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-regex-compat/PKGBUILD b/testing/haskell-regex-compat/PKGBUILD index b0778ac42..507a96618 100644 --- a/testing/haskell-regex-compat/PKGBUILD +++ b/testing/haskell-regex-compat/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.93.1 -pkgrel=4 +pkgrel=4.1 pkgdesc="Replaces and enhances Text.Regex" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-regex-base=0.93.2-4' 'haskell-regex-posix=0.94.4-2') +depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1' 'haskell-regex-posix=0.94.4-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-regex-posix/PKGBUILD b/testing/haskell-regex-posix/PKGBUILD index 69f3773d6..3b00616eb 100644 --- a/testing/haskell-regex-posix/PKGBUILD +++ b/testing/haskell-regex-posix/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.94.4 -pkgrel=2 +pkgrel=2.1 pkgdesc="The posix regex backend for regex-base" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-regex-base=0.93.2-4') +depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-stm/PKGBUILD b/testing/haskell-stm/PKGBUILD index 5f3a97ed7..9a9c9a962 100644 --- a/testing/haskell-stm/PKGBUILD +++ b/testing/haskell-stm/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=stm pkgname=haskell-stm pkgver=2.2.0.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-syb/PKGBUILD b/testing/haskell-syb/PKGBUILD index f90006a56..64faf05ed 100644 --- a/testing/haskell-syb/PKGBUILD +++ b/testing/haskell-syb/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=syb pkgname=haskell-syb pkgver=0.3 -pkgrel=2 +pkgrel=2.1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' sh) +depends=('ghc=7.0.3-2' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD index e60891918..7dbc1ce17 100644 --- a/testing/haskell-text/PKGBUILD +++ b/testing/haskell-text/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=text pkgname=haskell-text pkgver=0.11.0.5 -pkgrel=2 +pkgrel=2.1 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' sh 'haskell-deepseq=1.1.0.2-2') +depends=('ghc=7.0.3-2' sh 'haskell-deepseq=1.1.0.2-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD index c14b2eecc..446b2ffca 100644 --- a/testing/haskell-transformers/PKGBUILD +++ b/testing/haskell-transformers/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Rémy Oudompheng <remy@archlinux.org> -# $Id: PKGBUILD 115140 2011-03-17 09:11:21Z vesa $ +# $Id: PKGBUILD 128119 2011-06-22 11:19:38Z vesa $ _hkgname=transformers pkgname=haskell-transformers pkgver=0.2.2.0 -pkgrel=2 +pkgrel=3.1 pkgdesc="Concrete functor and monad transformers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-xhtml/PKGBUILD b/testing/haskell-xhtml/PKGBUILD index 63abbbb64..4a34206ad 100644 --- a/testing/haskell-xhtml/PKGBUILD +++ b/testing/haskell-xhtml/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.0.1 -pkgrel=7 +pkgrel=7.1 pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." url="http://hackage.haskell.org/package/xhtml" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD index 7aca7312b..22a9eb932 100644 --- a/testing/haskell-zlib/PKGBUILD +++ b/testing/haskell-zlib/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=zlib pkgname=haskell-zlib pkgver=0.5.3.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="Compression and decompression in the gzip and zlib formats" url="http://hackage.haskell.org/package/zlib" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 'zlib' sh) +depends=(ghc=7.0.3-2 'zlib' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch new file mode 100644 index 000000000..31ad95d36 --- /dev/null +++ b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch @@ -0,0 +1,31 @@ +From 900baff9ff400a6eba034089ed69362c2c2d61e4 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Wed, 22 Jun 2011 12:05:19 +0200 +Subject: [PATCH] fix configure without the optional translations module + +--- + set_soenv.in | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/set_soenv.in b/set_soenv.in +index f015bab..8e39314 100755 +--- a/set_soenv.in ++++ b/set_soenv.in +@@ -1068,9 +1068,11 @@ $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.'; + $L10N_MODULE = PathFormat($SRC_ROOT."/translations"); + + # Check for poor help localizations, i.e. no help translation at all... +-opendir(DIR,$L10N_MODULE . "/source"); +-@languages = readdir(DIR); +-closedir(DIR); ++@languages=(); ++if (opendir(DIR,$L10N_MODULE . "/source")) ++{ @languages = readdir(DIR); ++ closedir(DIR); ++} + $WITH_POOR_HELP_LOCALIZATIONS = ""; + + foreach $language (@languages) +-- +1.7.3.4 + diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 7ffa3b42e..646192a73 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127521 2011-06-15 18:45:39Z andyrtr $ +# $Id: PKGBUILD 128395 2011-06-23 18:37:12Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -24,8 +24,8 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.1.1 -pkgver=3.4.1rc1 +_LOver=3.4.1.2 +pkgver=3.4.1rc2 pkgrel=1 arch=('i686' 'x86_64') #_LO_tree="3.4" @@ -47,8 +47,8 @@ makedepends=( # makedepends # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -_mirror="http://download.documentfoundation.org/libreoffice/src" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" +#_mirror="http://download.documentfoundation.org/libreoffice/src" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -92,7 +92,8 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt buildfix_boost.diff buildfix_ct2n.diff - vbahelper.visibility.patch) + vbahelper.visibility.patch + 0001-fix-configure-without-the-optional-translations-modu.patch) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 @@ -131,25 +132,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('a21bbbc0cf9b482a78357b7b6132e799' - 'd9ccdb2b53de8e16d7bb3215b9e97d7a' - 'd3aa4a8e05f8b5c3ccf4f945b82b32a2' - 'eb03b6627f2a2240eca089c925692259' - '190c9b25a7193b7ca98d6f6d09cd20d2' - '45b632fb71b123b699c9e89f9db6632a' - '19b3e65676e8e8839a4dd884a74e83e4' - '79a955fd38d0eedca7db146c5a985041' - '9b9b80ff14a3c6f430cc1fee4551c53e' - 'c592798d08cccfb14f6cda95eb542d7b' - '1f98cbec964a9563b72962c943af3545' - '01aa850fa07e4440706dcea0def5c27a' - '9765abf75b58c5dbdf82a953af8c6de4' - '1f07e271d64606116c84c7adbc90a324' - '877cf0733c202936f8b918b9ad423f0d' - '231f5a392ab78167a5a7ab7bc922a421' - '9452301d1eee5fc3bb4758e003829075' - '1bc390b972bbe27f513956af37e60538' - '974b73ed0add1d6e325b9da4e3ca5c5d' +md5sums=('f38317f991b1c253c416c67be7c3754d' + 'aa0d333b2eeca843c55cd4fafb77cda4' + '571a1d550c7d2d0ae80d712611447f71' + '30794ddc83d1c2e79564f0788f09186a' + '6887bf7d9badf0f0822a0c85261b4679' + '5b9891c11e79a6131763c0131a5c442e' + '3b91cbeaa68f22b5c017cd5f3919c070' + '5578f0dc49d092c57285e3bf3a311702' + '117fc2edb8c0765d0d39dba2ed910ea7' + '6e7b4efe196c44519d0d438c5a65bd92' + '44eddc7cd60a61a347694aa9a1988c28' + '361d32db4b08954fd210219e2fcc45d8' + '793ceaf4c7af5bbcfd0b8feb369d1f54' + '58177e2ff875c494f08490b061171669' + '43d7f4910b01a826ea97f63af4bdb36c' + '852c34e284cddf499d80957e7c994da5' + '281fe1792a84129e33853ba3fea4d378' + 'cc2553bf6be74f818f2e9ad7178bef92' + 'fe8fb18f2d4e4a37a4c23bc59f7a730c' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -191,7 +192,8 @@ md5sums=('a21bbbc0cf9b482a78357b7b6132e799' 'b7b2d0e04e142f26dd96119c80757d1f' 'bc228237108cab7745897a9f466b6d39' 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d') + '43b145db28e6c0d73578ae6fd35e510d' + 'f8a8fdcc58f50560fbc266e28efdbbfe') build() { @@ -218,6 +220,7 @@ build() { patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch + patch -Np1 -i ${srcdir}/0001-fix-configure-without-the-optional-translations-modu.patch # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -467,7 +470,7 @@ package_libreoffice-sdk() { sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch new file mode 100644 index 000000000..1404460df --- /dev/null +++ b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch @@ -0,0 +1,83 @@ +From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Thu, 28 Apr 2011 09:18:54 +0300 +Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in + EU::CBuilder + +Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), +CFLAGS and LDFLAGS from the environment have overridden the Config.pm +ccflags and ldflags settings. This can cause binary incompatibilities +between the core Perl and extensions built with EU::CBuilder. + +Append to the Config.pm values rather than overriding them. +--- + .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- + dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +index b572312..2255c51 100644 +--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm ++++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +@@ -40,11 +40,13 @@ sub new { + $self->{config}{$k} = $v unless exists $self->{config}{$k}; + } + $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; +- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; ++ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) ++ if defined $ENV{CFLAGS}; + $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; + $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; + $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; +- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; ++ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) ++ if defined $ENV{LDFLAGS}; + + unless ( exists $self->{config}{cxx} ) { + my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); +diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t +index c3bf6b5..1bb15aa 100644 +--- a/dist/ExtUtils-CBuilder/t/04-base.t ++++ b/dist/ExtUtils-CBuilder/t/04-base.t +@@ -1,7 +1,7 @@ + #! perl -w + + use strict; +-use Test::More tests => 50; ++use Test::More tests => 64; + use Config; + use Cwd; + use File::Path qw( mkpath ); +@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, + "_prepare_mksymlists_args(): got expected arguments for Mksymlists", + ); + ++my %testvars = ( ++ CFLAGS => 'ccflags', ++ LDFLAGS => 'ldflags', ++); ++ ++while (my ($VAR, $var) = each %testvars) { ++ local $ENV{$VAR}; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "honours $var from Config.pm"); ++ ++ $ENV{$VAR} = "-foo -bar"; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, ++ "honours $VAR from the environment"); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "doesn't override $var from Config.pm with $VAR from the environment"); ++} ++ + ##### + + for ($source_file, $object_file, $lib_file) { +-- +1.7.4.4 + diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog index fd53c2560..9add39e20 100644 --- a/testing/perl/ChangeLog +++ b/testing/perl/ChangeLog @@ -1,3 +1,8 @@ +2011-06-22 Angel Velasquez <angvp@archlinux.org> + * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS + * Fixed #FS22197, FS#22441, FS#24767 + * Rebuilt perl 5.14.1-2 against db 5.2.28 + 2011-06-16 Angel Velasquez <angvp@archlinux.org> * Fixed #FS24660 * Rebuilt against db 5.2.28 diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD index b00377dc1..8f6af76c0 100644 --- a/testing/perl/PKGBUILD +++ b/testing/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127611 2011-06-17 06:29:52Z angvp $ +# $Id: PKGBUILD 128400 2011-06-23 21:11:34Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.14.0 -pkgrel=2 +pkgver=5.14.1 +pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -13,11 +13,16 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) +source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 +perlbin.sh +perlbin.csh +0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) install=perl.install options=('!makeflags' '!purge') -md5sums=('e7457deea78330c5f8eebb2fd2a45479' - 'f86eb0dba1638ca6d1c8fff1b06c2a71') +md5sums=('97cd306a2c22929cc141a09568f43bb0' + '5ed2542fdb9a60682f215bd33701e61a' + 'd76445605c49886c77734446247e439d' + 'c25d86206d649046538c3daab7874564') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -41,7 +46,9 @@ build() { -Dsitescript=/usr/bin/site_perl \ -Dvendorscript=/usr/bin/vendor_perl \ -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} + -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" + patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } package() { @@ -68,9 +75,12 @@ package() { -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - # Profile script so set paths to perl scripts. + # Profile script to set paths to perl scripts. install -D -m755 ${srcdir}/perlbin.sh \ ${pkgdir}/etc/profile.d/perlbin.sh + # Profile script to set paths to perl scripts on csh. (FS#22441) + install -D -m755 ${srcdir}/perlbin.csh \ + ${pkgdir}/etc/profile.d/perlbin.csh (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) @@ -91,4 +101,3 @@ package() { install -dv ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf } - diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh new file mode 100644 index 000000000..cc0d5d553 --- /dev/null +++ b/testing/perl/perlbin.csh @@ -0,0 +1,17 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh index 09811a8b4..20f830436 100755 --- a/testing/perl/perlbin.sh +++ b/testing/perl/perlbin.sh @@ -3,18 +3,13 @@ # Added /usr/bin/*_perl dirs for scripts # Remove /usr/lib/perl5/*_perl/bin in next release -[ -d /usr/bin/site_perl ] && - PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/site_perl/bin +[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin -[ -d /usr/bin/vendor_perl ] && - PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/vendor_perl/bin +[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin -[ -d /usr/bin/core_perl ] && - PATH=$PATH:/usr/bin/core_perl +[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl export PATH diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD index 6b97ea8c1..c84fcb803 100644 --- a/testing/spamassassin/PKGBUILD +++ b/testing/spamassassin/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 125325 2011-05-25 21:40:50Z remy $ +# $Id: PKGBUILD 128413 2011-06-23 22:14:04Z angvp $ # Maintainer: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis - pkgname=spamassassin -pkgver=3.3.1 -pkgrel=5 +pkgver=3.3.2 +pkgrel=1 pkgdesc="A mail filter to identify spam." arch=(i686 x86_64) license=(APACHE) @@ -16,8 +15,9 @@ depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ # perl-archive-tar perl-io-zlib) makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam' - 'gnupg: gpg support, without this use --nogpg flag for sa-update' - 're2c: regexp compiler, for compiling rules with sa-compile') + 'gnupg: gpg support, without this use --nogpg flag for sa-update' + 're2c: regexp compiler, for compiling rules with sa-compile' + 'dkim: DomainKeys Identified Mail (DKIM) checking') backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \ etc/mail/spamassassin/init.pre \ etc/mail/spamassassin/v310.pre \ @@ -27,7 +27,7 @@ install=${pkgname}.install options=(!emptydirs) source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \ spamd.conf.d spamd) -md5sums=('5a93f81fda315411560ff5da099382d2' +md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' '0534d3071a526a27ddc2b297afa03b04') |
