diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 15:38:15 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 15:38:15 -0300 |
commit | c28258d27bd9d58760eb647f912bb98a536aa753 (patch) | |
tree | 261e61872b291c02790e5483c769710942547731 /community | |
parent | eefed5e3db847eccce0207f89c7430b9ec4994b7 (diff) | |
parent | 949fa4e5ed405aaddcebff7e21008f03cdffa580 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/geda-gaf/PKGBUILD
community/mplayer2/PKGBUILD
community/parcellite/PKGBUILD
community/python2-pytables/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/kbd/PKGBUILD
core/systemd/PKGBUILD
extra/calligra/PKGBUILD
extra/dmapi/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/libtorrent-rasterbar/PKGBUILD
extra/llvm/PKGBUILD
extra/nx/PKGBUILD
extra/ocaml/PKGBUILD
extra/php-xcache/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/vcdimager/PKGBUILD
extra/w3m/PKGBUILD
extra/xorg-bdftopcf/PKGBUILD
extra/xorg-xcalc/PKGBUILD
extra/xorg-xconsole/PKGBUILD
extra/xorg-xedit/PKGBUILD
extra/xorg-xmag/PKGBUILD
extra/xorg-xmessage/PKGBUILD
extra/xorg-xvidtune/PKGBUILD
libre/unzip-libre/PKGBUILD
social/opentracker/PKGBUILD
Diffstat (limited to 'community')
94 files changed, 2139 insertions, 405 deletions
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 1a350d92d..4a0459fd1 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79970 2012-11-15 08:39:27Z mtorromeo $ +# $Id: PKGBUILD 82354 2013-01-16 08:38:43Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit -pkgver=2.2.1 -pkgrel=4 +pkgver=2.2.2 +pkgrel=1 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64 mips64el) @@ -59,7 +59,7 @@ package() { sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf } -sha256sums=('9865ca89f5b975ccf25441ddf45a874448f2bba944005aa8cd5e3c3148713a63' +sha256sums=('8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b' '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5' '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007' - 'e60c031c6354f41938447c439eadee77127307687a2c487a54fab884eeafd9c2') + '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4') diff --git a/community/audit/python2.patch b/community/audit/python2.patch index b5f6cbc25..87286fc5b 100644 --- a/community/audit/python2.patch +++ b/community/audit/python2.patch @@ -1,10 +1,10 @@ ---- configure.old 2010-10-22 15:54:13.193333452 +0200 -+++ configure 2010-10-22 15:54:52.546667020 +0200 -@@ -10662,7 +10662,7 @@ +--- configure.orig 2013-01-16 09:19:32.475800853 +0100 ++++ configure 2013-01-16 09:20:45.764146581 +0100 +@@ -13076,7 +13076,7 @@ # Find any Python interpreter. if test -z "$PYTHON"; then -- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 +- for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + for ac_prog in python2 do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD index 08a24307e..225429d81 100644 --- a/community/brise/PKGBUILD +++ b/community/brise/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 82228 2013-01-12 17:11:20Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> pkgname=brise -pkgver=0.13 -pkgrel=2 +pkgver=0.16 +pkgrel=1 pkgdesc="Rime schema repository" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" @@ -24,4 +24,4 @@ package() { cd "${srcdir}/$pkgname" make DESTDIR="$pkgdir" install } -md5sums=('2346866c7a10e3f7f210a551083b31ac') +md5sums=('bc45f42852fd7bed59a171233d50cb79') diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index 19cb32a30..d063f4697 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81241 2012-12-14 11:41:36Z andrea $ +# $Id: PKGBUILD 82406 2013-01-16 22:11:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> # Contributor: MisterFred <mister.fred[at]free[dot]fr> pkgname=cantata -pkgver=0.9.1 +pkgver=0.9.2 pkgdesc="A KDE client for the music player daemon (MPD)" pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('kdebase-runtime' 'taglib-extras' 'ffmpeg' 'mpg123' 'libmtp' 'speex') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://cantata.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('78e2f379fe9a0afd32e24de83f1c283e') +md5sums=('882cec90eb01d190b899689675e990b0') build() { mkdir build diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index 0ce5530ea..ffdf67f1d 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78395 2012-10-17 18:38:19Z giovanni $ +# $Id: PKGBUILD 82451 2013-01-18 08:29:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.8 +pkgver=1.4.9 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('LGPL' 'GPL') depends=('pcsclite' 'libusbx') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/3768/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b6c37110f50b059a8ba94f118cfd679a') +source=("https://alioth.debian.org/frs/download.php/3864/${pkgname}-${pkgver}.tar.bz2") +md5sums=('1afd9cc6fb1676d1fdd605d10c70d08e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD index 1a3031f3c..ca59ebaa3 100644 --- a/community/cdrtools/PKGBUILD +++ b/community/cdrtools/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 81381 2012-12-19 11:23:36Z stativ $ +# $Id: PKGBUILD 82236 2013-01-12 18:33:09Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=cdrtools -pkgver=3.01a10 +pkgver=3.01a11 pkgrel=1 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=(!makeflags) backup=('etc/default/cdrecord' 'etc/default/rscsi') install=cdrtools.install source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2) -md5sums=('85abd7dc87ed9fdbcecca50ab6da7d7d') +md5sums=('e4f8f105affc5d93b6ebabd63c43c8a6') build() { cd "$srcdir"/cdrtools-${pkgver%%a*} diff --git a/community/consonance/PKGBUILD b/community/consonance/PKGBUILD index 9206e3a1e..2eb1d370c 100644 --- a/community/consonance/PKGBUILD +++ b/community/consonance/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76320 2012-09-15 20:11:01Z jsteel $ +# $Id: PKGBUILD 82327 2013-01-15 11:34:58Z allan $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contributor: Auguste Pop <auguste [at] gmail [dot] com> # Contributor: boenki <boenki at gmx dot de> @@ -6,23 +6,27 @@ pkgname=consonance pkgver=0.5.1 -pkgrel=9 +pkgrel=10 pkgdesc="A lightweight GTK+ music manager that aims to be fast, bloat-free and light on memory consumption" arch=('i686' 'x86_64' 'mips64el') url="http://sites.google.com/site/consonancemanager" license=('GPL') -depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libcdio' - 'libmad' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3' 'taglib') +depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libmad' + 'libcdio-paranoia' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3' + 'taglib') install=$pkgname.install source=($url/releases-1/$pkgname-$pkgver.tar.gz - libnotify.patch) + libnotify.patch + cdio-includes.patch) md5sums=('2a195dd2314f7b65cc57cc871a4c5a47' - 'caa1e8b41723950fd926bfefccbbd8ac') + 'caa1e8b41723950fd926bfefccbbd8ac' + '239b451ba8795f8c287e994a7e32d859') build() { cd "$srcdir"/$pkgname-$pkgver patch -Np1 -i "$srcdir"/libnotify.patch + patch -Np1 -i "$srcdir"/cdio-includes.patch ./configure --prefix=/usr diff --git a/community/consonance/cdio-includes.patch b/community/consonance/cdio-includes.patch new file mode 100644 index 000000000..c570468b1 --- /dev/null +++ b/community/consonance/cdio-includes.patch @@ -0,0 +1,12 @@ +diff -upr consonance-0.5.1.orig/src/cdda.h consonance-0.5.1/src/cdda.h +--- consonance-0.5.1.orig/src/cdda.h 2013-01-14 05:14:54.000000000 +0200 ++++ consonance-0.5.1/src/cdda.h 2013-01-14 05:15:16.000000000 +0200 +@@ -18,7 +18,7 @@ + #ifndef CDDA_H + #define CDDA_H + +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/cd_types.h> + + struct con_cdda_decoder { diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index d3ada24cd..fb91a2a5e 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 79443 2012-11-05 16:58:53Z stephane $ +# $Id: PKGBUILD 82520 2013-01-20 01:50:26Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.57 +pkgver=1.58 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('pcre' 'qt') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4753472689fdcb4276fde55e6e984597c87921bd') +sha1sums=('c7f597c600c30b1a5e9c6b3228a11e9872d562e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index cdd6f2493..d5bacea73 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82166 2013-01-10 09:21:45Z spupykin $ +# $Id: PKGBUILD 82360 2013-01-16 10:08:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.1.1 +pkgver=1.1.2 _pkgver=1.1 pkgrel=2 pkgdesc="Utility to organize and develop raw images" @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('735b9c42f4a4c93a482a195800002b10') +md5sums=('cdc27dc2d9d53df3ec2c6aa908a3eb3c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/darktable/darktable.install b/community/darktable/darktable.install index 8ea5d73af..24b15a4f5 100644 --- a/community/darktable/darktable.install +++ b/community/darktable/darktable.install @@ -2,12 +2,8 @@ post_install() { [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } -pre_upgrade() { - pre_remove -} - post_upgrade() { - post_install + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } post_remove() { diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index aefe2109a..452ad3aba 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79601 2012-11-08 19:11:56Z lfleischer $ +# $Id: PKGBUILD 82328 2013-01-15 11:34:59Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.6 -pkgrel=1 +pkgrel=2 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' diff --git a/community/dgen-sdl/PKGBUILD b/community/dgen-sdl/PKGBUILD new file mode 100644 index 000000000..411a0964f --- /dev/null +++ b/community/dgen-sdl/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 82263 2013-01-13 21:31:21Z jsteel $ +# Maintainer: Jonathan Steel <mail@jsteel.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Jason Chu <jason@archlinux.org> +# Contributor: Joker-jar <joker-jar@yandex.ru> + +pkgname=dgen-sdl +pkgver=1.31 +pkgrel=2 +pkgdesc="An emulator for Sega Genesis/Mega Drive systems ported to SDL" +arch=('i686' 'x86_64') +url="http://dgen.sourceforge.net" +license=('BSD') +depends=('sdl' 'libgl' 'libarchive') +makedepends=('nasm') +source=(http://downloads.sourceforge.net/dgen/$pkgname-$pkgver.tar.gz) +md5sums=('3f297010cc17c471c8c66652d9dee905') + + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install + + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index 792ea7184..921f8cc5b 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -8,10 +8,10 @@ pkgname=erlang-nox pkgver=R15B03_1 -pkgrel=1 +pkgrel=2 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') -url='http://www.erlang.org' +url='http://www.erlang.org/' license=('custom') depends=('ncurses' 'openssl') provides=('erlang') @@ -29,7 +29,7 @@ build() { cd "$srcdir/otp_src_${pkgver/_1/}" msg2 'Configuring...' - ./configure --prefix=/usr --enable-smp-support + ./configure --prefix=/usr --enable-smp-support --with-odbc msg2 'Compiling...' make } diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index ce845a996..2cdfb1b27 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81307 2012-12-17 09:59:36Z arodseth $ +# $Id: PKGBUILD 82512 2013-01-19 21:47:45Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -8,10 +8,10 @@ pkgname=erlang pkgver=R15B03_1 -pkgrel=1 +pkgrel=2 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' arch=(i686 x86_64 mips64el) -url='http://www.erlang.org' +url='http://www.erlang.org/' license=('custom') depends=('ncurses' 'glu' 'wxgtk' 'openssl') makedepends=('perl' 'mesa' 'lksctp-tools') @@ -26,7 +26,7 @@ build() { cd "$srcdir/otp_src_${pkgver/_1/}" msg2 'Configuring...' - ./configure --prefix=/usr --enable-smp-support + ./configure --prefix=/usr --enable-smp-support --with-odbc msg2 'Compiling...' make } diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 3b223561c..43596a313 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81376 2012-12-19 10:52:03Z stativ $ +# $Id: PKGBUILD 82226 2013-01-12 16:49:34Z eric $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=2 +pkgrel=3 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD index 0f6946a8c..7d616dd76 100644 --- a/community/fcitx-configtool/PKGBUILD +++ b/community/fcitx-configtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80513 2012-11-23 11:40:13Z fyan $ +# $Id: PKGBUILD 82240 2013-01-13 01:32:17Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-configtool -pkgver=0.4.5.1 -pkgrel=2 +pkgver=0.4.5.2 +pkgrel=1 pkgdesc="GTK based config tool for Fcitx" arch=('i686' 'x86_64' 'mips64el') url="http://fcitx.googlecode.com/" @@ -16,7 +16,6 @@ build() { cd "$srcdir/$pkgname-$pkgver" msg "Starting make..." - rm -rf build mkdir build cd build @@ -29,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('6787dedcb57e6147553ef755c51bb46b') +md5sums=('fc5d232ed2e7b7b3fced0264961f48d9') diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 36865e625..484c8671e 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,20 +1,19 @@ -# $Id$ +# $Id: PKGBUILD 82225 2013-01-12 16:39:34Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> ## Mozc compile option _bldtype=Release -_zipcoderel=201211 +_zipcoderel=201211 #201212 is broken, for now _protobuf_ver=2.4.1 _pkgbase=mozc pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.6.1187.102 -_patchver=${pkgver}.2 -pkgrel=4 -groups=('mozc-im') +_patchver=${pkgver}.3 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/mozc/" license=('custom') @@ -93,8 +92,9 @@ package() { install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } + md5sums=('e5246d17a81d2e942e9e8de0c3240c95' 'e61df4b5754f3869ca504d269dc9641d' '59c5f7e9c734b40197454318f228859f' 'ed436802019c9e1f40cc750eaf78f318' - 'a70fa7d5cef505c14f61e739b0502444') + '3c947ef02d9bf3341192ba22916f3605') diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index 44cd7b43e..2c9b5a6da 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70842 2012-05-17 18:20:47Z idevolder $ +# $Id: PKGBUILD 82304 2013-01-14 17:20:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Jan Willemson <janwil@hot.ee> @@ -9,24 +9,38 @@ pkgname=fpc pkgver=2.6.0 -pkgrel=2 +_gdbver=7.5.1 +pkgrel=4 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." arch=('i686' 'x86_64' 'mips64el') url="http://www.freepascal.org/" license=('GPL' 'LGPL' 'custom') backup=("etc/fpc.cfg") -depends=(ncurses) +depends=(ncurses zlib expat) makedepends=(fpc) options=(zipman) -source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz) -md5sums=('17375e665a4e1311f85812fe2754f609') +source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz + http://ftp.gnu.org/gnu/gdb/gdb-${_gdbver}.tar.bz2 + fpc-gdb.patch) +md5sums=('17375e665a4e1311f85812fe2754f609' + '3f48f468b24447cf24820054ff6e85b1' + '1e45ece6b5d4ee60b860e75926b4122d') build() { + cd ${srcdir}/gdb-${_gdbver} + ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui + make + make -C gdb libgdb.a + cp libdecnumber/libdecnumber.a gdb/ + cd ${srcdir}/fpcbuild-$pkgver + patch -p1 <$srcdir/fpc-gdb.patch + export GDBLIBDIR=${srcdir}/gdb-${_gdbver}/gdb + export LIBGDBFILE=$GDBLIBDIR/libgdb.a pushd fpcsrc/compiler fpcmake -Tall popd - make NOGDB=1 build + make build } package() { @@ -34,7 +48,7 @@ package() { export HOME=$srcdir - make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install + make -j1 PREFIX=${pkgdir}/usr install export PATH=$pkgdir/usr/bin:$PATH diff --git a/community/fpc/fpc-gdb.patch b/community/fpc/fpc-gdb.patch new file mode 100644 index 000000000..f46b556bb --- /dev/null +++ b/community/fpc/fpc-gdb.patch @@ -0,0 +1,737 @@ +diff -wbBur fpcbuild-2.6.0/fpcsrc/ide/fp.pas fpcbuild-2.6.0.my/fpcsrc/ide/fp.pas +--- fpcbuild-2.6.0/fpcsrc/ide/fp.pas 2010-08-20 15:04:44.000000000 +0400 ++++ fpcbuild-2.6.0.my/fpcsrc/ide/fp.pas 2013-01-14 20:55:58.472376421 +0400 +@@ -14,6 +14,9 @@ + **********************************************************************} + program FP; + ++{$LINKLIB libz.so} ++ ++ + {$ifdef Windows} + { some windows versions, namely at least XP x64 don't like if the IDE stack + is too big } +diff -wbBur fpcbuild-2.6.0/fpcsrc/packages/gdbint/Makefile fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/Makefile +--- fpcbuild-2.6.0/fpcsrc/packages/gdbint/Makefile 2011-12-11 00:19:00.000000000 +0400 ++++ fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/Makefile 2013-01-14 20:32:15.545303270 +0400 +@@ -2337,10 +2337,12 @@ + endif + ifeq ($(OS_SOURCE),openbsd) + override FPCOPT+=-FD$(NEW_BINUTILS_PATH) ++override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) + endif + ifndef CROSSBOOTSTRAP + ifneq ($(BINUTILSPREFIX),) + override FPCOPT+=-XP$(BINUTILSPREFIX) ++override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) + endif + ifneq ($(BINUTILSPREFIX),) + override FPCOPT+=-Xr$(RLINKPATH) +diff -wbBur fpcbuild-2.6.0/fpcsrc/packages/gdbint/src/gdbint.pp fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/src/gdbint.pp +--- fpcbuild-2.6.0/fpcsrc/packages/gdbint/src/gdbint.pp 2011-12-10 20:50:23.000000000 +0400 ++++ fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/src/gdbint.pp 2013-01-14 20:53:27.332331458 +0400 +@@ -17,6 +17,7 @@ + + {$define NotImplemented} + ++{$define GDB_DISABLE_PYTHON} + {$define COMPILING_GDBINT_UNIT} + {$ifdef USE_GDBLIBINC} + {$i gdblib.inc} +@@ -50,7 +51,6 @@ + {$ifdef GDB_V601} + {$info using gdb 6.1.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$undef GDB_HAS_DEPRECATED_CBPH} + {$endif def GDB_V601} + +@@ -58,14 +58,12 @@ + {$ifdef GDB_V602} + {$info using gdb 6.2.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$endif def GDB_V602} + + { 6.3.x } + {$ifdef GDB_V603} + {$info using gdb 6.3.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$endif def GDB_V603} + + { 6.4.x } +@@ -73,7 +71,6 @@ + {$info using gdb 6.4.x} + {$define GDB_V6} + {$define GDB_NEEDS_NO_ERROR_INIT} +- {$define GDB_HAS_DB_COMMANDS} + {$endif def GDB_V604} + + { 6.5.x } +@@ -87,7 +84,6 @@ + {$ifdef GDB_V606} + {$info using gdb 6.6.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$define GDB_USES_BP_LOCATION} + {$define GDB_NEEDS_NO_ERROR_INIT} + {$define GDB_USES_EXPAT_LIB} +@@ -98,7 +94,6 @@ + {$ifdef GDB_V607} + {$info using gdb 6.7.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$define GDB_USES_BP_LOCATION} + {$define GDB_NEEDS_NO_ERROR_INIT} + {$define GDB_USES_EXPAT_LIB} +@@ -109,7 +104,6 @@ + {$ifdef GDB_V608} + {$info using gdb 6.8.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$define GDB_USES_BP_LOCATION} + {$define GDB_BP_LOCATION_HAS_GLOBAL_NEXT} + {$define GDB_NEEDS_NO_ERROR_INIT} +@@ -120,13 +114,64 @@ + {$define GDB_HAS_BP_NONE} + {$endif def GDB_V608} + ++{ 7.5.x } ++{$ifdef GDB_V705} ++ {$info using gdb 7.5.x} ++ {$define GDB_V7} ++ {$define GDB_BP_LOCATION_HAS_GDBARCH} ++ {$define GDB_HAS_PROGRAM_SPACE} ++ {$define GDB_NO_UIOUT} ++ {$define GDB_NEEDS_INTERPRETER_SETUP} ++ {$define GDB_NEEDS_SET_INSTREAM} ++ {$define GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ {$define GDB_USES_BP_OPS} ++ {$define GDB_BP_TI_HAS_LENGTH} ++ {$define GDB_BP_LOCATION_HAS_REFCOUNT} ++ {$define GDB_BP_LOCATION_HAS_OPS} ++ {$define GDB_UI_FILE_HAS_WRITE_ASYNC} ++ {$ifdef win32} ++ {$define GDB_USES_LIBADVAPI32} ++ {$endif win32} ++{$endif def GDB_V705} ++ ++{ 7.4.x } ++{$ifdef GDB_V704} ++ {$info using gdb 7.4.x} ++ {$define GDB_V7} ++ {$define GDB_BP_LOCATION_HAS_GDBARCH} ++ {$define GDB_HAS_PROGRAM_SPACE} ++ {$define GDB_NO_UIOUT} ++ {$define GDB_NEEDS_INTERPRETER_SETUP} ++ {$define GDB_NEEDS_SET_INSTREAM} ++ {$define GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ {$define GDB_USES_BP_OPS} ++ {$define GDB_BP_TI_HAS_LENGTH} ++ {$define GDB_BP_LOCATION_HAS_REFCOUNT} ++ {$define GDB_BP_LOCATION_HAS_OPS} ++ {$define GDB_UI_FILE_HAS_WRITE_ASYNC} ++ {$ifdef win32} ++ {$define GDB_USES_LIBADVAPI32} ++ {$endif win32} ++{$endif def GDB_V704} ++ + { 7.3.x } + {$ifdef GDB_V703} + {$info using gdb 7.3.x} + {$define GDB_V7} + {$define GDB_BP_LOCATION_HAS_GDBARCH} + {$define GDB_HAS_PROGRAM_SPACE} +-{$endif def GDB_V702} ++ {$define GDB_BP_TI_HAS_LENGTH} ++ {$define GDB_BP_LOCATION_HAS_REFCOUNT} ++ {$ifdef GDB_CVS} ++ {$define GDB_NO_UIOUT} ++ {$define GDB_NEEDS_INTERPRETER_SETUP} ++ {$define GDB_NEEDS_SET_INSTREAM} ++ {$define GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ {$define GDB_USES_BP_OPS} ++ {$define GDB_BP_LOCATION_HAS_OPS} ++ {$define GDB_UI_FILE_HAS_WRITE_ASYNC} ++ {$endif GDB_CVS} ++{$endif def GDB_V703} + + { 7.2.x } + {$ifdef GDB_V702} +@@ -448,8 +493,11 @@ + {$LINKLIB libintl.a} + {$LINKLIB imagehlp} + {$endif not USE_MINGW_GDB} +- {$LINKLIB kernel32} ++ {$ifdef GDB_USES_LIBADVAPI32} ++ {$LINKLIB advapi32} ++ {$endif GDB_USES_LIBADVAPI32} + {$LINKLIB user32} ++ {$LINKLIB kernel32} + {$endif win32} + + {$ifdef win64} +@@ -588,9 +636,11 @@ + type + + pui_file = ^ui_file; ++ pstdio_file = ^stdio_file; + + ui_file_flush_ftype = procedure(stream : pui_file);cdecl; + ui_file_write_ftype = procedure(stream : pui_file;buf : pchar;len : longint);cdecl; ++ ui_file_write_async_save_ftype = procedure(stream : pui_file;buf : pchar;len : longint);cdecl; + ui_file_fputs_ftype = procedure(buf : pchar; stream : pui_file);cdecl; + ui_file_delete_ftype = procedure(stream : pui_file);cdecl; + ui_file_isatty_ftype = function(stream : pui_file) : longbool;cdecl; +@@ -605,6 +655,9 @@ + magic : plongint; + to_flush : ui_file_flush_ftype; + to_write : ui_file_write_ftype; ++ {$ifdef GDB_UI_FILE_HAS_WRITE_ASYNC} ++ to_write_async_safe : ui_file_write_async_save_ftype; ++ {$endif} + to_fputs : ui_file_fputs_ftype; + {$ifdef GDB_V6} + to_read : ui_file_read_ftype; +@@ -616,6 +669,13 @@ + to_data : pointer; + end; + ++ stdio_file = record ++ magic : plongint; ++ _file : P_C_FILE; ++ df : longint; ++ close_p : longint; ++ end; ++ + { used to delete stdio_ui_file gdb_stdout and gdb_stderr } + procedure ui_file_delete(stream : pui_file);cdecl;external; + +@@ -774,10 +834,16 @@ + {$ifdef GDB_V6} + type + ui_out = pointer; ++{$ifndef GDB_NO_UIOUT} + var + uiout : ui_out;cvar;external; ++{$else GDB_NO_UIOUT} ++var ++ cli_uiout : ui_out;cvar;external; ++ current_uiout : ui_out;cvar;external; ++{$endif GDB_NO_UIOUT} + function cli_out_new (stream : pui_file):ui_out;cdecl;external; +-{$endif} ++{$endif GDB_V6} + + {$ifdef go32v2} + { needed to be sure %fs contains the DOS memory selector +@@ -815,8 +881,11 @@ + jmp_buf = dpmi_jmp_buf; + pjmp_buf = pdpmi_jmp_buf; + ++ + function setjmp(var rec : jmp_buf) : longint;cdecl;external; + ++ function malloc(size : longint) : pointer;cdecl;external; ++ + procedure longjmp(var rec : jmp_buf;return_value : longint);cdecl;external; + + procedure reload_fs;assembler; +@@ -869,6 +938,13 @@ + pCORE_ADDR = ^CORE_ADDR; + pblock = ^block; + ++ tframe_id = record ++ stack_addr, code_addr, special_addr : CORE_ADDR; ++ addr_p_flags : byte;{ for three 1 bit flags ++ stack_addr_p, code_addr_p, special_addr_p : cint : 1; } ++ inline_depth : longint; ++ end; ++ + tlanguage = (language_unknown,language_auto,language_c, + language_cplus,language_java,language_chill, + language_fortran,language_m2,language_asm, +@@ -897,9 +973,18 @@ + + target_hw_bp_type = (hw_write, hw_read, hw_access, hw_execute); + ++ { pointer to structures that we don't need } ++ pbp_ops = pointer; ++ pbp_location_ops = pointer; ++ pprogram_space = pointer; ++ pgdbarch = pointer; ++ + {$PACKRECORDS 4} + pbreakpoint = ^breakpoint; + breakpoint = record ++{$ifdef GDB_USES_BP_OPS} ++ ops : pbp_ops; ++{$endif GDB_USES_BP_OPS} + next : pbreakpoint; + typ : bptype; + enable : tenable; +@@ -910,9 +995,15 @@ + {$else not GDB_USES_BP_LOCATION} + address : CORE_ADDR; + {$endif not GDB_USES_BP_LOCATION} ++{$ifndef GDB_USES_BP_OPS} + line_number : longint; + source_file : pchar; ++{$endif not GDB_USES_BP_OPS} + silent : byte; ++{$ifdef GDB_USES_BP_OPS} ++ display_canonical: byte; ++{$endif GDB_USES_BP_OPS} ++ + ignore_count : longint; + {$ifndef GDB_USES_BP_LOCATION} + shadow_contents : array[0..15] of char; +@@ -919,10 +1010,21 @@ + inserted : char; + duplicate : char; + {$endif not GDB_USES_BP_LOCATION} ++ + commands : pointer; {^command_line} ++{$ifdef GDB_USES_BP_OPS} ++ frame_id : tframe_id; ++ pspace : pprogram_space; ++{$else not GDB_USES_BP_OPS} + frame : CORE_ADDR; + cond : pointer; {^expression} +- addr_string : ^char; ++{$endif GDB_USES_BP_OPS} ++ addr_string : pchar; ++{$ifdef GDB_USES_BP_OPS} ++ filter : pchar; ++ addr_string_range_end : pchar; ++ gdbarch : pgdbarch; ++{$endif GDB_USES_BP_OPS} + language : tlanguage; + input_radix : longint; + cond_string : ^char; +@@ -941,6 +1043,9 @@ + bp_target_info = record + placed_address_space : pointer;{paddress_space;} + placed_address : CORE_ADDR; ++{$ifdef GDB_BP_TI_HAS_LENGTH} ++ length : longint; ++{$endif GDB_BP_TI_HAS_LENGTH} + shadow_contents : array[0..15] of char; + shadow_len : longint; + placed_size : longint; +@@ -948,9 +1053,17 @@ + + bp_location = record + next : pbp_location; ++{$ifdef GDB_BP_LOCATION_HAS_OPS} ++ ops : pbp_location_ops; ++{$endif GDB_BP_LOCATION_HAS_OPS} ++ ++{$ifdef GDB_BP_LOCATION_HAS_REFCOUNT} ++ refc : longint; ++{$else} + {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT} + global_next : pbp_location; + {$endif GDB_BP_LOCATION_HAS_GLOBAL_NEXT} ++{$endif} + loc_type : bp_loc_type; + owner : pbreakpoint; + {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT} +@@ -961,10 +1074,10 @@ + inserted : byte; + duplicate : byte; + {$ifdef GDB_BP_LOCATION_HAS_GDBARCH} +- gdbarch : pointer;{pgdbarch;} ++ gdbarch : pgdbarch; + {$endif GDB_BP_LOCATION_HAS_GDBARCH} + {$ifdef GDB_HAS_PROGRAM_SPACE} +- pspace : pointer;{pprogram_space;} ++ pspace : pprogram_space; + {$endif GDB_HAS_PROGRAM_SPACE} + address : CORE_ADDR; + {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT} +@@ -979,6 +1092,11 @@ + target_info : bp_target_info; + overlay_target_info : bp_target_info; + events_till_retirement : longint; ++{$ifdef GDB_USES_BP_OPS} ++ { line and source file are in location } ++ line_number : longint; ++ source_file : pchar; ++{$endif not GDB_USES_BP_OPS} + end; + + tfreecode=(free_nothing,free_contents,free_linetable); +@@ -1488,7 +1606,9 @@ + {$endif ndef GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED} + current_target : target_ops;cvar;external; + stop_pc : CORE_ADDR;cvar;external; +- { Only used from GDB 5.01 but doesn't hurst otherwise } ++ { Only used from GDB 5.0 but doesn't hurst otherwise } ++ { This global variable is declared in defs.h as external ++ and instanciated in main.c since version 5.0. } + interpreter_p : pchar;cvar;public; + + { we need also to declare some vars } +@@ -1502,13 +1622,22 @@ + + { Whether xdb commands will be handled } + {$ifdef GDB_HAS_DB_COMMANDS} ++ { These two global variables are declared in defs.h ++ since version 4.18 } + xdb_commands : longint;cvar;public; + + { Whether dbx commands will be handled } + dbx_commands : longint;cvar;public; + {$endif GDB_HAS_DB_COMMANDS} + ++{$ifdef GDB_NEEDS_SET_INSTREAM} + var ++ instream : P_C_FILE;cvar;external; ++ function gdb_fopen (filename : pchar; mode : pchar) : pui_file;cdecl;external; ++{$endif GDB_NEEDS_SET_INSTREAM} ++var ++ { The four following variables are defined in defs.h ++ and instanciated in main.c since version 5.0 } + gdb_stdout : pui_file;cvar;public; + gdb_stderr : pui_file;cvar;public; + gdb_stdlog : pui_file;cvar;public; +@@ -1516,6 +1645,9 @@ + event_loop_p : longint;cvar;public; + {$ifdef GDB_V6} + (* target IO streams *) ++ { The three following variables are declared in defs.h ++ and instanciated in main.c since version 6.0 } ++ gdb_stdin : pui_file;cvar;public; + gdb_stdtargin : pui_file;cvar;public; + gdb_stdtargerr : pui_file;cvar;public; + {$endif} +@@ -1523,7 +1655,10 @@ + { used for gdb_stdout and gdb_stderr } + function xmalloc(size : longint) : pointer;cdecl;external; + { used for QueryHook } +-function xstrvprintf(msg : pchar) : pchar; varargs; cdecl; external; ++{ xvasprintf is present at least from GDB 5.3 ++ while xstrvprintf only appears in version 6.2, ++ so only use xvasprintf function } ++function xvasprintf(ret : ppchar; msg : pchar) : pchar; varargs; cdecl; external; + procedure xfree(p : pointer); cdecl; external; + function find_pc_line(i:CORE_ADDR;l:longint):symtab_and_line;cdecl;external; + function find_pc_function(i:CORE_ADDR):psymbol;cdecl;external; +@@ -2406,11 +2541,15 @@ + QueryHook:=0 + else + begin +- if curr_gdb^.reset_command and (pos('Kill',question)>0) then ++ if curr_gdb^.reset_command and ((pos('Kill',question)>0) or ++ (pos('Discard symbol table',question)>0)) then + QueryHook:=1 + else if pos('%',question)>0 then + begin +- local:=xstrvprintf(question,arg); ++ xvasprintf(@local,question,arg); ++ { xvasprintf can failed, in that case local is set to nil } ++ if not assigned(local) then ++ local:=question; + QueryHook:=curr_gdb^.Query(local, nil); + xfree(local); + end +@@ -2451,7 +2590,12 @@ + last_breakpoint_number:=b.number; + { function breakpoints have zero as file and as line !! + but they are valid !! } ++{$ifndef GDB_USES_BP_OPS} + invalid_breakpoint_line:=(b.line_number<>sym.line) and (b.line_number<>0); ++{$else GDB_USES_BP_OPS} ++ invalid_breakpoint_line:=(b.loc=nil) or ++ ((b.loc^.line_number<>sym.line) and (b.loc^.line_number<>0)); ++{$endif GDB_USES_BP_OPS} + {$ifdef GDB_USES_BP_LOCATION} + if assigned (b.loc) then + last_breakpoint_address:=b.loc^.address +@@ -2471,7 +2615,11 @@ + {$ifdef GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED} + + type ++{$ifdef GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ breakpoint_created_function_type = procedure (bpp : pbreakpoint); cdecl; ++{$else not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} + breakpoint_created_function_type = procedure (bpnum : longint); cdecl; ++{$endif not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} + pobserver = pointer; + var + breakpoint_created_observer : pobserver = nil; +@@ -2479,8 +2627,14 @@ + function observer_attach_breakpoint_created(create_func : breakpoint_created_function_type) : pobserver;cdecl;external; + procedure observer_detach_breakpoint_created(pob : pobserver);cdecl;external; + +-var breakpoint_chain : pbreakpoint ;cvar;external; + ++{$ifdef GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++procedure notify_breakpoint_created(bpp : pbreakpoint); cdecl; ++begin ++ CreateBreakpointHook(bpp^); ++end; ++{$else not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++var breakpoint_chain : pbreakpoint ;cvar;external; + + procedure notify_breakpoint_created(bpnum : longint);cdecl; + var +@@ -2498,8 +2652,16 @@ + pb:=pb^.next; + end; + end; ++{$endif not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} + {$endif def GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED} + ++{ Avoid loading of main.o object by providing a ++ stripped down version of relocate_gdb_directory function } ++function relocate_gdb_directory(path : pchar) : pchar; cdecl; public; ++begin ++ relocate_gdb_directory:=path; ++end; ++ + {***************************************************************************** + tgdbinterface + *****************************************************************************} +@@ -2528,7 +2690,7 @@ + gdb_command('set print object on'); + gdb_command('set print null-stop'); + {$ifdef USE_MINGW_GDB} // maybe this also should be done for newer cygwin gdbs. +- gdb_command('set confirm off'); ++ //gdb_command('set confirm off'); + {$endif} + end; + +@@ -2609,9 +2771,9 @@ + var + top_level_val : longint; + +-function catch_errors(func : pointer; command : pchar; from_tty,mask : longint) : longint;cdecl;external; ++function catch_command_errors(func : pointer; command : pchar; from_tty,mask : longint) : longint;cdecl;external; + +-function gdbint_execute_command(command : pchar; from_tty,mask : longint) : longint;cdecl; ++function gdbint_execute_command(command : pchar; from_tty : longint) : longint;cdecl; + begin + gdbint_execute_command:=1; + execute_command(command,from_tty); +@@ -2658,6 +2820,8 @@ + begin + {$ifdef cpui386} + MaskAllFPUExceptions := control or MaskAllExceptions; ++{$else} ++ MaskAllFPUExceptions:=0; + {$endif} + end; + +@@ -2716,7 +2880,8 @@ + begin + quit_return:=error_return; + mask:=longint($ffffffff); +- catch_errors(@gdbint_execute_command,@command,0,mask); ++ catch_command_errors(@gdbint_execute_command,@command, ++ 1,mask); + {$ifdef go32v2} + reload_fs; + {$endif go32v2} +@@ -2973,11 +3138,43 @@ + c_environ : ppchar;external name '_environ'; + c_argc : longint;external name '___crt0_argc'; + c_argv : ppchar;external name '___crt0_argv'; ++ ++ procedure ReallocateEnvironUsingCMalloc; ++ ++ var ++ neededsize , count : longint; ++ penv : pchar; ++ newenv : ppchar; ++ begin ++ if not assigned(c_environ) then ++ neededsize:=0 ++ else ++ begin ++ count:=0; ++ penv:=c_environ^; ++ while assigned(penv) do ++ begin ++ inc(count); ++ inc(penv,sizeof(pchar)); ++ end; ++ neededsize:=count*sizeof(pchar); ++ end; ++ newenv:=malloc(neededsize); ++ system.move(c_environ,newenv,neededsize); ++ c_environ:=newenv; ++ end; ++ + {$endif def go32v2} + var + current_directory : pchar; cvar; external; + gdb_dirbuf : array[0..0] of char; cvar; external; + CurrentDir : AnsiString; ++{$ifdef GDB_NEEDS_INTERPRETER_SETUP} ++ type ++ interpreter_struct_p = pointer; { to opaque type } ++ function interp_lookup (name : pchar) : interpreter_struct_p;cdecl; external; ++ function interp_set (interp : interpreter_struct_p) : longbool;cdecl; external; ++{$endif GDB_NEEDS_INTERPRETER_SETUP} + const + DIRBUF_SIZE = 1024; + +@@ -2986,13 +3183,28 @@ + var + OldSigInt : SignalHandler; + {$endif supportexceptions} ++{$ifdef GDB_NEEDS_SET_INSTREAM} ++var ++ dummy_file : pui_file; ++{$endif GDB_NEEDS_SET_INSTREAM} ++ + {$ifdef GDB_INIT_HAS_ARGV0} + var + argv0 : pchar; + {$endif not GDB_INIT_HAS_ARGV0} ++{$ifdef GDB_NEEDS_INTERPRETER_SETUP} ++var ++ interp : interpreter_struct_p; ++{$endif GDB_NEEDS_INTERPRETER_SETUP} ++var ++ save_gdb_stdin, ++ save_gdb_stdout, ++ save_gdb_stderr : pui_file; + begin + {$ifdef go32v2} +- c_environ:=system.envp; ++ { c_environ:=system.envp; } ++ { DJGPP libC presupposes the c_enivron was malloc'ated } ++ ReallocateEnvironUsingCMalloc; + c_argc:=system.argc; + c_argv:=system.argv; + {$endif def go32v2} +@@ -3012,8 +3224,25 @@ + ui_file_delete(gdb_stderr); + if assigned(gdb_stdout) then + ui_file_delete(gdb_stdout); ++{$ifdef GDB_NEEDS_SET_INSTREAM} ++ if assigned(gdb_stdin) then ++ ui_file_delete(gdb_stdin); ++ gdb_stdin:=mem_fileopen; ++ save_gdb_stdin:=gdb_stdin; ++ dummy_file :=gdb_fopen('dummy.$$$','a'); ++ {in captured_main code, this is simply ++ instream:=stdin; but stdin is a highly system dependent macro ++ so that we try to avoid it here } ++ if assigned(dummy_file) then ++ instream:=pstdio_file(dummy_file^.to_data)^._file ++ else ++ instream:=nil; ++{$endif GDB_NEEDS_SET_INSTREAM} ++ + gdb_stderr:=mem_fileopen; + gdb_stdout:=mem_fileopen; ++ save_gdb_stderr:=gdb_stderr; ++ save_gdb_stdout:=gdb_stdout; + gdb_stdlog:=gdb_stderr; + gdb_stdtarg:=gdb_stderr; + set_ui_file_write(gdb_stdout,@gdbint_ui_file_write); +@@ -3022,7 +3251,9 @@ + error_init; + {$endif GDB_NEEDS_NO_ERROR_INIT} + {$ifdef GDB_V6} +-// gdb_stdtargin := gdb_stdin; ++{$ifdef GDB_NEEDS_SET_INSTREAM} ++ gdb_stdtargin := gdb_stdin; ++{$endif GDB_NEEDS_SET_INSTREAM} + gdb_stdtargerr := gdb_stderr; + {$endif} + GetDir(0, CurrentDir); +@@ -3034,8 +3265,10 @@ + next_exit:=exitproc; + exitproc:=@DoneLibGDB; + {$ifdef GDB_V6} ++{$ifndef GDB_NO_UIOUT} + uiout := cli_out_new (gdb_stdout); +-{$endif} ++{$endif not GDB_NO_UIOUT} ++{$endif GDB_V6} + {$ifdef GDB_INIT_HAS_ARGV0} + getmem(argv0,length(paramstr(0))+1); + strpcopy(argv0,paramstr(0)); +@@ -3044,6 +3277,31 @@ + {$else not GDB_INIT_HAS_ARGV0} + gdb_init; + {$endif not GDB_INIT_HAS_ARGV0} ++{$ifdef GDB_NEEDS_INTERPRETER_SETUP} ++ { interpreter can only be set after all files are ++ initialized, which is done in gdb_init function. } ++ interp := interp_lookup ('console'); ++ interp_set (interp); ++ ++ { We need to re-set gdb_stdXX ui_files } ++ if assigned(gdb_stderr) then ++ ui_file_delete(gdb_stderr); ++ if assigned(gdb_stdout) then ++ ui_file_delete(gdb_stdout); ++ if assigned(gdb_stdin) then ++ ui_file_delete(gdb_stdin); ++ gdb_stdin:=save_gdb_stdin; ++ gdb_stderr:=save_gdb_stderr; ++ gdb_stdout:=save_gdb_stdout; ++ gdb_stdlog:=gdb_stderr; ++ gdb_stdtarg:=gdb_stderr; ++ set_ui_file_write(gdb_stdout,@gdbint_ui_file_write); ++ set_ui_file_write(gdb_stderr,@gdbint_ui_file_write); ++{$ifdef GDB_NO_UIOUT} ++ cli_uiout := cli_out_new (gdb_stdout); ++ current_uiout:=cli_uiout; ++{$endif GDB_NO_UIOUT} ++{$endif GDB_NEEDS_INTERPRETER_SETUP} + {$ifdef supportexceptions} + {$ifdef unix} + fpsignal(SIGINT,OldSigInt); +@@ -3069,14 +3327,34 @@ + end; + + {$ifdef GDB_HAS_SYSROOT} +-var gdb_sysroot : pchar; cvar;public; ++ { Here we declare as cvar;public; a bunch of global ++ variables that are defined in main.c source. ++ We must not load main.o otherwise, we will get ++ into multiply defined symbols troubles. } ++var ++ gdb_sysrootc : char; ++ { used locally only to provide a pchar pointing to '\0' } ++ gdb_sysroot : pchar; cvar;public; ++ { gdb_sysroot global variable is declared in defs.h and ++ instanciated in main.c since version 6.0 } + gdb_datadir : pchar; cvar;public; ++ { gdb_datadir global variable is declared in defs.h and ++ instanciated in main.c since version 7.0 } + python_libdir : pchar;cvar;public; +- gdb_sysrootc : char; ++ { python_libdir global variable is declared in defs.h and instanciated ++ in main.c since version 7.2 } + return_child_result : longbool;cvar;public; ++ { return_chlid_result global variable is declared in main.h and ++ instanciated in main.c since version 6.4 } + return_child_result_value : longint;cvar;public; ++ { return_child_result_value global variable is declared in main.h and ++ instanciated in main.c since version 6.4 with a startup value of -1 } + batch_silent : longbool;cvar;public; ++ { batch_silent global variable is declared in main.h since 7.0, but ++ instanciated in main.c since version 6.4 } + batch_flag : longbool;cvar;public; ++ { batch_flag global variable is declared in main.h and ++ instanciated in main.c since version 7.2 } + {$endif} + {$ifdef GDB_HAS_DEBUG_FILE_DIRECTORY} + var +@@ -3086,6 +3364,7 @@ + begin + {$ifdef GDB_HAS_SYSROOT} + gdb_sysrootc := #0; ++ return_child_result_value := -1; + gdb_sysroot := @gdb_sysrootc; + gdb_datadir := @gdb_sysrootc; + python_libdir := @gdb_sysrootc; diff --git a/community/freehdl/PKGBUILD b/community/freehdl/PKGBUILD index a4b51017f..d10a4bdee 100644 --- a/community/freehdl/PKGBUILD +++ b/community/freehdl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74820 2012-08-06 09:08:00Z spupykin $ +# $Id: PKGBUILD 82362 2013-01-16 10:08:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Neil Darlow <neil@darlow.co.uk> # Contributor: Jens Maucher <defcon@archlinux.us> pkgname=freehdl pkgver=0.0.8 -pkgrel=4 +pkgrel=5 pkgdesc='An open-source (C++ generating) VHDL simulator' arch=('i686' 'x86_64' 'mips64el') url='http://freehdl.seul.org' license=('GPL') depends=('perl') optdepends=('gtkwave: to view output when run standalone') -options=('!libtool') +options=('libtool') install=${pkgname}.install source=("http://downloads.sourceforge.net/qucs/$pkgname-$pkgver.tar.gz") md5sums=('aa1382b8b5c6a972e9652c648a9278b5') diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 8ae8cd258..18ba72120 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78524 2012-10-20 09:33:12Z heftig $ +# $Id: PKGBUILD 82215 2013-01-12 08:15:28Z andrea $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=8 +pkgrel=9 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -72,6 +72,8 @@ build() { cd gb.pdf patch -Np0 -i ../../poppler-0.20.patch cd .. + # replace obsolete AM_CONFIG_HEADER + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4 ./reconf-all ## diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index c151e3d18..d3b3e70f7 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81800 2012-12-30 15:21:02Z foutrelis $ +# $Id: PKGBUILD 82216 2013-01-12 08:15:30Z andrea $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -42,6 +42,8 @@ build() { # Fix build with LLVM 3.2 patch -Np1 -i ${srcdir}/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch + # replace obsolete AM_CONFIG_HEADER + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4 ./reconf-all ./configure --prefix=/usr -C diff --git a/community/geda-gaf/ChangeLog b/community/geda-gaf/ChangeLog index c8b902cc5..29717fa61 100644 --- a/community/geda-gaf/ChangeLog +++ b/community/geda-gaf/ChangeLog @@ -1,4 +1,8 @@ 2012-01-19 Kyle Keen <keenerd@gmail.com> + * 1.8.1-1 + - Version bump + +2012-01-19 Kyle Keen <keenerd@gmail.com> * 1.6.2-2 - libpng15 rebuild diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD index 53d91653f..bd57f80af 100644 --- a/community/geda-gaf/PKGBUILD +++ b/community/geda-gaf/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=geda-gaf -pkgver=1.6.2 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project" arch=('i686' 'x86_64' 'mips64el') url="http://www.gpleda.org" @@ -15,9 +15,9 @@ optdepends=('python2: for two of the commands (garchive, tragesym)' 'gawk: for sw2asc') replaces=('geda-suite' 'geda-libs') install=geda-gaf.install -source=(http://geda.seul.org/release/v1.6/$pkgver/$pkgname-$pkgver.tar.gz +source=(http://ftp.geda-project.org/geda-gaf/stable/v1.8/$pkgver/$pkgname-$pkgver.tar.gz) geda-1.6.2-correct_glib_include.patch) -md5sums=('35ae86aebc174ec1fc03863fde4c843c' +md5sums=('3c5ef297e403b493fdf7a5d47bbeeb73' 'af28867b393e0351b97d5d23cdefc812') build () diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD new file mode 100644 index 000000000..4a2ea9180 --- /dev/null +++ b/community/gemrb/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 82325 2013-01-15 11:15:34Z stativ $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=gemrb +pkgver=0.7.2 +pkgrel=2 +pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate" +arch=('i686' 'x86_64') +url="http://www.gemrb.org/" +license=('GPL') +depends=('python2' 'openal' 'libpng' 'sdl_mixer') +# optionally it is possible to build vlc plugin too +makedepends=('cmake') +install=gemrb.install +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz") +md5sums=('4260fcd42f42ce9232668b202b320b29') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + if [ ! -d "$srcdir/build" ] ; then + mkdir "$srcdir/build" + fi + cd "$srcdir/build" + + cmake -DCMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgver + make +} + +package() { + cd "$srcdir"/build + make DESTDIR="$pkgdir" install +} + diff --git a/community/gemrb/gemrb.install b/community/gemrb/gemrb.install new file mode 100644 index 000000000..43ea46f2c --- /dev/null +++ b/community/gemrb/gemrb.install @@ -0,0 +1,24 @@ +post_install() { + cat << EOF + +Installing the games +-------------------- + 1. Install the game(s) (eg using wine or Unshield) + 2. Copy /etc/gemrb/GemRB.cfg.sample to ~/.gemrb/gemrb.cfg or to /etc/gemrb/gemrb.cfg + 3. Edit gemrb.cfg, mainly to set up the path to the game's data files. It is crucial to get this right. + 4. Now You can start the game by executing "gemrb" at the command line prompt + +EOF + +gtk-update-icon-cache -f /usr/share/icons/hicolor/ +} + +post_upgrade() { + post_install +} + +post_remove() { + echo "Don't forget to remove game data files." + post_install +} + diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index c385e7a05..7e8122199 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75948 2012-09-06 19:45:39Z jlichtblau $ +# $Id: PKGBUILD 82441 2013-01-18 06:33:26Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=geos -pkgver=3.3.5 +pkgver=3.3.6 pkgrel=1 pkgdesc="C++ port of the Java Topology Suite" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('gcc-libs' 'bash') options=('!libtool' '!emptydirs') changelog=$pkgname.changelog source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('3b513fbe2d155364d61e76d9c250d6d8e75b5166783a233596c744373cb5874f') +sha256sums=('7ee6c1da9a1b87a3e29209e7cddbf19d36f9689d8e44fec2c9bcf6a1b1be3898') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog index ea7b3b411..ce733ca84 100644 --- a/community/geos/geos.changelog +++ b/community/geos/geos.changelog @@ -1,2 +1,5 @@ +2013-01-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * geos 3.3.6-1 + 2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * geos 3.3.5-1 diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index 78f1adc33..114bf9e46 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76151 2012-09-12 05:56:57Z ebelanger $ +# $Id: PKGBUILD 82330 2013-01-15 11:35:00Z allan $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Media decoding library" arch=('i686' 'x86_64' 'mips64el') url="http://gmerlin.sourceforge.net/avdec_frame.html" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 6256f16eb..bc20723c3 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 76142 2012-09-12 05:13:57Z ebelanger $ +# $Id: PKGBUILD 82329 2013-01-15 11:35:00Z allan $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" license=('GPL') -depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl') +depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia' + 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl') makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa') optdepends=('alsa-lib: for ALSA support' 'jack: for JACK support' 'libquicktime: for movie encoding' 'pulseaudio: for PulseAudio support' 'v4l-utils: for video conversion') -options=('!libtool' '!makeflags') +options=('!libtool') install=gmerlin.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('2f2a0880e738e71486f04c929ba067f4') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + cdio-api-fixes.patch) +md5sums=('2f2a0880e738e71486f04c929ba067f4' + 'd0e407f01435394a0cfe04acb3c1a4cc') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/cdio-api-fixes.patch" + rm -rf cpuinfo.sh ./configure --prefix=/usr --without-doxygen diff --git a/community/gmerlin/cdio-api-fixes.patch b/community/gmerlin/cdio-api-fixes.patch new file mode 100644 index 000000000..14c934b16 --- /dev/null +++ b/community/gmerlin/cdio-api-fixes.patch @@ -0,0 +1,104 @@ +diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c +--- gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c 2013-01-10 21:16:27.000000000 +0200 ++++ gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c 2013-01-10 21:25:59.000000000 +0200 +@@ -28,8 +28,8 @@ + + #include "cdaudio.h" + #define DO_NOT_WANT_PARANOIA_COMPATIBILITY +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + + /* + * Ripping support +diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c gmerlin-1.2.0/plugins/cdaudio/cdtext.c +--- gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c 2013-01-10 21:16:27.000000000 +0200 ++++ gmerlin-1.2.0/plugins/cdaudio/cdtext.c 2013-01-10 21:25:27.000000000 +0200 +@@ -34,7 +34,7 @@ + #include "cdaudio.h" + + #define GET_FIELD(dst, key) \ +- field = cdtext_get_const(key, cdtext); ++ field = cdtext_get_const(cdtext, key, i+1); + + #define GET_FIELD_DEFAULT(dst,key) \ + field = cdtext_get_const(key, cdtext); \ +@@ -64,30 +64,26 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + + /* Get information for the whole disc */ + +- cdtext = cdio_get_cdtext (cdio, 0); ++ cdtext = cdio_get_cdtext (cdio); + + if(!cdtext) + return 0; + +- artist = cdtext_get_const(CDTEXT_PERFORMER, cdtext); +- author = cdtext_get_const(CDTEXT_COMPOSER, cdtext); /* Composer overwrites songwriter */ ++ artist = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, 0); ++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, 0); /* Composer overwrites songwriter */ + + if(!author) +- author = cdtext_get_const(CDTEXT_SONGWRITER, cdtext); ++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, 0); + +- album = cdtext_get_const(CDTEXT_TITLE, cdtext); +- genre = cdtext_get_const(CDTEXT_GENRE, cdtext); +- comment = cdtext_get_const(CDTEXT_MESSAGE, cdtext); ++ album = cdtext_get_const(cdtext, CDTEXT_FIELD_TITLE, 0); ++ genre = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, 0); ++ comment = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, 0); + + for(i = 0; i < idx->num_tracks; i++) + { + if(idx->tracks[i].is_audio) + { +- cdtext = cdio_get_cdtext (cdio, i+1); +- if(!cdtext) +- return 0; +- +- GET_FIELD(title, CDTEXT_TITLE); ++ GET_FIELD(title, CDTEXT_FIELD_TITLE); + + if(!title) + return 0; +@@ -95,7 +91,7 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_TITLE, title); + +- if((field = cdtext_get_const(CDTEXT_PERFORMER, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_ARTIST, field); + else +@@ -103,10 +99,10 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + GAVL_META_ARTIST, artist); + + +- if((field = cdtext_get_const(CDTEXT_COMPOSER, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_AUTHOR, field); +- else if((field = cdtext_get_const(CDTEXT_SONGWRITER, cdtext))) ++ else if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_AUTHOR, field); + else if(author) +@@ -114,14 +110,14 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_ + GAVL_META_AUTHOR, author); + + +- if((field = cdtext_get_const(CDTEXT_GENRE, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_GENRE, field); + else + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_GENRE, genre); + +- if((field = cdtext_get_const(CDTEXT_MESSAGE, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_COMMENT, field); + else diff --git a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch index 03b662c86..ceee6db82 100644 --- a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -31,16 +31,16 @@ index 7e50db4..b0e907c 100644 --- a/plugins/common/Makefile.am +++ b/plugins/common/Makefile.am @@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ - gsd-keygrab.c \ - gsd-keygrab.h \ - gsd-input-helper.c \ + gsd-keygrab.c \ + gsd-keygrab.h \ + gsd-input-helper.c \ - gsd-input-helper.h \ - gsd-power-helper.c \ - gsd-power-helper.h + gsd-input-helper.h - + libcommon_la_CPPFLAGS = \ - $(AM_CPPFLAGS) + $(AM_CPPFLAGS) diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c deleted file mode 100644 index 27d0eda..0000000 @@ -300,7 +300,7 @@ index 9c84d7f..a2f277e 100644 #include <gtk/gtk.h> #include <gio/gdesktopappinfo.h> +#include <gio/gunixfdlist.h> - + #ifdef HAVE_GUDEV #include <gudev/gudev.h> @@ -51,7 +52,6 @@ @@ -309,27 +309,27 @@ index 9c84d7f..a2f277e 100644 #include "gsd-input-helper.h" -#include "gsd-power-helper.h" #include "gsd-enums.h" - + #include <canberra.h> @@ -105,6 +105,10 @@ static const gchar introspection_xml[] = #define KEY_CURRENT_INPUT_SOURCE "current" #define KEY_INPUT_SOURCES "sources" - + +#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" + #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - + typedef struct { @@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate - + /* Power stuff */ GSettings *power_settings; - GDBusProxy *upower_proxy; GDBusProxy *power_screen_proxy; GDBusProxy *power_keyboard_proxy; - + + /* systemd stuff */ + GDBusProxy *logind_proxy; + gint inhibit_keys_fd; @@ -339,7 +339,7 @@ index 9c84d7f..a2f277e 100644 GSList *screens; @@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) } - + static void +power_action_suspend (GsdMediaKeysManager *manager) +{ @@ -396,7 +396,7 @@ index 9c84d7f..a2f277e 100644 @@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) } #endif /* HAVE_GUDEV */ - + + g_clear_object (&priv->logind_proxy); if (priv->settings) { g_object_unref (priv->settings); @@ -404,7 +404,7 @@ index 9c84d7f..a2f277e 100644 @@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) priv->power_keyboard_proxy = NULL; } - + - if (priv->upower_proxy) { - g_object_unref (priv->upower_proxy); - priv->upower_proxy = NULL; @@ -415,7 +415,7 @@ index 9c84d7f..a2f277e 100644 g_object_unref (priv->cancellable); @@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) } - + static void +inhibit_done (GObject *source, + GAsyncResult *result, @@ -497,20 +497,20 @@ index 9c84d7f..a2f277e 100644 + manager); + } - + static void @@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) - + if (media_keys_manager->priv->start_idle_id != 0) g_source_remove (media_keys_manager->priv->start_idle_id); + if (media_keys_manager->priv->inhibit_keys_fd != -1) + close (media_keys_manager->priv->inhibit_keys_fd); - + G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); } @@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, } - + static void -upower_ready_cb (GObject *source_object, - GAsyncResult *res, @@ -545,7 +545,7 @@ index 9c84d7f..a2f277e 100644 - (GAsyncReadyCallback) upower_ready_cb, - manager); } - + GsdMediaKeysManager * diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c index 1c594d8..bb7224c 100644 @@ -565,7 +565,7 @@ index 1c594d8..bb7224c 100644 #include <libnotify/notify.h> #include <canberra-gtk.h> +#include <gio/gunixfdlist.h> - + #define GNOME_DESKTOP_USE_UNSTABLE_API #include <libgnome-desktop/gnome-rr.h> @@ -43,7 +44,6 @@ @@ -573,20 +573,20 @@ index 1c594d8..bb7224c 100644 #include "gsd-enums.h" #include "gsd-power-manager.h" -#include "gsd-power-helper.h" - + #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" @@ -78,6 +78,10 @@ #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ - + +#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" + /* Keep this in sync with gnome-shell */ #define SCREENSAVER_FADE_TIME 10 /* seconds */ - + @@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate ca_context *canberra_context; ca_proplist *critical_alert_loop_props; @@ -609,7 +609,7 @@ index 1c594d8..bb7224c 100644 + gboolean inhibit_suspend_taken; + guint inhibit_lid_switch_timer_id; }; - + enum { @@ -218,8 +228,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); static gchar *engine_get_summary (GsdPowerManager *manager); @@ -619,12 +619,12 @@ index 1c594d8..bb7224c 100644 -static void kill_lid_close_safety_timer (GsdPowerManager *manager); +static void uninhibit_lid_switch (GsdPowerManager *manager); +static gboolean external_monitor_is_connected (GnomeRRScreen *screen); - + G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) - + @@ -2049,6 +2059,57 @@ gnome_session_shutdown (void) } - + static void +action_poweroff (GsdPowerManager *manager) +{ @@ -681,7 +681,7 @@ index 1c594d8..bb7224c 100644 GsdPowerActionType action_type) { @@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager, - + switch (action_type) { case GSD_POWER_ACTION_SUSPEND: - gsd_power_suspend (manager->priv->upower_proxy); @@ -706,7 +706,7 @@ index 1c594d8..bb7224c 100644 @@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager, return ret; } - + -static void -do_lid_open_action (GsdPowerManager *manager) -{ @@ -777,7 +777,7 @@ index 1c594d8..bb7224c 100644 + manager->priv->inhibit_lid_switch_timer_id = 0; + return G_SOURCE_REMOVE; } - + - return TRUE; -} - @@ -797,7 +797,7 @@ index 1c594d8..bb7224c 100644 + g_debug ("external monitor still there; trying again later"); + return G_SOURCE_CONTINUE; } - + /* Sets up a timer to be triggered some seconds after closing the laptop lid @@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) * again in the timeout handler to see if we can suspend then. @@ -813,7 +813,7 @@ index 1c594d8..bb7224c 100644 + } + + g_debug ("setting up lid close safety timer"); - + - manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, - (GSourceFunc) lid_close_safety_timer_cb, + manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, @@ -822,7 +822,7 @@ index 1c594d8..bb7224c 100644 - g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); + g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); } - + static void -kill_lid_close_safety_timer (GsdPowerManager *manager) +restart_inhibit_lid_switch_timer (GsdPowerManager *manager) @@ -837,7 +837,7 @@ index 1c594d8..bb7224c 100644 + setup_inhibit_lid_switch_timer (manager); } } - + static void -suspend_with_lid_closed (GsdPowerManager *manager) +do_lid_open_action (GsdPowerManager *manager) @@ -845,7 +845,7 @@ index 1c594d8..bb7224c 100644 gboolean ret; GError *error = NULL; - GsdPowerActionType action_type; - + - /* maybe lock the screen if the lid is closed */ - lock_screensaver (manager); - @@ -873,7 +873,7 @@ index 1c594d8..bb7224c 100644 + /* TRANSLATORS: this is the sound description */ + CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), + NULL); - + - /* ensure we turn the panel back on after resume */ + /* ensure we turn the panel back on after lid open */ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, @@ -886,7 +886,7 @@ index 1c594d8..bb7224c 100644 error->message); g_clear_error (&error); } - + - /* only toggle keyboard if present and not already toggled */ - if (manager->priv->upower_kdb_proxy && - manager->priv->kbd_brightness_old == -1) { @@ -904,7 +904,7 @@ index 1c594d8..bb7224c 100644 - - do_power_action_type (manager, action_type); } - + static void do_lid_closed_action (GsdPowerManager *manager) { @@ -917,7 +917,7 @@ index 1c594d8..bb7224c 100644 @@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager) CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), NULL); - + + /* turn the panel off if the lid is closed (mainly for Dells...) */ + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, + GNOME_RR_DPMS_OFF, @@ -930,7 +930,7 @@ index 1c594d8..bb7224c 100644 + /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ - + - /* perform policy action */ - if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") - || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { @@ -942,7 +942,7 @@ index 1c594d8..bb7224c 100644 - } + restart_inhibit_lid_switch_timer (manager); } - + - static void up_client_changed_cb (UpClient *client, GsdPowerManager *manager) @@ -952,12 +952,12 @@ index 1c594d8..bb7224c 100644 return; manager->priv->lid_is_closed = tmp; + g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); - + /* fake a keypress */ if (tmp) @@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) } - + static void -sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, - GAsyncResult *res, @@ -988,14 +988,14 @@ index 1c594d8..bb7224c 100644 const gchar *signal_name, @@ -3477,75 +3442,38 @@ out: } - + static void -lock_screensaver (GsdPowerManager *manager) +lock_screensaver (GsdPowerManager *manager, + GSourceFunc done_cb) { gboolean do_lock; - + do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, "lock-enabled"); - if (!do_lock) @@ -1048,7 +1048,7 @@ index 1c594d8..bb7224c 100644 - G_DBUS_CALL_FLAGS_NONE, - -1, NULL, NULL, NULL); } - + - /* close existing notifications on resume, the system power - * state is probably different now */ - notify_close_if_showing (manager->priv->notification_low); @@ -1084,12 +1084,12 @@ index 1c594d8..bb7224c 100644 + */ + g_timeout_add (500, done_cb, manager); } - + static void @@ -3755,6 +3683,287 @@ out: return ret; } - + +static void +inhibit_lid_switch_done (GObject *source, + GAsyncResult *result, @@ -1377,7 +1377,7 @@ index 1c594d8..bb7224c 100644 @@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager, g_debug ("Starting power manager"); gnome_settings_profile_start (NULL); - + + manager->priv->logind_proxy = + g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + 0, @@ -1412,19 +1412,19 @@ index 1c594d8..bb7224c 100644 g_signal_connect (manager->priv->up_client, "device-added", G_CALLBACK (engine_device_added_cb), manager); @@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); - if (manager->priv->x11_screen == NULL) - return FALSE; + G_CALLBACK (idle_idletime_reset_cb), manager); + g_signal_connect (manager->priv->idletime, "alarm-expired", + G_CALLBACK (idle_idletime_alarm_expired_cb), manager); + g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); + /* set up initial state */ + on_randr_event (manager->priv->x11_screen, manager); - + /* ensure the default dpms timeouts are cleared */ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, @@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) { g_debug ("Stopping power manager"); - + + if (manager->priv->inhibit_lid_switch_timer_id != 0) { + g_source_remove (manager->priv->inhibit_lid_switch_timer_id); + manager->priv->inhibit_lid_switch_timer_id = 0; @@ -1436,11 +1436,11 @@ index 1c594d8..bb7224c 100644 @@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) manager->priv->introspection_data = NULL; } - + - kill_lid_close_safety_timer (manager); - g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); - + g_clear_object (&manager->priv->connection); @@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) g_clear_object (&manager->priv->settings); @@ -1460,7 +1460,7 @@ index 1c594d8..bb7224c 100644 + + g_clear_object (&manager->priv->logind_proxy); g_clear_object (&manager->priv->x11_screen); - + g_ptr_array_unref (manager->priv->devices_array); @@ -3980,6 +4223,8 @@ static void gsd_power_manager_init (GsdPowerManager *manager) @@ -1469,8 +1469,8 @@ index 1c594d8..bb7224c 100644 + manager->priv->inhibit_lid_switch_fd = -1; + manager->priv->inhibit_suspend_fd = -1; } - + static void --- +-- 1.8.0 diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index c12723aac..1480326d9 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80371 2012-11-21 04:26:48Z jconder $ +# $Id: PKGBUILD 82410 2013-01-16 23:40:08Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.6.3 -pkgrel=1 +pkgver=3.6.4 +pkgrel=2 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,11 +14,11 @@ options=('!emptydirs' '!libtool') install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" - '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch' - 'arch.patch') -sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc' - 'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109' - '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') + '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch' + 'arch.patch') +sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' + 'dbea64c93db308cbcae52cf0c512986c6f07a0bd5023b0641255416af863011e' + '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -27,7 +27,8 @@ build() { patch -Np1 -i "$srcdir/arch.patch" aclocal - automake + autoconf + automake --add-missing ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -44,7 +45,4 @@ build() { package() { cd "$srcdir/$_pkgname-$pkgver" make -C 'plugins/updates' DESTDIR="${pkgdir}" install - - _schema='org.gnome.settings-daemon.plugins.updates.gschema.xml' - install -D -m644 "data/$_schema" "$pkgdir/usr/share/glib-2.0/schemas/$_schema" } diff --git a/community/gnujump/PKGBUILD b/community/gnujump/PKGBUILD new file mode 100644 index 000000000..0da4248af --- /dev/null +++ b/community/gnujump/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 82500 2013-01-19 17:34:43Z jsteel $ +# Maintainer: jsteel <mail at jsteel dot org> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Patrik Ilg <p.ilg@arcor.de> + +pkgname=gnujump +pkgver=1.0.8 +pkgrel=3 +pkgdesc="A clone of the simple yet addictive game Xjump" +arch=('i686' 'x86_64') +url="http://gnujump.es.gnu.org" +license=('GPL3') +depends=('libgl' 'sdl_image' 'sdl_mixer') +makedepends=('mesa' 'glu') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname.png + $pkgname.desktop) +md5sums=('a8bdd3402a9d12faa5835a2c41ef7b3e' + 'aff6af66e632095aa3154e952571f9b5' + 'd875e92130b669a4148908bc391a2a8c') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + LDFLAGS="-lm" + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install + + install -Dm644 "$srcdir"/$pkgname.png "$pkgdir"/usr/share/pixmaps/$pkgname.png + install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop +} diff --git a/community/gnujump/gnujump.desktop b/community/gnujump/gnujump.desktop new file mode 100644 index 000000000..9e9d14739 --- /dev/null +++ b/community/gnujump/gnujump.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=GNUjump +Comment=A clone of the simple yet addictive game Xjump +Exec=gnujump +Icon=gnujump.png +Terminal=false +Categories=Game;ArcadeGame; diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 06bcb0b3e..8954a068a 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80625 2012-11-27 11:18:45Z arodseth $ +# $Id: PKGBUILD 82502 2013-01-19 17:36:30Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,10 +10,10 @@ pkgname=go pkgver=1.0.3 -pkgrel=4 +pkgrel=5 epoch=2 pkgdesc='Google Go compiler and tools' -arch=('x86_64' 'i686') +arch=('x86_64' 'i686' 'armv6h') url='http://golang.org/' license=('custom') depends=('perl' 'gawk') @@ -31,18 +31,23 @@ build() { if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 - fi - if [ "$CARCH" == 'i686' ]; then + elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 + else + export GOARCH=arm fi - export GOROOT_FINAL=/usr/lib/go export GOOS=linux + cd src bash make.bash - # Enable ARM crosscompilation - export GOARCH=arm + # Enable ARM crosscompilation for non-arm platforms + if [ "$CARCH" == 'x86_64' ]; then + export GOARCH=arm + elif [ "$CARCH" == 'i686' ]; then + export GOARCH=arm + fi bash make.bash } @@ -51,9 +56,10 @@ check() { if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 - fi - if [ "$CARCH" == 'i686' ]; then + elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 + else + export GOARCH=arm fi export GOROOT=$srcdir/$pkgname diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 81aee4a30..722b757d0 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,12 +1,12 @@ -#$Id: PKGBUILD 81475 2012-12-21 17:01:26Z arodseth $ +#$Id: PKGBUILD 82408 2013-01-16 23:36:09Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide -pkgver=15 +pkgver=16 pkgrel=1 -pkgdesc='IDE for editing and building projects written in the Go programming language' +pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' @@ -14,46 +14,49 @@ depends=('go' 'libpng12' 'glib2' 'qt' 'qjson' 'qtwebkit') makedepends=('gendesk') options=('!strip') _name=('Golang IDE') +# http://$pkgname.googlecode.com/files/liteidex$pkgver.linux-386-webkit.tar.bz2 +# http://$pkgname.googlecode.com/files/liteidex$pkgver.linux-amd64-webkit.tar.bz2 source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master" 'golangide.png' 'golangide.sh') -sha256sums=('23158d09d5d3c439a07d12532dc8cdbc963c65dde1739f2e19b611a7d2f8944e' +sha256sums=('ad40b86cace58bf85bf94e09d9dfc353cbdb31f09566bfd9487d15f321fbe078' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' - '9b1844a1e3a611760c2d2072b539cca0d2eed1584e1bf04a7fdd8d171e3cd775') + 'aa5ea27f9c3626431a9cb45e5267771a1eeff48b2e3927c0574eaef9302cfd74') build() { cd "$srcdir" - - msg2 'Generating .desktop file' + msg2 'Generating .desktop file...' gendesk -n msg2 'Compiling...' - cd "liteide-master/build" + cd liteide-master/build chmod +x build_linux.sh webkit_linux.sh QTDIR=/usr ./build_linux.sh QTDIR=/usr ./webkit_linux.sh # Fixing insecure RPATH, need to test if this is still needed msg2 'Fixing...' - cd "../liteidex" + cd ../liteidex find . -name "*.so" -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; find . -name liteide -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; } package() { - cd "$srcdir/liteide-master/liteidex" - msg2 'Creating directories...' mkdir -p "$pkgdir/usr/lib/liteide" mkdir -p "$pkgdir/usr/share/liteide" mkdir -p "$pkgdir/usr/share/doc/$pkgname" + cd "$srcdir/liteide-master/build/liteide" + msg2 'Packaging executables...' - for binary in goastview goapi goexec godocview liteidex; do + for binary in goastview goapi goexec godocview liteide; do install -Dm755 "bin/$binary" "$pkgdir/usr/bin/$binary" done install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + cd "$srcdir/liteide-master/liteidex" + msg2 'Packaging resources...' cp -r deploy/* "$pkgdir/usr/share/liteide" cp -r os_deploy/* "$pkgdir/usr/share/liteide" diff --git a/community/golangide/golangide.sh b/community/golangide/golangide.sh index 70705e5f3..736727ed7 100644 --- a/community/golangide/golangide.sh +++ b/community/golangide/golangide.sh @@ -1,7 +1,8 @@ #!/bin/sh +ELF=/usr/bin/liteide # The libqjson issue has been reported upstream if [ ! -z $GOROOT -a -e $GOROOT ]; then - LD_PRELOAD=/usr/lib/libqjson.so /usr/bin/liteidex $@ + LD_PRELOAD=/usr/lib/libqjson.so $ELF $@ else - GOROOT=/usr/lib/go LD_PRELOAD=/usr/lib/libqjson.so /usr/bin/liteidex $@ + GOROOT=/usr/lib/go LD_PRELOAD=/usr/lib/libqjson.so $ELF $@ fi diff --git a/community/grsync/PKGBUILD b/community/grsync/PKGBUILD index 9508c1ed8..ff1a7010c 100644 --- a/community/grsync/PKGBUILD +++ b/community/grsync/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78660 2012-10-22 13:48:12Z spupykin $ +# $Id: PKGBUILD 82455 2013-01-18 09:20:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=grsync -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="GTK GUI for rsync" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gtk2' 'rsync') makedepends=('gettext' 'intltool') install=grsync.install source=(http://www.opbyte.it/release/grsync-$pkgver.tar.gz) -md5sums=('1b40ee3c9191dbf6080285ce6dc2383d') +md5sums=('872b3686ecb770e257d67c3a2c262a65') build() { cd $srcdir/grsync-$pkgver diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 890dba215..061476cc2 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,33 +1,28 @@ -# $Id: PKGBUILD 79447 2012-11-05 19:27:31Z bgyorgy $ +# $Id: PKGBUILD 82444 2013-01-18 06:43:16Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator -pkgver=2.91.5 -pkgrel=2 +pkgver=2.91.6 +pkgrel=1 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/gtranslator/" license=('GPL') depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'gucharmap' 'json-glib') +makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib') optdepends=('gucharmap: for charmap plugin' 'json-glib: for open-tran plugin') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz - disable-dockbar.patch) -sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6' - '04647eb198291024e5a65564ad6be239b7af4472421a44c2d57ed5d6a8bb4384') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) +sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6') build() { cd ${srcdir}/${pkgname}-${pkgver} - # Tempolary disable dockbar, because layout loading is completely broken with gdl 3.6 - patch -Np1 -i ${srcdir}/disable-dockbar.patch - ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile make } diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog index 7187196b4..9dbf32879 100644 --- a/community/gtranslator/gtranslator.changelog +++ b/community/gtranslator/gtranslator.changelog @@ -1,3 +1,6 @@ +2013-01-18 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> + * gtranslator 2.91.6-1 + 2012-11-05 Balló György <ballogyor+arch at gmail dot com> * gtranslator 2.91.5-2 rebuild for gdl 3.6 diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD index bff719418..f64640432 100644 --- a/community/homebank/PKGBUILD +++ b/community/homebank/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75013 2012-08-11 18:51:43Z ebelanger $ +# $Id: PKGBUILD 82438 2013-01-18 06:05:16Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=homebank -pkgver=4.4 -pkgrel=3 +pkgver=4.5 +pkgrel=1 pkgdesc="Free, easy, personal accounting for everyone" arch=('i686' 'x86_64' 'mips64el') url="http://homebank.free.fr/" @@ -12,8 +12,9 @@ license=('GPL') depends=('desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'libofx' 'librsvg' 'perlxml' 'shared-mime-info') makedepends=('intltool') install=$pkgname.install +changelog=$pkgname.changelog source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz) -sha256sums=('13b89373575e3ac229d2683aa7296778ad7cdae1a7a019c9124a1d5b23dce7d2') +sha256sums=('3c6dcb19fd975037857f84fd6a186a5b0b84f590f37ead0d37868fa484c6e547') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog new file mode 100644 index 000000000..75beb2e9d --- /dev/null +++ b/community/homebank/homebank.changelog @@ -0,0 +1,2 @@ +2013-01-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * homebank 4.5-1 diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index 735d181e9..95fdf5673 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 80758 2012-12-03 10:07:15Z spupykin $ +# $Id: PKGBUILD 82275 2013-01-14 09:20:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd -pkgver=1.1 +pkgver=2.0 pkgrel=1 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz hostapd hostapd.conf.d hostapd.service) -md5sums=('e3ace8306d066ab2d24b4c9f668e2dd7' +md5sums=('ba22e639bc57aa4035d2ea8ffa9bbbee' '5d7ee10b04e33f22c37be56a4c33dddb' 'd570327c385f34a4af24d3a0d61cea19' 'f169534b0f59b341f6df1a21e0344511' diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index 73a1a7f7b..e2035031b 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80615 2012-11-27 03:11:48Z fyan $ +# $Id: PKGBUILD 82426 2013-01-17 13:14:23Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=0.9.4 +pkgver=0.9.7 pkgrel=2 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64' 'mips64el') @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('ec7fdc6f8c772b1c5412be59546bc667') +md5sums=('7234fd5ed900274f83c418c83ef3a630') diff --git a/community/ibus-rime/ibus-rime.install b/community/ibus-rime/ibus-rime.install index 220126eb3..1ed0581cb 100644 --- a/community/ibus-rime/ibus-rime.install +++ b/community/ibus-rime/ibus-rime.install @@ -1,3 +1,3 @@ pre_upgrade() { - rm /usr/share/ibus-rime/*.bin || true + rm -f /usr/share/ibus-rime/*.bin } diff --git a/community/intel-gpu-tools/PKGBUILD b/community/intel-gpu-tools/PKGBUILD new file mode 100644 index 000000000..605221109 --- /dev/null +++ b/community/intel-gpu-tools/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 82424 2013-01-17 10:47:47Z thestinger $ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Mikael Eriksson <mikael_eriksson@miffe.org> +# Originally by: Denis Smirnov <detanator@gmail.com> + +pkgname=intel-gpu-tools +pkgver=1.3 +pkgrel=2 +pkgdesc="Tools for development and testing of the Intel DRM driver" +arch=(i686 x86_64) +license=(MIT) +url="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" +depends=('libdrm' 'libpciaccess' 'cairo') +source=(http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2) +md5sums=('67facd6241e26e2c68614728e3a932e9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/intel-gpu-tools/COPYING" +} diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 01afab866..7b59a1d18 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81483 2012-12-22 10:23:17Z stativ $ +# $Id: PKGBUILD 82378 2013-01-16 10:38:22Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.0.1 -_pkgver=123.94 +pkgver=12.0.2 +_pkgver=123.123 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('0641de81781cfb2f122df3b327a902fb') +md5sums=('64de83782d5b5e0b3f0139cd933b87cd') build() { cd "$srcdir" diff --git a/community/kmscon/PKGBUILD b/community/kmscon/PKGBUILD new file mode 100644 index 000000000..11cb9492d --- /dev/null +++ b/community/kmscon/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: David Herrmann <dh.herrmann@googlemail.com> +pkgname=kmscon +pkgver=6 +pkgrel=3 +pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS)' +arch=(i686 x86_64) +url='https://github.com/dvdhrm/kmscon' +license=('MIT') +depends=(systemd libdrm mesa libegl libgbm libgles pango libxkbcommon libpciaccess xkeyboard-config) +makedepends=('libxslt' 'docbook-xsl' 'linux-api-headers') +options=(!libtool) +source=(https://github.com/downloads/dvdhrm/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('12f6966cef8e846f31dbcad916a9f347') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --enable-kmscon \ + --disable-wlterm \ + --enable-multi-seat \ + --enable-hotplug \ + --enable-pciaccess \ + --with-video=fbdev,dumb,drm \ + --with-fonts=pango,freetype2,8x16 \ + --with-sessions=dummy,terminal + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" "$pkgdir/usr/lib/systemd/system" + cp COPYING "$pkgdir/usr/share/licenses/$pkgname/" + cp docs/kmscon{,@}.service "$pkgdir/usr/lib/systemd/system/" +} diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD new file mode 100644 index 000000000..3a093b9af --- /dev/null +++ b/community/libgit2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Hilton Medeiros <medeiros.hilton@gmail.com> +# Contributor: Dave Reisner <d@falconindy.com> + +pkgname=libgit2 +pkgver=0.17.0 +pkgrel=2 +pkgdesc="A linkable library for Git" +arch=('i686' 'x86_64') +url="http://libgit2.github.com/" +depends=('zlib') +makedepends=(cmake python) +license=('GPL2') +source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver") +md5sums=('5a09dd1118d1354375407119d19e0f2c') + +build() { + cd "$srcdir"/$pkgname-* + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-* + make DESTDIR="$pkgdir" install +} diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD index 8be462094..5b9445720 100644 --- a/community/librime/PKGBUILD +++ b/community/librime/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80591 2012-11-26 15:20:56Z fyan $ +# $Id: PKGBUILD 82381 2013-01-16 11:25:08Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=librime -pkgver=0.9.4 -pkgrel=3 +pkgver=0.9.7 +pkgrel=1 pkgdesc="Rime input method engine" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/rimeime/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('c917d52ddc5483147d0409de9dafc8af') +md5sums=('732fe5258ab4fced26e61475cdcffdb1') diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 28126b601..16bf31e60 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81314 2012-12-17 10:10:51Z spupykin $ +# $Id: PKGBUILD 82286 2013-01-14 10:03:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -34,15 +34,13 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d - libvirt.tmpfiles.d - openbsd-netcat-default.patch) + libvirt.tmpfiles.d) md5sums=('86a8c0acabb01e11ac84fe00624dc54e' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '8d98e62915785686b0b6c8c070628392' - '456723b41903d3aaa7ec948c1feea265') + '8d98e62915785686b0b6c8c070628392') build() { cd "$srcdir/$pkgname-$pkgver" @@ -54,8 +52,6 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done -# patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch - export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ @@ -65,6 +61,7 @@ build() { sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service + sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service } package() { diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 774a8ebc1..c9bf8ebcf 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79775 2012-11-12 09:26:01Z spupykin $ +# $Id: PKGBUILD 82279 2013-01-14 09:20:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond -pkgver=2.16.1 +pkgver=2.16.2 pkgrel=1 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' options=('emptydirs') install=lilypond.install source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) -md5sums=('3a87363ba287d2958ee9414c3c16bbb2') +md5sums=('6db27f17d47e4f66a3b0716c65db3041') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index 147dd70eb..f50c37e50 100644 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,16 +1,18 @@ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 82331 2013-01-15 11:35:02Z allan $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: kagan <juanynie@mi.madritel.es> pkgname=mednafen pkgver=0.8.D.3 -pkgrel=2 +pkgrel=3 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('libcdio' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa') +makedepends=('pkgconfig' 'mesa' 'glu') changelog=ChangeLog source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 mednafen-0.8.13.3-zlib-1.2.6.patch) diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 5a1236e10..018c8470a 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 81010 2012-12-09 18:03:32Z bpiotrowski $ +# $Id: PKGBUILD 82332 2013-01-15 11:35:04Z allan $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20121128 -pkgrel=1 +pkgrel=2 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.mplayer2.org/" install=$pkgname.install depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' - 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' + 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') if [ "$CARCH" != "mips64el" ]; then depends+=('libgl' 'libvdpau' 'lirc-utils') fi -makedepends=('mesa' 'unzip' 'python' 'python-docutils') -[ "$CARCH" != "mips64el" ] && makedepends+=('yasm') +makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('696adb2503b2202fe39de6c98b573cd6') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz + cdio-api-fixes.patch) +md5sums=('696adb2503b2202fe39de6c98b573cd6' + '5ff5fa9d0fd50239ed3a1756b31e6a9d') build() { cd $srcdir/$pkgname-$pkgver @@ -35,6 +36,8 @@ build() { [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection" + patch -Np1 -i $srcdir/cdio-api-fixes.patch + ./configure --prefix=/usr --confdir=/etc/mplayer \ --enable-translation --language=all \ --enable-joystick \ diff --git a/community/mplayer2/cdio-api-fixes.patch b/community/mplayer2/cdio-api-fixes.patch new file mode 100644 index 000000000..eeb9f0589 --- /dev/null +++ b/community/mplayer2/cdio-api-fixes.patch @@ -0,0 +1,50 @@ +diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c +--- mplayer2-20121128.orig/stream/stream_cdda.c 2013-01-10 19:37:31.000000000 +0200 ++++ mplayer2-20121128/stream/stream_cdda.c 2013-01-10 20:23:25.000000000 +0200 +@@ -17,8 +17,8 @@ + */ + + #include "config.h" +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + #include <cdio/cdio.h> + + #include <stdio.h> +@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = { + }; + + static const char *cdtext_name[] = { +- [CDTEXT_ARRANGER] = "Arranger", +- [CDTEXT_COMPOSER] = "Composer", +- [CDTEXT_MESSAGE] = "Message", +- [CDTEXT_ISRC] = "ISRC", +- [CDTEXT_PERFORMER] = "Performer", +- [CDTEXT_SONGWRITER] = "Songwriter", +- [CDTEXT_TITLE] = "Title", +- [CDTEXT_UPC_EAN] = "UPC_EAN", ++ [CDTEXT_FIELD_ARRANGER] = "Arranger", ++ [CDTEXT_FIELD_COMPOSER] = "Composer", ++ [CDTEXT_FIELD_MESSAGE] = "Message", ++ [CDTEXT_FIELD_ISRC] = "ISRC", ++ [CDTEXT_FIELD_PERFORMER] = "Performer", ++ [CDTEXT_FIELD_SONGWRITER] = "Songwriter", ++ [CDTEXT_FIELD_TITLE] = "Title", ++ [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN", + }; + + static bool print_cdtext(stream_t *s, int track) + { + cdda_priv* p = (cdda_priv*)s->priv; +- cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track); ++ cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio); + if (text) { + mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD"); + for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) { + const char *name = cdtext_name[i]; +- const char *value = cdtext_get_const(i, text); ++ const char *value = cdtext_get_const(text, i, track); + if (name && value) + mp_msg(MSGT_SEEK, MSGL_INFO, " %s: '%s'\n", name, value); + } diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 5c2b5b070..954579b1e 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77158 2012-10-05 23:55:11Z jconder $ +# $Id: PKGBUILD 82334 2013-01-15 11:35:06Z allan $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,19 +14,22 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=0.26.0 -pkgrel=1 +pkgrel=2 epoch=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.mythtv.org" license=('GPL') makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' - 'libvorbis' 'mplayer' 'mythtv' 'perl-datetime-format-iso8601' - 'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww' - 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' - 'python2-oauth' 'python-imaging' 'python2-pycurl' 'taglib' 'zlib') + 'libvorbis' 'mesa' 'mplayer' 'mythtv' + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' + 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging' + 'python2-pycurl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" + 'cdparanoia.patch' 'mtd.rc') md5sums=('15bd7b2f4173488966f3d761e0eacffa' + '5de8dd79d0b8a2b006f3c3258938b6b7' '476c12ba074794ad7f4ae092bdf949d6') build() { @@ -36,6 +39,8 @@ build() { sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php' sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp' + patch -Np1 -i "$srcdir/cdparanoia.patch" + ./configure --prefix=/usr \ --enable-all \ --python=python2 @@ -78,7 +83,7 @@ package_mythplugins-mythgame() { package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=('mythtv' 'taglib') + depends=('mythtv' 'libcdio-paranoia' 'taglib') cd "$srcdir/$pkgbase-$pkgver/mythmusic" make INSTALL_ROOT="$pkgdir" install diff --git a/community/mythplugins/cdparanoia.patch b/community/mythplugins/cdparanoia.patch new file mode 100644 index 000000000..b4d1449d5 --- /dev/null +++ b/community/mythplugins/cdparanoia.patch @@ -0,0 +1,52 @@ +diff -Nru a/configure b/configure +--- a/configure 2012-10-02 23:30:24.000000000 +1300 ++++ b/configure 2013-01-09 14:54:40.448916370 +1300 +@@ -649,7 +649,7 @@ + echo "MythMusic requires FLAC." + fi + +- if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then ++ if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then + disable cdio + fi + +diff -Nru a/mythmusic/mythmusic/cddecoder.cpp b/mythmusic/mythmusic/cddecoder.cpp +--- a/mythmusic/mythmusic/cddecoder.cpp 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cddecoder.cpp 2013-01-09 14:53:37.031690618 +1300 +@@ -14,7 +14,7 @@ + #include <QString> + + // libcdio +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/logging.h> + + // MythTV +diff -Nru a/mythmusic/mythmusic/cddecoder.h b/mythmusic/mythmusic/cddecoder.h +--- a/mythmusic/mythmusic/cddecoder.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cddecoder.h 2013-01-09 14:53:12.328140979 +1300 +@@ -11,8 +11,8 @@ + #endif + + #ifdef HAVE_CDIO +-# include <cdio/cdda.h> +-# include <cdio/paranoia.h> ++# include <cdio/paranoia/cdda.h> ++# include <cdio/paranoia/paranoia.h> + #endif + + class Metadata; +diff -Nru a/mythmusic/mythmusic/cdrip.cpp b/mythmusic/mythmusic/cdrip.cpp +--- a/mythmusic/mythmusic/cdrip.cpp 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cdrip.cpp 2013-01-09 14:54:11.815330268 +1300 +@@ -8,8 +8,8 @@ + + #include "config.h" + #ifdef HAVE_CDIO +-# include <cdio/cdda.h> +-# include <cdio/paranoia.h> ++# include <cdio/paranoia/cdda.h> ++# include <cdio/paranoia/paranoia.h> + #endif //def HAVE_CDIO + + // C++ includes diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 28612f39e..950896dae 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80156 2012-11-16 23:35:58Z ioni $ +# $Id: PKGBUILD 82411 2013-01-16 23:44:10Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -29,10 +29,12 @@ replaces=('myththemes' 'mythplugins-mythvideo') backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" + 'alsa.patch' 'mythbackend.rc' 'mythbackend.conf' 'mythbackend.service') md5sums=('f57066bf75e6f14824c494d41639f4f9' + 'f64b8219e3d27a2edf96733b851e576b' 'c8f935d42fb8617e9279bd539811ca5f' 'ab962d83614cbd0ac11ce3fcc929829d' 'e4d572dcc307d6d8ae26bee5aebf9f3a') @@ -41,6 +43,8 @@ build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np1 -i "$srcdir/alsa.patch" + ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ --cpu="$ARCH" \ diff --git a/community/mythtv/alsa.patch b/community/mythtv/alsa.patch new file mode 100644 index 000000000..07cf1c3a9 --- /dev/null +++ b/community/mythtv/alsa.patch @@ -0,0 +1,66 @@ +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-common.c b/external/FFmpeg/libavdevice/alsa-audio-common.c +--- a/external/FFmpeg/libavdevice/alsa-audio-common.c 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio-common.c 2013-01-09 13:23:49.704360811 +1300 +@@ -28,6 +28,7 @@ + * @author Nicolas George ( nicolas george normalesup org ) + */ + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #include "avdevice.h" + #include "libavutil/avassert.h" +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-dec.c b/external/FFmpeg/libavdevice/alsa-audio-dec.c +--- a/external/FFmpeg/libavdevice/alsa-audio-dec.c 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio-dec.c 2013-01-09 13:23:47.911005108 +1300 +@@ -45,6 +45,7 @@ + * plugin. + */ + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #include "libavformat/internal.h" + #include "libavutil/opt.h" +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-enc.c b/external/FFmpeg/libavdevice/alsa-audio-enc.c +--- a/external/FFmpeg/libavdevice/alsa-audio-enc.c 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio-enc.c 2013-01-09 13:23:46.880992286 +1300 +@@ -37,6 +37,7 @@ + * which gives a low latency suitable for real-time playback. + */ + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + + #include "libavformat/internal.h" +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio.h b/external/FFmpeg/libavdevice/alsa-audio.h +--- a/external/FFmpeg/libavdevice/alsa-audio.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio.h 2013-01-09 13:23:51.121045145 +1300 +@@ -30,6 +30,7 @@ + #ifndef AVDEVICE_ALSA_AUDIO_H + #define AVDEVICE_ALSA_AUDIO_H + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #include "config.h" + #include "libavutil/log.h" +diff -Nru a/libs/libmyth/audio/audiooutputalsa.h b/libs/libmyth/audio/audiooutputalsa.h +--- a/libs/libmyth/audio/audiooutputalsa.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/libs/libmyth/audio/audiooutputalsa.h 2013-01-09 13:22:13.313180438 +1300 +@@ -1,6 +1,7 @@ + #ifndef AUDIOOUTPUTALSA + #define AUDIOOUTPUTALSA + ++#include <sys/types.h> + #define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API + #include <alsa/asoundlib.h> +diff -Nru a/libs/libmythtv/audioinputalsa.h b/libs/libmythtv/audioinputalsa.h +--- a/libs/libmythtv/audioinputalsa.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/libs/libmythtv/audioinputalsa.h 2013-01-09 13:22:44.470223553 +1300 +@@ -24,6 +24,7 @@ + #include "audioinput.h" + + #ifdef USING_ALSA ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #else + typedef int snd_pcm_t; diff --git a/community/ncrack/PKGBUILD b/community/ncrack/PKGBUILD new file mode 100644 index 000000000..09e369a4d --- /dev/null +++ b/community/ncrack/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Daniel Micay <daneilmicay@gmail.com> +# Contributor: mickael9 <mickael9 at gmail dot com> + +pkgname=ncrack +pkgver=0.4a +_realver=0.4ALPHA +pkgrel=2 +pkgdesc='A high-speed network authentication cracking tool' +arch=(i686 x86_64) +url='http://nmap.org/ncrack/' +license=(GPL) +depends=(openssl) +source=("http://nmap.org/ncrack/dist/ncrack-${_realver}.tar.gz") +md5sums=('db9be165469c04650ddc7403b29eb472') + +build() { + cd "$srcdir/$pkgname-${_realver}" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-${_realver}" + make install DESTDIR="$pkgdir" +} diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 2d9bf318a..4f5a6907e 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82204 2013-01-11 18:56:25Z bpiotrowski $ +# $Id: PKGBUILD 82484 2013-01-19 14:04:44Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.17 +pkgver=0.8.18 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ depends=('openssl' 'python2' 'v8') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('8f070b42ffb84fde9d3ed2f802b08664b94dda327a36bf08a80c8b7efcf8b29e') +sha256sums=('1d63dd42f9bd22f087585ddf80a881c6acbe1664891b1dda3b71306fe9ae00f9') build() { cd node-v${pkgver} diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index 50bebc680..5a8bdf9d4 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55624 2011-09-16 13:23:02Z spupykin $ +# $Id: PKGBUILD 82459 2013-01-18 09:53:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite -pkgver=1.0.2rc5 +pkgver=1.1.3 pkgrel=1 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64' 'mips64el') @@ -11,17 +11,11 @@ url="http://parcellite.sourceforge.net/" license=('GPL3') depends=('gtk2') makedepends=('intltool') -source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz - history_menu_crash_patch - parcellite-1.0.2rc5-glib.patch) -md5sums=('fa2d3ac8ec70df47e425695919bbc097' - '8fd6e07fa907865ca4db7b3e13441ce6' - '5fad7f05a198bb9ff8b79544b42d51ff') +source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz) +md5sums=('b1527b6590744fa28c322c2de14b4811') build() { cd "$srcdir/parcellite-$pkgver" - (cd src && patch -p0 <$srcdir/history_menu_crash_patch) - patch -Np1 -i ${srcdir}/parcellite-1.0.2rc5-glib.patch ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR="$pkgdir" install diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 9fd0afae1..a1af3b510 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 81201 2012-12-13 02:14:39Z giovanni $ +# $Id: PKGBUILD 82449 2013-01-18 08:24:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.8.7 +pkgver=1.8.8 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,9 @@ license=('BSD') depends=('python2' 'systemd-tools') makedepends=('pkg-config') options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3842/pcsc-lite-${pkgver}.tar.bz2" +source=("https://alioth.debian.org/frs/download.php/3862/pcsc-lite-${pkgver}.tar.bz2" 'pcscd') -md5sums=('744f4b437492ce22ae23aa483a76becf' +md5sums=('069dc875a2ae2d85a2ebceac73252c0a' 'c97b6bce695222efb0f003d8e8369010') build() { diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index f55879df8..c7fad70bb 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78527 2012-10-20 09:33:28Z heftig $ +# $Id: PKGBUILD 82217 2013-01-12 08:15:31Z andrea $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.15 +pkgver=0.7.16 pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') @@ -30,4 +30,4 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } -md5sums=('cd03b61636b8d58592e7f419b434581f') +md5sums=('6ba1e576212e129111518a8c4afd1092') diff --git a/community/pidgin-kwallet/PKGBUILD b/community/pidgin-kwallet/PKGBUILD new file mode 100644 index 000000000..85692069a --- /dev/null +++ b/community/pidgin-kwallet/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 82219 2013-01-12 09:18:51Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Mateusz Slazynski <ceceron@gmail.com> + +pkgname=pidgin-kwallet +pkgver=1.1.0 +pkgrel=2 +pkgdesc="KWallet plugin for Pidgin" +arch=('i686' 'x86_64') +url="http://kde-apps.org/content/show.php/Pidgin+KWallet+Plugin?content=127136" +license=('GPL') +depends=('pidgin' 'kdelibs') +makedepends=('cmake') +options=(!libtool) +source=("http://kde-apps.org/CONTENT/content-files/127136-PidginKWallet-$pkgver.tar.bz2") +md5sums=('c8fde518d8058de8302124791d0d15c6') + +build() { + cd "$srcdir/PidginKWallet-$pkgver" + + mkdir -p build + cd build + + cmake .. + make +} + +package() { + #sed -i 's|GemRBPath=.*|GemRBPath=/usr/share/gemrb/|' "$pkgdir/etc/GemRB.cfg.sample + install -Dm644 "$srcdir/PidginKWallet-$pkgver/build/plugin/libkwallet.so" "$pkgdir/usr/lib/pidgin/libkwallet.so" +} diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 079899c3d..7ea9fb4c5 100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 75419 2012-08-22 19:34:43Z ttopper $ +# $Id: PKGBUILD 82336 2013-01-15 11:35:08Z allan $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') url="http://pragha.wikispaces.com/" license=('GPL3') -depends=('libnotify' 'libcdio' 'gstreamer0.10-base' +depends=('libnotify' 'libcdio-paranoia' 'gstreamer0.10-base' 'taglib' 'hicolor-icon-theme' 'gtk2' 'dbus-glib' 'sqlite' 'desktop-file-utils' 'libclastfm') optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install -source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2") -sha1sums=('a7b839df5799263f870ea65a7f272015e24637e9') +source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2" + cdio-includes.patch) +sha1sums=('a7b839df5799263f870ea65a7f272015e24637e9' + '05a2e007800dc5395a0bb7f026ec7e388cd9488c') build() { cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/cdio-includes.patch" + LIBS+="-ldbus-glib-1" ./configure --prefix=/usr make } @@ -29,7 +34,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - + install -m 644 "data/$pkgname.desktop" "$pkgdir/usr/share/applications" install -d "$pkgdir/usr/share/pixmaps" install -m 644 "data/$pkgname.png" "$pkgdir/usr/share/pixmaps/" diff --git a/community/pragha/cdio-includes.patch b/community/pragha/cdio-includes.patch new file mode 100644 index 000000000..9f93044d1 --- /dev/null +++ b/community/pragha/cdio-includes.patch @@ -0,0 +1,12 @@ +diff -upr pragha-1.1.1.orig/src/cdda.h pragha-1.1.1/src/cdda.h +--- pragha-1.1.1.orig/src/cdda.h 2013-01-14 04:58:09.000000000 +0200 ++++ pragha-1.1.1/src/cdda.h 2013-01-14 04:58:52.000000000 +0200 +@@ -21,7 +21,7 @@ + + #include <glib.h> + +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/cd_types.h> + #ifdef __CDIO_CONFIG_H__ + #include <cdio/cdio_unconfig.h> diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index 5dc473aba..2549f2832 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,28 +1,20 @@ -# $Id: PKGBUILD 80996 2012-12-08 22:47:00Z arodseth $ +# $Id: PKGBUILD 82430 2013-01-17 14:54:20Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing pkgver=2.0b7 -pkgrel=1 -pkgdesc='Programming language and environment for creating images, animation, and interactions' +pkgrel=2 +pkgdesc='Programming language and environment for creating images, animations and interactions' arch=('x86_64' 'i686') url='http://www.processing.org/' license=('GPL' 'LGPL') depends=('libgl' 'libxxf86vm') makedepends=('gendesk') options=(!strip) -#if [[ $CARCH == 'x86_64' ]]; then -# optdepends=('lib32-libxtst: resource extension library') -# source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" -# "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") -# sha256sums=('844b4280b242176107f6c40fef47fa420695111cdb2b80294570297f63b1186f' -# '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') -#else - source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" - "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('55db8370672f9e2658443a7fe577e23f06ca1ab2435719c865a059a0e65cdc83' +source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" + "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") +sha256sums=('55db8370672f9e2658443a7fe577e23f06ca1ab2435719c865a059a0e65cdc83' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') -#fi build() { cd "$srcdir" @@ -34,8 +26,8 @@ package() { install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/" cp -r ./* "$pkgdir/usr/share/$pkgname/" - chmod a+x "$pkgdir/usr/share/$pkgname/$pkgname" - ln -s /usr/share/$pkgname/$pkgname "$pkgdir/usr/bin/$pkgname" + ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" + ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java" install -Dm644 "$srcdir/$pkgname.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "$srcdir/$pkgname.desktop" \ diff --git a/community/python-pygit2/PKGBUILD b/community/python-pygit2/PKGBUILD new file mode 100644 index 000000000..fa3dcbb15 --- /dev/null +++ b/community/python-pygit2/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> + +pkgbase=python-pygit2 +pkgname=(python-pygit2 python2-pygit2) +pkgver=0.17.3 +pkgrel=2 +pkgdesc='Python bindings for libgit2' +url="https://github.com/libgit2/pygit2" +depends=(libgit2) +makedepends=(python python2) +arch=(i686 x86_64) +license=('GPL2') +source=(https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz) +md5sums=('d7a03ddd2d3b0dee1c7ee89998dd3022') + +package_python-pygit2() { + cd "$srcdir/pygit2-$pkgver" + depends+=(python) + replaces=(python-libgit2) + conflicts=(python-libgit2) + LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1 +} + +package_python2-pygit2() { + cd "$srcdir/pygit2-$pkgver" + depends+=(python2) + replaces=(python2-libgit2) + conflicts=(python2-libgit2) + python2 setup.py install --root="$pkgdir" --optimize=1 +} diff --git a/community/python2-pytables/PKGBUILD b/community/python2-pytables/PKGBUILD index 2f94dcd3f..b876cc266 100644 --- a/community/python2-pytables/PKGBUILD +++ b/community/python2-pytables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76245 2012-09-15 08:49:57Z aginiewicz $ +# $Id: PKGBUILD 82342 2013-01-15 16:56:55Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Sebastien Binet <binet@cern.ch> pkgname=python2-pytables pkgver=2.4.0 -pkgrel=2 +pkgrel=3 arch=("i686" "x86_64" "mips64el") pkgdesc="PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" url="http://www.pytables.org" diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index dc96f51dc..aa04833f1 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76435 2012-09-18 12:56:49Z spupykin $ +# $Id: PKGBUILD 82281 2013-01-14 09:21:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 -pkgver=0.37 +pkgver=0.38 pkgrel=1 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('qtwebkit' 'phonon' 'sdl') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('0f36197cb1a7ab6f54af43f4f67d7150') +md5sums=('075cd54c3f4eb306c4f8304dd08900c6') build() { cd "$srcdir/$pkgname" diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 67151e969..a68a65a17 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,15 +1,15 @@ -#$Id: PKGBUILD 81996 2013-01-05 13:30:27Z jlichtblau $ +#$Id: PKGBUILD 82337 2013-01-15 11:35:09Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.6.5 -pkgrel=1 +pkgver=0.6.6 +pkgrel=2 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') url="http://qmmp.ylsoftware.com/" license=('GPL') depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt' 'taglib' 'xdg-utils') -makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack') +makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio-paranoia' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack' 'projectm' 'mesa') optdepends=('flac: native FLAC support' 'jack: JACK sound output' 'libmpcdec: Musepack support' @@ -19,14 +19,19 @@ optdepends=('flac: native FLAC support' 'libmms: MMS stream protocol support' 'libmodplug: MOD playing library' 'libsndfile: sampled sound support' + 'projectm: visual efects' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install -source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('3db8a38da74ed4a8551c9215f4984f83831d5a4602e1daaf42fcb48313a73372') +source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2 + cdio-includes.patch) +sha256sums=('dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99' + '7b3ff46dd30070cd79c5ca2dd6dfa1b9872bc09041f4bd985edf20a4333db07c') build() { cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/cdio-includes.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr make } @@ -36,4 +41,3 @@ package() { make DESTDIR=${pkgdir} install } -sha256sums=('7a53af8228e0062eda5df5d34c00221587a1a3764e614b5d8b12541c2c75f080') diff --git a/community/qmmp/cdio-includes.patch b/community/qmmp/cdio-includes.patch new file mode 100644 index 000000000..4c471291f --- /dev/null +++ b/community/qmmp/cdio-includes.patch @@ -0,0 +1,12 @@ +diff -upr qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +--- qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp 2013-01-10 21:55:55.000000000 +0200 ++++ qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp 2013-01-10 21:56:26.000000000 +0200 +@@ -25,7 +25,7 @@ + #include <QFileInfo> + #include <QDir> + #include <cdio/cdio.h> +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/audio.h> + #include <cdio/cd_types.h> + #include <cdio/logging.h> diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 5e0dc389a..83a1d07a0 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,9 @@ +2013-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.6-2 libcdio/libcdio-paranoia rebuild + +2013-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.6-1 + 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.5-1 diff --git a/community/qtcurve-gtk2/PKGBUILD b/community/qtcurve-gtk2/PKGBUILD index 798c75fbd..43814f1bf 100644 --- a/community/qtcurve-gtk2/PKGBUILD +++ b/community/qtcurve-gtk2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76418 2012-09-17 15:35:37Z svenstaro $ +# $Id: PKGBUILD 82497 2013-01-19 15:53:37Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 -pkgver=1.8.15 -pkgrel=2 +pkgver=1.8.16 +pkgrel=1 pkgdesc="A configurable set of widget styles for KDE and Gtk" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-look.org/content/show.php?content=40492" @@ -14,16 +14,12 @@ depends=('gtk2') makedepends=('cmake') groups=('qtcurve') options=('!libtool') -source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2" - cairo_flush_fix.patch) -md5sums=('00054b1923f995fa55e0573730b9f3a6' - '3aec00bd00af49ed42a47855ec37f670') +source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") +md5sums=('8923caaa0704f6a30252a5eadb015d76') build() { cd "${srcdir}" - patch -Np1 -i ${srcdir}/cairo_flush_fix.patch -d QtCurve-Gtk2-${pkgver} - mkdir -p build cd build/ cmake ../QtCurve-Gtk2-${pkgver} \ diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index c54d0f03a..86917cde8 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81783 2012-12-29 12:37:02Z andrea $ +# $Id: PKGBUILD 82318 2013-01-14 22:03:09Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') url='http://rekonq.kde.org/' @@ -14,10 +14,16 @@ depends=('kdebase-keditbookmarks' 'qoauth') makedepends=('cmake' 'automoc4') optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('380aa337b561ee0c5eb1aa8401f7bd8d98a2b18e645e92f3387baae06d501d84') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'fix-google-sync.patch') +sha256sums=('380aa337b561ee0c5eb1aa8401f7bd8d98a2b18e645e92f3387baae06d501d84' + '7360746d3668c1353e0b30351d33014c41d3171d64a43fed5178207883291001') build(){ + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-google-sync.patch + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/community/rekonq/fix-google-sync.patch b/community/rekonq/fix-google-sync.patch new file mode 100644 index 000000000..aa2aecc13 --- /dev/null +++ b/community/rekonq/fix-google-sync.patch @@ -0,0 +1,155 @@ +From: Andrea Diamantini <adjam7@gmail.com> +Date: Tue, 08 Jan 2013 16:09:03 +0000 +Subject: Workaround to fix Google Bookmarks sync + minor speed improvement +X-Git-Url: http://quickgit.kde.org/?p=rekonq.git&a=commitdiff&h=58bd0c195b60c3cf597a8d9296e5725dc4be7c9b +--- +Workaround to fix Google Bookmarks sync + minor speed improvement + +Courtesy patch by "Francesco". Thanks :) + +BUG: 312824 +--- + + +--- a/src/sync/googlesynchandler.cpp ++++ b/src/sync/googlesynchandler.cpp +@@ -3,7 +3,7 @@ + * This file is a part of the rekonq project + * + * Copyright (C) 2012 by Siteshwar Vashisht <siteshwar at gmail dot com> +-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com> ++* Copyright (C) 2011-2013 by Andrea Diamantini <adjam7 at gmail dot com> + * + * + * This program is free software; you can redistribute it and/or +@@ -172,24 +172,24 @@ + + QString path = _webPage.mainFrame()->url().path(); + +- if (path == "/ServiceLogin" && _doLogin == true) ++ if ( (path == QL1S("/ServiceLogin") || path == QL1S("/Login")) && _doLogin == true) + { + // Let's login to our Google account + QWebFrame *frame = _webPage.mainFrame(); + +- QWebElement email = frame->findFirstElement("#Email"); +- QWebElement passwd = frame->findFirstElement("#Passwd"); +- QWebElement form = frame->findFirstElement("#gaia_loginform"); +- +- email.setAttribute("value", ReKonfig::syncUser()); +- passwd.setAttribute("value", ReKonfig::syncPass()); +- form.evaluateJavaScript("this.submit();"); ++ QWebElement email = frame->findFirstElement( QL1S("#Email") ); ++ QWebElement passwd = frame->findFirstElement( QL1S("#Passwd") ); ++ QWebElement form = frame->findFirstElement( QL1S("#gaia_loginform") ); ++ ++ email.setAttribute( QL1S("value"), ReKonfig::syncUser()); ++ passwd.setAttribute( QL1S("value"), ReKonfig::syncPass()); ++ form.evaluateJavaScript( QL1S("this.submit();") ); + emit syncStatus(Rekonq::Bookmarks, true, i18n("Signing in...")); + + // Login only once + _doLogin = false; + } +- else if (path == "/bookmarks/") ++ else if (path == QL1S("/bookmarks/") ) + { + // We get to this page after successful login, let's fetch the bookmark list in Xml format. + QNetworkAccessManager *qnam = _webPage.networkAccessManager(); +@@ -199,16 +199,16 @@ + emit syncStatus(Rekonq::Bookmarks, true, i18n("Fetching bookmarks from server...")); + connect(_reply, SIGNAL(finished()), this, SLOT(fetchingBookmarksFinished())); + } +- else if (path == "/ServiceLoginAuth") ++ else if (path == QL1S("/ServiceLoginAuth") ) + { + emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!")); + _isSyncing = false; + } +- else if (path == "/bookmarks/mark") ++ else if (path == QL1S("/bookmarks/mark") ) + { + QWebFrame *frame = _webPage.mainFrame(); + +- QString sigKey = frame->findFirstElement("input[name=sig]").attribute("value"); ++ QString sigKey = frame->findFirstElement( QL1S("input[name=sig]") ).attribute( QL1S("value") ); + kDebug() << "Signature Key is : " << sigKey; + + QNetworkAccessManager *qnam = _webPage.networkAccessManager(); +@@ -219,7 +219,7 @@ + for (QSet<QString>::const_iterator iter = _bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter) + { + QNetworkRequest request; +- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?dlq=" + *iter + "&sig=" + sigKey)); ++ request.setUrl(QUrl( QL1S("https://www.google.com/bookmarks/mark?dlq=") + *iter + QL1S("&sig=") + sigKey)); + + kDebug() << "Delete url is : " << request.url(); + QNetworkReply *r = qnam->get(request); +@@ -243,7 +243,7 @@ + postData.append("&sig=" + sigKey.toUtf8()); + + QNetworkRequest request; +- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + "&btnA")); ++ request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + QL1S("&btnA") )); + request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); + kDebug() << "Url: " << request.url(); + kDebug() << "Post data is :" << postData; +@@ -257,7 +257,7 @@ + _bookmarksToAdd.clear(); + + } +- else if (path == "/Logout") ++ else if (path == QL1S("/Logout") ) + { + //Session finished + emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!")); +@@ -277,10 +277,10 @@ + { + QString data = _reply->readAll(); + +- QDomDocument doc("bookmarks"); ++ QDomDocument doc( QL1S("bookmarks") ); + doc.setContent(data); + +- QDomNodeList bookmarksOnServer = doc.elementsByTagName("bookmark"); ++ QDomNodeList bookmarksOnServer = doc.elementsByTagName( QL1S("bookmark") ); + emit syncStatus(Rekonq::Bookmarks, true, i18n("Reading bookmarks...")); + + BookmarkManager *manager = BookmarkManager::self(); +@@ -291,8 +291,8 @@ + + for (int i = 0; i < bookmarksOnServer.size(); ++i) + { +- QString title = getChildElement(bookmarksOnServer.at(i), "title"); +- QString url = getChildElement(bookmarksOnServer.at(i), "url"); ++ QString title = getChildElement(bookmarksOnServer.at(i), QL1S("title") ); ++ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") ); + + KBookmark bookmark = manager->bookmarkForUrl(KUrl(url)); + if (bookmark.isNull()) +@@ -377,7 +377,7 @@ + found = true; + break; + } +- else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), "url")) ++ else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), QL1S("url")) ) + { + found = true; + } +@@ -398,13 +398,13 @@ + + for (int i = 0; i < bookmarksOnServer.count(); ++i) + { +- QString url = getChildElement(bookmarksOnServer.at(i), "url"); ++ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") ); + + KBookmark result = manager->bookmarkForUrl(KUrl(url)); + if (result.isNull()) + { + kDebug() << "Deleting from Google Bookmarks: " << url; +- _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), "id")); ++ _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), QL1S("id") )); + } + } + + diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 24219d027..28c21f61a 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75976 2012-09-07 16:59:24Z arodseth $ +# $Id: PKGBUILD 82259 2013-01-13 18:18:25Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -7,19 +7,20 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.1.5 +pkgver=1.1.9 pkgrel=1 arch=('x86_64' 'i686' 'mips64el') -url="http://ruby-gnome2.sourceforge.jp/" +url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('460e50ff5e69238a648d59b1bae31a0748273307eecad734b1c1abdecd361dcb') +sha256sums=('975aa4ba04e19ea1374ad8384eab144c23080358bb1ad092bf2b2abef48091e8') build() { cd "$srcdir/ruby-gtk2-$pkgver" LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango \ --topdir="$pkgdir" --vendor + mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" make } diff --git a/community/scrypt/LICENSE b/community/scrypt/LICENSE new file mode 100644 index 000000000..620fe9e58 --- /dev/null +++ b/community/scrypt/LICENSE @@ -0,0 +1,23 @@ +Copyright 2009 Colin Percival +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. diff --git a/community/scrypt/PKGBUILD b/community/scrypt/PKGBUILD new file mode 100644 index 000000000..ebec0b4f3 --- /dev/null +++ b/community/scrypt/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 82492 2013-01-19 15:11:52Z thestinger $ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Oliver Herold <oliver - at - akephalos - dot - de> + +pkgname=scrypt +pkgver=1.1.6 +pkgrel=3 +pkgdesc="key derivation function and encryption utility" +arch=('i686' 'x86_64') +depends=(openssl) +url="http://www.tarsnap.com/scrypt/" +license=('BSD') +source=(http://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz LICENSE) +md5sums=('a35523cd497f7283635ce881db39c2e2') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} +md5sums=('a35523cd497f7283635ce881db39c2e2' + '46754c4c55dc7c70dbb3480dce6274da') diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 57cd498df..925b45bc2 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 74889 2012-08-08 19:20:31Z giovanni $ +# $Id: PKGBUILD 82340 2013-01-15 15:31:26Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> -# TODO: -# bring in pyalsa, csound, mma +# TODO: bring in pyalsa, csound, mma pkgname=solfege -pkgver=3.20.6 +pkgver=3.20.8 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +21,7 @@ optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'lilypond: for generating print-outs & score sheets' 'texlive-bin: use LaTeX to replace HTML reports with DVI') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('078e3bb06df0355e8ed53ee633ed3abd') +md5sums=('401f421bde27112d7fa01aaccc080a95') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/tcpflow/PKGBUILD b/community/tcpflow/PKGBUILD index a835fdc92..cc18cef85 100644 --- a/community/tcpflow/PKGBUILD +++ b/community/tcpflow/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 75325 2012-08-19 20:50:53Z cbrannon $ +# $Id: PKGBUILD 82467 2013-01-18 15:47:09Z fyan $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Jeff Mickey <jeff@archlinux.org> pkgname=tcpflow -pkgver=1.2.9 +pkgver=1.3.0 pkgrel=1 pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" arch=('i686' 'x86_64' 'mips64el') url="http://afflib.org/software/tcpflow" license=('GPL') depends=('gcc-libs' 'libpcap' 'zlib') -source=("https://github.com/downloads/simsong/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('99e2fbbc6ab8db03a1a9b935689dd407') +source=("https://github.com/simsong/$pkgname/archive/$pkgname-$pkgver.tar.gz") build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgname-$pkgver" + sh bootstrap.sh ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgname-$pkgver" make DESTDIR="$pkgdir" install } + +md5sums=('446be6d852bc7ddd0a8d5149f2bddb60') diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD index 3aa49afc9..c433678b1 100644 --- a/community/tesseract/PKGBUILD +++ b/community/tesseract/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 79036 2012-10-29 09:23:46Z spupykin $ +# $Id: PKGBUILD 82232 2013-01-12 17:31:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Hauser <andy-aur@splashground.de> # chinese requires two files -_langs=(ind swe ron slv srp tgl tur hun fin ita nld jpn vie spa ukr fra slk -kor ell rus por bul lav lit pol dan-frak deu dan ces cat eng chi_tra chi_sim) +_langs=(afr ara aze bel ben bul cat ces chi_sim chi_tra chr dan deu ell +eng enm epo epo_alt equ est eus fin fra frk frm glg grc heb hin hrv hun +ind isl ita ita_old jpn kan kor lav lit mal mkd mlt msa nld nor pol por +ron rus slk slv spa spa_old sqi srp swa swe tam tel tgl tha tur ukr vie) pkgbase=tesseract pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done)) pkgver=3.02.02 -pkgrel=1 +_pkgver=3.02 +pkgrel=2 pkgdesc="An OCR programm" arch=(x86_64 i686 'mips64el') url="http://code.google.com/p/tesseract-ocr" @@ -17,42 +20,74 @@ license=("APACHE") depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica) source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz $(for l in ${_langs[@]}; do - echo http://tesseract-ocr.googlecode.com/files/${l}.traineddata.gz + echo http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${_pkgver}.${l}.tar.gz done)) md5sums=('3d57ee5777fa998632ad0693c13a0e9e' - 'f4ae2e5668f693cc51c6e3c3f57a8f1d' - '3787ff0fc1a07517203466830f6f868e' - '7b50075692e7a07ac8f59e0cde51cfb9' - 'defc498fa09480ef0052fde79f4f84e5' - 'c1e0f0ef07d26a72063802370bbfe2c9' - 'af86cab0da52fff7e83f9c7668617a21' - 'b0f4798bf1f9ee541ae73aff49f08821' - '966fa3ebe24d7dfade951e0a4a9f52b5' - '33812ef03197dce20b8c888409d8541a' - '9a307661a010703cd2bb265a3da5eaff' - '89992f69802b9f4a36fec40efd95c503' - 'cad3dd7c9401fa0676bf195456ba0c14' - 'af75c7a696b18a1d2e4f7e21a222cf95' - 'dd9078211127189995504f034468fcd6' - '56a82ac3994f0552d54fd14ff5ed6817' - 'e6000550883684b5e93b7e0a21016287' - '2e7fbf80215b38f423dcf78e396b92d7' - '909b811739b2e7d51cc3ca109998353a' - '0d3a21c18f752eb058e7b854c37b7a69' - 'c477b7faddc044a4595135d0378be34c' - 'd0b59fcfd80f9e09be890647ae93f00d' - 'a7501f9a48bc7ef2fa50cba8b8f0c7b1' - '1f366f55e5e0725deb751ec847bf42dc' - '1b4460ab998151f1ed8e48928ded58be' - 'c3d6447245663138f1d3aa4567c72192' - 'cfa8a81df6a34940604fafa7353ffc43' - 'be81a761f61800f6d39393a31435fff3' - '7aaeb321dbf069d14d2601dc36d3dddc' - '2e97c952075064834f1cad6a133970fa' - '308099b2b95834916ec410191c86cd48' - 'd91041ad156cf2db36664e91ef799451' - '06fce5f5c0221286eab591819406d91e' - '127e0b742b615d81c3b97a555acd8285') + '16a756bf353896e34386f4509582e487' + 'd7b3708f1f1f2898c258209923063f57' + '143044ff7b643b844c2f0b2a170ceda2' + '3bb6dab515166d641ac62e973c868ac5' + '0b662630eb4b2e0ebf40c38184068fba' + '91fc34ef041aafe32549a7a6232afad0' + '27b77ecc66f8c8d904cd6b87886aca22' + 'ae144b9d230267b5ae62804ad7a09dac' + '718779539d3202ae95ae5ff52a3ad5e8' + '391ed3fcf014bae777b33dc7a771a00d' + 'dd5b4fa247500d7713ab5556af62d9fa' + '2f6a93920b3ce55de24ca762a66a5de1' + '57bdb26ec7c767e126ff97776d8bfb10' + '3760cc3dee6489dcc865b31e7a36bd47' + '3562250fe6f4e76229a329166b8ae853' + 'd9dc4ad9cbcde78e5be59eb226865661' + '5dc0cf01d21ee43ed834ee947e1e810a' + '67815529386679223092ddf301bf57d4' + '94667836c651fc4fd43645efdc34e19a' + 'a067f5975cbe83fea205897187fa256b' + '4c2cee5bf3558f6384e5907aa02ae80c' + '71f8b343ed2010f775ff474faec5874f' + '2bca200b783fdba2f546063c68740c50' + 'dd734ac212a98a02945760891b657e70' + 'e0ca24ca45de83e67057f0e208233ffc' + 'ef7b8e13891e08f29b02011a5dd6b630' + 'f14aac95ab2f4a5f919da82dbc1fcd3c' + '7ae7f3384083c66f06d63b6c0f0a66c3' + '186f17b326a58313344c2ea987ea7785' + '0396a267d894f485b6b534476f3322dc' + 'eb1b3537cd664fec48bebac75fac5992' + '9f672ea7c90eecbbe35ec353ff45c764' + '3f05946a9e57a8ffabb3fccc8a80cfaa' + 'fbdba86f34b907f5a709051c01b53f71' + '989ca558eb05fcf6873dfdd8c692291d' + 'e1be2b08e667c3bb0ab0f18c9456bf2f' + '510016e85d7ea8e1f4ebf98741138909' + 'fc9125f6652fb661575d6e15c94f88f6' + '2095b56c9c6b0dba9b837fd226ed6d29' + '801021a1ad6e4aa3ef697f065ff6c798' + '1f5e8f022d3c2697075bdfc03935f128' + 'b8930c64befcaadbb47951cad4a2f075' + '90a41ac86375b230980b643b35b88011' + 'cb42ec9504eecdc4f974dbca4387ac34' + '6db5753b3b03296544bbb2c0f59a7178' + '6d979585abb07c13dda003820129461c' + '90b3f1f4113a9dccd0287e6b5b7512d6' + 'ad490a8091ee329190266f3fd057c511' + '9f498e01855a57473af8f083c125455a' + 'e8c785df8aaa49e61f3a95aa24066122' + '991e4771e16abd6a66caeaeeb2a4d4d2' + 'c7bea975ba663d13e03c29d6cf33b5a8' + 'fe1385ed203ecd9e0999a44b135069ec' + '7838da948e404bb760bef83a5c3d64dd' + '372e38617fcc7e25c77996c5499ae063' + 'd8350668fa790b5d4007348a55840bdf' + '6c68107a71f82fa42c858e4d6dc70aca' + '46d3a5d7159236edb33272dd8b1090f6' + 'c68b0fdcdf34dd431c25f323673ef1d6' + '349d203ef88864eab8d1201672ca84be' + 'd458f0719b99e4dcfd4fa2a06e5150a3' + '3dc5a5028e75da12eaba62669a80acc4' + 'a8934e0e6496997112cbef2961adef5e' + '0aa61f18463bb89234a6d06fcbf0c644' + '78a74432848b4c53cc2ccf2eb339c0b6') build() { cd $srcdir/$pkgname-$pkgver @@ -80,7 +115,7 @@ package_tesseract-data-${l}(){ groups=('tesseract-data') mkdir -p \$pkgdir/usr/share/tessdata - cp \$srcdir/${l}.traineddata \$pkgdir/usr/share/tessdata/ + cp \$srcdir/tesseract-ocr/tessdata/${l}.* \$pkgdir/usr/share/tessdata/ find \$pkgdir/usr/share/tessdata -type f -exec chmod 0644 {} \; } " diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD new file mode 100644 index 000000000..df57c5d07 --- /dev/null +++ b/community/the_silver_searcher/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 82290 2013-01-14 11:59:53Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jeff Horelick <jdhore1@gmail.com> +# Contributor: skydrome <skydrome@i2pmail.org> + +pkgname=the_silver_searcher +pkgver=0.13.1 +pkgrel=1 +pkgdesc='Code searching tool similar to Ack, but faster' +url='http://github.com/ggreer/the_silver_searcher' +license=('Apache') +depends=('pcre') +arch=('x86_64' 'i686') +source=("https://github.com/downloads/ggreer/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('140ded2207259f670e4b866a68cc2577495b63844c7dae101f89078c6b37b6fc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's:configure:configure --prefix=/usr:' build.sh + ./build.sh +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 148370ccb..100243ad7 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 77666 2012-10-13 11:45:54Z allan $ +# $Id: PKGBUILD 82377 2013-01-16 10:35:35Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 -pkgver=2.3.9 -pkgrel=3 +pkgver=3.1.0 +pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc') -source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz" - "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7185090a089c9c0e0eca7535a8f25dca') +depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt') +makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa') +source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('7f061f3e5a2a6a83c146508ccefabd86') build() { cd ${pkgname}-${pkgver} diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index eb99ea59c..68aa6f7ed 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79508 2012-11-06 11:41:31Z spupykin $ +# $Id: PKGBUILD 82338 2013-01-15 11:35:10Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=13 +pkgrel=14 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -32,13 +32,11 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'xorg-xinit: autostart xbmc') install="${pkgname}.install" source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" - "xbmc.service") -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') + "xbmc.service" + "cdio.patch") +md5sums=('9e8a26ee25173c7268abea7f1d82d428' + '76fae229ebc3bcfaab7e7f27e4fb51f5' + '49c0a7cbfca3666a24e8824950bd371b') build() { cd "${srcdir}/xbmc-$pkgver" @@ -46,6 +44,12 @@ build() { # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \ + lib/libid3tag/libid3tag/configure.ac \ + lib/libdvd/libdvdcss/configure.ac + + patch -p1 <$srcdir/cdio.patch + # Bootstrapping XBMC ./bootstrap diff --git a/community/xbmc/cdio.patch b/community/xbmc/cdio.patch new file mode 100644 index 000000000..0f74deaa4 --- /dev/null +++ b/community/xbmc/cdio.patch @@ -0,0 +1,39 @@ +diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp +--- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2012-03-22 02:07:50.000000000 +0400 ++++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2013-01-09 14:40:10.670040454 +0400 +@@ -27,6 +27,10 @@ + #include "storage/MediaManager.h" + #include "utils/log.h" + ++#define CDTEXT_TITLE CDTEXT_FIELD_TITLE ++#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER ++#define CDTEXT_GENRE CDTEXT_FIELD_GENRE ++ + using namespace MUSIC_INFO; + + #ifdef HAS_DVD_DRIVE +diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp +--- xbmc-11.0/xbmc/storage/cdioSupport.cpp 2012-03-22 02:07:50.000000000 +0400 ++++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp 2013-01-09 14:51:40.276801092 +0400 +@@ -648,15 +648,18 @@ + CSingleLock lock(*m_cdio); + + // Get the CD-Text , if any +- cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum); ++ cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio); + + if (pcdtext == NULL) + return ; + + // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe. + for (int i = 0; i < MAX_CDTEXT_FIELDS; i++) +- if (pcdtext->field[i]) +- xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i]; ++ { ++ char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum); ++ if (data != NULL) ++ xcdt[(cdtext_field_t)i] = data; ++ } + } + + CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName) diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service index 23756cf03..431582f1b 100644 --- a/community/xbmc/xbmc.service +++ b/community/xbmc/xbmc.service @@ -6,7 +6,7 @@ After = remote-fs.target User = xbmc Group = xbmc Type = simple -ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 +ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp Restart = always [Install] diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD index 41c4ff9eb..d1b0cf9fd 100644 --- a/community/xmms-imms/PKGBUILD +++ b/community/xmms-imms/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 64367 2012-02-11 23:25:01Z allan $ +# $Id: PKGBUILD 82400 2013-01-16 15:53:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kritoke <kritoke@nospam.gmail.com> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=xmms-imms -pkgver=3.1.0_rc8 -pkgrel=3 +pkgver=3.1.0_rc10 +pkgrel=1 pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste." arch=(i686 x86_64 'mips64el') license=("GPL") url="http://imms.luminal.org/" -depends=('xmms' 'pcre' 'sqlite3' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw') +depends=('xmms' 'pcre' 'sqlite' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw') replaces=('imms') source=(http://imms.googlecode.com/files/imms-${pkgver/_/-}.tar.bz2) -md5sums=('31b77cbc2dba334b039c5618bbbf203e') +md5sums=('61302249e9638779b3241987ab62676d') build() { cd $srcdir/imms-${pkgver/_/-} @@ -22,11 +22,11 @@ build() { autoheader aclocal autoconf - ./configure --prefix=/usr --disable-immsremote + CXXFLAGS="$CXXFLAGS -DDEBUG=0" ./configure --prefix=/usr --disable-immsremote fi - make || return 1 + make mkdir -p $pkgdir/usr/bin make prefix=$pkgdir/usr DESTDIR=$startdir/pkg/usr/lib/xmms/General \ - BMPDESTDIR=$pkgdir/usr/lib/bmp/General install || return 1 + BMPDESTDIR=$pkgdir/usr/lib/bmp/General install } diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD index d8be5e354..0ca15e5a0 100755 --- a/community/xnoise/PKGBUILD +++ b/community/xnoise/PKGBUILD @@ -1,15 +1,19 @@ -# $Id$ +# $Id: PKGBUILD 82522 2013-01-20 02:39:18Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: archtux <antonio dot arias99999 at gmail dot com> pkgname=xnoise pkgver=0.2.14 -pkgrel=5 +pkgrel=6 pkgdesc="Media player with a slick GUI, great speed and lots of features." arch=('i686' 'x86_64' 'mips64el') url="http://www.xnoise-media-player.com/" license=('GPL2') depends=('desktop-file-utils' 'gnome-icon-theme' 'gstreamer0.10-base-plugins' 'gtk3' 'libsoup' 'sqlite' 'taglib') +optdepends=('gstreamer0.10-good-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs') makedepends=('gettext' 'intltool') options=('!libtool') install=$pkgname.install diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index f88fe5655..402d60541 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80743 2012-12-01 19:51:02Z arodseth $ +# $Id: PKGBUILD 82428 2013-01-17 13:32:57Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Patrick Smits <mail@patricksmits.net> pkgname=yaws pkgver=1.95 -pkgrel=3 +pkgrel=4 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework' arch=('x86_64' 'i686' 'mips64el') url='http://yaws.hyber.org/' @@ -14,18 +14,19 @@ depends=('pam' 'erlang') backup=('etc/yaws/yaws.conf') options=('!emptydirs') install=$pkgname.install +optdepends=('erlang-nox: erlang without X') source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" "$pkgname.service") sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406' - 'cce672e0bc73f536186bdbb8ac139d8000db4bd67f5fdeff84fdc4b4f8bd84f9') + '3f8347add6e3741e77f7bb9ba6b31feb1c878e2e58ecf19063891e801fa24698') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - for file in www/cgi.yaws www/cgi-bin/foo.py; do - # python2 fix - sed -i '0,/on/s//on2/' "$file" + # python2 fix + for file in cgi.yaws cgi-bin/foo.py; do + sed -i '0,/on/s//on2/' "www/$file" done make } diff --git a/community/yaws/yaws.service b/community/yaws/yaws.service index 48f9bb8ef..7e2ced32d 100644 --- a/community/yaws/yaws.service +++ b/community/yaws/yaws.service @@ -4,6 +4,7 @@ After=syslog.target network.target [Service] Type=forking +GuessMainPID=no ExecStart=/usr/bin/yaws --daemon --heart ExecReload=/usr/bin/yaws --hup ExecStop=/usr/bin/yaws --stop |