diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-26 04:08:50 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-26 04:08:50 +0000 |
| commit | cda3f380f74d60573c1202f7f34a79c8182e341a (patch) | |
| tree | 267f0bea80b969004688d5352a9472b4816a8742 | |
| parent | 5f3874cb8718456941af21c866515ddddd82edbc (diff) | |
Mon May 26 04:03:20 UTC 2014
32 files changed, 597 insertions, 192 deletions
diff --git a/community/flobopuyo/PKGBUILD b/community/flobopuyo/PKGBUILD index 4531d93f9..f0ad3e129 100644 --- a/community/flobopuyo/PKGBUILD +++ b/community/flobopuyo/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 67617 2012-03-13 14:21:37Z lcarlier $ +# $Id: PKGBUILD 111859 2014-05-25 20:12:39Z jlichtblau $ # Maintainer : Jaroslav Lichtblau <tu@dragonlord.cz> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> # contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=flobopuyo pkgver=0.20 -pkgrel=6 +pkgrel=7 pkgdesc="Clone of the famous PuyoPuyo" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/$pkgname/" license=('GPL') -depends=('libgl' 'sdl_image' 'sdl_mixer') +depends=('glu' 'sdl_image' 'sdl_mixer') makedepends=('mesa' 'patch') changelog=$pkgname.changelog -source=(http://www.sourcefiles.org/Games/Puzzle/$pkgname-$pkgver.tgz \ - $pkgname-makefile.patch $pkgname-0.20-gcc4.patch \ +source=(http://www.sourcefiles.org/Games/Puzzle/$pkgname-$pkgver.tgz + $pkgname-makefile.patch $pkgname-0.20-gcc4.patch $pkgname-0.20-libs.patch $pkgname.desktop $pkgname.png) @@ -22,25 +22,25 @@ md5sums=('88961898c9dd48b60464f6f10f695b8b' '4c6667be791681d43bb7ea1b6f9f9072' 'bb8afd6e04bde08fd33e22c466674878' 'b7c0fd71cd948bbc43a86742ffad6d86' - '20ebbe6e7ad57fe5f89a03ee40b4257e' + 'b18b185000c30bd3b7ff324052c95896' 'd9abe591e6cdd654269474444df1ec9d') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - patch -Np0 < ${srcdir}/$pkgname-makefile.patch - patch -Np1 < ${srcdir}/$pkgname-$pkgver-gcc4.patch - patch -Np1 < ${srcdir}/$pkgname-$pkgver-libs.patch + patch -Np0 < "${srcdir}"/$pkgname-makefile.patch + patch -Np1 < "${srcdir}"/$pkgname-$pkgver-gcc4.patch + patch -Np1 < "${srcdir}"/$pkgname-$pkgver-libs.patch make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -D -m644 man/${pkgname}.6 ${pkgdir}/usr/share/man/man6/$pkgname.6 - install -D ${srcdir}/$pkgname.desktop ${pkgdir}/usr/share/applications/$pkgname.desktop - install -D ${srcdir}/$pkgname.png ${pkgdir}/usr/share/pixmaps/$pkgname.png + install -D -m644 man/${pkgname}.6 "${pkgdir}"/usr/share/man/man6/$pkgname.6 + install -D "${srcdir}"/$pkgname.desktop "${pkgdir}"/usr/share/applications/$pkgname.desktop + install -D "${srcdir}"/$pkgname.png "${pkgdir}"/usr/share/pixmaps/$pkgname.png } diff --git a/community/flobopuyo/flobopuyo.changelog b/community/flobopuyo/flobopuyo.changelog index eee8fbb12..21fa1ec7a 100644 --- a/community/flobopuyo/flobopuyo.changelog +++ b/community/flobopuyo/flobopuyo.changelog @@ -1,3 +1,6 @@ +2014-05-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * flobopuyo 0.20-7 FS#39303 fixed + 2010-11-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * flobopuyo 0.20-5 * home page and source file fix @@ -9,8 +12,8 @@ 2008-09-15 Ronald van Haren <ronald.archlinux.org> * added x86_64 version & a couple of patches to build it -2008-09-14 Jaroslav Lichtblau <tu@dragonlord.cz> +2008-09-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Added provided man page to the package -2008-09-11 Jaroslav Lichtblau <tu@dragonlord.cz> +2008-09-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Package moved to [community] diff --git a/community/flobopuyo/flobopuyo.desktop b/community/flobopuyo/flobopuyo.desktop index aae37c31e..ceb66ec76 100644 --- a/community/flobopuyo/flobopuyo.desktop +++ b/community/flobopuyo/flobopuyo.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=Flobopuyo Comment=A remake of the famous PuyoPuyo Exec=flobopuyo -Icon=/usr/share/pixmaps/flobopuyo.png +Icon=flobopuyo Terminal=false Type=Application -Categories=Application;Game;ArcadeGame; +Categories=Game;ArcadeGame; StartupNotify=false diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index 9b703d2d2..cc332ae86 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108925 2014-04-07 17:15:45Z jlichtblau $ +# $Id: PKGBUILD 111817 2014-05-25 09:22:34Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc='Graphical two-pane filemanager for Gnome' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool') install=$pkgname.install changelog=$pkgname.changelog source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.4/$pkgname-$pkgver.tar.xz) -sha256sums=('ec57e81008a07bf4589bff8fe1ac519cb422016a8dc272d5ebf3d2441385d443') +sha256sums=('8f47ac8428086406536c45b53cbf23b734322f2a557d91698cdeb2bd296f3029') build() { cd "$pkgname-$pkgver" diff --git a/community/gnome-commander/gnome-commander.changelog b/community/gnome-commander/gnome-commander.changelog index 90fbb5aab..e397c2d5b 100644 --- a/community/gnome-commander/gnome-commander.changelog +++ b/community/gnome-commander/gnome-commander.changelog @@ -1,3 +1,6 @@ +2014-05-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * gnome-commander 1.4.2-1 + 2014-04-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * gnome-commander 1.4.1-1 diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index c05e2c9d9..ae8b554bd 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110169 2014-04-25 18:51:17Z jlichtblau $ +# $Id: PKGBUILD 111852 2014-05-25 19:08:47Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgbase=kid3 pkgname=('kid3' 'kid3-qt') pkgver=3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://kid3.sourceforge.net/" license=('GPL') @@ -54,7 +54,7 @@ conflicts=('kid3-qt') package_kid3-qt() { pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, QT version" -depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'qt4') +depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'qt4' 'phonon-qt4') conflicts=('kid3') provides=('kid3') diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog index 608436d29..35d92927d 100644 --- a/community/kid3/kid3.changelog +++ b/community/kid3/kid3.changelog @@ -1,3 +1,6 @@ +2014-05-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 3.1-2 FS#40121 fixed + 2014-04-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kid3 3.1-1 diff --git a/community/mod_wsgi/PKGBUILD b/community/mod_wsgi/PKGBUILD index 7e5a1af92..cae5a5490 100644 --- a/community/mod_wsgi/PKGBUILD +++ b/community/mod_wsgi/PKGBUILD @@ -1,33 +1,52 @@ -# $Id: PKGBUILD 106738 2014-03-06 21:43:47Z anatolik $ +# $Id: PKGBUILD 111823 2014-05-25 10:39:16Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Ryan Coyner <rcoyner@gmail.com> -pkgname=mod_wsgi -pkgver=3.4 -pkgrel=4 -pkgdesc='Python WSGI adapter module for Apache' +pkgbase=mod_wsgi +pkgname=($pkgbase 'mod_wsgi2') +pkgver=3.5 +pkgrel=1 +pkgdesc='Python2 WSGI adapter module for Apache' arch=('x86_64' 'i686') url='http://www.modwsgi.org/' license=('APACHE') -depends=('apache' 'python') -install=mod_wsgi.install -source=("http://modwsgi.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8') +makedepends=('apache' 'python' 'python2') +install='mod_wsgi.install' +source=("https://github.com/GrahamDumpleton/$pkgname/archive/$pkgver.tar.gz") +sha256sums=('f0674c38f0f568ece55610bcc6a775c179835c4cba23aa7f876d2a2a8520bf93') build() { - cd "$srcdir/$pkgbase-$pkgver" + cp -r "$pkgbase-$pkgver" py2 + # Build the Python 3 version + cd "$pkgbase-$pkgver" ./configure --prefix=/usr \ --with-apxs=/usr/bin/apxs \ --with-python=/usr/bin/python make LDLIBS='-lpython3 -lpthread -ldl -lutil -lm' + + # Build the Python 2 version + cd "$srcdir/py2" + ./configure \ + --prefix=/usr \ + --with-apxs=/usr/bin/apxs \ + --with-python=/usr/bin/python2 + make } -package() { - cd "$srcdir/$pkgbase-$pkgver" +package_mod_wsgi() { + pkgdesc='Python WSGI adapter module for Apache' + depends=('apache' 'python') + conflicts=('mod_wsgi2') + make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install +} - make DESTDIR="$pkgdir" install +package_mod_wsgi2() { + pkgdesc='Python2 WSGI adapter module for Apache' + depends=('apache' 'python2') + conflicts=('mod_wsgi') + make -C py2 DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD deleted file mode 100644 index 09218cfbd..000000000 --- a/community/mod_wsgi2/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 106739 2014-03-06 21:43:48Z anatolik $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Ryan Coyner <rcoyner@gmail.com> - -pkgname=mod_wsgi2 -pkgver=3.4 -pkgrel=5 -pkgdesc='Python2 WSGI adapter module for Apache' -arch=('x86_64' 'i686') -url='http://www.modwsgi.org/' -license=('APACHE') -depends=('apache' 'python2') -conflicts=('mod_wsgi') -install="$pkgname.install" -source=("http://modwsgi.googlecode.com/files/mod_wsgi-$pkgver.tar.gz") -sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8') - -build() { - cd "$srcdir/mod_wsgi-$pkgver" - - ./configure \ - --prefix=/usr \ - --with-apxs=/usr/bin/apxs \ - --with-python=/usr/bin/python2 - make -} - -package() { - cd "$srcdir/mod_wsgi-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/mod_wsgi2/mod_wsgi2.install b/community/mod_wsgi2/mod_wsgi2.install deleted file mode 100644 index a7f0290c2..000000000 --- a/community/mod_wsgi2/mod_wsgi2.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - cat << ENDOFMESSAGE -==> -==> -==> To install mod_wsgi, add the following line in -==> /etc/httpd/conf/httpd.conf file: -==> -==> LoadModule wsgi_module modules/mod_wsgi.so -==> -==> and restart/reload Apache. -==> -==> -ENDOFMESSAGE -} - -# vim:set ts=2 sw=2 et: diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index ca6c1cafc..a2c6702c9 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 104048 2014-01-14 21:30:48Z jlichtblau $ +# $Id: PKGBUILD 111849 2014-05-25 18:53:23Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget pkgver=12.0 -pkgrel=1 +pkgrel=2 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686') url="http://nzbget.sourceforge.net/" license=('GPL') -depends=('gnutls' 'libpar2' 'libsigc++' 'libxml2' 'python') +depends=('libpar2' 'libsigc++' 'libxml2' 'python') changelog=${pkgname}.changelog source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz) sha256sums=('023c4e3b9c7e920d9ea72b60135b438ce13543454f79984c06fd15365b9a882e') @@ -17,7 +17,7 @@ sha256sums=('023c4e3b9c7e920d9ea72b60135b438ce13543454f79984c06fd15365b9a882e') build() { cd ${pkgname}-${pkgver} - ./configure --prefix='/usr' --sbindir='/usr/bin' --enable-parcheck + ./configure --prefix='/usr' --sbindir='/usr/bin' --enable-parcheck --with-tlslib=OpenSSL make } diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog index 4f48ebf99..7b3d4c097 100644 --- a/community/nzbget/nzbget.changelog +++ b/community/nzbget/nzbget.changelog @@ -1,3 +1,6 @@ +2014-05-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * nzbget 12.0-2 FS#40075 implemented + 2014-01-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * nzbget 12.0-1 diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 4cda13577..c23641d09 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 108755 2014-04-02 19:32:57Z jlichtblau $ +# $Id: PKGBUILD 111814 2014-05-25 09:10:19Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('postgresql' 'gdal' 'json-c') changelog=$pkgname.changelog source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz) -sha256sums=('0bf842824815d9155129dcdda0a940ae3b7698c114e6e4a1cc2497527d0704d1') +sha256sums=('c17812aa4bb86ed561dfc65cb42ab45176b94e0620de183a4bbd773d6d876ec1') build() { cd ${pkgname}-${pkgver} diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 387995230..0ab48fe6d 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,6 @@ +2014-05-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * postgis-2.1.3-1 + 2014-04-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * postgis-2.1.2-1 diff --git a/community/python-numarray/PKGBUILD b/community/python-numarray/PKGBUILD index 788f59063..c94b5e91a 100644 --- a/community/python-numarray/PKGBUILD +++ b/community/python-numarray/PKGBUILD @@ -1,18 +1,16 @@ -# $Id: PKGBUILD 78232 2012-10-17 10:26:10Z allan $ +# $Id: PKGBUILD 111801 2014-05-25 01:31:25Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> pkgbase=python-numarray pkgname=python2-numarray pkgver=1.5.2 -pkgrel=6 +pkgrel=7 pkgdesc='Provides array manipulation and computational capabilities.' arch=('i686' 'x86_64') url='http://numpy.scipy.org/' license=('BSD') depends=('python2') -conflicts=('python2-numarray<=1.5.2-6') -replaces=('python2-numarray<=1.5.2-6') source=("http://downloads.sourceforge.net/sourceforge/numpy/numarray-${pkgver}.tar.gz" 'LICENSE') md5sums=('d2ecfc60fe4869c328b872540d04e0f7' diff --git a/community/python2-netifaces/PKGBUILD b/community/python2-netifaces/PKGBUILD index daad6408f..19f795d5f 100644 --- a/community/python2-netifaces/PKGBUILD +++ b/community/python2-netifaces/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 83533 2013-02-02 14:19:06Z giovanni $ +# $Id: PKGBUILD 111809 2014-05-25 08:23:20Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> # Contributor: Ghost of Kendo <ghostofkendo at gmail dot com> pkgname=python2-netifaces -pkgver=0.8 -pkgrel=2 +pkgver=0.10.4 +pkgrel=1 pkgdesc="Portable module to access network interface information in Python" arch=('i686' 'x86_64') url="http://alastairs-place.net/netifaces/" license=('MIT') depends=('python2') makedepends=('python2-distribute') -source=("http://alastairs-place.net/projects/netifaces/netifaces-${pkgver}.tar.gz") -md5sums=('e57e5983f4c286fac5f8068fbfc5c873') +source=("https://pypi.python.org/packages/source/n/netifaces/netifaces-${pkgver}.tar.gz") +md5sums=('36da76e2cfadd24cc7510c2c0012eb1e') package() { cd "${srcdir}/netifaces-${pkgver}" python2 setup.py install --root "${pkgdir}" # Install license, that is inside the readme file - install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 README.rst "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 590fb7a8d..1c20526ed 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 108922 2014-04-07 16:44:18Z jlichtblau $ +#$Id: PKGBUILD 111811 2014-05-25 08:26:58Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.7.6 +pkgver=0.7.7 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support' install=$pkgname.install changelog=$pkgname.changelog source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('e9964936822e44ac4cca9ab64ddf7e091429996b7d67694279ce5303624400c3') +sha256sums=('dda66bf60121a8a2cb7175b16b3b948099f8c119ee9a11c671555e8c38caa387') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index d00aa9bc7..c99a3a2f3 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2014-05-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.7-1 + 2014-04-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.7.6-1 diff --git a/community/shake/PKGBUILD b/community/shake/PKGBUILD index 55336da5f..82105230b 100644 --- a/community/shake/PKGBUILD +++ b/community/shake/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 67776 2012-03-14 11:42:05Z giovanni $ +# $Id: PKGBUILD 111862 2014-05-25 20:28:58Z jlichtblau $ # Maintainer : Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor : Allan McRae <allan@archlinux.org> # Contributor: Julien MISCHKOWITZ <wain@archlinux.fr> pkgname=shake pkgver=0.999 -pkgrel=2 +pkgrel=3 pkgdesc="Userspace defragmenter that can be run while system is in use" arch=('i686' 'x86_64') url="http://vleu.net/shake/" license=('GPL3') depends=('attr') -makedepends=('cmake' 'help2man') +makedepends=('cmake' 'help2man' 'patch') install=$pkgname.install -source=(http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('f030d5ba5d4d2d449249c49b253a71de8c342b9b2f5e1e7d3e7ba5277e3f5e91') +source=(http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2 + $pkgname.patch) +sha256sums=('f030d5ba5d4d2d449249c49b253a71de8c342b9b2f5e1e7d3e7ba5277e3f5e91' + 'f7d594bed6b719f103d30da8680122ddb1bfb30d0cf30507f9ce24aefe73c511') build() { - cd ${srcdir}/${pkgname}-fs-${pkgver}/build - + cd "${srcdir}"/${pkgname}-fs-${pkgver} + patch -Np0 -i "${srcdir}"/$pkgname.patch + + cd "${srcdir}"/${pkgname}-fs-${pkgver}/build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr .. make } package() { - cd ${srcdir}/${pkgname}-fs-${pkgver}/build + cd "${srcdir}"/${pkgname}-fs-${pkgver}/build - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/shake/shake.patch b/community/shake/shake.patch new file mode 100644 index 000000000..26245919a --- /dev/null +++ b/community/shake/shake.patch @@ -0,0 +1,10 @@ +--- judge.h 2011-03-18 00:13:20.000000000 +0100 ++++ judge.h 2014-05-25 22:19:57.868937044 +0200 +@@ -22,6 +22,7 @@ + #include <stdbool.h> + #include <fcntl.h> + #include <time.h> ++#include <sys/types.h> + typedef unsigned int uint; + typedef long long int llint; + diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index d46384a54..747c05804 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 110377 2014-04-28 15:11:35Z jgc $ +# $Id: PKGBUILD 111855 2014-05-25 19:34:14Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.4.0 -pkgrel=3 +pkgver=1.5.0 +pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' license=('MIT') depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('49b0b6d5e2366a7bad5158b29998213e5ca7f254') +sha1sums=('42939c536bcdfbd92edb5e51af76ce7f0a4c6ed7') build() { cd $pkgname-$pkgver diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index 6ba66f566..9b815d1a6 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109794 2014-04-18 17:31:37Z andyrtr $ +# $Id: PKGBUILD 111827 2014-05-25 11:04:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,8 +7,8 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=5.0.12 -pkgrel=2 +pkgver=5.1.1 +pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64') url="http://www.indexdata.dk/yaz" @@ -16,7 +16,7 @@ license=('BSD') depends=('openssl' 'libxslt' 'icu') changelog=$pkgname.changelog source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('4501bbeee665e34ad480508e83fbe8b65d2b5fd0a8194077f1b4235b616a846e') +sha256sums=('473fb0c8061cf9f084fa85685879f99bb711df4c336a8be6402fbe6721b0d6ed') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog index 2ee2a0a8a..3792558ea 100644 --- a/community/yaz/yaz.changelog +++ b/community/yaz/yaz.changelog @@ -1,3 +1,6 @@ +2014-05-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * yaz 5.1.1-1 + 2014-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * yaz 5.0.12-1 diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 0b91dcefb..637303660 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 206460 2014-02-26 23:09:38Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 213576 2014-05-25 19:31:44Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.18 +pkgver=2.19 pkgrel=1 -pkgdesc="A string search utility" +pkgdesc='A string search utility' arch=('i686' 'x86_64') license=('GPL3') -url="http://www.gnu.org/software/grep/grep.html" +url='http://www.gnu.org/software/grep/grep.html' groups=('base' 'base-devel') -depends=('glibc' 'pcre' 'sh') +depends=('glibc' 'pcre') makedepends=('texinfo') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('7439f8266f50844b56cc3e2721606541' +install=$pkgname.install +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('ac732142227d9fe9567d71301e127979' 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr --without-included-regex make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/core/grep/grep-2.11-exclude-dir-crash.patch b/core/grep/grep-2.11-exclude-dir-crash.patch deleted file mode 100644 index 6b1731768..000000000 --- a/core/grep/grep-2.11-exclude-dir-crash.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@archlinux.org> -Date: Mon, 12 Mar 2012 09:28:01 +0100 -Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand - -* src/main.c (grepdir): Don't invoke excluded_file_name on NULL. -* NEWS (Bug fixes): Mention it. ---- - NEWS | 5 +++++ - src/main.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index d0a63d5..d4d70f5 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- - - * Noteworthy changes in release ?.? (????-??-??) [?] - -+** Bug fixes -+ -+ grep no longer segfaults with -r --exclude-dir and no file operand. -+ I.e., ":|grep -r --exclude-dir=D PAT" would segfault. -+ - - * Noteworthy changes in release 2.11 (2012-03-02) [stable] - -diff --git a/src/main.c b/src/main.c -index 2f6c761..f4f1235 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats) - struct stats const *ancestor; - char *name_space; - int status = 1; -- if (excluded_directory_patterns -+ if (dir && excluded_directory_patterns - && excluded_file_name (excluded_directory_patterns, dir)) - return 1; - --- -1.7.9.3 - diff --git a/core/grep/grep.install b/core/grep/grep.install index 885238ac3..a594d9c8c 100644 --- a/core/grep/grep.install +++ b/core/grep/grep.install @@ -2,16 +2,17 @@ infodir=usr/share/info file=grep.info post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null } post_upgrade() { - post_install $1 + post_install "$1" } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null } +# vim:set ts=2 sw=2 ft=sh et: diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD new file mode 100644 index 000000000..43fbac8a5 --- /dev/null +++ b/extra/libreoffice-fresh/PKGBUILD @@ -0,0 +1,378 @@ +# $Id: PKGBUILD 213572 2014-05-25 11:27:38Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> + +pkgname="libreoffice-fresh" +_LOver=4.3.0.0.beta1 +pkgver=4.3.0 +pkgrel=0.2 +pkgdesc="LibreOffice branch which contains new features and program enhancements" +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +depends=("curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2' + 'libwps' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' #'libxaw' + 'libgl' 'dbus-glib' 'libxslt' 'redland' 'icu' #'librsvg' + 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' # 'libtextcat' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' + 'libcdr' 'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene' + # 'lpsolve' ? calc + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' + 'gtk2' 'xdg-utils' #'telepathy-glib' 'orbit2' 'translate-toolkit' + 'gst-plugins-base-libs' 'glu') +makedepends=('sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' + 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' + 'clucene' 'junit' 'libmythes' 'libwpg' 'mesa' + 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu' + 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' 'apr' 'serf' + 'ttf-liberation' # to satisfy regression tests + 'chrpath') +optdepends=('libreoffice-fresh-langpack: additional language support' + 'java-runtime: adds java support' + 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell2: interactive java -- good for prototyping/macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' + #'gtk2: for browser plugin and old gtk2 desktop integration' + 'libpaper: takes care of papersize' + 'postgresql-libs: for postgresql-connector' + 'gtk3: for gtk3 Gnome integration' + 'kdelibs: for kde desktop integration' + 'make: for use in SDK' + 'gcc: for use in SDK' + 'zip: for use in SDK') +backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-fresh.sh + etc/profile.d/libreoffice-fresh.csh) +install=$pkgname.install +provides=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome' + 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk' 'libreoffice-sdk-doc' + 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' + 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') +conflicts=('libreoffice-stable' 'libreoffice-common' 'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome' + 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk' 'libreoffice-sdk-doc' + 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' + 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') + +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} + ${_additional_source_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz + ${_additional_source_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 + ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + ${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 + ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/libmwaw-0.2.0.tar.bz2 + ${_additional_source_url}/libfreehand-0.0.0.tar.bz2 + ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2 + ${_additional_source_url}/libe-book-0.0.3.tar.bz2 + ${_additional_source_url}/libabw-0.0.2.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2 + ${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz + ${_additional_source_url}/CoinMP-1.7.6.tgz + ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip # don't use system glm! LibO patches it! + ${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2 + ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 + ${_additional_source_url}/510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2 + make-pyuno-work-with-system-wide-module-install.diff + libreoffice-fresh.sh libreoffice-fresh.csh) +noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 + 9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz + 185d60944ea767075d27247c3162b3bc-unowinreg.dll + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 + 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz + 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 + 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + libmwaw-0.2.0.tar.bz2 + libfreehand-0.0.0.tar.bz2 + Firebird-2.5.2.26540-0.tar.bz2 + libe-book-0.0.3.tar.bz2 + libabw-0.0.2.tar.bz2 + language-subtag-registry-2014-03-27.tar.bz2 + 8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz + CoinMP-1.7.6.tgz + bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip + collada2gltf-master-6258611a6a.tar.bz2 + OpenCOLLADA-master-6509aa13af.tar.bz2 + 510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2) +md5sums=('c98ff0989252558dc21b71ec5e32049f' + 'SKIP' + '5b3b55d75a9659dace93900c3e88d6a9' + 'SKIP' + '507657907ee417631287c79deb44cfc8' + 'SKIP' + 'd6eef4b4cacb2183f2bf265a5a03a354' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + 'a7983f859eafb2677d7ff386a023bc40' + 'e8e197d628436490886d17cffa108fe3' + '8ab049135b2d15313da5d9f0656894a1' + '2c9b0f83ed5890af02c0df1c1776f39b' + '048751f3271906db5126ab76870444c4' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + 'ae330b9493bd4503ac390106ff6060d7' + '22f8a85daf4a012180322e1f52a7563b' + '7681383be6ce489d84c1c74f4e7f9643' + '36271d3fa0d9dec1632029b6d7aac925' + '0168229624cfac409e766913506961a8' + '17410483b5b5f267aa18b7e00b65e6e0' + '185d60944ea767075d27247c3162b3bc' + 'd794625f156a9fb1c53b3f8a8aa13b5e' + '496dd00028afcc19f896b01394769043' + '21154d2004e025c8a3666625b0357bb5' + '2f1ceaf2ac8752ed278e175447d9b978' + '40fa48e03b1e28ae0325cc34b35bc46d' + '504af523f5d1a5590bbeb6a4b55e8a97' + '8ac8ae9829c4fefd1ae9f715f95d4e0b' + '1cce53bf4b40ae29790d2c5c9f8b1129' + 'bae83fa5dc7f081768daace6e199adc3' + 'c8a8be5829ceffacfe1d68d078f5c442' + '4ca8a6ef0afeefc864e9ef21b9f14bd6' + '510c3f8504bfb8cc8c8fc5d0fac74055' + '07d2bf5ad839a394cca008b3ec6e7bb1' + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') + +prepare() { + + cd libreoffice-$_LOver + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # unowinreg.dll must be a file not a symlink or the result will become a broken symlink + # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll + rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll + cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + + # qt4 fix + sed -i "s:qmake:qmake-qt4:g" configure.ac +} + +build() { + cd libreoffice-$_LOver + + #autoconf -f + + # non-SMP test build + #export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + + ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --disable-verbose \ + --enable-release-build \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --enable-crashdump \ + --enable-avahi \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-gstreamer \ + --disable-gstreamer-0-10 \ + --enable-lockdown\ + --enable-opencl \ + --enable-opengl \ + --enable-openssl \ + --enable-odk\ + --enable-orcus \ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --disable-telepathy \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --with-system-apr \ + --with-system-libcdr \ + --with-system-mdds\ + --without-myspell-dicts \ + --with-system-libvisio \ + --without-system-libcmis \ + --with-system-libmspub \ + --without-system-libexttextcat \ + --without-system-orcus \ + --without-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --with-system-libodfgen \ + --without-system-libmwaw \ + --with-system-libetonyek \ + --without-system-libfreehand \ + --without-system-firebird \ + --with-system-libatomic-ops \ + --without-system-libebook \ + --without-system-libabw \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-glew \ + --without-system-glm \ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --with-system-serf \ + --without-system-npapi-headers \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-icu \ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --without-system-hsqldb \ + --with-alloc=system\ + --with-system-clucene \ + --disable-dependency-tracking \ + --enable-hardlink-deliver #--help + + touch src.downloaded + make +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package() { + + cd libreoffice-$_LOver + make DESTDIR="$pkgdir/" distro-pack-install + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh # fails + rm -rf ${pkgdir}/etc/bash_completion.d + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py + + # fix environment path to keep compatibility with other java-environments + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh + + # fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; + + # cleanup + rm -rf ${pkgdir}/usr/share/appdata + + # fix insecure rpath + chrpath -d $pkgdir/usr/lib/libreoffice/program/libCbc.so.3 + chrpath -d $pkgdir/usr/lib/libreoffice/program/libOsi.so.1 + chrpath -d $pkgdir/usr/lib/libreoffice/program/libCoinMP.so.1 + chrpath -d $pkgdir/usr/lib/libreoffice/program/libCbcSolver.so.3 + chrpath -d $pkgdir/usr/lib/libreoffice/program/libOsiClp.so.1 + chrpath -d $pkgdir/usr/lib/libreoffice/program/libCgl.so.1 + chrpath -d $pkgdir/usr/lib/libreoffice/program/libClp.so.1 +} diff --git a/extra/libreoffice-fresh/libreoffice-fresh.csh b/extra/libreoffice-fresh/libreoffice-fresh.csh new file mode 100644 index 000000000..502512189 --- /dev/null +++ b/extra/libreoffice-fresh/libreoffice-fresh.csh @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/extra/libreoffice-fresh/libreoffice-fresh.install b/extra/libreoffice-fresh/libreoffice-fresh.install new file mode 100644 index 000000000..fb59da3b1 --- /dev/null +++ b/extra/libreoffice-fresh/libreoffice-fresh.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/libreoffice-fresh/libreoffice-fresh.sh b/extra/libreoffice-fresh/libreoffice-fresh.sh new file mode 100644 index 000000000..7bfdcf7f6 --- /dev/null +++ b/extra/libreoffice-fresh/libreoffice-fresh.sh @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 diff --git a/extra/libreoffice-fresh/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice-fresh/make-pyuno-work-with-system-wide-module-install.diff new file mode 100644 index 000000000..3317b3ca5 --- /dev/null +++ b/extra/libreoffice-fresh/make-pyuno-work-with-system-wide-module-install.diff @@ -0,0 +1,44 @@ +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index defd7b2..ea2a809 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "`uname -s`" in + NetBSD|OpenBSD|FreeBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths +diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py +index f93ac5e..92a2891 100644 +--- a/pyuno/source/module/uno.py ++++ b/pyuno/source/module/uno.py +@@ -26,8 +26,12 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # ++import os + import sys + ++sys.path.append('/usr/lib/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" + import pyuno + + try: +diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py +index 610ac5f..df243d0 100755 +--- a/scripting/source/pyprov/officehelper.py ++++ b/scripting/source/pyprov/officehelper.py +@@ -44,7 +44,7 @@ def bootstrap(): + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "/usr/lib/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 5defd4e30..e8e61ce22 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204641 2014-01-24 14:01:34Z tomegun $ +# $Id: PKGBUILD 213577 2014-05-25 19:33:41Z seblu $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('MIT') depends=('libffi' 'expat') makedepends=('doxygen') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('bc91befb8386ec5c1ff4f24ad8464c24a7496ae2') +sha1sums=('bace08b4a531ea4b80b4cf4e953320bc48ed7efe') build() { cd $pkgname-$pkgver |