diff options
Diffstat (limited to 'extra')
136 files changed, 1030 insertions, 579 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 09c6fa9ae..aa6b6658b 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143076 2011-11-22 12:47:07Z giovanni $ +# $Id: PKGBUILD 144467 2011-12-06 11:17:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10683 +pkgver=10688 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('c9adbecbbec7831fc42b177c8b548e05') +md5sums=('0bb387c6aafa146e75130e1537a64066') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 6d8566651..32740d692 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142549 2011-11-11 23:52:56Z bisson $ +# $Id: PKGBUILD 144890 2011-12-09 03:35:28Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.1 -pkgrel=2 +pkgver=3.1.1 +pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' url='http://audacious-media-player.org/' license=('GPL3') @@ -13,8 +13,8 @@ arch=('i686' 'x86_64' 'mips64el') depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('p7zip-libre: zipped skins support') -source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('53d89b3e2faf5ca13dca55875dc04efc753328f2') +source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('fa5629d68ac1b12d563e8c0b4be083dea7c7924c') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD index 98005f9d9..45f2d5cef 100644 --- a/extra/babl/PKGBUILD +++ b/extra/babl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108536 2011-02-01 06:59:18Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 144898 2011-12-09 11:56:58Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=babl -pkgver=0.1.4 +pkgver=0.1.6 pkgrel=1 pkgdesc="Dynamic, any to any, pixel format conversion library" arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +11,19 @@ license=('LGPL3') depends=('glibc') options=('!libtool' '!makeflags') source=(ftp://ftp.gimp.org/pub/babl/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1deaf8188b200b10d98a343a7e712b2b') -sha1sums=('9f7186e5d968a4c9d81a63b20836b163f56df616') +sha1sums=('3178ec9f988efe895d00e2d432ad9b6ec10211e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index ce74ff1bb..2153ff5ad 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144362 2011-12-05 08:15:00Z bisson $ +# $Id: PKGBUILD 144487 2011-12-06 22:43:42Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -8,13 +8,16 @@ pkgname=bitlbee pkgver=3.0.4 -pkgrel=1 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' -arch=('i686' 'x86_64' 'mips64el') url='http://www.bitlbee.org/' license=('GPL') -depends=('openssl' 'glib2' 'libotr') -optdepends=('xinetd: to run bitlbee through xinetd') +arch=('i686' 'x86_64' 'mips64el') +depends=('openssl' 'glib2') +makedepends=('asciidoc' 'libotr') +optdepends=('skype4py: to use skyped' + 'libotr: for OTR encryption support' + 'xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' 'rc.d') @@ -28,15 +31,15 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --etcdir=/etc/bitlbee \ --pidfile=/var/run/bitlbee/bitlbee.pid \ --ipcsocket=/var/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/lib/systemd/system \ --ssl=openssl \ --strip=0 \ - --otr=1 \ - --ssl=gnutls + --otr=plugin make } diff --git a/extra/bitlbee/install b/extra/bitlbee/install index 7b43c7885..b0dd5511d 100644 --- a/extra/bitlbee/install +++ b/extra/bitlbee/install @@ -10,4 +10,5 @@ post_upgrade() { post_remove() { getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null + true } diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index e298d0cb4..20396ee35 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136387 2011-08-28 17:30:31Z andyrtr $ +# $Id: PKGBUILD 144878 2011-12-08 21:06:16Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.10 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -19,12 +19,17 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('fcf58dcff52f0908ff3bc368d820408b') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + gnutls_buildfix.patch) +md5sums=('fcf58dcff52f0908ff3bc368d820408b' + '372bf7a9da58ae49d9da50f79db69fb6') build() { cd ${srcdir}/${pkgname}-${pkgver} + # fix build with latest gnutls + patch -Np1 -i ${srcdir}/gnutls_buildfix.patch + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py ./configure --prefix=/usr --disable-static \ diff --git a/extra/claws-mail/gnutls_buildfix.patch b/extra/claws-mail/gnutls_buildfix.patch new file mode 100644 index 000000000..31de8eb8b --- /dev/null +++ b/extra/claws-mail/gnutls_buildfix.patch @@ -0,0 +1,12 @@ +--- claws-mail-3.7.10/src/common/ssl.c 2011-12-07 14:55:08.682553870 +0100 ++++ claws-mail-3.7.10/src/common/ssl.c 2011-12-07 14:55:43.808349602 +0100 +@@ -270,7 +270,9 @@ gboolean ssl_init_socket_with_method(Soc + if (session == NULL || r != 0) + return FALSE; + ++#if GNUTLS_VERSION_NUMBER < 0x020c00 + gnutls_transport_set_lowat (session, 1); ++#endif + gnutls_set_default_priority(session); + gnutls_protocol_set_priority (session, proto_prio); + gnutls_cipher_set_priority (session, cipher_prio); diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index bdd3b1e7a..57e789067 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 144384 2011-12-05 13:01:04Z ibiru $ +# $Id: PKGBUILD 144475 2011-12-06 14:25:28Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord pkgver=0.1.15 -pkgrel=2 +pkgrel=3 pkgdesc="Color daemon" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'sqlite3' 'udev') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -optdepends=('shared-color-profiles: color profiles') -source=($url/releases/$pkgname-$pkgver.tar.xz) +source=($url/releases/$pkgname-$pkgver.tar.xz + scan_only_color_profile_dir.patch) options=('!libtool') -sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8') +sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8' + 'b4b8ea1008ecfdc1084ec69d647127587a2a87f7') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/scan_only_color_profile_dir.patch" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static diff --git a/extra/colord/scan_only_color_profile_dir.patch b/extra/colord/scan_only_color_profile_dir.patch new file mode 100644 index 000000000..0591fc420 --- /dev/null +++ b/extra/colord/scan_only_color_profile_dir.patch @@ -0,0 +1,35 @@ +From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Tue, 6 Dec 2011 09:49:49 +0000 +Subject: [PATCH] If /usr/share/color appears at runtime, don't rescan the + parent dir + +Resolves https://bugs.freedesktop.org/show_bug.cgi?id=43542 +--- + src/cd-profile-store.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/cd-profile-store.c b/src/cd-profile-store.c +index ecad474..c662351 100644 +--- a/src/cd-profile-store.c ++++ b/src/cd-profile-store.c +@@ -260,8 +260,14 @@ cd_profile_store_file_monitor_changed_cb (GFileMonitor *monitor, + /* just rescan the correct directory */ + parent = g_file_get_parent (file); + parent_path = g_file_get_path (parent); +- g_debug ("CdProfileStore: %s was added, rescanning %s", path, parent_path); +- cd_profile_store_search_path (profile_store, parent_path); ++ if (g_strcmp0 (parent_path, DATADIR) == 0) { ++ g_debug ("CdProfileStore: %s was added, rescanning", path); ++ cd_profile_store_search_path (profile_store, path); ++ } else { ++ g_debug ("CdProfileStore: %s was added, rescanning parent %s", ++ path, parent_path); ++ cd_profile_store_search_path (profile_store, parent_path); ++ } + out: + if (parent != NULL) + g_object_unref (parent); +-- +1.7.6 + diff --git a/extra/convertlit/PKGBUILD b/extra/convertlit/PKGBUILD new file mode 100644 index 000000000..4c7477666 --- /dev/null +++ b/extra/convertlit/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 144473 2011-12-06 12:35:16Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: gDD (usrgdd | gmail) +# Contributor: cantabile + +pkgname=convertlit +pkgver=1.8 +pkgrel=6 +pkgdesc="An extractor/converter for .LIT eBooks" +arch=('i686' 'x86_64') +url="http://www.convertlit.com/" +license=('GPL') +depends=('glibc') +makedepends=('libtommath') +source=("http://www.convertlit.com/clit18src.zip") +md5sums=('d691d4729485fe5d73e3f0937d8fb42e') + +build() { + cd ${srcdir}/lib + make + + cd ../clit18 + sed -i 's|../libtommath-0.30/|/usr/lib/|' Makefile + make +} + +package() { + cd ${srcdir}/clit18 + + install -Dm755 clit "$pkgdir/usr/bin/clit" +} diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 2b4a1156e..4d7971276 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.23 -pkgrel=8 +pkgrel=8.1 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 538f77327..39c34fed7 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dconf pkgver=0.10.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="A low-level configuration system." arch=(i686 x86_64 'mips64el') url="http://live.gnome.org/dconf" diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 38c885149..00d2269e5 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136084 2011-08-22 14:13:59Z dan $ +# $Id: PKGBUILD 144489 2011-12-06 22:57:33Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.7.5.1 +pkgver=1.7.6 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('f5355c442c5bc2481dbef7fdea8f0556') -sha1sums=('15671defd1eefe255aa564b6f3097e30ab07ff55') +md5sums=('79f67eea3d43a5c9964194786d786f37') +sha1sums=('6c63ece66875c9312b76bfe11d688e1b1ae2e3bb') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 26eba0f2a..7125acf0d 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -21,14 +21,14 @@ fi source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) md5sums=('8ec30d05efe0f6cc6f702933e6781e8e' - '081d03278559a351322157a441fabcf5') + '99d412cb539f328dbc37d5ead3407fc7') build() { cd "$srcdir/$pkgname" -# [ "$CARCH" = "mips64el" ] && patch -Np1 -i $srcdir/ffmpeg-loongson.patch - if [ "$CARCH" = "mips64el" ] ; then +# Make video decoding faster and turn all pixels green. +# patch -Np1 -i $srcdir/ffmpeg-loongson.patch extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi" else extraconf="" diff --git a/extra/ffmpeg/ffmpeg-loongson.patch b/extra/ffmpeg/ffmpeg-loongson.patch index 501eafd15..d576812da 100644 --- a/extra/ffmpeg/ffmpeg-loongson.patch +++ b/extra/ffmpeg/ffmpeg-loongson.patch @@ -1,8 +1,7 @@ -diff --git a/configure b/configure -index 25e8cef..1d6c652 100755 ---- a/configure -+++ b/configure -@@ -230,6 +230,7 @@ Advanced options (experts only): +diff -Nru ffmpeg.orig/configure ffmpeg/configure +--- ffmpeg.orig/configure 2011-12-09 21:40:32.268783206 +0100 ++++ ffmpeg/configure 2011-12-09 21:40:50.408820175 +0100 +@@ -249,6 +249,7 @@ --disable-armvfp disable ARM VFP optimizations --disable-iwmmxt disable iwmmxt optimizations --disable-mmi disable MMI optimizations @@ -10,15 +9,15 @@ index 25e8cef..1d6c652 100755 --disable-neon disable neon optimizations --disable-vis disable VIS optimizations --disable-yasm disable use of yasm assembler -@@ -995,6 +996,7 @@ ARCH_EXT_LIST=' - armvfp +@@ -1110,6 +1111,7 @@ + avx iwmmxt mmi + loongson2mmi mmx mmx2 neon -@@ -2862,6 +2864,7 @@ if enabled arm; then +@@ -3367,6 +3369,7 @@ fi if enabled mips; then echo "MMI enabled ${mmi-no}" @@ -26,11 +25,10 @@ index 25e8cef..1d6c652 100755 fi if enabled ppc; then echo "AltiVec enabled ${altivec-no}" -diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -index add4b10..8244e51 100644 ---- a/libavcodec/avcodec.h -+++ b/libavcodec/avcodec.h -@@ -1586,6 +1586,8 @@ typedef struct AVCodecContext { +diff -Nru ffmpeg.orig/libavcodec/avcodec.h ffmpeg/libavcodec/avcodec.h +--- ffmpeg.orig/libavcodec/avcodec.h 2011-12-09 21:40:31.980782616 +0100 ++++ ffmpeg/libavcodec/avcodec.h 2011-12-09 21:40:50.504820368 +0100 +@@ -1824,6 +1824,8 @@ #define FF_IDCT_SIMPLENEON 22 #define FF_IDCT_SIMPLEALPHA 23 #define FF_IDCT_BINK 24 @@ -39,11 +37,10 @@ index add4b10..8244e51 100644 /** * slice count -diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c -index bbfdb6a..dfc3452 100644 ---- a/libavcodec/dsputil.c -+++ b/libavcodec/dsputil.c -@@ -4525,6 +4525,7 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) +diff -Nru ffmpeg.orig/libavcodec/dsputil.c ffmpeg/libavcodec/dsputil.c +--- ffmpeg.orig/libavcodec/dsputil.c 2011-12-09 21:40:31.912782478 +0100 ++++ ffmpeg/libavcodec/dsputil.c 2011-12-09 21:40:50.568820499 +0100 +@@ -3193,6 +3193,7 @@ if (HAVE_MMI) dsputil_init_mmi (c, avctx); if (ARCH_SH4) dsputil_init_sh4 (c, avctx); if (ARCH_BFIN) dsputil_init_bfin (c, avctx); @@ -51,23 +48,20 @@ index bbfdb6a..dfc3452 100644 for(i=0; i<64; i++){ if(!c->put_2tap_qpel_pixels_tab[0][i]) -diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h -index d1816e6..1a72ae9 100644 ---- a/libavcodec/dsputil.h -+++ b/libavcodec/dsputil.h -@@ -636,6 +636,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx); +diff -Nru ffmpeg.orig/libavcodec/dsputil.h ffmpeg/libavcodec/dsputil.h +--- ffmpeg.orig/libavcodec/dsputil.h 2011-12-09 21:40:31.720782087 +0100 ++++ ffmpeg/libavcodec/dsputil.h 2011-12-09 21:40:50.628820621 +0100 +@@ -650,6 +650,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_loongson2(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); - void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx); -diff --git a/libavcodec/loongson2/dsputil_loongson2.c b/libavcodec/loongson2/dsputil_loongson2.c -new file mode 100644 -index 0000000..01bd3ac ---- /dev/null -+++ b/libavcodec/loongson2/dsputil_loongson2.c + void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); +diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.c ffmpeg/libavcodec/loongson2/dsputil_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.c 2011-12-09 21:40:50.668820701 +0100 @@ -0,0 +1,221 @@ +/* + * Copyright(C) 2006-2010 comcat <jiankemeng@gmail.com> @@ -290,11 +284,9 @@ index 0000000..01bd3ac +#endif + +} -diff --git a/libavcodec/loongson2/dsputil_loongson2.d b/libavcodec/loongson2/dsputil_loongson2.d -new file mode 100644 -index 0000000..808f0a3 ---- /dev/null -+++ b/libavcodec/loongson2/dsputil_loongson2.d +diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.d ffmpeg/libavcodec/loongson2/dsputil_loongson2.d +--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.d 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.d 2011-12-09 21:40:50.680820726 +0100 @@ -0,0 +1,18 @@ +libavcodec/loongson2/dsputil_loongson2.o: \ + libavcodec/loongson2/dsputil_loongson2.c \ @@ -314,24 +306,16 @@ index 0000000..808f0a3 + libavcodec/loongson2/../eval.h libavcodec/loongson2/../parser.h \ + libavcodec/loongson2/../avcodec.h libavcodec/loongson2/../mpeg12data.h \ + libavutil/rational.h libavcodec/loongson2/../rl.h -diff --git a/libavcodec/loongson2/dsputil_loongson2.h b/libavcodec/loongson2/dsputil_loongson2.h -new file mode 100644 -index 0000000..87c7bd9 ---- /dev/null -+++ b/libavcodec/loongson2/dsputil_loongson2.h +diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.h ffmpeg/libavcodec/loongson2/dsputil_loongson2.h +--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.h 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.h 2011-12-09 21:40:50.692820753 +0100 @@ -0,0 +1,3 @@ +#include "libavcodec/dsputil.h" + +void dsputil_init_pix_loongson2(DSPContext* c, AVCodecContext *avctx); -diff --git a/libavcodec/loongson2/dsputil_loongson2.o b/libavcodec/loongson2/dsputil_loongson2.o -new file mode 100644 -index 0000000..fca0b55 -Binary files /dev/null and b/libavcodec/loongson2/dsputil_loongson2.o differ -diff --git a/libavcodec/loongson2/idct_loongson2.c b/libavcodec/loongson2/idct_loongson2.c -new file mode 100644 -index 0000000..539cab5 ---- /dev/null -+++ b/libavcodec/loongson2/idct_loongson2.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/idct_loongson2.c ffmpeg/libavcodec/loongson2/idct_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/idct_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/idct_loongson2.c 2011-12-09 21:40:50.744820857 +0100 @@ -0,0 +1,336 @@ +/* + * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org> @@ -669,11 +653,9 @@ index 0000000..539cab5 + +declare_idct (ff_loongson2_idct, loongson2_table, + loongson2_row_head, loongson2_row, loongson2_row_tail, loongson2_row_mid) -diff --git a/libavcodec/loongson2/idct_loongson2_xvid.c b/libavcodec/loongson2/idct_loongson2_xvid.c -new file mode 100644 -index 0000000..4a1ee1e ---- /dev/null -+++ b/libavcodec/loongson2/idct_loongson2_xvid.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/idct_loongson2_xvid.c ffmpeg/libavcodec/loongson2/idct_loongson2_xvid.c +--- ffmpeg.orig/libavcodec/loongson2/idct_loongson2_xvid.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/idct_loongson2_xvid.c 2011-12-09 22:38:11.227175456 +0100 @@ -0,0 +1,301 @@ +/* + * XVID MPEG-4 VIDEO CODEC @@ -713,13 +695,13 @@ index 0000000..4a1ee1e +// Various memory constants (trigonometric values or rounding values) +//----------------------------------------------------------------------------- + -+static const int16_t tg_1_16[4*4] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int16_t, tg_1_16)[4*4] = { + 13036,13036,13036,13036, // tg * (2<<16) + 0.5 + 27146,27146,27146,27146, // tg * (2<<16) + 0.5 + -21746,-21746,-21746,-21746, // tg * (2<<16) + 0.5 + 23170,23170,23170,23170}; // cos * (2<<15) + 0.5 + -+static const int32_t rounder_0[2*8] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int32_t, rounder_0)[2*8] = { + 65536,65536, + 3597,3597, + 2260,2260, @@ -731,7 +713,7 @@ index 0000000..4a1ee1e + + +// Table for rows 0,4 - constants are multiplied by cos_4_16 -+static const int16_t tab_i_04_mmx[32*4] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int16_t, tab_i_04_mmx)[32*4] = { + 16384,16384,16384,-16384, // movq-> w06 w04 w02 w00 + 21407,8867,8867,-21407, // w07 w05 w03 w01 + 16384,-16384,16384,16384, // w14 w12 w10 w08 @@ -771,7 +753,7 @@ index 0000000..4a1ee1e + + +// %3 for rows 0,4 - constants are multiplied by cos_4_16 -+static const int16_t tab_i_04_xmm[32*4] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int16_t, tab_i_04_xmm)[32*4] = { + 16384,21407,16384,8867, // movq-> w05 w04 w01 w00 + 16384,8867,-16384,-21407, // w07 w06 w03 w02 + 16384,-8867,16384,-21407, // w13 w12 w09 w08 @@ -865,7 +847,7 @@ index 0000000..4a1ee1e + "packsswh $f14, $f14, $f8 \n\t"/* 4 ; y6 y7 y4 y5*/\ + "sdc1 $f6, " #A2 " \n\t"/* 3 ; save y3 y2 y1 y0*/\ + "pshufh $f14, $f14, $f20 \n\t"/* y7 y6 y5 y4*/\ -+ "sdc1 $f14, 8 +" #A2 " \n\t"/* 7 ; save y7 y6 y5 y4*/\ ++ "sdc1 $f14, 8 +" #A2 " \n\t"/* 7 ; save y7 y6 y5 y4*/ + + +#define DCT_8_INV_COL(A1,A2)\ @@ -976,12 +958,9 @@ index 0000000..4a1ee1e + : "r"(block), "r"(rounder_0), "r"(tab_i_04_xmm), "r"(tg_1_16) + :"$f0","$f2","$f4","$f6","$f8","$f10","$f12","$f14","$f18","$f16","$20","$22","$24","$26"); +} -+ -diff --git a/libavcodec/loongson2/motion_est_loongson2.c b/libavcodec/loongson2/motion_est_loongson2.c -new file mode 100644 -index 0000000..bb67290 ---- /dev/null -+++ b/libavcodec/loongson2/motion_est_loongson2.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/motion_est_loongson2.c ffmpeg/libavcodec/loongson2/motion_est_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/motion_est_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/motion_est_loongson2.c 2011-12-09 23:25:15.247445391 +0100 @@ -0,0 +1,365 @@ +/* + * Loongson2E MMI optimized motion estimation @@ -994,13 +973,13 @@ index 0000000..bb67290 +#include "dsputil_loongson2.h" +#include "../avcodec.h" + -+static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={ ++DECLARE_ASM_CONST(8, uint64_t, round_tab)[3]={ + 0x0000000000000000ULL, + 0x0001000100010001ULL, + 0x0002000200020002ULL, +}; + -+static attribute_used __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; ++DECLARE_ASM_CONST(8, uint64_t, bone)= 0x0101010101010101LL; + +static inline void sad8_1_loongson2(uint8_t *blk1, uint8_t *blk2, int stride, int h) +{ @@ -1348,11 +1327,9 @@ index 0000000..bb67290 + c->sad[0]= sad16_loongson2; + c->sad[1]= sad8_loongson2; +} -diff --git a/libavcodec/loongson2/mpegvideo_loongson2.c b/libavcodec/loongson2/mpegvideo_loongson2.c -new file mode 100644 -index 0000000..18d070a ---- /dev/null -+++ b/libavcodec/loongson2/mpegvideo_loongson2.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/mpegvideo_loongson2.c ffmpeg/libavcodec/loongson2/mpegvideo_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/mpegvideo_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/mpegvideo_loongson2.c 2011-12-09 21:40:50.828821027 +0100 @@ -0,0 +1,385 @@ +/* + * The simplest mpeg encoder (well, it was the simplest!) @@ -1739,10 +1716,9 @@ index 0000000..18d070a +// draw_edges = draw_edges_loongson2; + +} -diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile -index 3f4da68..73e4d56 100644 ---- a/libavcodec/mips/Makefile -+++ b/libavcodec/mips/Makefile +diff -Nru ffmpeg.orig/libavcodec/mips/Makefile ffmpeg/libavcodec/mips/Makefile +--- ffmpeg.orig/libavcodec/mips/Makefile 2011-12-09 21:40:31.700782047 +0100 ++++ ffmpeg/libavcodec/mips/Makefile 2011-12-09 21:40:50.836821045 +0100 @@ -1,3 +1,9 @@ OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ ps2/idct_mmi.o \ @@ -1753,11 +1729,10 @@ index 3f4da68..73e4d56 100644 + loongson2/idct_loongson2_xvid.o \ + loongson2/mpegvideo_loongson2.o \ + loongson2/motion_est_loongson2.o -diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c -index b47ff9a..af92552 100644 ---- a/libavcodec/mpegvideo.c -+++ b/libavcodec/mpegvideo.c -@@ -176,6 +176,9 @@ av_cold int ff_dct_common_init(MpegEncContext *s) +diff -Nru ffmpeg.orig/libavcodec/mpegvideo.c ffmpeg/libavcodec/mpegvideo.c +--- ffmpeg.orig/libavcodec/mpegvideo.c 2011-12-09 21:40:31.644781931 +0100 ++++ ffmpeg/libavcodec/mpegvideo.c 2011-12-09 21:40:50.868821109 +0100 +@@ -182,6 +182,9 @@ #elif ARCH_BFIN MPV_common_init_bfin(s); #endif @@ -1767,11 +1742,10 @@ index b47ff9a..af92552 100644 /* load & permutate scantables note: only wmv uses different ones -diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h -index 5302be9..8d09906 100644 ---- a/libavcodec/mpegvideo.h -+++ b/libavcodec/mpegvideo.h -@@ -689,6 +689,7 @@ int MPV_encode_picture(AVCodecContext *avctx, unsigned char *buf, int buf_size, +diff -Nru ffmpeg.orig/libavcodec/mpegvideo.h ffmpeg/libavcodec/mpegvideo.h +--- ffmpeg.orig/libavcodec/mpegvideo.h 2011-12-09 21:40:31.728782103 +0100 ++++ ffmpeg/libavcodec/mpegvideo.h 2011-12-09 21:40:50.892821159 +0100 +@@ -704,6 +704,7 @@ void MPV_common_init_mmx(MpegEncContext *s); void MPV_common_init_axp(MpegEncContext *s); void MPV_common_init_mlib(MpegEncContext *s); @@ -1779,16 +1753,15 @@ index 5302be9..8d09906 100644 void MPV_common_init_mmi(MpegEncContext *s); void MPV_common_init_arm(MpegEncContext *s); void MPV_common_init_altivec(MpegEncContext *s); -diff --git a/libavcodec/options.c b/libavcodec/options.c -index 7ca1062..c05b3f4 100644 ---- a/libavcodec/options.c.orig 2011-06-22 12:52:11.584428161 -0300 -+++ b/libavcodec/options.c 2011-06-22 12:52:25.003143367 -0300 -@@ -219,6 +219,8 @@ static const AVOption options[]={ - {"simple", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"simplemmx", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"libmpeg2mmx", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, -+{"libmpeg2loongson2", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_LIBMPEG2LOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, -+{"xvidloongson2", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_XVIDLOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"ps2", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_PS2 }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"mlib", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_MLIB }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"arm", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, +diff -Nru ffmpeg.orig/libavcodec/options.c ffmpeg/libavcodec/options.c +--- ffmpeg.orig/libavcodec/options.c 2011-12-09 21:40:31.820782292 +0100 ++++ ffmpeg/libavcodec/options.c 2011-12-09 21:45:31.645390878 +0100 +@@ -251,6 +251,8 @@ + {"simple", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, ++{"libmpeg2loongson2", NULL, 0, AV_OPT_TYPE_CONST, FF_IDCT_LIBMPEG2LOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, ++{"xvidloongson2", NULL, 0, AV_OPT_TYPE_CONST, FF_IDCT_XVIDLOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"ps2", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_PS2 }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"mlib", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_MLIB }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"arm", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 121bfc29e..98c08a84e 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143496 2011-11-25 03:20:54Z bisson $ +# $Id: PKGBUILD 144921 2011-12-10 11:25:45Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.1.0 +pkgver=2.5.2 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('9ab09afece8d94faacdcadb150f87c0337108857' +sha1sums=('2d4eddf52fd7a7d6c936afb3c42b12dfc86aed01' '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 1b80a60be..14c922a82 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142878 2011-11-17 18:34:36Z ibiru $ +# $Id: PKGBUILD 144900 2011-12-09 12:16:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.3 +pkgver=3.2.5 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751') +sha256sums=('0cec1916b4ba878531d32163767a8d39b72eea8d6893103238c82d3a27127c81') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 808942a8a..93a8cbd50 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $ +# $Id: PKGBUILD 144902 2011-12-09 12:21:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl -pkgver=0.1.6 -pkgrel=2 +pkgver=0.1.8 +pkgrel=1 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" @@ -15,19 +15,21 @@ optdepends=('openexr: for using the openexr plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \ - 0.1.6-ffmpeg.patch) -sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d' - 'd62d4987f1c0fc256f5968271fc65cce0cc4c195') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make } +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gettext-mono/PKGBUILD b/extra/gettext-mono/PKGBUILD index bb9490811..5741a1640 100644 --- a/extra/gettext-mono/PKGBUILD +++ b/extra/gettext-mono/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 69576 2010-02-21 06:28:43Z allan $ +# $Id: PKGBUILD 144881 2011-12-08 21:14:16Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gettext-mono -pkgver=0.17 -pkgrel=4 +pkgver=0.18.1.1 +pkgrel=1 pkgdesc="mono assemblies for GNU internationalization library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gettext" -license=('GPL3') -depends=('mono>=1.9') +license=('GPL') +depends=('mono>=2.10.6') source=(ftp://ftp.gnu.org/pub/gnu/gettext/gettext-$pkgver.tar.gz) -md5sums=('58a2bc6d39c0ba57823034d55d65d606') +md5sums=('3dd55b952826d2b32f51308f2f91aa89') build() { # get rid of that .wapi errors; thanks to brice diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD index 739f42ca3..5e1fee3fd 100644 --- a/extra/gobject-introspection/PKGBUILD +++ b/extra/gobject-introspection/PKGBUILD @@ -3,7 +3,7 @@ pkgname=gobject-introspection pkgver=1.30.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch=('x86_64' 'i686' 'mips64el') diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 6c9daaaa4..95d13fa3f 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $ +# $Id: PKGBUILD 144927 2011-12-10 21:25:05Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.1.17 -pkgrel=3 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -23,14 +23,11 @@ optdepends=('gupnp-av: uPnP plugin' 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a') +sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # support tracker 0.12, already fixed in git master. - sed -i 's/sparql-0.11/sparql-0.12/g' configure - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index 9d2d331f3..b1b19646b 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139336 2011-10-01 18:58:47Z ibiru $ +# $Id: PKGBUILD 144926 2011-12-10 21:23:58Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.1.17 -pkgrel=2 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" arch=(mips64el) @@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f88406b1737bdf0dc38c3acda418983084afe62ddc09fefd14a95f42ec727eaf') +sha256sums=('dc5bc1ea74ed3d47c4ec2d94886234346671509bdc63ce181f98824e7178ae83') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 26f7397c1..bb30981e5 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ backup=(etc/conf.d/irqbalance) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz irqbalance.conf.d irqbalance.rc.d) -md5sums=('58e1c9c164b12d797b500634a73938b4' +md5sums=('6f246481d6295bcb9a79751c03207c96' '336c1ee99818f9ecda1687e34c69fd6b' 'fb82fc5d267d39110baf720d81282a7c') diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD index 48a2d6911..9ae345965 100644 --- a/extra/kdeaccessibility/PKGBUILD +++ b/extra/kdeaccessibility/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141787 2011-11-02 18:13:09Z andrea $ +# $Id: PKGBUILD 144651 2011-12-08 09:19:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -8,7 +8,7 @@ pkgname=('kdeaccessibility-jovie' 'kdeaccessibility-kmag' 'kdeaccessibility-kmousetool' 'kdeaccessibility-kmouth') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://accessibility.kde.org' @@ -16,7 +16,7 @@ license=('GPL' 'FDL') groups=('kde' 'kdeaccessibility') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('9695d2b8b6f55266e3f76ebf05543f23857b9520') +sha1sums=('03f4ac8234dcc49eb93eff3630f76e226e290fff') build() { cd ${srcdir} diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 29d56822b..55990c6e2 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141789 2011-11-02 18:13:14Z andrea $ +# $Id: PKGBUILD 144653 2011-12-08 09:19:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'syslog-path.patch') -sha1sums=('b2d6d210bc40e8731a9ae8409673f3d71b57de0a' +sha1sums=('1a294315645adbbff348a380196d4300a408b70d' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index e9f8a56af..a313ced91 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141791 2011-11-02 18:13:17Z andrea $ +# $Id: PKGBUILD 144655 2011-12-08 09:19:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('4d3611cbcd6052a7ba7137baa196c654d9d38d4d') +sha1sums=('f397f49a73273baadabcaf45cf18c4d6a3efbe44') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 6cc4d02a4..69cb5a342 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141793 2011-11-02 18:13:21Z andrea $ +# $Id: PKGBUILD 144657 2011-12-08 09:19:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2") -sha1sums=('ecf5d1cc087d78ba049fe65e06ee992a2fadcc19') +sha1sums=('33e1bc6f1043c9bf6186190b66b21483301eac7e') build() { cd "${srcdir}" diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 444df1228..fa02ce80e 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141749 2011-11-02 18:12:12Z andrea $ +# $Id: PKGBUILD 144615 2011-12-08 09:18:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('htdig: to build the search index in khelpcenter' install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2" 'libqzeitgeist08.patch') -sha1sums=('293dec26e0d7278396d2ad0240d14aeea6060970' +sha1sums=('bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6' '164c9e4305029cb68a2101cfeeb76c7066c2fd39') build() { diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 57f02f9bd..a186ea25d 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141771 2011-11-02 18:12:45Z andrea $ +# $Id: PKGBUILD 144857 2011-12-08 16:10:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.7.3 -pkgrel=3 +pkgver=4.7.4 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -32,10 +32,9 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kscreensaver') options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" - 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e' - '8c2bdefb23a03b753b78d16944d03fa3939d2d99' +sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' @@ -46,7 +45,6 @@ sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e' build() { cd "${srcdir}"/${_pkgname}-${pkgver} - patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index a14566963..356046249 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141773 2011-11-02 18:12:47Z andrea $ +# $Id: PKGBUILD 144637 2011-12-08 09:18:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") -sha1sums=('952dc26d0d908b41973a8d7b4d27765bf5128d58') +sha1sums=('ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 99ab380c8..bb1c748e5 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141795 2011-11-02 18:13:24Z andrea $ +# $Id: PKGBUILD 144659 2011-12-08 09:19:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2") -sha1sums=('d87622d46bce9a5f8b875393ac2292f5a57d5f78') +sha1sums=('8f260e09bffcf74bad18a5168016d0dad5db3656') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 3262e30d0..7057c3b8c 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141797 2011-11-02 18:13:27Z andrea $ +# $Id: PKGBUILD 144855 2011-12-08 14:50:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE bindings for ruby" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2") -sha1sums=('bf41817298a8b18ba3542e45256c1c6ddb08c900') +sha1sums=('e220dc672461aa1369e58de325f980139fcd52f6') build() { cd "${srcdir}" diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 7686e051c..1e5e85828 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141799 2011-11-02 18:13:30Z andrea $ +# $Id: PKGBUILD 144663 2011-12-08 09:19:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") -sha1sums=('3e31b85d1a27a273450652d9f5a33f2c3c035329') +sha1sums=('416e9f25ff2050d9c5518254a7cc7d4cad22b648') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 74f5a4dca..91f35ddc1 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141801 2011-11-02 18:13:33Z andrea $ +# $Id: PKGBUILD 144665 2011-12-08 09:19:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") -sha1sums=('e0cc0d644084f1c71b6afc30d5467c49ba9a9fab') +sha1sums=('7116668ecd5baf55734a8349a2f0b04d0e701898') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 016bd8d5b..685bb939b 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141763 2011-11-02 18:12:32Z andrea $ +# $Id: PKGBUILD 144627 2011-12-08 09:18:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") -sha1sums=('6e69719edccb23e3ced7ba30b72e88d214d6f54e') +sha1sums=('b4b3d8ce2b08af62202f5ae79fe57bde60dd9a85') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 5c8a7ebb8..7d809f25d 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141765 2011-11-02 18:12:34Z andrea $ +# $Id: PKGBUILD 144629 2011-12-08 09:18:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE bindings for Python" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") -sha1sums=('16063793d39fdc9f5b9916cab49236103ce79da2') +sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 147af2513..c96e6c1c9 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141769 2011-11-02 18:12:40Z andrea $ +# $Id: PKGBUILD 144633 2011-12-08 09:18:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Qt bindings for ruby" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") -sha1sums=('2e3b36ece9039ccd39be76145575015503c6283c') +sha1sums=('e49e38a59238cf6f5ec9c2d9afc06f3330369fc7') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 2c6a7439f..940613359 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141767 2011-11-02 18:12:38Z andrea $ +# $Id: PKGBUILD 144631 2011-12-08 09:18:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") -sha1sums=('676042633b8c426adf1f47ad143f5db20ae257ef') +sha1sums=('8f2412a8bbb343bdb1e14c0fc6ef3681afe9d601') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 22a7bd81c..943e70baf 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141753 2011-11-02 18:12:18Z andrea $ +# $Id: PKGBUILD 144619 2011-12-08 09:18:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="http://kde.org/" @@ -11,10 +11,15 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") -sha1sums=('ede4095fdb190b3bef13b246111e7d79903ad77e') +source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2" + 'fix-crash.patch') +sha1sums=('068d37e2404311b9caa23d78ee7fa262188a8622' + 'b209b2b7017622fea3406c5a9636e2334566af01') build() { + cd "${srcdir}"/smokegen-${pkgver} + patch -p1 -i "${srcdir}"/fix-crash.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdebindings-smokegen/fix-crash.patch b/extra/kdebindings-smokegen/fix-crash.patch new file mode 100644 index 000000000..5864da3f3 --- /dev/null +++ b/extra/kdebindings-smokegen/fix-crash.patch @@ -0,0 +1,13 @@ +diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp +diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp +--- smokegen-4.7.0/type_compiler.cpp.orig 2011-08-02 14:34:08.000000000 +0200 ++++ smokegen-4.7.0/type_compiler.cpp 2011-08-02 14:34:34.000000000 +0200 +@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara + + void TypeCompiler::visitPtrOperator(PtrOperatorAST* node) + { ++ if ( ! m_session->token_stream ) return; ++ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return; + if (token_text(m_session->token_stream->kind(node->op))[0] == '*') { + QPair<bool, bool> cv = m_visitor->parseCv(node->cv); + pointerDepth.append(cv.first); diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 7c532e38b..a84b14362 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141761 2011-11-02 18:12:30Z andrea $ +# $Id: PKGBUILD 144625 2011-12-08 09:18:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") -sha1sums=('a25114d92c540f16af9022366ca2b5da447a1531') +sha1sums=('c3e2bd07158c4bc6a19123d5ae8e81529b52e07b') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index d7207015d..cce7f1e7e 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142565 2011-11-12 08:14:45Z andrea $ +# $Id: PKGBUILD 144621 2011-12-08 09:18:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.7.3 -pkgrel=2 +pkgver=4.7.4 +pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('cf1c4b7116695f0842972b2985eca65f6b63702e') +sha1sums=('2b1033732d166946db3096ddbf6eb9a6ddb61877') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 91e7a18be..dccccf6f1 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141803 2011-11-02 18:13:36Z andrea $ +# $Id: PKGBUILD 144667 2011-12-08 09:19:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2") -sha1sums=('24f09f604e1687062b3296a30b873d1781379543') +sha1sums=('edeb024db23da00cf896bc41c6e3efa371d9867d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index f97ac94c2..cbda53904 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141805 2011-11-02 18:13:40Z andrea $ +# $Id: PKGBUILD 144669 2011-12-08 09:19:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2") -sha1sums=('ce6240d44cbf47b3dbfd1dbc03196c916e4394e9') +sha1sums=('da39832093c1ea6eb28c6b5b4f67cb24473d8fb5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index f0d4411b4..5993a1545 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141807 2011-11-02 18:13:43Z andrea $ +# $Id: PKGBUILD 144671 2011-12-08 09:19:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") -sha1sums=('88cc89a6c942b7cef548532702c5e68bf75f0748') +sha1sums=('8ef005a50316d7d86b7bc1ed306380d69ce946a0') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index ddf686d8c..f1bc07000 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141809 2011-11-02 18:13:47Z andrea $ +# $Id: PKGBUILD 144673 2011-12-08 09:19:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") -sha1sums=('e22b54be4a2e8ce8a22af73fa6155ee012fa6fdf') +sha1sums=('6cb65b2c524f529976e4c63a75a7637a181d08d9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index bf4942ea7..33f76b461 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141811 2011-11-02 18:13:50Z andrea $ +# $Id: PKGBUILD 144675 2011-12-08 09:19:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") -sha1sums=('44a60b76bbc8ae61b8673c37c2b8721f12dc22bb') +sha1sums=('15fda47cd6685a7e19fb4744ec930b9a4dcfbe05') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 365128388..9b885ec49 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141813 2011-11-02 18:13:53Z andrea $ +# $Id: PKGBUILD 144677 2011-12-08 09:19:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") -sha1sums=('c90205954d9c153aaa5966b424aa437b07e657f7') +sha1sums=('36165292cb9935343d1aa2572935a130b6619f00') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 5a839bb6b..53ce7a39e 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141815 2011-11-02 18:13:57Z andrea $ +# $Id: PKGBUILD 144679 2011-12-08 09:20:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") -sha1sums=('5f9835994ec6ad9454f7ee19bf003c8457e11d9e') +sha1sums=('4a90c59928a4947c5cd970ed72e5e9cea370d8e6') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 17b1eea92..3a2781967 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141817 2011-11-02 18:14:01Z andrea $ +# $Id: PKGBUILD 144681 2011-12-08 09:20:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2") -sha1sums=('aef288a20209a4c1bf5d6f48be689c433049ea83') +sha1sums=('c5999ba4218cb0331b906fbcaafa7f497762221d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index e2a5ad425..d18a7a4dc 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144051 2011-12-02 20:54:24Z ibiru $ +# $Id: PKGBUILD 144683 2011-12-08 09:20:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.7.3 -pkgrel=2 +pkgver=4.7.4 +pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2") -sha1sums=('5a948b641f380e1cc6cf0f91d795a97029464bbb') +sha1sums=('4c76ef89e6210f2f25e719176db4d8a2b31b6222') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 4891170f0..da0399a4a 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141821 2011-11-02 18:14:07Z andrea $ +# $Id: PKGBUILD 144685 2011-12-08 09:20:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2") -sha1sums=('5df19802a731b5f7033b43aa9b35e0b20164cd3e') +sha1sums=('8ec806306a7b08cb8ca5e567a48417cd2268e501') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index edb96cc11..abb06b626 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141823 2011-11-02 18:14:09Z andrea $ +# $Id: PKGBUILD 144687 2011-12-08 09:20:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2") -sha1sums=('da01b1c71d74f634ace0b6c2fc6e0186a08f9974') +sha1sums=('d2450f7aa24fc0118dd20d2e11d61fca68ba5461') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 543470bfc..48ad4fb51 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141825 2011-11-02 18:14:13Z andrea $ +# $Id: PKGBUILD 144689 2011-12-08 09:20:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") -sha1sums=('e98ba022e987b9601ea1b27e97607ff7885ff788') +sha1sums=('b0b2b748e4ea0f670ffe5c9be01a6997a061a75c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 775af4f8b..1f784900c 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141827 2011-11-02 18:14:15Z andrea $ +# $Id: PKGBUILD 144691 2011-12-08 09:20:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2") -sha1sums=('41d333f726d9752a7ddb48f98817d91744adb7b0') +sha1sums=('d4e489093b440e4246c817821187193e4e53be66') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index b66c3555b..4674a5ee7 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141829 2011-11-02 18:14:18Z andrea $ +# $Id: PKGBUILD 144693 2011-12-08 09:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") -sha1sums=('46b865ece6e14d4476297d4a3b400d5fab6564ea') +sha1sums=('92d7e446216bdfdf68e13c9f0ba39d44e02b29c9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index a5bb66c24..2c98139ca 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141831 2011-11-02 18:14:22Z andrea $ +# $Id: PKGBUILD 144695 2011-12-08 09:20:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") -sha1sums=('07d5ad5c1b8308c2c8c2ff48e2c0c18adfd051ca') +sha1sums=('b3baa81277417f352d4a0bdca61df75515f30c0d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 0290a54c2..61c85dea2 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141833 2011-11-02 18:14:26Z andrea $ +# $Id: PKGBUILD 144697 2011-12-08 09:20:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") -sha1sums=('616c16a94066ec2930bc0795f8053be221c871e5') +sha1sums=('c726b0856234ce78fab0ecd61072cdb035e66513') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index a1ac2edb7..29fca5ac8 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141777 2011-11-02 18:12:53Z andrea $ +# $Id: PKGBUILD 144641 2011-12-08 09:18:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2") -sha1sums=('980a8dae9c7a0f8483fde5dc839fae834763933a') +sha1sums=('e560c355a8d91bbb61b9f2e6c7cb11bd79eba1ab') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 4e4e85026..3c1d22bd0 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141835 2011-11-02 18:14:29Z andrea $ +# $Id: PKGBUILD 144699 2011-12-08 09:20:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2") -sha1sums=('a5d06f373976554d58c8aae279e411a6be028826') +sha1sums=('e61d0192dce0e1427ee41ff96f1bcb73c77cbcef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 4006d6eac..e2197da44 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141837 2011-11-02 18:14:31Z andrea $ +# $Id: PKGBUILD 144701 2011-12-08 09:20:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2") -sha1sums=('5c7d4115f029e09a006912bf816d4ce396a9b49a') +sha1sums=('f808118fcd5df59a9a808747be940a88b30cf6f3') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 8af05974a..a75526795 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141839 2011-11-02 18:14:34Z andrea $ +# $Id: PKGBUILD 144703 2011-12-08 09:20:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2") -sha1sums=('411695882916a8a1d0db86426a0d8f935fab21ad') +sha1sums=('30dba80e6f34124fd5a8ebf6688e261ab109d0d4') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index 4721fae86..5715c57da 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141841 2011-11-02 18:14:43Z andrea $ +# $Id: PKGBUILD 144705 2011-12-08 09:20:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('abd90be42fa67cd6d6be1defe90dcd0408e94445') +sha1sums=('a1f97524f868ab9dae0439abcbf4b41f68715598') build() { cd $srcdir diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 97b500140..7e0d99786 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141843 2011-11-02 18:14:47Z andrea $ +# $Id: PKGBUILD 144707 2011-12-08 09:20:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") -sha1sums=('7096721285d15311699acc76abd62755d6e93860') +sha1sums=('598714d18cf7adab8afd4f906070f0915e1cdc95') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 183d6dd0c..3c1402ec8 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141845 2011-11-02 18:14:51Z andrea $ +# $Id: PKGBUILD 144709 2011-12-08 09:20:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2") -sha1sums=('820f9b6449732f6cab48f5c2d9e7dbcf53eb6437') +sha1sums=('098c71d7588d5163656cb07a476efbfc6755900a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index c734d406b..7e18901a7 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141847 2011-11-02 18:14:55Z andrea $ +# $Id: PKGBUILD 144711 2011-12-08 09:20:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") -sha1sums=('bdd35e5defbcfc151f4960541c351246cb4dfa9e') +sha1sums=('bbfda234e8aec109c63226499fc72355b1c051ca') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index c3eb024e3..93a78cbed 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141849 2011-11-02 18:14:58Z andrea $ +# $Id: PKGBUILD 144713 2011-12-08 09:20:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") -sha1sums=('d97511574120614ffb85308888c23eb2d3ba1b01') +sha1sums=('cd528839b6a9be997ed8d4a2fc87a8b5b8e8de91') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 6fb85c217..4859849c8 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141851 2011-11-02 18:15:01Z andrea $ +# $Id: PKGBUILD 144715 2011-12-08 09:21:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") -sha1sums=('d276d230e76f7fbe91229dd015a6465cb1a6956e') +sha1sums=('31e23ab6735291ec86ebd83e2eee7afa191a4a59') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 32a58e460..647c3fc4e 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141853 2011-11-02 18:15:04Z andrea $ +# $Id: PKGBUILD 144717 2011-12-08 09:21:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2") -sha1sums=('2cc0b9d31248604ab570404a0c67ef325e8ed00e') +sha1sums=('a854213e5342e382d3b9c4a29d1aada654378d0f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 73f41b412..0985773b5 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141855 2011-11-02 18:15:07Z andrea $ +# $Id: PKGBUILD 144719 2011-12-08 09:21:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") -sha1sums=('547c298e2f3f7b8f651e3402bf18507321d4a7ce') +sha1sums=('15f7ca6fbabb757898cc0f18685f5e204e6b3f56') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 842085d19..3355032f0 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141857 2011-11-02 18:15:12Z andrea $ +# $Id: PKGBUILD 144721 2011-12-08 09:21:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") -sha1sums=('e0dd6e093cd487fa6604077371122d84b3e8efb7') +sha1sums=('bc40ae740e3a684e47ba1b5af01aeb427bb4336e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index de770154a..c46dc73a1 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141859 2011-11-02 18:15:14Z andrea $ +# $Id: PKGBUILD 144723 2011-12-08 09:21:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2") -sha1sums=('a55908cbc951c98dd27171909c1ccc5d978eec65') +sha1sums=('db278a2ebe4680a94c4963a53c1501cf1f1d9d2a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 67280fc9f..e6605019b 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141757 2011-11-02 18:12:23Z andrea $ +# $Id: PKGBUILD 144623 2011-12-08 09:18:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('a14700386f386cc50f7dd6785eeb93dae10a0362') +sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/staging-i686/PKGBUILD b/extra/kdegraphics-okular/staging-i686/PKGBUILD new file mode 100644 index 000000000..8b08d240f --- /dev/null +++ b/extra/kdegraphics-okular/staging-i686/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 144119 2011-12-04 09:06:00Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-okular +pkgver=4.7.4 +pkgrel=1 +pkgdesc='Document Viewer' +arch=('i686' 'x86_64') +url="http://kde.org/applications/graphics/okular/" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') +makedepends=('pkgconfig' 'cmake' 'automoc4') +optdepends=('kdegraphics-mobipocket: mobipocket support') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") +sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../okular-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install b/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index aef829149..56f05e2e0 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141861 2011-11-02 18:15:18Z andrea $ +# $Id: PKGBUILD 144725 2011-12-08 09:21:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('827b18fd902a464162db7a3cd98a22fa211bafc9') +sha1sums=('39b3b0312663a3ef7a68c972b39bf12fb4cabe8b') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index a0ef75125..e641d8e40 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141863 2011-11-02 18:15:21Z andrea $ +# $Id: PKGBUILD 144727 2011-12-08 09:21:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") -sha1sums=('fa7f8cac53f6041f18a2bee09c2aa3885e27f7c7') +sha1sums=('38dcb3c468ca359e7b0a0027523b8156de6a06a1') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index a18545c7b..1b842c7a8 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141865 2011-11-02 18:15:24Z andrea $ +# $Id: PKGBUILD 144729 2011-12-08 09:21:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('219fd55d94d695cee8c7b650dbe8088cc9807e5c') +sha1sums=('0e1636da30c78ad2c186bcd30c0566406b920126') build() { cd "${srcdir}" diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 9de106e09..3a90fada3 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143000 2011-11-20 11:13:59Z andrea $ +# $Id: PKGBUILD 144610 2011-12-08 09:18:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch') -sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3' +sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7') build() { diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index cde1482de..978cbd0cc 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142628 2011-11-12 17:15:23Z ibiru $ +# $Id: PKGBUILD 144731 2011-12-08 09:21:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,8 +10,8 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kmix' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') -pkgver=4.7.3 -pkgrel=3 +pkgver=4.7.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -20,7 +20,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'mplayerthumbs.config') -sha1sums=('4db44494e6a2ef886e3513b6a2eb4e526741a6ff' +sha1sums=('e0001afac38e35e3ab7b919d79f74cd57e3c18dd' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 0a99ea940..ef294cd36 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141869 2011-11-02 18:15:31Z andrea $ +# $Id: PKGBUILD 144733 2011-12-08 09:21:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7') +sha1sums=('15d5bdcda0e05de6247b22b96c6ca4a98da8a278') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 27ff41080..f1bb3f541 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141751 2011-11-02 18:12:14Z andrea $ +# $Id: PKGBUILD 144617 2011-12-08 09:18:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fa0e336e17f7abea1e36d28d941a4ef79b4e4635') +sha1sums=('fb02f53673316aaafb65b7c4dd570f3be3b4e935') build() { cd "${srcdir}" diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index be4e55bb2..16140a51b 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141871 2011-11-02 18:15:37Z andrea $ +# $Id: PKGBUILD 144735 2011-12-08 09:21:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('b540de51ba5b9995ce3b7c05cfb09112423d8569') +sha1sums=('233f6c413eeedd4af7cf15106a2af7b8f29977bf') build() { cd "${srcdir}" diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index fc01cff36..32cbf1484 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141746 2011-11-02 18:12:07Z andrea $ +# $Id: PKGBUILD 144612 2011-12-08 09:18:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b95822a3e38587744174308b629336cd3d0444f4') +sha1sums=('a539e29557c0a30779e752b9349b3a0c000ffbba') build() { cd ${srcdir} diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index bad1591cf..1392bfbbc 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141873 2011-11-02 18:15:43Z andrea $ +# $Id: PKGBUILD 144737 2011-12-08 09:21:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -72,7 +72,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-pattern' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('decdea2d081396c90daabc9af754a233b43a0783') +sha1sums=('2bbf77d77e809733e6a74ff5688e6ff5487bc8bf') build() { cd "${srcdir}" diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index ab43ade39..aea73b6b5 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 141759 2011-11-02 18:12:27Z andrea $ +# $Id: PKGBUILD 144748 2011-12-08 09:52:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-kwrite' 'kdesdk-kate') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2" 'pkgbuild-syntax-highlight.patch') -sha1sums=('d67e871a49d426246f2e555ace0ad5a303c41045' +sha1sums=('b808f01213e0e44607e8f2577f9d1b4f88e14388' 'ab0c5d2a796b0f283154799add161c99f48ffcd5') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 773086d6f..0a9da92ae 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141875 2011-11-02 18:15:48Z andrea $ +# $Id: PKGBUILD 144767 2011-12-08 10:28:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -24,7 +24,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -34,7 +34,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'fix-python2-path.patch') -sha1sums=('c0afae643345c92bce387ceafbcea59d3fbd812e' +sha1sums=('3a0f61204653dc3f9f975732b6f67659c60ecaf3' 'd05ca0231869c484fd3861955d960a60aff7dcfb') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 6b6c0441b..fa5020736 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141877 2011-11-02 18:15:51Z andrea $ +# $Id: PKGBUILD 144739 2011-12-08 09:21:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('93d6f0a92c805de51fc68469f940f38858f81fbe') +sha1sums=('f929e598180f420d7fc6e4642ed56af9eee5a22b') build() { cd $srcdir diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index f875791fc..c7f21e1b5 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141879 2011-11-02 18:15:55Z andrea $ +# $Id: PKGBUILD 144741 2011-12-08 09:21:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdeutils-ark' 'kdeutils-printer-applet' 'kdeutils-superkaramba' 'kdeutils-sweeper') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -26,7 +26,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('23fc9823647152d5d8cc250a55402c8930db4059') +sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e') build() { cd "${srcdir}"/${pkgbase}-${pkgver} diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD index 94e797734..bfb042d6a 100644 --- a/extra/kdevelop-pg-qt/PKGBUILD +++ b/extra/kdevelop-pg-qt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 118371 2011-04-06 12:38:22Z andrea $ +# $Id: PKGBUILD 144905 2011-12-09 16:07:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-pg-qt pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDevelop Parser Generator, a LL(1) parser generator used by KDevelop language plugins" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdelibs') +depends=('kdevelop') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") sha1sums=('b5bcb46a490bfb6a2d04c48cb28e0c77cdde183f') diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index ac5d5745e..d081099ab 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141881 2011-11-02 18:15:58Z andrea $ +# $Id: PKGBUILD 144743 2011-12-08 09:21:45Z andrea $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdewebdev @@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ groups=('kde' 'kdewebdev') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('11108698887d376d00f02cbdfa1496aa3cb268c1') +sha1sums=('1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c') build() { cd $srcdir diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 15c62994a..ec440bca1 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141675 2011-11-02 06:41:48Z andyrtr $ +# $Id: PKGBUILD 144919 2011-12-10 10:45:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.27 +pkgver=2.4.28 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -13,16 +13,26 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch - COPYING) -md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd' + COPYING + git_fixes.diff + #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 + rbo.h list.h) +md5sums=('6488f64119c6439fa4038e9cd7b30b67' 'c722c8406507b7e3a8da7a3030d1d9cf' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') + 'ba65e71c481b94ef0fb6c23c7f21ffa1' + '671b87f9670e709e54a19cd292c6330d' + '073846ea43fb4d6130062c1897d92e40' + 'ce867d3331862c2b87d1a37461b42dbe') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + + # add a missing file in the release tarball + patch -Np1 -i ${srcdir}/git_fixes.diff + cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ -# libtoolize --force + #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff new file mode 100644 index 000000000..5ebcb606a --- /dev/null +++ b/extra/libdrm/git_fixes.diff @@ -0,0 +1,19 @@ +From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 05 Dec 2011 21:24:48 +0000 +Subject: test/radeon: add missing files for dist + +--- +diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am +index 021ca72..1775669 100644 +--- a/tests/radeon/Makefile.am ++++ b/tests/radeon/Makefile.am +@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ + + radeon_ttm_SOURCES = \ + rbo.c \ ++ rbo.h \ ++ list.h \ + radeon_ttm.c +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libdrm/list.h b/extra/libdrm/list.h new file mode 100644 index 000000000..305c903e1 --- /dev/null +++ b/extra/libdrm/list.h @@ -0,0 +1,137 @@ +/* + * + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + */ + +/** + * \file + * List macros heavily inspired by the Linux kernel + * list handling. No list looping yet. + * + * Is not threadsafe, so common operations need to + * be protected using an external mutex. + */ +#ifndef _U_DOUBLE_LIST_H_ +#define _U_DOUBLE_LIST_H_ + +#include <stddef.h> + +struct list_head +{ + struct list_head *prev; + struct list_head *next; +}; + +static void list_inithead(struct list_head *item) +{ + item->prev = item; + item->next = item; +} + +static void list_add(struct list_head *item, struct list_head *list) +{ + item->prev = list; + item->next = list->next; + list->next->prev = item; + list->next = item; +} + +static void list_addtail(struct list_head *item, struct list_head *list) +{ + item->next = list; + item->prev = list->prev; + list->prev->next = item; + list->prev = item; +} + +static void list_replace(struct list_head *from, struct list_head *to) +{ + to->prev = from->prev; + to->next = from->next; + from->next->prev = to; + from->prev->next = to; +} + +static void list_del(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; +} + +static void list_delinit(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; + item->next = item; + item->prev = item; +} + +#define LIST_INITHEAD(__item) list_inithead(__item) +#define LIST_ADD(__item, __list) list_add(__item, __list) +#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) +#define LIST_REPLACE(__from, __to) list_replace(__from, __to) +#define LIST_DEL(__item) list_del(__item) +#define LIST_DELINIT(__item) list_delinit(__item) + +#define LIST_ENTRY(__type, __item, __field) \ + ((__type *)(((char *)(__item)) - offsetof(__type, __field))) + +#define LIST_IS_EMPTY(__list) \ + ((__list)->next == (__list)) + +#ifndef container_of +#define container_of(ptr, sample, member) \ + (void *)((char *)(ptr) \ + - ((char *)&(sample)->member - (char *)(sample))) +#endif + +#define LIST_FOR_EACH_ENTRY(pos, head, member) \ + for (pos = container_of((head)->next, pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ + for (pos = container_of((head)->next, pos, member), \ + storage = container_of(pos->member.next, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.next, storage, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ + for (pos = container_of((head)->prev, pos, member), \ + storage = container_of(pos->member.prev, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.prev, storage, member)) + +#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.prev, pos, member)) + +#endif /*_U_DOUBLE_LIST_H_*/ diff --git a/extra/libdrm/rbo.h b/extra/libdrm/rbo.h new file mode 100644 index 000000000..c25c73a4c --- /dev/null +++ b/extra/libdrm/rbo.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2011 Red Hat + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Jerome Glisse <j.glisse@gmail.com> + */ +#ifndef RBO_H +#define RBO_H + +#include "list.h" + +struct rbo { + struct list_head list; + int fd; + unsigned refcount; + unsigned mapcount; + unsigned handle; + unsigned size; + unsigned alignment; + void *data; +}; + +struct rbo *rbo(int fd, unsigned handle, unsigned size, + unsigned alignment, void *ptr); +int rbo_map(struct rbo *bo); +void rbo_unmap(struct rbo *bo); +struct rbo *rbo_incref(struct rbo *bo); +struct rbo *rbo_decref(struct rbo *bo); +int rbo_wait(struct rbo *bo); + +#endif diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index e3d6354c0..3305f740f 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141779 2011-11-02 18:12:56Z andrea $ +# $Id: PKGBUILD 144643 2011-12-08 09:18:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('084f6aff760957d2005dd571dad178ca685abb68') +sha1sums=('f97516a2da26da3c15075a007bec7c8f9860379b') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 95b05321a..e2cfe2cfc 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141775 2011-11-02 18:12:50Z andrea $ +# $Id: PKGBUILD 144639 2011-12-08 09:18:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d2a1e88c6135fa23cea7670dfbb7c8634dc9c870') +sha1sums=('2f508c6efa9ef9561d25578000c7d5bb5ed1c5ee') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 6e8787d8d..b85c2918f 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141781 2011-11-02 18:12:59Z andrea $ +# $Id: PKGBUILD 144645 2011-12-08 09:19:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('daaf507f75855660ae9f1af00158c2746c574902') +sha1sums=('19031140c87d9d7003fef564b6927c6f69d7e3d3') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 1ccf20cea..40cf07e56 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141783 2011-11-02 18:13:03Z andrea $ +# $Id: PKGBUILD 144647 2011-12-08 09:19:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9c6d4406a1292cfe81fa27508ffe4d96633417bf') +sha1sums=('3225ac0c55f5e4fef71a8baee8d3c49efff6adbf') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 09bef8527..98d783a80 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141785 2011-11-02 18:13:06Z andrea $ +# $Id: PKGBUILD 144649 2011-12-08 09:19:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="An image scanning library" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d1efdd1f5f7f99ba173ddcc88b2ddee343ecf96b') +sha1sums=('3c7a8d5b7fd80175684a0373fae26197e8158565') build() { cd "${srcdir}" diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD index b64e27dd8..8a86b2f38 100644 --- a/extra/libmythes/PKGBUILD +++ b/extra/libmythes/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 104337 2011-01-01 13:29:40Z andyrtr $ +# $Id: PKGBUILD 144883 2011-12-08 21:25:55Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmythes pkgver=1.2.1 -pkgrel=1 +pkgrel=2 +epoch=1 pkgdesc="a simple thesaurus" arch=('i686' 'x86_64' 'mips64el') url="http://hunspell.sourceforge.net/ " diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index 54953a283..372d98220 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libxslt pkgver=1.1.26 -pkgrel=2 +pkgrel=2.1 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64' 'mips64el') url="http://xmlsoft.org/XSLT/" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 707b85d1e..8b5dbf8b6 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143899 2011-11-30 19:57:03Z giovanni $ +# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 90356df24..2c2310b2d 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141372 2011-10-30 06:47:25Z allan $ +# $Id: PKGBUILD 144867 2011-12-08 20:35:39Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -10,39 +10,34 @@ # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=2.9 -_gcc_ver=4.6.2 -pkgrel=7 +pkgver=3.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz - http://llvm.org/releases/$pkgver/clang-$pkgver.tgz - ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz +makedepends=('libffi' 'python2' 'ocaml') +source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tar.gz + http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz clang-plugin-loader-registry.patch cindexer-clang-path.patch - clang-toolchains-gcc-versions.patch clang-pure64.patch enable-lto.patch - bug-9869-operator-h-c++0x.patch) -sha256sums=('661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779' - '70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df' - '12cf0bfb128cd8bd2a308c3c03cf0e607aa47bd87d9a58b422b96bd387e476c1' + fix-gold-lto-linking.patch) +sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477' + 'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d' 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c' '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' - '7c05788c02697f0cd05f7c74fe65b460530c0748851313eb950c5d4d17a8115a' - '5bba4964d0d832c9e97308beb45244ff6ed4e16ed3f9f771babe571f1b82fa33' - '1a308679edf3078b8f0c33c94d4e6d0c0db6d3baad91babce08bf5370aa052ef' - '1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7') + '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524' + 'cf8922a932e1859f3783bef2af8ac1e90ce96f8eec79928392327b71b3d7cb89' + '24d275cdf170f53844bc7174b065fb51b6ddbb9642ced34702cde1f0f74d9192') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver.src" # At the present, clang must reside inside the LLVM source code tree to build # See http://llvm.org/bugs/show_bug.cgi?id=4840 rm -rf tools/clang - cp -r "$srcdir/clang-$pkgver" tools/clang + cp -r "$srcdir/clang-$pkgver.src" tools/clang # Fix symbolic links from OCaml bindings to LLVM libraries sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml @@ -63,11 +58,8 @@ build() { # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - # Add GCC 4.6.1 to GccVersions (FS#23631) - patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" - if [[ $CARCH == x86_64 ]]; then - # Adjust lib paths + # Adjust linker path patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" fi @@ -75,9 +67,8 @@ build() { # Use gold instead of default linker, and always use the plugin patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - # Fix upstream bug #9869: - # Operator.h incompatibility with GCC 4.6 in C++0x mode - patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch" + # Fix libLTO.so location in gold plugin + patch -Np1 -i "$srcdir/fix-gold-lto-linking.patch" # Apply strip option to configure _optimized_switch="enable" @@ -86,20 +77,8 @@ build() { # Include location of libffi headers in CPPFLAGS export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - # TODO: Uncomment when clang works with GCC 4.6+ - #_cxx_headers="/usr/include/c++/$_gcc_ver" - #if [[ ! -d $_cxx_headers ]]; then - # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" - # return 1 - #fi - _cxx_headers="/usr/include/c++/clang-$pkgver" - - _32bit_headers="" - if [[ $CARCH == x86_64 ]]; then - # Important for multilib - _32bit_headers="32" - fi - + # Force the use of GCC instead of clang + CC=gcc CXX=g++ \ ./configure \ --prefix=/usr \ --libdir=/usr/lib/llvm \ @@ -111,9 +90,6 @@ build() { --disable-debug-runtime \ --disable-assertions \ --with-binutils-include=/usr/include \ - --with-cxx-include-root=$_cxx_headers \ - --with-cxx-include-arch=$CHOST \ - --with-cxx-include-32bit-dir=$_32bit_headers \ --$_optimized_switch-optimized make REQUIRES_RTTI=1 @@ -123,11 +99,13 @@ package_llvm() { pkgdesc="Low Level Virtual Machine" depends=('perl' 'libffi') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver.src" # We move the clang directory out of the tree so it won't get installed and # then we bring it back in for the clang package mv tools/clang "$srcdir" + # Copy missing file into the expected location + cp bindings/ocaml/llvm/META.llvm bindings/ocaml/llvm/Release/ # -j1 is due to race conditions during the installation of the OCaml bindings make -j1 DESTDIR="$pkgdir" install mv "$srcdir/clang" tools @@ -148,9 +126,6 @@ package_llvm() { # Get rid of example Hello transformation rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" - # Add ld.so.conf.d entry install -d "$pkgdir/etc/ld.so.conf.d" echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" @@ -162,7 +137,7 @@ package_llvm-ocaml() { pkgdesc="OCaml bindings for LLVM" depends=("llvm=$pkgver-$pkgrel" 'ocaml') - cd "$srcdir/llvm-$pkgver" + cd "$srcdir/llvm-$pkgver.src" install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" @@ -177,15 +152,13 @@ package_llvm-ocaml() { package_clang() { pkgdesc="C language family frontend for LLVM" url="http://clang.llvm.org/" - # It looks like clang still needs GCC to assemble and link object files - # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html - depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") + depends=("llvm=$pkgver-$pkgrel" 'gcc') # Fix installation path for clang docs sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver/Makefile.config" + "$srcdir/llvm-$pkgver.src/Makefile.config" - cd "$srcdir/llvm-$pkgver/tools/clang" + cd "$srcdir/llvm-$pkgver.src/tools/clang" make DESTDIR="$pkgdir" install # Fix permissions of static libs @@ -193,12 +166,7 @@ package_clang() { # Revert the path change in case we want to do a repackage later sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - # Install old libstdc++ headers. Contains combined headers from - # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 - install -d "$pkgdir/usr/include/c++" - cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" + "$srcdir/llvm-$pkgver.src/Makefile.config" install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" } @@ -208,7 +176,7 @@ package_clang-analyzer() { url="http://clang-analyzer.llvm.org/" depends=("clang=$pkgver-$pkgrel" 'python2') - cd "$srcdir/llvm-$pkgver/tools/clang" + cd "$srcdir/llvm-$pkgver.src/tools/clang" install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} for _tool in scan-{build,view}; do diff --git a/extra/llvm/clang-pure64.patch b/extra/llvm/clang-pure64.patch index da6178519..9bbbfaa8b 100644 --- a/extra/llvm/clang-pure64.patch +++ b/extra/llvm/clang-pure64.patch @@ -3,36 +3,11 @@ Index: lib/Driver/Tools.cpp --- lib/Driver/Tools.cpp (revision 123373) +++ lib/Driver/Tools.cpp (working copy) @@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::arm) - CmdArgs.push_back("/lib/ld-linux.so.3"); + else if (ToolChain.getArch() == llvm::Triple::ppc64) + CmdArgs.push_back("/lib64/ld64.so.1"); else - CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); + CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); } CmdArgs.push_back("-o"); -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1317,18 +1317,10 @@ - if (Arch == llvm::Triple::x86) - Suffix64 = "/64"; - -- std::string Lib32 = "lib"; -- -- bool Exists; -- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) -- Lib32 = "lib32"; -- -+ std::string Lib32 = "lib32"; - std::string Lib64 = "lib"; -- bool Symlink; -- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && -- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) -- Lib64 = "lib64"; - -+ bool Exists; - std::string GccTriple = ""; - if (Arch == llvm::Triple::arm) { - if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch index 40d93104a..3c8691b17 100644 --- a/extra/llvm/enable-lto.patch +++ b/extra/llvm/enable-lto.patch @@ -2,17 +2,12 @@ Index: lib/Driver/ToolChains.cpp =================================================================== --- lib/Driver/ToolChains.cpp (revision 123373) +++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,11 +1398,11 @@ - Lib = Lib64; - } +@@ -1398,7 +1398,7 @@ + PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + + GCCInstallation.getTriple() + "/bin").str()); -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -+ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); - if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) - Linker = LinkerPath.str(); - else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); LinuxDistro Distro = DetectLinuxDistro(Arch); @@ -27,7 +22,8 @@ Index: lib/Driver/Tools.cpp - if (Args.hasArg(options::OPT_use_gold_plugin)) { + // if (Args.hasArg(options::OPT_use_gold_plugin)) { CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; +- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; ++ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; CmdArgs.push_back(Args.MakeArgString(Plugin)); - } + // } diff --git a/extra/llvm/fix-gold-lto-linking.patch b/extra/llvm/fix-gold-lto-linking.patch new file mode 100644 index 000000000..84d166471 --- /dev/null +++ b/extra/llvm/fix-gold-lto-linking.patch @@ -0,0 +1,11 @@ +diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile +--- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300 ++++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200 +@@ -26,6 +26,6 @@ LINK_COMPONENTS := support + # Because off_t is used in the public API, the largefile parts are required for + # ABI compatibility. + CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) ++CXXFLAGS+=-L $(SharedLibDir) -lLTO + + include $(LEVEL)/Makefile.common diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index e0ce6b0e1..8d63f8280 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143491 2011-11-24 21:29:37Z juergen $ +# $Id: PKGBUILD 144879 2011-12-08 21:06:55Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.25.1 -pkgrel=2 +pkgrel=3 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.0.53' 'texinfo' 'sh') + depends=('sbcl=1.0.54' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index fc31188ae..6b4b6f09f 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.8.2 +pkgver=2.8.4.2 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64' 'mips64el') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.8.2' 'gdb') +depends=('monodevelop>=2.8.4.2' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('0c1661c05d8a3fbe56cf1122d9730b26') +md5sums=('4c081b6d85ffe36389a3b06da37dcbe4') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" @@ -20,6 +20,10 @@ build() { ./configure --prefix=/usr make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 7de84d024..a00ba49aa 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.8.2 +pkgver=2.8.4.2 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1 options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4a445e251d5e8a12a8aa4ae22f3a6841') +md5sums=('276fb75e2ffa4cf41fd609caa74dc276') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD index 52a4e8806..5eeb3031d 100644 --- a/extra/most/PKGBUILD +++ b/extra/most/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 125648 2011-05-27 17:52:54Z stephane $ -# Maintainer: juergen <juergen@archlinux.org> +# $Id: PKGBUILD 144477 2011-12-06 14:33:19Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=most pkgver=5.0.0a -pkgrel=3 +pkgrel=4 pkgdesc="A terminal pager similar to 'more' and 'less'" arch=('i686' 'x86_64' 'mips64el') depends=('slang') license=('GPL') -url="ftp://space.mit.edu/pub/davis/most/" -source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz most-debian.patch) +url="http://www.jedsoft.org/most/index.html" +source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz + most-debian.patch + most-leak-fd.patch) sha1sums=('99eedb7169754b9a47c7755ac48949d76531e3b2' - '937796040c69bae3bf735fa3cd734775c582e7d0') - + '937796040c69bae3bf735fa3cd734775c582e7d0' + 'c5713e1278febdd0ed434e6e3044feb220b5d525') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i ../most-debian.patch + patch -Np1 -i ../most-leak-fd.patch ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/extra/most/most-leak-fd.patch b/extra/most/most-leak-fd.patch new file mode 100644 index 000000000..c8cd2af09 --- /dev/null +++ b/extra/most/most-leak-fd.patch @@ -0,0 +1,14 @@ +--- most-5.0.0a.orig/src/most.c 2007-06-03 00:03:59.000000000 -0400 ++++ most-5.0.0a/src/most.c 2010-12-31 04:42:08.000000000 -0500 +@@ -321,9 +321,11 @@ + { + fprintf (stderr, "fwrite returned %d, errno = %d\n", + m, errno); ++ (void) fclose (fp); + exit (1); + } + } ++ (void) fclose (fp); + } + + void most_initialize_most (void) diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog index 40ba5e4e7..b22d95f8d 100644 --- a/extra/mpd/ChangeLog +++ b/extra/mpd/ChangeLog @@ -1,3 +1,6 @@ +2011-12-05 Angel Velasquez <angvp@archlinux.org> + * Version bump to 0.16.6 + 2011-09-03 Angel Velasquez <angvp@archlinux.org> * Version bump to 0.16.4 * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 4578958de..afe78dfe7 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 142638 2011-11-12 17:15:35Z ibiru $ +# $Id: PKGBUILD 144459 2011-12-06 06:52:26Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.5 -pkgrel=2 +pkgver=0.16.6 +pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -19,7 +19,7 @@ install=${pkgname}.install changelog=ChangeLog source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2" 'mpd') -md5sums=('f7564cff12035f6a1112cce770655df7' +md5sums=('5489dd327fba12c67f01558d2cfa6d57' 'e5669c2bff4031928531e52475addeb1') build() { diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 4be16689a..5caa18d63 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143260 2011-11-24 07:38:10Z andrea $ +# $Id: PKGBUILD 144910 2011-12-09 17:20:57Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.18 +pkgver=5.5.19 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('38b65815249f3bcacf3b0ee85171c486' +md5sums=('a78cf450974e9202bd43674860349b5a' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD index 2c6f54a83..96cf743d5 100644 --- a/extra/nicotine/PKGBUILD +++ b/extra/nicotine/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 108389 2011-01-30 22:14:15Z angvp $ +# $Id: PKGBUILD 144457 2011-12-06 06:35:08Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> pkgname=nicotine pkgver=1.2.16 -pkgrel=2 +pkgrel=3 pkgdesc="Soulseek music-sharing client, written in python" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('pygtk>=2.14.1' 'mutagen' 'python-geoip>=1.2.4') +depends=('pygtk>=2.14.1' 'mutagen') conflicts=(nicotine-plus) replaces=(nicotine-plus) url="http://sourceforge.net/projects/nicotine-plus/" @@ -18,6 +18,9 @@ optdepends=('python-sexy: To enable spell checking' 'python-geoip: to enable Geographical blocker') md5sums=('ac7433c21ef619a37e079a7ae68da94a') + + + build() { cd ${srcdir}/${pkgname}+-${pkgver} sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476 @@ -25,6 +28,10 @@ build() { cd trayicon python2 autogen.py make +} + +package() { + cd ${srcdir}/${pkgname}+-${pkgver}/trayicon make DESTDIR=${pkgdir} install ln -s nicotine.py ${pkgdir}/usr/bin/nicotine } diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index b710e7d66..9464444f6 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ntp pkgver=4.2.6.p4 _realver=4.2.6p4 -pkgrel=2 +pkgrel=2.1 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD index 5159c7d32..08e9ce2db 100644 --- a/extra/orbit2/PKGBUILD +++ b/extra/orbit2/PKGBUILD @@ -3,7 +3,7 @@ pkgname=orbit2 pkgver=2.14.19 -pkgrel=1 +pkgrel=1.1 pkgdesc="Thin/fast CORBA ORB" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 41eef8858..47f3f81a7 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141476 2011-10-30 16:50:53Z foutrelis $ +# $Id: PKGBUILD 144934 2011-12-10 23:19:27Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.0 -pkgrel=3 +pkgver=2.10.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') @@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 nm09-more.patch) -sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd' +sha256sums=('2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8' '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e') build() { @@ -32,6 +32,9 @@ build() { sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} + # Pidgin doesn't explicitly link to libm + LDFLAGS+=' -Wl,--copy-dt-needed-entries' + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD index 82b7e2b79..2ef5e2208 100644 --- a/extra/pm-utils/PKGBUILD +++ b/extra/pm-utils/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pm-utils pkgver=1.4.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64' 'mips64el') url="http://pm-utils.freedesktop.org" diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index 0fe7ea09b..60db8e35f 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136695 2011-08-31 14:31:56Z jgc $ +# $Id: PKGBUILD 144479 2011-12-06 17:28:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.102 +pkgver=0.103 pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ replaces=('policykit') options=('!libtool') source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz polkit.pam) -md5sums=('a3726bdb9728c103e58f62131e26693a' +md5sums=('aaacf2ef18774ea8a825a426a7cfe763' '6564f95878297b954f0572bc1610dd15') build() { diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 0f60dacfb..98a4e1def 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -5,7 +5,7 @@ pkgname=postfix pkgver=2.8.7 -pkgrel=1 +pkgrel=1.1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD index 7a46571da..4eeff18a7 100644 --- a/extra/purple-plugin-pack/PKGBUILD +++ b/extra/purple-plugin-pack/PKGBUILD @@ -1,25 +1,34 @@ -# $Id: PKGBUILD 77562 2010-04-15 22:34:21Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 144607 2011-12-08 01:03:26Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Dale Blount <dale@archlinux.org> pkgname=purple-plugin-pack -pkgver=2.6.3 +pkgver=2.7.0 pkgrel=1 -pkgdesc="Plugin pack for Pidgin" +pkgdesc="Compilation of plugins for the libpurple family of IM clients" arch=('i686' 'x86_64' 'mips64el') -url="http://plugins.guifications.org/trac/wiki/PluginPack" +url="https://www.guifications.org/projects/purple-plugin-pack" license=('GPL') -depends=('pidgin') -makedepends=('intltool' 'python') +depends=('libpurple') +makedepends=('intltool' 'gettext' 'python2' 'pidgin') options=('!libtool') -source=(http://plugins.guifications.org/trac/downloads/48) -md5sums=('2dccee28f087c7e81cef07ee845399bb') +source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-2.7.0.tar.bz2) +sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') build() { - cd "$srcdir/purple-plugin_pack-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr } + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD index addb040dc..c8fe95255 100644 --- a/extra/putty/PKGBUILD +++ b/extra/putty/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 131725 2011-07-14 01:51:53Z eric $ +# $Id: PKGBUILD 144938 2011-12-11 04:46:16Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=putty -pkgver=0.61 +pkgver=0.62 pkgrel=1 pkgdesc="A terminal integrated SSH/Telnet client" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~sgtatham/putty/" license=('MIT') depends=('gtk2') -source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('db0e37f6b82ea62f0ace87927d29b2a4') -sha1sums=('cbb82fd392142e3455e859ca8bc7b1e61b246204') +source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz + putty-${pkgver}.tar.gz.sig::http://the.earth.li/~sgtatham/putty/latest/putty-${pkgver}.tar.gz.DSA) +sha1sums=('5898438614117ee7e3704fc3f30a3c4bf2041380' + '128cded001647e3b47494dbfb1eeb70cbed49a7c') build() { cd "${srcdir}/${pkgname}-${pkgver}/unix" diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD index 806c926ad..06e1abf86 100644 --- a/extra/qhull/PKGBUILD +++ b/extra/qhull/PKGBUILD @@ -6,7 +6,7 @@ pkgname=qhull pkgver=2010.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="A general dimension code for computing convex hulls and related structures" arch=('i686' 'x86_64' 'mips64el') url="http://www.qhull.org/" diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index ef51d1d45..29b5fc0a8 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143489 2011-11-24 20:44:47Z juergen $ +# $Id: PKGBUILD 144860 2011-12-08 19:58:02Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.53 +pkgver=1.0.54 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -18,11 +18,9 @@ makedepends=('sbcl' 'texinfo') makedepends=('clisp' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" - "arch-fixes.lisp" - "mips-arch.h.diff") -md5sums=('28bdb8d65b240bcc45370f19b781f9b8' - '7ac0c1936547f4278198b8bf7725204d' - 'a456535d65d6c5b85b1b646f11455fce') + "arch-fixes.lisp") +md5sums=('b7e956a71d603bb714f71c2f7ef350f6' + '7ac0c1936547f4278198b8bf7725204d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index d5df7b1c8..1b06de270 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142894 2011-11-17 18:35:07Z ibiru $ +# $Id: PKGBUILD 144929 2011-12-10 21:36:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') license=('GPL') @@ -19,7 +19,7 @@ install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' - '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') + '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/seahorse/seahorse-ssh-askpass.sh b/extra/seahorse/seahorse-ssh-askpass.sh index 44281ac2b..04f79d8f2 100644 --- a/extra/seahorse/seahorse-ssh-askpass.sh +++ b/extra/seahorse/seahorse-ssh-askpass.sh @@ -1,3 +1,3 @@ -if [ -z "$SSH_ASKPASS" ]; then +if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass fi diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD index b98f97abd..364881d66 100644 --- a/extra/unixodbc/PKGBUILD +++ b/extra/unixodbc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=unixodbc pkgver=2.3.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index b2e124f72..e4134fdeb 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138500 2011-09-25 14:55:34Z andyrtr $ +# $Id: PKGBUILD 144876 2011-12-08 20:54:22Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.8.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') @@ -25,6 +25,7 @@ build() { cd "${srcdir}"/${pkgbase}-${pkgver} patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DWITH_VIGRANUMPY=1 \ -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \ -DDOCINSTALL=share/doc @@ -49,6 +50,9 @@ package_vigra() { # remove doc rm -rf "${pkgdir}"/usr/share/doc + + #fix shebang for python2 + sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config } package_vigra-doc() { diff --git a/extra/xalan-java/PKGBUILD b/extra/xalan-java/PKGBUILD new file mode 100644 index 000000000..f7fa0ad7c --- /dev/null +++ b/extra/xalan-java/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Hussam Al-Tayeb <ht990332@gmail.com> + +pkgname=xalan-java +pkgver=2.7.1 +pkgrel=3 +pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types" +arch=('any') +license=('APACHE') +url="http://xml.apache.org/xalan-j" +depends=('xerces2-java') +source=(http://mirror.softaculous.com/apache//xml/xalan-j/xalan-j_${pkgver//./_}-bin-2jars.tar.gz) +md5sums=('3ccda39bcd08b780436dfd2f22fb23d5') + +build() { + /bin/true +} + +package() { + cd ${srcdir}/xalan-j_${pkgver//./_} + install -m755 -d ${pkgdir}/usr/share/java + install -m644 xalan.jar ${pkgdir}/usr/share/java/ || return 1 + install -m644 xsltc.jar ${pkgdir}/usr/share/java/ || return 1 +} diff --git a/extra/xerces2-java/PKGBUILD b/extra/xerces2-java/PKGBUILD new file mode 100644 index 000000000..cccb28bed --- /dev/null +++ b/extra/xerces2-java/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 144863 2011-12-08 20:32:13Z andyrtr $ + +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xerces2-java +pkgver=2.11.0 +pkgrel=1 +pkgdesc="High performance fully compliant Java XML parser" +arch=('any') +url="http://xml.apache.org/xerces2-j" +license=('APACHE') +provides=("java-xerces2=${pkgver}") +conflicts=('java-xerces2') +replaces=('java-xerces2') +source=(http://mirror.checkdomain.de/apache//xerces/j/Xerces-J-bin.${pkgver}.tar.gz) +md5sums=('29d731e0ae57eb3f2e09af6594bc2515') + +build() { + /bin/true +} + +package() { + cd ${srcdir}/xerces-${pkgver//./_} + install -m755 -d ${pkgdir}/usr/share/java + rm -f xercesSamples.jar + install -m644 *.jar ${pkgdir}/usr/share/java/ +} diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 5be04a4a5..c2c9c34a2 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.11.2 -pkgrel=2 +pkgrel=2.1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -20,7 +20,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch xvfb-run xvfb-run.1 - 10-quirks.conf) + 10-quirks.conf + loongson.patch) md5sums=('8796fff441e5435ee36a72579008af24' '6c7e87d63ac4b535e19a80c89d0cf091' 'f8194638ca4872c2b0a67862a70bcebf' @@ -30,7 +31,8 @@ md5sums=('8796fff441e5435ee36a72579008af24' '47f9b979fe38043b42ff86eeee6fd0d0' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' - 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') + 'd4f7dfc6be4ef4e2c6dd7632a9d88abe' + 'd39c2e1a70bb4e400bb688cc74cd15f8') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -55,6 +57,9 @@ build() { # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" + # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html + patch -Np1 -i "${srcdir}/loongson.patch" + autoreconf -fi if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch new file mode 100644 index 000000000..b6c9692fc --- /dev/null +++ b/extra/xorg-server/loongson.patch @@ -0,0 +1,49 @@ +diff -ru xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h xorg-server-1.11.2/hw/xfree86/dri/sarea.h +--- xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h 2011-12-07 16:47:06.971237310 +0100 ++++ xorg-server-1.11.2/hw/xfree86/dri/sarea.h 2011-12-07 16:48:40.132392770 +0100 +@@ -42,6 +42,8 @@ + /* SAREA area needs to be at least a page */ + #if defined(__alpha__) + #define SAREA_MAX 0x2000 ++#elif defined(__mips__) ++#define SAREA_MAX 0x4000 + #elif defined(__ia64__) + #define SAREA_MAX 0x10000 /* 64kB */ + #else +diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c +--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2011-12-07 16:47:06.967237429 +0100 ++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2011-12-07 16:52:33.200881187 +0100 +@@ -493,9 +493,10 @@ + Bool + xf86EnableIO(void) + { +-#if defined(__powerpc__) ++#if defined(__powerpc__) || defined(__mips__) + int fd; + unsigned int ioBase_phys; ++ extern unsigned int IOPortBase; + #endif + + if (ExtendedEnabled) +@@ -520,6 +521,21 @@ + #endif + } + close(fd); ++#elif defined(__mips__) ++ fd = open("/dev/mem", O_RDWR); ++ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, ++ PROT_READ | PROT_WRITE, MAP_SHARED, fd, ++ 0x1fd00000); ++ if (IOPortBase == MAP_FAILED) { ++ xf86Msg(X_WARNING, ++ "xf86EnableIOPorts: Failed to map iobase (%s)\n", ++ strerror(errno)); ++ return FALSE; ++ } ++ close(fd); ++ xf86Msg(X_WARNING, ++ "xf86EnableIOPorts: map iobase (%x)\n", ++ IOPortBase); + #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) + if (ioperm(0, 1024, 1) || iopl(3)) { + if (errno == ENODEV) diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 95eed637b..d11a75e9f 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 143828 2011-11-29 13:33:59Z stephane $ +# $Id: PKGBUILD 144599 2011-12-07 15:40:43Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh -pkgver=4.3.12 -pkgrel=3 +pkgver=4.3.14 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' license=('custom') depends=('pcre' 'libcap' 'gdbm') install=zsh.install -source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch') -md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811' - 'b367c1398b60242f7044a93a837227f9') +source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" + 'zprofile') +backup=('etc/zsh/zprofile') +md5sums=('1c819a3ff7302b42eba988e333e76109' + '24a9335edf77252a7b5f52e079f7aef7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # upstream patch to fix handling of compressed kernel modules - patch -p1 -i ${srcdir}/modules.patch # FS#16360 sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ Doc/zsh.texi \ @@ -29,7 +29,7 @@ build() { --enable-zshenv=/etc/zsh/zshenv \ --enable-zlogin=/etc/zsh/zlogin \ --enable-zlogout=/etc/zsh/zlogout \ - --enable-zprofile=/etc/profile \ + --enable-zprofile=/etc/zsh/zprofile \ --enable-zshrc=/etc/zsh/zshrc \ --enable-maildir-support \ --with-term-lib='ncursesw' \ @@ -54,5 +54,6 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install + install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/zsh/zprofile b/extra/zsh/zprofile new file mode 100644 index 000000000..6bfcdf7cb --- /dev/null +++ b/extra/zsh/zprofile @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' |