diff options
34 files changed, 970 insertions, 118 deletions
diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index 987d952af..5e24f32ea 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 64798 2012-02-18 05:40:50Z svenstaro $ +# $Id: PKGBUILD 68719 2012-04-01 00:16:22Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -pkgver=2.79 -pkgrel=2 +pkgver=2.80 +pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64' 'mips64el') url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=('freeglut') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2440.tgz \ +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2531.tgz ${pkgbase}.pc) -md5sums=('29d6f43964d8494f0366cd69e4883dd1' +md5sums=('d1eec0332110264a21d0fc0f2fb127c3' 'd1da06deba3b08b884d2212f6838905c') build() { - cd ${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver}-rev2531 # get a clean build dir [[ -d build ]] && rm -rf build @@ -46,11 +46,15 @@ build() { package_bullet() { optdepends=('bullet-docs: documentation') - cd ${pkgbase}-${pkgver}/build + cd ${pkgbase}-${pkgver}-rev2531/build # install it make DESTDIR=${pkgdir} install + # fix #29012 + install -Dm644 ../Extras/HACD/hacdVector.inl ${pkgdir}/usr/include/bullet/HACD/hacdVector.inl + install -Dm644 ../Extras/HACD/hacdCircularList.inl ${pkgdir}/usr/include/bullet/HACD/hacdCircularList.inl + # manually handle pkgconfig file mkdir -p "${pkgdir}"/usr/lib/pkgconfig sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc @@ -63,7 +67,7 @@ package_bullet-docs() { pkgdesc="Documentation for bullet" depends=() - cd ${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver}-rev2531 # install docs install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD new file mode 100644 index 000000000..d488c8ad8 --- /dev/null +++ b/community/esdl/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: kappa <kappacurve@gmail.com> + +pkgname=esdl +pkgver=1.2 +pkgrel=2 +arch=('x86_64' 'i686') +pkgdesc="SDL and OpenGL bindings for the Erlang programming language" +url="http://esdl.sourceforge.net/" +license=('custom') +depends=('erlang' 'sdl' 'mesa') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.src.tar.gz") +md5sums=('3e96c1d47bd7c1e23285360d88ce1bea') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + find -type f -print0 | xargs -0 chmod 644 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install + + # to make wings3d compile + ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \ + "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/glu.hrl" + ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \ + "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/gl.hrl" + + install -Dm644 "$srcdir/$pkgname-$pkgver/license.terms" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD index e4cdc270b..b767fc161 100644 --- a/community/expac/PKGBUILD +++ b/community/expac/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 62143 2012-01-16 19:53:09Z dreisner $ +# $Id: PKGBUILD 68721 2012-04-01 00:18:57Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=expac -pkgver=0.07 +pkgver=1 pkgrel=1 pkgdesc="pacman database extraction utility" arch=('i686' 'x86_64' 'mips64el') @@ -11,16 +11,14 @@ license=('GPL') depends=('pacman') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('1bc637b733051827982db12db84643f2') +md5sums=('be8348f18e6af9db250437b14a91e443') build() { - cd "$srcdir/$pkgname-$pkgver" - make + make -C "$pkgname-$pkgver" } package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install } # vim: ft=sh syn=sh diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index a14415418..4ee0ba194 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68634 2012-03-30 15:35:07Z arodseth $ +# $Id: PKGBUILD 68693 2012-03-31 21:00:41Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Thanks to Moonprincessluna at DeviantArt for the default icon: # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a pkgname=gendesk -pkgver=0.4 +pkgver=0.4.1 pkgrel=1 pkgdesc="Utility to generate .desktop files and download icons" arch=('x86_64' 'i686') @@ -15,7 +15,7 @@ makedepends=('go>=2:1-2') conflicts=('go-hg') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz" "http://roboticoverlords.org/images/default.png") -sha256sums=('33f95ce4b48ffb194693b0c35f8b9728a6d9c961f365a0c38bbd128c0d851993' +sha256sums=('09961d689f78b766dbdb6faaa78712589a384e6fb1ff6bf77def3a6319e4ec6a' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index c835cc950..ea5fafe3f 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 68608 2012-03-29 13:28:45Z arodseth $ +# $Id: PKGBUILD 68691 2012-03-31 19:33:32Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andres Perera <andres87p gmail> # Contributor: Matthew Bauer <mjbauer95@gmail.com> # Contributor: Christian Himpel <chressie at gmail dot com> @@ -7,34 +8,34 @@ pkgname=go pkgver=1 -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc='Google Go compiler and tools (release version)' -arch=('i686' 'x86_64' 'mips64el') +arch=('x86_64' 'i686') url="http://golang.org/" license=('custom') depends=('perl' 'ed' 'gawk') makedepends=('mercurial' 'inetutils') options=('!strip' '!emptydirs') -install=$pkgname.install -source=($pkgname.sh) -md5sums=('e7087d190fd519db3be5adb3a51194cc') +source=("$pkgname" + "$pkgname.sh") +md5sums=('fb4d2508c44b3823e05ed360c2976322' + 'e7087d190fd519db3be5adb3a51194cc') build() { _hgroot="https://go.googlecode.com/hg/" _hgrepo="release" cd "$srcdir" - msg "Connecting to Mercurial server...." - if [ -d $_hgrepo ] ; then + msg "Connecting to Mercurial server...." + if [[ -d $_hgrepo ]] ; then cd $_hgrepo hg pull -u msg "The local files are updated." else hg clone $_hgroot $_hgrepo fi - msg "Mercurial checkout done or server timeout" rm -rf "$srcdir/$_hgrepo-build" @@ -91,6 +92,9 @@ package() { $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h install $srcdir/go.sh $pkgdir/etc/profile.d/ + + mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf" + install -Dm755 "$srcdir/go" "$pkgdir/usr/bin/go" } # vim:set ts=2 sw=2 et: diff --git a/community/go/go b/community/go/go new file mode 100644 index 000000000..c284ec45c --- /dev/null +++ b/community/go/go @@ -0,0 +1,5 @@ +#!/bin/sh +if [[ -z $GOROOT ]]; then + export GOROOT=/usr/lib/go +fi +/usr/bin/go.elf "$@" diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD index 4b0bbf1bb..e1cfd759a 100644 --- a/community/hatari/PKGBUILD +++ b/community/hatari/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 63626 2012-02-05 12:01:45Z ibiru $ +# $Id: PKGBUILD 68675 2012-03-31 12:26:15Z lcarlier $ # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=hatari -pkgver=1.5.0 -pkgrel=2 +pkgver=1.6.1 +pkgrel=1 pkgdesc='An Atari ST and STE emulator' arch=('i686' 'x86_64' 'mips64el') url='http://hatari.sourceforge.net/' license=('GPL') depends=('sdl' 'libpng') makedepends=('cmake') -source=("http://download.berlios.de/hatari/${pkgname}-${pkgver}.tar.bz2") -md5sums=('16277cff73ec3a342b87b7b7ea3932f4') +source=("http://download.tuxfamily.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('14f6af33734c971cb4f349a38c6981a1') build() { cd ${pkgname}-${pkgver} diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD index 837c1c7a1..d50b7dda0 100644 --- a/community/libgringotts/PKGBUILD +++ b/community/libgringotts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67534 2012-03-13 11:05:54Z lcarlier $ +# $Id: PKGBUILD 68667 2012-03-31 08:24:10Z stativ $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=libgringotts pkgver=1.2.1 -pkgrel=8 +pkgrel=9 pkgdesc="Encryption backend for Gringotts." arch=('i686' 'x86_64' 'mips64el') url="http://developer.berlios.de/projects/gringotts" @@ -21,10 +21,11 @@ build() { ./configure --prefix=/usr make } -pckage() { + +package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - rm -fr ${pkgdir}/usr/share || return 1 + rm -fr ${pkgdir}/usr/share } diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index 129627884..fa2f55d2e 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -5,7 +5,7 @@ #Previous Contributor: Jeff Bailes <thepizzaking@gmail.com> pkgname=me-tv -pkgver=1.4.0.7 +pkgver=1.4.0.9 pkgrel=1 epoch=1 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" @@ -42,4 +42,4 @@ package() { } -md5sums=('1f7e10b063b869afcb00c6570061c1ef') +md5sums=('4d097d8893bc8c5dec0811e6cdcf4d7b') diff --git a/community/me-tv/me-tv.install b/community/me-tv/me-tv.install index f701b4754..ca1279c14 100644 --- a/community/me-tv/me-tv.install +++ b/community/me-tv/me-tv.install @@ -10,6 +10,7 @@ pre_upgrade() { post_upgrade() { post_install $1 + echo "If you run into errors after upgrading, try deleting ~/.local/share/me-tv/" } pre_remove() { diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD index ac547d633..cf5854876 100644 --- a/community/osmo/PKGBUILD +++ b/community/osmo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67694 2012-03-14 00:29:40Z giovanni $ +# $Id: PKGBUILD 68669 2012-03-31 08:29:38Z stativ $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Benzo <mb_benzo@yahoo.es> pkgname=osmo pkgver=0.2.10 -pkgrel=6 +pkgrel=7 pkgdesc="A handy personal organizer" arch=('i686' 'x86_64' 'mips64el') url="http://clayo.org/osmo/" diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index e8b132726..9527951b5 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 63833 2012-02-06 00:38:50Z giovanni $ +# $Id: PKGBUILD 68679 2012-03-31 14:28:34Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') url="https://alioth.debian.org/projects/pcsclite/" license=('BSD') -depends=('udev') +depends=('python') makedepends=('pkg-config') options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3695/pcsc-lite-${pkgver}.tar.bz2" +source=("https://alioth.debian.org/frs/download.php/3706/pcsc-lite-${pkgver}.tar.bz2" 'pcscd') -md5sums=('cb7156346e9478c19085c918b605ed43' +md5sums=('7ad8c97c89f77aab7a00317eb7e811e9' 'c97b6bce695222efb0f003d8e8369010') build() { @@ -33,7 +33,7 @@ build() { package() { cd "${srcdir}/pcsc-lite-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install install -D -m644 ${srcdir}/pcsc-lite-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -D -m755 ${srcdir}/pcscd ${pkgdir}/etc/rc.d/pcscd diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index 4827be4e4..ea12e6cd3 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 64357 2012-02-11 23:24:08Z allan $ +# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> + pkgname=setconf -pkgver=0.3.2 -pkgrel=4 +pkgver=0.4 +pkgrel=1 pkgdesc="Utility to easily change settings in Makefiles and configuration files" arch=('x86_64' 'i686' 'mips64el') url="http://setconf.roboticoverlords.org/" license=('GPL') depends=('pcre' 'gc') -makedepends=('shedskin>=0.9.1') +makedepends=('shedskin') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") -sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03') +sha256sums=('dca9d6e829f3247da8cb78434dd18d96f3439fc83a32626ff83d4a5c16099d31') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 6c7466e05..3913c16fa 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67475 2012-03-11 23:32:18Z svenstaro $ +# $Id: PKGBUILD 68697 2012-03-31 21:54:47Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20120312 + pkgver=1.99.git20120331 fi pkgrel=1 diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index eb69eeed3..069fd02bd 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62241 2012-01-18 17:54:17Z tdziedzic $ +# $Id: PKGBUILD 68673 2012-03-31 10:11:37Z rvanharen $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mrshpot <mrshpot at gmail dot com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=smalltalk pkgver=3.2.4 -pkgrel=4 +pkgrel=5 pkgdesc='A free implementation of Smalltalk-80 by the GNU project' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') @@ -18,7 +18,7 @@ optdepends=('tk: for gst-blox' 'sqlite3' 'sed: for examples' 'gtk2') - +install=smalltalk.install source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('a36a7c9beddca08dc492b500738efc82') @@ -41,7 +41,7 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - make check +# make check } package() { diff --git a/community/smalltalk/smalltalk.install b/community/smalltalk/smalltalk.install new file mode 100644 index 000000000..992e4edfb --- /dev/null +++ b/community/smalltalk/smalltalk.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(gst-base.info{,-1,-2,-3,-4,-5}.gz gst-libs.info{,-1,-2,-3}.gz gst.info{,-1,-2}.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index 35d08d4f9..8b1f78842 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -5,17 +5,17 @@ # Contributor: coolkehon <coolkehon@gmail.com> pkgname=task -pkgver=1.9.4 -pkgrel=3 +pkgver=2.0.0 +pkgrel=1 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64' 'mips64el') url="http://taskwarrior.org/projects/show/taskwarrior/" -license=('GPL') +license=('MIT') depends=() makedepends=('cmake') -optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon') +optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon', 'lua: for luaexport addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) -sha1sums=('b9bae255f4fa03970eced3ac0876935271d1d7a1') +sha256sums=('78971e366c2395de1cc4b0c4fc41dd950c309d3bc2f6e9594b4c5821ad6775bd') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,7 +28,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/etc/bash_completion.d/task_completion.sh" + install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/usr/share/bash_completion/completions/task_completion.sh" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/fish/task.fish" "$pkgdir/usr/share/fish/completions/task.fish" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/zsh/_task" "$pkgdir/usr/share/zsh/site-functions/_task" @@ -36,4 +36,6 @@ package() { install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskdata.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskdata.vim" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskedit.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskedit.vim" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskrc.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskrc.vim" + + install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/task/LICENSE" } diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 0f0238e2d..4835d5941 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153962 2012-03-21 06:20:46Z pierre $ +# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl @@ -6,7 +6,7 @@ _ver=1.0.1 # use a pacman compatible version scheme # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgver=$_ver -pkgrel=1 +pkgrel=2 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64' 'mips64el') url='https://www.openssl.org' @@ -19,12 +19,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' 'gnu-linux-mips64el-gcc.patch' - 'ca-dir.patch') + 'ca-dir.patch' + 'disable-tls12-client.patch') md5sums=('134f168bc2a8333f19f81d684841710b' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' 'd7115f0cc44df346d7b68c681819f94b' - '3bf51be3a1bbd262be46dc619f92aa90') + '3bf51be3a1bbd262be46dc619f92aa90' + '26432b9d7af63c63828b6405c9185400') build() { cd $srcdir/$pkgname-$_ver @@ -36,6 +38,8 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch + # workaround for PR#2771 + patch -p1 -i $srcdir/disable-tls12-client.patch # patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch @@ -56,7 +60,8 @@ build() { ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 ${optflags} \ "${openssltarget}" \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ + -DOPENSSL_NO_TLS1_2_CLIENT make depend make diff --git a/core/openssl/disable-tls12-client.patch b/core/openssl/disable-tls12-client.patch new file mode 100644 index 000000000..edb87e77f --- /dev/null +++ b/core/openssl/disable-tls12-client.patch @@ -0,0 +1,36 @@ +Index: openssl/ssl/t1_lib.c +RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v +rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null +--- t1_lib.c 2012/02/27 16:38:10 1.64.2.14.2.31 ++++ t1_lib.c 2012/03/21 21:32:57 1.64.2.14.2.32 +@@ -544,7 +544,7 @@ + } + skip_ext: + +- if (TLS1_get_version(s) >= TLS1_2_VERSION) ++ if (TLS1_get_client_version(s) >= TLS1_2_VERSION) + { + if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6) + return NULL; +Index: openssl/ssl/s23_clnt.c +RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v +rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u '/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2>/dev/null +--- s23_clnt.c 2011/05/19 18:22:15 1.43.2.4.2.5 ++++ s23_clnt.c 2012/03/29 19:08:54 1.43.2.4.2.6 +@@ -287,12 +287,14 @@ + + if (ssl2_compat && ssl23_no_ssl2_ciphers(s)) + ssl2_compat = 0; +- ++#ifndef OPENSSL_NO_TLS1_2_CLIENT + if (!(s->options & SSL_OP_NO_TLSv1_2)) + { + version = TLS1_2_VERSION; + } +- else if (!(s->options & SSL_OP_NO_TLSv1_1)) ++ else ++#endif ++ if (!(s->options & SSL_OP_NO_TLSv1_1)) + { + version = TLS1_1_VERSION; + } diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD index cb1c045b3..b7cb6a04f 100644 --- a/core/xz/PKGBUILD +++ b/core/xz/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $ +# $Id: PKGBUILD 154939 2012-03-31 12:48:19Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Contributor: François Charette <firmicus@gmx.net> pkgname=xz pkgver=5.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64' 'mips64el') url='http://tukaani.org/xz/' license=('GPL' 'LGPL' 'custom') depends=('sh') -provides=('lzma' 'lzma-utils' 'xz-utils') -replaces=('lzma' 'lzma-utils' 'xz-utils') -conflicts=('lzma' 'lzma-utils' 'xz-utils') options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('fefe52f9ecd521de2a8ce38c21a27574') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig" + 'compile-fix.patch') +md5sums=('fefe52f9ecd521de2a8ce38c21a27574' + 'd0725667a6dae0853194dc691e900e26' + 'b74e4f7793848cc5765c848ea30f971f') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/compile-fix.patch ./configure --prefix=/usr \ --disable-rpath \ diff --git a/core/xz/compile-fix.patch b/core/xz/compile-fix.patch new file mode 100644 index 000000000..f3b7878d1 --- /dev/null +++ b/core/xz/compile-fix.patch @@ -0,0 +1,28 @@ +From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001 +From: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue, 10 Jan 2012 17:13:03 +0200 +Subject: [PATCH] Tests: Fix a compiler warning with _FORTIFY_SOURCE. + +Reported here: +http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 +--- + tests/create_compress_files.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c +index 44367d8..bd5b4ef 100644 +--- a/tests/create_compress_files.c ++++ b/tests/create_compress_files.c +@@ -79,7 +79,8 @@ static void + write_abc(FILE *file) + { + for (size_t i = 0; i < 12345; ++i) +- fwrite("abc\n", 4, 1, file); ++ if (fwrite("abc\n", 4, 1, file) != 1) ++ exit(1); + } + + +-- +1.7.6 + diff --git a/extra/bootchart/PKGBUILD b/extra/bootchart/PKGBUILD index 5eb0b3d28..9a48b1b01 100644 --- a/extra/bootchart/PKGBUILD +++ b/extra/bootchart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154392 2012-03-27 12:40:40Z tomegun $ +# $Id: PKGBUILD 154945 2012-03-31 14:17:08Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> pkgname="bootchart" -pkgver=1.15 +pkgver=1.16 pkgrel=1 -pkgdesc="a 'startup' graphing tool" +pkgdesc="A 'startup' graphing tool" url="https://meego.gitorious.org/meego-developer-tools/bootchart" license=('GPL2') arch=(i686 x86_64) @@ -23,5 +23,5 @@ package() { cd "$srcdir/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('e24cad9db140521fca5193a88589e669' - '5546709bc77b775290cb54a29affa6ec') +md5sums=('d563854bdbf0f0de821406881164a607' + '381f1375d5563ced806a5bbe7b2efd8e') diff --git a/extra/bootchart/build.patch b/extra/bootchart/build.patch index 82c6e1bfd..91ca34def 100644 --- a/extra/bootchart/build.patch +++ b/extra/bootchart/build.patch @@ -1,15 +1,18 @@ -From 4fe62e6b4c072676d246be02ba92a1df3a9d0feb Mon Sep 17 00:00:00 2001 +From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg@jklm.no> Date: Fri, 16 Mar 2012 01:34:10 +0100 Subject: [PATCH] Makefile: move binary and avoid empty dirs Install to /usr/bin by default, and don't install an empty /etc. + +v2: Adjust README to reflect the change. --- Makefile | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) + README | 2 +- + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index 566a848..c017509 100644 +index 2150ed3..ae432fa 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,10 @@ CC := gcc @@ -29,6 +32,19 @@ index 566a848..c017509 100644 OBJS := log.o svg.o bootchart.o +diff --git a/README b/README +index fa1d730..1906abb 100644 +--- a/README ++++ b/README +@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool + Bootchart is a tool, usually run at system startup, that collects and graphs + the CPU and disk load of the system as it works. The output of bootchart is + an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel +-by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork ++by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork + init off to resume normal system startup, while monitoring and logging + startup information in the background. + -- -1.7.9.4 +1.7.9.5 diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD index e073ae272..e6902bb33 100644 --- a/extra/clisp/PKGBUILD +++ b/extra/clisp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151174 2012-02-25 06:56:49Z pierre $ +# $Id: PKGBUILD 154935 2012-03-31 09:53:13Z ronald $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=clisp pkgver=2.49 -pkgrel=2 +pkgrel=3 pkgdesc="ANSI Common Lisp interpreter, compiler and debugger" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 7c07fcc93..b02b50e8a 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 151647 2012-02-29 10:28:02Z ronald $ +# $Id: PKGBUILD 154928 2012-03-31 08:57:52Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot -pkgver=4.4.4 -pkgrel=2 +pkgver=4.6.0 +pkgrel=1 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnuplot.info" @@ -13,17 +13,12 @@ license=('custom') depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') install=gnuplot.install -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "lua_tikz.patch") -sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31' - 'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2') build() { cd $srcdir/$pkgname-$pkgver - # upstram patch to fix lua/tikz terminal - patch -Np0 -i ${srcdir}/lua_tikz.patch - # fix default source location; use the GDFONTPATH variable to modify at runtime sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD index 030de8269..7f3e48c2d 100644 --- a/extra/libsigsegv/PKGBUILD +++ b/extra/libsigsegv/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 137667 2011-09-10 11:21:14Z pierre $ +# $Id: PKGBUILD 154929 2012-03-31 09:05:33Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Johannes Weiner <hannes@saeurebad.de> pkgname=libsigsegv -pkgver=2.6 -pkgrel=2 +pkgver=2.10 +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') pkgdesc="Page fault detection library" -url="http://libsigsegv.sourceforge.net/" +url="http://www.gnu.org/software/libsigsegv/" license=('GPL2') depends=('glibc') options=('!libtool') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7e24993730649d13c6eabc28bd24de35') +sha1sums=('b75a647a9ebda70e7a3b33583efdd550e0eac094') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD index 4f4a1218b..c51ffeaa9 100644 --- a/kernels/xen/PKGBUILD +++ b/kernels/xen/PKGBUILD @@ -1,18 +1,18 @@ -# Mantainer M0Rf30 +# Maintainer M0Rf30 # Contributor WaxyMouthfeel -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=xen pkgver=4.1.2 -pkgrel=3 +pkgrel=3.1 pkgdesc="Xen 4 (hypervisor and tools)" arch=(i686 x86_64) url="http://xen.org/" license="GPL" if [[ $CARCH == "x86_64" ]]; then - depends=('xz-utils' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'lib32-glibc') + depends=('xz' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'lib32-glibc') else - depends=('xz-utils' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'glibc') + depends=('xz' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'glibc') fi optdepends=('xen-docs: Xen Official Documentation') diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index aaf169d88..e31f18c5b 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -3,10 +3,11 @@ # Contributor: dorphell <dorphell@archlinux.org> # Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> pkgname=sdl-libre pkgver=1.2.15 -pkgrel=1 +pkgrel=1.1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64' 'mips64el') url="http://www.libsdl.org" @@ -20,16 +21,19 @@ options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch + riva_mmio.patch no-riva-accel.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' + 'f5ab9ba6ba2bb8df74d0f768f9df3ea8' 'eb2f5899db608ad27b379faa5e0beb80') build() { cd ${srcdir}/SDL-${pkgver} patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch + patch -Np0 -i $srcdir/riva_mmio.patch patch -Np0 -i $srcdir/no-riva-accel.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ --with-x --disable-rpath --disable-static diff --git a/libre/sdl-libre/riva_mmio.patch b/libre/sdl-libre/riva_mmio.patch new file mode 100644 index 000000000..945d9bf9b --- /dev/null +++ b/libre/sdl-libre/riva_mmio.patch @@ -0,0 +1,554 @@ +--- src/video/fbcon/riva_mmio.h 2012-01-19 04:30:06.000000000 -0200 ++++ /dev/null 2012-04-01 13:58:27.776718756 -0300 +@@ -1,449 +0,0 @@ +-/***************************************************************************\ +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NOTICE TO USER: The source code is copyrighted under U.S. and *| +-|* international laws. Users and possessors of this source code are *| +-|* hereby granted a nonexclusive, royalty-free copyright license to *| +-|* use this code in individual and commercial software. *| +-|* *| +-|* Any use of this source code must include, in the user documenta- *| +-|* tion and internal comments to the code, notices to the end user *| +-|* as follows: *| +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *| +-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *| +-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *| +-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *| +-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *| +-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *| +-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *| +-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *| +-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *| +-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *| +-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *| +-|* *| +-|* U.S. Government End Users. This source code is a "commercial *| +-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *| +-|* consisting of "commercial computer software" and "commercial *| +-|* computer software documentation," as such terms are used in *| +-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *| +-|* ment only as a commercial end item. Consistent with 48 C.F.R. *| +-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *| +-|* all U.S. Government End Users acquire the source code with only *| +-|* those rights set forth herein. *| +-|* *| +-\***************************************************************************/ +- +-#ifndef __RIVA_HW_H__ +-#define __RIVA_HW_H__ +-#define RIVA_SW_VERSION 0x00010003 +- +-/* +- * Typedefs to force certain sized values. +- */ +-typedef Uint8 U008; +-typedef Uint16 U016; +-typedef Uint32 U032; +- +-/* +- * HW access macros. +- */ +-#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d)) +-#define NV_RD08(p,i) (((U008 *)(p))[i]) +-#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d)) +-#define NV_RD16(p,i) (((U016 *)(p))[(i)/2]) +-#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d)) +-#define NV_RD32(p,i) (((U032 *)(p))[(i)/4]) +-#define VGA_WR08(p,i,d) NV_WR08(p,i,d) +-#define VGA_RD08(p,i) NV_RD08(p,i) +- +-/* +- * Define supported architectures. +- */ +-#define NV_ARCH_03 0x03 +-#define NV_ARCH_04 0x04 +-#define NV_ARCH_10 0x10 +-/***************************************************************************\ +-* * +-* FIFO registers. * +-* * +-\***************************************************************************/ +- +-/* +- * Raster OPeration. Windows style ROP3. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 Rop3; +-} RivaRop; +-/* +- * 8X8 Monochrome pattern. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Shape; +- U032 reserved03[0x001]; +- U032 Color0; +- U032 Color1; +- U032 Monochrome[2]; +-} RivaPattern; +-/* +- * Scissor clip rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaClip; +-/* +- * 2D filled rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; +- U032 reserved03[0x03E]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaRectangle; +-/* +- * 2D screen-screen BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeftSrc; +- U032 TopLeftDst; +- U032 WidthHeight; +-} RivaScreenBlt; +-/* +- * 2D pixel BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 TopLeft; +- U032 WidthHeight; +- U032 WidthHeightIn; +- U032 reserved02[0x03C]; +- U032 Pixels; +-} RivaPixmap; +-/* +- * Filled rectangle combined with monochrome expand. Useful for glyphs. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 reserved03[(0x040)-1]; +- U032 Color1A; +- struct +- { +- U032 TopLeft; +- U032 WidthHeight; +- } UnclippedRectangle[64]; +- U032 reserved04[(0x080)-3]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipB; +- U032 Color1B; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClippedRectangle[64]; +- U032 reserved05[(0x080)-5]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipC; +- U032 Color1C; +- U032 WidthHeightC; +- U032 PointC; +- U032 MonochromeData1C; +- U032 reserved06[(0x080)+121]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipD; +- U032 Color1D; +- U032 WidthHeightInD; +- U032 WidthHeightOutD; +- U032 PointD; +- U032 MonochromeData1D; +- U032 reserved07[(0x080)+120]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipE; +- U032 Color0E; +- U032 Color1E; +- U032 WidthHeightInE; +- U032 WidthHeightOutE; +- U032 PointE; +- U032 MonochromeData01E; +-} RivaBitmap; +-/* +- * 3D textured, Z buffered triangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BC]; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 FogColor; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 AlphaTest; +- U032 reserved02[0x339]; +- U032 FogAndIndex; +- U032 Color; +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- float TextureS; +- float TextureT; +-} RivaTexturedTriangle03; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 ColorKey; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 Blend; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 FogColor; +- U032 reserved02[0x39]; +- struct +- { +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- U032 Color; +- U032 Specular; +- float TextureS; +- float TextureT; +- } Vertex[16]; +- U032 DrawTriangle3D; +-} RivaTexturedTriangle05; +-/* +- * 2D line. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; /* source color 0304-0307*/ +- U032 Reserved02[0x03e]; +- struct { /* start aliased methods in array 0400- */ +- U032 point0; /* y_x S16_S16 in pixels 0- 3*/ +- U032 point1; /* y_x S16_S16 in pixels 4- 7*/ +- } Lin[16]; /* end of aliased methods in array -047f*/ +- struct { /* start aliased methods in array 0480- */ +- U032 point0X; /* in pixels, 0 at left 0- 3*/ +- U032 point0Y; /* in pixels, 0 at top 4- 7*/ +- U032 point1X; /* in pixels, 0 at left 8- b*/ +- U032 point1Y; /* in pixels, 0 at top c- f*/ +- } Lin32[8]; /* end of aliased methods in array -04ff*/ +- U032 PolyLin[32]; /* y_x S16_S16 in pixels 0500-057f*/ +- struct { /* start aliased methods in array 0580- */ +- U032 x; /* in pixels, 0 at left 0- 3*/ +- U032 y; /* in pixels, 0 at top 4- 7*/ +- } PolyLin32[16]; /* end of aliased methods in array -05ff*/ +- struct { /* start aliased methods in array 0600- */ +- U032 color; /* source color 0- 3*/ +- U032 point; /* y_x S16_S16 in pixels 4- 7*/ +- } ColorPolyLin[16]; /* end of aliased methods in array -067f*/ +-} RivaLine; +-/* +- * 2D/3D surfaces +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BE]; +- U032 Offset; +-} RivaSurface; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Pitch; +- U032 RenderBufferOffset; +- U032 ZBufferOffset; +-} RivaSurface3D; +- +-/***************************************************************************\ +-* * +-* Virtualized RIVA H/W interface. * +-* * +-\***************************************************************************/ +- +-struct _riva_hw_inst; +-struct _riva_hw_state; +-/* +- * Virtialized chip interface. Makes RIVA 128 and TNT look alike. +- */ +-typedef struct _riva_hw_inst +-{ +- /* +- * Chip specific settings. +- */ +- U032 Architecture; +- U032 Version; +- U032 CrystalFreqKHz; +- U032 RamAmountKBytes; +- U032 MaxVClockFreqKHz; +- U032 RamBandwidthKBytesPerSec; +- U032 EnableIRQ; +- U032 IO; +- U032 VBlankBit; +- U032 FifoFreeCount; +- U032 FifoEmptyCount; +- /* +- * Non-FIFO registers. +- */ +- volatile U032 *PCRTC; +- volatile U032 *PRAMDAC; +- volatile U032 *PFB; +- volatile U032 *PFIFO; +- volatile U032 *PGRAPH; +- volatile U032 *PEXTDEV; +- volatile U032 *PTIMER; +- volatile U032 *PMC; +- volatile U032 *PRAMIN; +- volatile U032 *FIFO; +- volatile U032 *CURSOR; +- volatile U032 *CURSORPOS; +- volatile U032 *VBLANKENABLE; +- volatile U032 *VBLANK; +- volatile U008 *PCIO; +- volatile U008 *PVIO; +- volatile U008 *PDIO; +- /* +- * Common chip functions. +- */ +- int (*Busy)(struct _riva_hw_inst *); +- void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int); +- void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*SetStartAddress)(struct _riva_hw_inst *,U032); +- void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032); +- void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032); +- int (*ShowHideCursor)(struct _riva_hw_inst *,int); +- void (*LockUnlock)(struct _riva_hw_inst *, int); +- /* +- * Current extended mode settings. +- */ +- struct _riva_hw_state *CurrentState; +- /* +- * FIFO registers. +- */ +- RivaRop *Rop; +- RivaPattern *Patt; +- RivaClip *Clip; +- RivaPixmap *Pixmap; +- RivaScreenBlt *Blt; +- RivaBitmap *Bitmap; +- RivaLine *Line; +- RivaTexturedTriangle03 *Tri03; +- RivaTexturedTriangle05 *Tri05; +-} RIVA_HW_INST; +-/* +- * Extended mode state information. +- */ +-typedef struct _riva_hw_state +-{ +- U032 bpp; +- U032 width; +- U032 height; +- U032 repaint0; +- U032 repaint1; +- U032 screen; +- U032 pixel; +- U032 horiz; +- U032 arbitration0; +- U032 arbitration1; +- U032 vpll; +- U032 pllsel; +- U032 general; +- U032 config; +- U032 cursor0; +- U032 cursor1; +- U032 cursor2; +- U032 offset0; +- U032 offset1; +- U032 offset2; +- U032 offset3; +- U032 pitch0; +- U032 pitch1; +- U032 pitch2; +- U032 pitch3; +-} RIVA_HW_STATE; +- +-/* +- * FIFO Free Count. Should attempt to yield processor if RIVA is busy. +- */ +- +-#define RIVA_FIFO_FREE(hwptr,cnt) \ +-{ \ +- while (FifoFreeCount < (cnt)) \ +- FifoFreeCount = hwptr->FifoFree >> 2; \ +- FifoFreeCount -= (cnt); \ +-} +-#endif /* __RIVA_HW_H__ */ +- +--- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200 ++++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300 +@@ -24,12 +24,10 @@ + #include "SDL_video.h" + #include "../SDL_blit.h" + #include "SDL_fbriva.h" +-#include "riva_mmio.h" + #include "riva_regs.h" + + + static int FifoEmptyCount = 0; +-static int FifoFreeCount = 0; + + /* Wait for vertical retrace */ + static void WaitVBL(_THIS) +@@ -41,20 +39,6 @@ + while ( !(*port & 0x08) ) + ; + } +-static void NV3WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) +- ; +-} +-static void NV4WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) +- ; +-} + + #if 0 /* Not yet implemented? */ + /* Sets video mem colorkey and accelerated blit function */ +@@ -74,7 +58,6 @@ + { + int dstX, dstY; + int dstW, dstH; +- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); + + /* Don't blit to the display surface when switched away */ + if ( switched_away ) { +@@ -93,13 +76,6 @@ + dstX += rect->x; + dstY += rect->y; + +- RIVA_FIFO_FREE(Bitmap, 1); +- Bitmap->Color1A = color; +- +- RIVA_FIFO_FREE(Bitmap, 2); +- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; +- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; +- + FB_AddBusySurface(dst); + + if ( dst == this->screen ) { +@@ -115,7 +91,6 @@ + int srcX, srcY; + int dstX, dstY; + int dstW, dstH; +- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); + + /* FIXME: For now, only blit to display surface */ + if ( dst->pitch != SDL_VideoSurface->pitch ) { +@@ -142,11 +117,6 @@ + dstX += dstrect->x; + dstY += dstrect->y; + +- RIVA_FIFO_FREE(Blt, 3); +- Blt->TopLeftSrc = (srcY << 16) | srcX; +- Blt->TopLeftDst = (dstY << 16) | dstX; +- Blt->WidthHeight = (dstH << 16) | dstW; +- + FB_AddBusySurface(src); + FB_AddBusySurface(dst); + +@@ -185,23 +155,15 @@ + + void FB_RivaAccel(_THIS, __u32 card) + { +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); + + /* We have hardware accelerated surface functions */ + this->CheckHWBlit = CheckHWBlit; + wait_vbl = WaitVBL; + switch (card) { +- case FB_ACCEL_NV3: +- wait_idle = NV3WaitIdle; +- break; +- case FB_ACCEL_NV4: +- wait_idle = NV4WaitIdle; +- break; + default: + /* Hmm... FIXME */ + break; + } +- FifoEmptyCount = Rop->FifoFree; + + /* The Riva has an accelerated color fill */ + this->info.blit_fill = 1; diff --git a/libre/sqlite3-libre/PKGBUILD b/libre/sqlite3-libre/PKGBUILD new file mode 100644 index 000000000..569538fbf --- /dev/null +++ b/libre/sqlite3-libre/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 154652 2012-03-30 14:26:35Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase="sqlite3" +pkgname=('sqlite3' 'sqlite3-tcl') +_amalgamationver=3071100 +_amalgamationver2=${_amalgamationver/00/} +#pkgver=${_amalgamationver2//0/.} +pkgver=3.7.11 +pkgrel=1.1 +pkgdesc="A C library that implements an SQL database engine" +arch=('i686' 'x86_64' 'mips64el') +license=('custom') +url="http://www.sqlite.org/" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + license.txt) +options=('!libtool' '!emptydirs') +md5sums=('0552d71bda98ebdcaea305cd6058221b' + 'c1cdbc5544034d9012e421e75a5e4890') + +build() { + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make + + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + +} + +package_sqlite3() { + + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite' 'sqlite3') + replaces=('sqlite' 'sqlite3') + provides=("sqlite3=$pkgver") + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install + + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} + +package_sqlite3-tcl() { + + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install +} diff --git a/libre/sqlite3-libre/license.txt b/libre/sqlite3-libre/license.txt new file mode 100644 index 000000000..118c5d5e6 --- /dev/null +++ b/libre/sqlite3-libre/license.txt @@ -0,0 +1,33 @@ +SQLite Copyright +SQLite is in the +Public Domain + + +All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. + +All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. +Obtaining An Explicit License To Use SQLite + +Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: +You are using SQLite in a jurisdiction that does not recognize the public domain. +You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. +You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. +Your legal department tells you that you have to purchase a license. + +If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. +Contributed Code + +In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: +The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. + +We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: +Hwaci +6200 Maple Cove Lane +Charlotte, NC 28269 +USA + +A template copyright release is available in PDF or HTML. You can use this release to make future changes. + +see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index 84bab9c17..6c03eb70f 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -1,28 +1,37 @@ # Maintainer: Cedric Girard <girard.cedric@gmail.com> +# Contributor: N30N <archlinux@alunamation.com> + pkgname=unarchiver -pkgver=2.7.1 -pkgrel=3 +pkgver=3.0 +pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') url="http://wakaba.c3.cx/s/apps/unarchiver.html" license=('LGPL2.1') -depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') -conflicts=('gnustep-base>=1.24') +depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') makedepends=('gcc-objc') -source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip) +source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip" + "native_obj_exceptions.patch" + "libz.patch") build() { - cd "$srcdir/The Unarchiver/XADMaster" + cd $srcdir/ + patch -Np1 -i native_obj_exceptions.patch + patch -Np1 -i libz.patch + + cd XADMaster . /usr/share/GNUstep/Makefiles/GNUstep.sh make -f Makefile.linux } package() { - cd "$srcdir/The Unarchiver/XADMaster" + cd "$srcdir/XADMaster" install -d "$pkgdir/usr/bin/" install -m755 unar lsar "$pkgdir/usr/bin/" } # vim:set ts=2 sw=2 et: -md5sums=('498ea1c984d5783322e070a71922b422') +md5sums=('c7c42cd3640bf477b79b21436344f098' + '4fa4ecc6e4ba14d3b6952d064e728511' + '665d01bf93191cc6f57dc80d8c1d3d5a') diff --git a/libre/unarchiver/libz.patch b/libre/unarchiver/libz.patch new file mode 100644 index 000000000..acba51463 --- /dev/null +++ b/libre/unarchiver/libz.patch @@ -0,0 +1,13 @@ +diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux +--- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 ++++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:56:13.749166606 +0100 +@@ -51,7 +51,8 @@ + -licuuc \ + -lobjc \ + -lstdc++ \ +- -lm ++ -lm \ ++ -lz + + LDFLAGS = -Wl,--whole-archive \ + -fexceptions \ diff --git a/libre/unarchiver/native_obj_exceptions.patch b/libre/unarchiver/native_obj_exceptions.patch new file mode 100644 index 000000000..9c84918b2 --- /dev/null +++ b/libre/unarchiver/native_obj_exceptions.patch @@ -0,0 +1,22 @@ +diff -Naur The Unarchiver/UniversalDetector/Makefile.linux The Unarchiver_patched/UniversalDetector/Makefile.linux +--- The Unarchiver/UniversalDetector/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 ++++ The Unarchiver_patched/UniversalDetector/Makefile.linux 2011-12-22 10:48:32.138621163 +0100 +@@ -16,7 +16,6 @@ + + GNUSTEP_OPTS = -DGNUSTEP \ + -DGNU_RUNTIME=1 \ +- -D_NATIVE_OBJC_EXCEPTIONS \ + -fgnu-runtime \ + -fexceptions \ + -fobjc-exceptions \ +diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux +--- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 ++++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:48:15.488721721 +0100 +@@ -16,7 +16,6 @@ + + GNUSTEP_OPTS = -DGNUSTEP \ + -DGNU_RUNTIME=1 \ +- -D_NATIVE_OBJC_EXCEPTIONS \ + -fgnu-runtime \ + -fexceptions \ + -fobjc-exceptions \ |