diff options
| author | root <root@rshg054.dnsready.net> | 2012-06-07 00:01:55 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-06-07 00:01:55 +0000 |
| commit | 334c2a7916a80d08b1c216cfbf02135e64891632 (patch) | |
| tree | d5ed69695fb4da7349d218aa56fa4403017b7e9c | |
| parent | 664b1c2195b2884102cc2d5a56a13702f8ee44fe (diff) | |
Thu Jun 7 00:01:54 UTC 2012
41 files changed, 1358 insertions, 184 deletions
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index e1dfd351c..7b44ecc55 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63386 2012-02-01 00:49:48Z giovanni $ +# $Id: PKGBUILD 72015 2012-06-05 17:23:40Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.4.9 +pkgver=0.5 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('81e6a717a020266f161d33980110a4f1') +md5sums=('b1ed24de45456a76dac0e3bcbea0033f') build() { cd "${srcdir}" diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index 9eab4e27a..840f9311c 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69334 2012-04-14 03:33:13Z svenstaro $ +# $Id: PKGBUILD 72013 2012-06-05 15:38:07Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -8,8 +8,7 @@ pkgname=('dmd' 'libphobos') pkgbase=dmd pkgver=2.059 -pkgrel=1 -pkgdesc="The Digital Mars D compiler" +pkgrel=3 arch=('i686' 'x86_64') url="http://www.digitalmars.com/d/2.0/" source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip @@ -39,12 +38,15 @@ build() { } package_dmd() { + pkgdesc="The Digital Mars D compiler" + backup=('etc/dmd.conf') depends=('libphobos' 'gcc-libs') install -Dm755 $srcdir/dmd2/src/dmd/dmd $pkgdir/usr/bin/dmd mkdir -p $pkgdir/etc - echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-lrt" > $pkgdir/etc/dmd.conf + echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf + install -Dm644 $srcdir/dmd2/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1 install -Dm644 $srcdir/dmd2/man/man1/rdmd.1 $pkgdir/usr/share/man/man1/rdmd.1 @@ -67,6 +69,7 @@ package_dmd() { } package_libphobos() { + pkgdesc="The phobos D standard library for DMD" install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux${_archbits}.a $pkgdir/usr/lib/libdruntime.a install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a diff --git a/community/lxinput/PKGBUILD b/community/lxinput/PKGBUILD new file mode 100644 index 000000000..7ed91636f --- /dev/null +++ b/community/lxinput/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 72002 2012-06-05 13:35:16Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Filipp "Scorp" Andjelo <scorp@mailueberfall.de> + +pkgname=lxinput +pkgver=0.3.2 +pkgrel=2 +pkgdesc="A small program to configure keyboard and mouse for LXDE." +arch=('i686' 'x86_64') +url="http://lxde.org/" +license=('GPL') +groups=('lxde') +depends=('gtk2>=2.12.0') +makedepends=('pkgconfig' 'intltool') +source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) +md5sums=('5bf563d04984ef2a147433f3bdda687b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} + diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index a4d998095..c38d48afc 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 69320 2012-04-13 16:10:58Z svenstaro $ +# $Id: PKGBUILD 72000 2012-06-05 13:31:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> pkgname=nbd -pkgver=3.0 -pkgrel=2 -pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP." +pkgver=3.1.1 +pkgrel=1 +pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64') url="http://nbd.sourceforge.net" license=('GPL') @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install -md5sums=('81f549155267536ad30851eb50ee8d1c' +md5sums=('e0e9d96abe068ee4f6fecd58635450ac' '2d05d426b8c2708d5f8a0d028fcbae05' 'e7b13a8b3369e11927d9917664557efa') diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 54a6f38bd..4a9fdb879 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70700 2012-05-15 08:39:01Z arodseth $ +# $Id: PKGBUILD 72018 2012-06-05 20:13:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.1.0 +pkgver=3.2.0 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('09b020a331f7c54edd731440fa1c717776021d5dc775e58965f8ef71673202e3') +sha256sums=('2734a61acd823831e870b6ce04a39f6d163e83f93096044c66ff36be5bbcdf2e') build() { cd "$srcdir" @@ -26,14 +26,11 @@ build() { sed '0,/CXXTFLAGS=/s//nop=/' -i scite/gtk/makefile setconf scite/gtk/makefile CXXTFLAGS "-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)" fi - sed '0,/CXXFLAGS=/s//nop=/' -i scintilla/gtk/makefile setconf scintilla/gtk/makefile CXXFLAGS "-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)" setconf scintilla/gtk/makefile CXXBASEFLAGS "-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic ${CXXFLAGS} -DGTK -DSCI_LEXER \$(INCLUDEDIRS)" - cd "$srcdir/scintilla/gtk" make - cd "$srcdir/$pkgname/gtk" make } @@ -42,12 +39,10 @@ package() { cd "$srcdir/$pkgname/gtk" make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/$pkgname/License.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE-scite" install -Dm644 "$srcdir/scintilla/License.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE-scintilla" - ln -sf SciTE "$pkgdir/usr/bin/scite" } diff --git a/community/scite/scite.install b/community/scite/scite.install index 686b22022..ad97d7bab 100644 --- a/community/scite/scite.install +++ b/community/scite/scite.install @@ -1,13 +1,13 @@ -post_install() { +post_upgrade() { update-desktop-database -q } -post_upgrade() { - post_install $1 +post_install() { + post_upgrade } post_remove() { - post_install $1 + post_upgrade } # vim:set ts=2 sw=2 et: diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD index 910446431..9d680a1ae 100644 --- a/community/tightvnc/PKGBUILD +++ b/community/tightvnc/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 67960 2012-03-16 12:47:31Z arodseth $ +# $Id: PKGBUILD 72020 2012-06-05 20:37:51Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Paul Mattal <paul@archlinux.org> +# Contributor: Andrew Hills <hills.as@gmail.com> pkgname=tightvnc pkgver=1.3.10 -pkgrel=7 +pkgrel=8 pkgdesc="VNC Unix server && viewer" arch=('i686' 'x86_64') license=('GPL') url="http://www.tightvnc.com" depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl') makedepends=('imake' 'setconf') -conflicts=('vnc') options=('!makeflags') source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" - 'http://people.csail.mit.edu/jaffer/Color/rgb.txt') + 'http://people.csail.mit.edu/jaffer/Color/rgb.txt') sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d' 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73') build() { cd $srcdir/vnc_unixsrc - setconf tightvncserver.conf '$colorPath' \"/usr/share/tightvnc\"\; - setconf vncserver '$colorPath' \"/usr/share/tightvnc\"\; setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\; setconf vncserver '$fontPath' \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\; xmkmf make World cd Xvnc ./configure + setconf programs/Xserver/dix/Makefile DEFAULTRGBDATABASE '/usr/share/tightvnc/rgb' setconf programs/Xserver/os/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L" setconf lib/font/fc/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L" make diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 0769a48dd..8f0256e4f 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160203 2012-05-30 19:05:51Z andyrtr $ +# $Id: PKGBUILD 160790 2012-06-05 20:25:07Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -6,7 +6,7 @@ pkgname=dovecot pkgver=2.1.7 -pkgrel=1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" @@ -19,10 +19,13 @@ optdepends=('libldap: ldap plugin' provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install -source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) +source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} + dovecot.sh + dovecot.tmpfilesd) md5sums=('b52d0faf1b9ec21bc5552691fe0ff1d1' '391cd5f98442ef446916c0f3b671d3f7' - '587159e84e2da6f83d70b3c706ba87cc') + '587159e84e2da6f83d70b3c706ba87cc' + 'f40857555bd65add2e86c89fe3242357') build() { cd ${srcdir}/$pkgname-$pkgver @@ -30,6 +33,7 @@ build() { # configure with openssl, mysql, and postgresql support ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --disable-static \ --with-nss \ --with-pam \ @@ -64,4 +68,8 @@ package() { install -m 755 ${srcdir}/$pkgname-$pkgver/doc/mkcert.sh ${pkgdir}/usr/lib/dovecot/mkcert.sh rm ${pkgdir}/etc/dovecot/README + + # systemd tmpfile + install -d -m755 ${pkgdir}/etc/tmpfiles.d + install -m 644 ${srcdir}/dovecot.tmpfilesd ${pkgdir}/etc/tmpfiles.d/dovecot.conf } diff --git a/extra/dovecot/dovecot.tmpfilesd b/extra/dovecot/dovecot.tmpfilesd new file mode 100644 index 000000000..4fb276d5f --- /dev/null +++ b/extra/dovecot/dovecot.tmpfilesd @@ -0,0 +1 @@ +d /var/run/dovecot 0755 root dovecot - diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 30b6b3463..071a2bf69 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159032 2012-05-15 10:44:22Z heftig $ +# $Id: PKGBUILD 160794 2012-06-05 23:43:39Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -15,11 +15,21 @@ options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gnome-session-3.3.1-llvmpipe.patch timeout.patch) +sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356' + '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' + '1942c8144711cf4bc0e776edd366579849e266a446b48cca0205d7ab82241782') build() { cd $pkgname-$pkgver + + # Allow software rendering + patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch + + # Increase timeout, for slow machines + patch -Np1 -i ../timeout.patch + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ --disable-schemas-compile --enable-systemd diff --git a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch new file mode 100644 index 000000000..40da1c9b7 --- /dev/null +++ b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch @@ -0,0 +1,9 @@ +diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility +--- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.000000000 -0400 ++++ gnome-session-3.3.1/data/hardware-compatibility 2011-11-03 17:53:17.156407217 -0400 +@@ -20,4 +20,4 @@ + + # Gallium has softpipe and llvmpipe + -softpipe +--llvmpipe ++#llvmpipe diff --git a/extra/gnome-session/timeout.patch b/extra/gnome-session/timeout.patch new file mode 100644 index 000000000..20500206b --- /dev/null +++ b/extra/gnome-session/timeout.patch @@ -0,0 +1,12 @@ +diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c +--- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 ++++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c 2012-06-04 11:06:35.911690067 +0200 +@@ -30,7 +30,7 @@ + #include <X11/Xatom.h> + + /* Wait up to this long for a running check to finish */ +-#define PROPERTY_CHANGE_TIMEOUT 5000 ++#define PROPERTY_CHANGE_TIMEOUT 10000 + + /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ + #define NO_ACCEL 0 diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index b3aa4dfd2..a9d142f7b 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156663 2012-04-22 16:04:02Z andyrtr $ +# $Id: PKGBUILD 160792 2012-06-05 20:47:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.19 +pkgver=3.0.20 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('valgrind' 'strace') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('05e85d18955edd5c0fe40fbb7ef168bd' - '52c7b7ecf7032322321bf667d86eb084') +md5sums=('1e9322764f4531b00b4a46a5d634695e' + 'efc0ac29d46219aa75f08f57ba679776') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgksu/PKGBUILD b/extra/libgksu/PKGBUILD index b5d0cf67a..d64ba07d9 100644 --- a/extra/libgksu/PKGBUILD +++ b/extra/libgksu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143675 2011-11-28 10:58:18Z jgc $ +# $Id: PKGBUILD 160761 2012-06-05 08:03:43Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgksu pkgver=2.0.12 -pkgrel=4 +pkgrel=5 pkgdesc="gksu authorization library" arch=(i686 x86_64) url="http://www.nongnu.org/gksu/index.html" @@ -13,13 +13,36 @@ makedepends=('intltool' 'gtk-doc') options=('!libtool' '!emptydirs') install=libgksu.install source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz - libgksu-2.0.12-revert-forkpty.patch) + libgksu-2.0.0-fbsd.patch + libgksu-2.0.12-automake-1.11.2.patch + libgksu-2.0.12-fix-make-3.82.patch + libgksu-2.0.12-notests.patch + libgksu-2.0.12-revert-forkpty.patch + libgksu-2.0.7-libs.patch + libgksu-2.0.7-polinguas.patch) md5sums=('c7154c8806f791c10e7626ff123049d3' - 'aebbe57e5286c654e27cf714cf3b704a') + '063a2b45d8e7cbba898d1db413242da0' + '2eeb34ad9b5bf29e8e2ebf8c8a5a28b6' + 'afeaf5caab03d793258d62d60a9bf0f0' + '4179d0487d6032e56b8a925010694c0a' + 'aebbe57e5286c654e27cf714cf3b704a' + '58d3a4a9d2ac741951720043ea3f7b5f' + '0b5c3d5d9b32cb3e65d9f0bfbcb11a76') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/libgksu-2.0.0-fbsd.patch" + patch -Np1 -i "${srcdir}/libgksu-2.0.7-libs.patch" + patch -Np1 -i "${srcdir}/libgksu-2.0.7-polinguas.patch" patch -Np1 -i "${srcdir}/libgksu-2.0.12-revert-forkpty.patch" + patch -Np0 -i "${srcdir}/libgksu-2.0.12-fix-make-3.82.patch" + patch -Np1 -i "${srcdir}/libgksu-2.0.12-notests.patch" + patch -Np1 -i "${srcdir}/libgksu-2.0.12-automake-1.11.2.patch" + + touch NEWS README + + intltoolize --force --copy --automake + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static --disable-schemas-install make diff --git a/extra/libgksu/libgksu-2.0.0-fbsd.patch b/extra/libgksu/libgksu-2.0.0-fbsd.patch new file mode 100644 index 000000000..5c007be5b --- /dev/null +++ b/extra/libgksu/libgksu-2.0.0-fbsd.patch @@ -0,0 +1,60 @@ +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c +--- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 ++++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 +@@ -23,7 +23,12 @@ + #include <unistd.h> + #include <string.h> + #include <fcntl.h> ++#ifdef __FreeBSD__ ++#include <libutil.h> ++#include <termios.h> ++#else + #include <pty.h> ++#endif + #include <pwd.h> + #include <sys/types.h> + #include <sys/wait.h> +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am +--- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + + EXTRA_DIST = libgksu.ver +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in +--- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 +@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- + gksu_run_helper_SOURCES = gksu-run-helper.c + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + EXTRA_DIST = libgksu.ver + all: all-am + +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am +--- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in +--- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 +@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + all: all-am + + .SUFFIXES: diff --git a/extra/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/extra/libgksu/libgksu-2.0.12-automake-1.11.2.patch new file mode 100644 index 000000000..0f22166fb --- /dev/null +++ b/extra/libgksu/libgksu-2.0.12-automake-1.11.2.patch @@ -0,0 +1,25 @@ +Due to the following change, pkglib_PROGRAMS is invalid: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf + +https://savannah.nongnu.org/bugs/index.php?35241 +https://bugs.gentoo.org/show_bug.cgi?id=397411 + +--- + libgksu/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am +index 49362f9..3cb1090 100644 +--- a/libgksu/Makefile.am ++++ b/libgksu/Makefile.am +@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = libgksu2.pc + +-pkglibdir = ${libdir}/${PACKAGE} +-pkglib_PROGRAMS = gksu-run-helper ++gksulibdir = ${libdir}/${PACKAGE} ++gksulib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + diff --git a/extra/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/extra/libgksu/libgksu-2.0.12-fix-make-3.82.patch new file mode 100644 index 000000000..0a7c5f142 --- /dev/null +++ b/extra/libgksu/libgksu-2.0.12-fix-make-3.82.patch @@ -0,0 +1,19 @@ +--- Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 ++++ Makefile.am 2010-08-22 16:11:55.289599110 -0500 +@@ -17,11 +17,11 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- if test -z "$(DESTDIR)" ; then \ +- for p in $(schemas_DATA) ; do \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ +- done \ +- fi ++ if test -z "$(DESTDIR)" ; then \ ++ for p in $(schemas_DATA) ; do \ ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ ++ done \ ++ fi + else + install-data-local: + endif diff --git a/extra/libgksu/libgksu-2.0.12-notests.patch b/extra/libgksu/libgksu-2.0.12-notests.patch new file mode 100644 index 000000000..3787ef6bf --- /dev/null +++ b/extra/libgksu/libgksu-2.0.12-notests.patch @@ -0,0 +1,26 @@ +Index: libgksu-2.0.12/libgksu/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksu/Makefile.am ++++ libgksu-2.0.12/libgksu/Makefile.am +@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` + gksu_run_helper_SOURCES = gksu-run-helper.c + +-noinst_PROGRAMS = test-gksu ++EXTRA_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la + test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` +Index: libgksu-2.0.12/libgksuui/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksuui/Makefile.am ++++ libgksu-2.0.12/libgksuui/Makefile.am +@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + +-noinst_PROGRAMS = test-gksuui ++EXTRA_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la + test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/extra/libgksu/libgksu-2.0.7-libs.patch b/extra/libgksu/libgksu-2.0.7-libs.patch new file mode 100644 index 000000000..b9fb77f27 --- /dev/null +++ b/extra/libgksu/libgksu-2.0.7-libs.patch @@ -0,0 +1,76 @@ +# https://savannah.nongnu.org/bugs/?25362 +# https://bugs.gentoo.org/show_bug.cgi?id=226837 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 ++++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 +@@ -43,6 +43,9 @@ + PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) + PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) + ++PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) ++ + # Checks for library functions. + ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" + +diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am +--- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 +@@ -3,7 +3,7 @@ + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" + + bin_PROGRAMS = gksu-properties +-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} ++gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} + gksu_properties_SOURCES = gksu-properties.c + + gladedir = ${prefix}/share/${PACKAGE} +diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am +--- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 +@@ -8,8 +8,8 @@ + # major -> breaks backward compatibility (changes to existing ABI) + # minor -> keeps compatibility (additions to the API) + # micro -> no change to the API/ABI +-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la +-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 + if USE_VERSION_SCRIPT + libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver + endif +@@ -24,12 +24,11 @@ + + pkglibdir = ${libdir}/${PACKAGE} + pkglib_PROGRAMS = gksu-run-helper +-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` ++gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c +-test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} + + EXTRA_DIST = libgksu.ver +diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am +--- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 +@@ -4,12 +4,13 @@ + + noinst_LTLIBRARIES = libgksuui1.0.la + libgksuui1_0_la_SOURCES = gksuui-dialog.c +-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` ++libgksuui1_0_la_LDFLAGS = -Wl,-O1 ++libgksuui1_0_la_LIBADD = ${GTK_LIBS} + + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c +-test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} ++ diff --git a/extra/libgksu/libgksu-2.0.7-polinguas.patch b/extra/libgksu/libgksu-2.0.7-polinguas.patch new file mode 100644 index 000000000..e423af16b --- /dev/null +++ b/extra/libgksu/libgksu-2.0.7-polinguas.patch @@ -0,0 +1,40 @@ +# https://savannah.nongnu.org/bugs/?25360 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 ++++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 +@@ -50,7 +50,7 @@ + GETTEXT_PACKAGE=AC_PACKAGE_NAME + AC_SUBST(GETTEXT_PACKAGE) + +-IT_PROG_INTLTOOL ++IT_PROG_INTLTOOL([0.35.5]) + AM_GLIB_GNU_GETTEXT + + ################################################## +diff -Nura a/po/LINGUAS b/po/LINGUAS +--- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 ++++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 +@@ -0,0 +1,23 @@ ++# please keep this list sorted alphabetically ++# http://live.gnome.org/GnomeGoals/PoLinguas ++# ++ca ++cs ++da ++de ++es ++eu ++fr ++hu ++it ++ko ++lt ++pl ++pt_BR ++ro ++ru ++sk ++sv ++nb ++nl ++zh_CN diff --git a/extra/wildmidi/PKGBUILD b/extra/wildmidi/PKGBUILD new file mode 100644 index 000000000..51402e133 --- /dev/null +++ b/extra/wildmidi/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Panagiotis Papadopoulos + +pkgname=wildmidi +pkgver=0.2.3.5 +pkgrel=2 +pkgdesc='Open Source MIDI Synthesizer' +arch=('i686' 'x86_64') +url='http://wildmidi.sourceforge.net/' +license=('LGPL3') +depends=('alsa-lib') +options=(!makeflags !libtool) +source=(http://sourceforge.net/projects/wildmidi/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('44583c95fd67761f8cd6275fd1c312f2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --disable-werror + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index 4361bbd6f..ab3511aa8 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160441 2012-06-01 21:45:19Z andrea $ +# $Id: PKGBUILD 160754 2012-06-05 05:18:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -56,11 +56,13 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-containments' 'kdeplasma-addons-libs' 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-bing' 'kdeplasma-addons-runners-browserhistory' 'kdeplasma-addons-runners-characters' 'kdeplasma-addons-runners-contacts' 'kdeplasma-addons-runners-converter' 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-duckduckgo' 'kdeplasma-addons-runners-events' 'kdeplasma-addons-runners-katesessions' 'kdeplasma-addons-runners-konquerorsessions' @@ -68,6 +70,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-runners-kopete' 'kdeplasma-addons-runners-mediawiki' 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-runners-youtube' 'kdeplasma-addons-wallpapers-mandelbrot' 'kdeplasma-addons-wallpapers-marble' 'kdeplasma-addons-wallpapers-pattern' @@ -75,13 +78,13 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.8.80 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' - 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth') + 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") sha1sums=('138ed0e557d31c4254bd4cc90f4bab65885dc35e') @@ -98,7 +101,7 @@ build() { package_kdeplasma-addons-applets-bball() { pkgdesc='A bouncy ball for plasma' depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' + install='kdeplasma-addons.install' cd $srcdir/build/applets/bball make DESTDIR=$pkgdir install } @@ -147,7 +150,7 @@ package_kdeplasma-addons-applets-charselect() { package_kdeplasma-addons-applets-comic() { pkgdesc='View comic strips from the Internet' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') cd $srcdir/build/applets/comic make DESTDIR=$pkgdir install } @@ -172,7 +175,7 @@ package_kdeplasma-addons-applets-dict() { package_kdeplasma-addons-applets-eyes() { pkgdesc='XEyes clone' depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' + install='kdeplasma-addons.install' cd $srcdir/build/applets/eyes make DESTDIR=$pkgdir install } @@ -180,7 +183,7 @@ package_kdeplasma-addons-applets-eyes() { package_kdeplasma-addons-applets-fifteenpuzzle() { pkgdesc='Put the pieces in order' depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' + install='kdeplasma-addons.install' cd $srcdir/build/applets/fifteenPuzzle make DESTDIR=$pkgdir install } @@ -222,15 +225,15 @@ package_kdeplasma-addons-applets-incomingmsg() { package_kdeplasma-addons-applets-kdeobservatory() { pkgdesc='Visualize the KDE ecosystem' - depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qwt') - install='kdeplasma-addons-applets.install' + depends=('kdeplasma-addons-libs' 'qwt') + install='kdeplasma-addons.install' cd $srcdir/build/applets/kdeobservatory make DESTDIR=$pkgdir install } package_kdeplasma-addons-applets-kimpanel() { pkgdesc='A generic input method panel for Oriental languages' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') optdepends=('scim: SCIM backend' 'fcitx: FCITX backend' 'ibus: IBUS backend') @@ -254,14 +257,14 @@ package_kdeplasma-addons-applets-kolourpicker() { package_kdeplasma-addons-applets-konqprofiles() { pkgdesc='List and launch Konqueror profiles' - depends=('kdebase-workspace') + depends=('kdebase-konqueror' 'kdeplasma-addons-libs') cd $srcdir/build/applets/konqprofiles make DESTDIR=$pkgdir install } package_kdeplasma-addons-applets-konsoleprofiles() { pkgdesc='List and launch Konsole profiles' - depends=('kdebase-workspace') + depends=('kdebase-konsole' 'kdeplasma-addons-libs') cd $srcdir/build/applets/konsoleprofiles make DESTDIR=$pkgdir install } @@ -287,7 +290,7 @@ package_kdeplasma-addons-applets-leavenote() { package_kdeplasma-addons-applets-life() { pkgdesc='Life' depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' + install='kdeplasma-addons.install' cd $srcdir/build/applets/life make DESTDIR=$pkgdir install } @@ -295,7 +298,7 @@ package_kdeplasma-addons-applets-life() { package_kdeplasma-addons-applets-luna() { pkgdesc='Display moon phases for your location' depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' + install='kdeplasma-addons.install' cd $srcdir/build/applets/luna make DESTDIR=$pkgdir install } @@ -316,7 +319,7 @@ package_kdeplasma-addons-applets-mediaplayer() { package_kdeplasma-addons-applets-microblog() { pkgdesc='Update and view your microblog status.' - depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qoauth' 'qca-ossl') + depends=('kdeplasma-addons-libs' 'qoauth' 'qca-ossl' 'qjson') cd $srcdir/build/applets/microblog make DESTDIR=$pkgdir install } @@ -366,7 +369,7 @@ package_kdeplasma-addons-applets-plasmaboard() { package_kdeplasma-addons-applets-previewer() { pkgdesc='Preview This File' depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' + install='kdeplasma-addons.install' cd $srcdir/build/applets/previewer make DESTDIR=$pkgdir install } @@ -374,14 +377,14 @@ package_kdeplasma-addons-applets-previewer() { package_kdeplasma-addons-applets-qalculate() { pkgdesc='A powerful mathematical equation solver' depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' + install='kdeplasma-addons.install' cd $srcdir/build/applets/qalculate make DESTDIR=$pkgdir install } package_kdeplasma-addons-applets-rememberthemilk() { pkgdesc='Remember The Milk Todo list applet' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') cd $srcdir/build/applets/rememberthemilk make DESTDIR=$pkgdir install } @@ -411,7 +414,7 @@ package_kdeplasma-addons-applets-social-news() { pkgdesc='Stay informed with the Social Desktop' replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') cd $srcdir/build/applets/social-news make DESTDIR=$pkgdir install } @@ -446,14 +449,14 @@ package_kdeplasma-addons-applets-unitconverter() { package_kdeplasma-addons-applets-weather() { pkgdesc='Displays Weather information' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') cd $srcdir/build/applets/weather make DESTDIR=$pkgdir install } package_kdeplasma-addons-applets-weatherstation() { pkgdesc='Weather reports with an LCD display style' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') cd $srcdir/build/applets/weatherstation make DESTDIR=$pkgdir install } @@ -492,6 +495,13 @@ package_kdeplasma-addons-runners-audioplayercontrol() { make DESTDIR=$pkgdir install } +package_kdeplasma-addons-runners-bing() { + pkgdesc='Matches Bing queries' + depends=('kdebase-workspace') + cd $srcdir/build/runners/bing + make DESTDIR=$pkgdir install +} + package_kdeplasma-addons-runners-browserhistory() { pkgdesc='Searches in Konqueror´s history' depends=('kdebase-workspace') @@ -527,6 +537,13 @@ package_kdeplasma-addons-runners-datetime() { make DESTDIR=$pkgdir install } +package_kdeplasma-addons-runners-duckduckgo() { + pkgdesc='Matches DuckDuckGo queries' + depends=('kdebase-workspace') + cd $srcdir/build/runners/duckduckgo + make DESTDIR=$pkgdir install +} + package_kdeplasma-addons-runners-events() { pkgdesc='Calendar Events runner' depends=('kdebase-workspace') @@ -536,28 +553,28 @@ package_kdeplasma-addons-runners-events() { package_kdeplasma-addons-runners-katesessions() { pkgdesc='Matches Kate Sessions' - depends=('kdebase-workspace') + depends=('kdebase-workspace' 'kdesdk-kate') cd $srcdir/build/runners/katesessions make DESTDIR=$pkgdir install } package_kdeplasma-addons-runners-konquerorsessions() { pkgdesc='Matches Konqueror Sessions' - depends=('kdebase-workspace') + depends=('kdebase-workspace' 'kdebase-konqueror') cd $srcdir/build/runners/konquerorsessions make DESTDIR=$pkgdir install } package_kdeplasma-addons-runners-konsolesessions() { pkgdesc='Matches Konsole Sessions' - depends=('kdebase-workspace') + depends=('kdebase-workspace' 'kdebase-konsole') cd $srcdir/build/runners/konsolesessions make DESTDIR=$pkgdir install } package_kdeplasma-addons-runners-kopete() { pkgdesc='Kopete Contact runner' - depends=('kdebase-workspace') + depends=('kdebase-workspace' 'kdenetwork-kopete') cd $srcdir/build/runners/kopete make DESTDIR=$pkgdir install } @@ -576,6 +593,14 @@ package_kdeplasma-addons-runners-spellchecker() { make DESTDIR=$pkgdir install } +package_kdeplasma-addons-runners-youtube() { + pkgdesc='Matches YouTube queries' + depends=('kdebase-workspace') + install='kdeplasma-addons.install' + cd $srcdir/build/runners/youtube + make DESTDIR=$pkgdir install +} + package_kdeplasma-addons-wallpapers-mandelbrot() { pkgdesc='Mandelbrot' depends=('kdebase-workspace') @@ -599,7 +624,7 @@ package_kdeplasma-addons-wallpapers-pattern() { package_kdeplasma-addons-wallpapers-potd() { pkgdesc='Picture of the Day' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') cd $srcdir/build/wallpapers/potd make DESTDIR=$pkgdir install } @@ -613,7 +638,7 @@ package_kdeplasma-addons-wallpapers-virus() { package_kdeplasma-addons-wallpapers-weather() { pkgdesc='Weather' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') + depends=('kdeplasma-addons-libs') cd $srcdir/build/wallpapers/weather make DESTDIR=$pkgdir install } diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons.install new file mode 100644 index 000000000..c4ef46ba8 --- /dev/null +++ b/kde-unstable/kdeplasma-addons/kdeplasma-addons.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/libkcompactdisc/PKGBUILD b/kde-unstable/libkcompactdisc/PKGBUILD index 112e1689c..d59da7274 100644 --- a/kde-unstable/libkcompactdisc/PKGBUILD +++ b/kde-unstable/libkcompactdisc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160182 2012-05-30 06:34:40Z andrea $ +# $Id: PKGBUILD 160756 2012-06-05 05:30:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('52c984a187195e92436b070cee186977c5dee977') +sha1sums=('d7a052a3c7e5a9efaa8d3535f5f350dfc3ec6793') build() { cd "${srcdir}" diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD new file mode 100644 index 000000000..b6b429442 --- /dev/null +++ b/libre/apache-ant/PKGBUILD @@ -0,0 +1,108 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Paul Mattal <paul@archlinux.org> +# Contributor: Andrew Wright <andreww@photism.org> + +pkgname=apache-ant +pkgver=1.8.2 + +provides=("apache-ant-libre=$pkgver") +replaces=("apache-ant-libre") +conflicts=("apache-ant-libre") + +pkgrel=4.2 +pkgdesc="A Java-based build tool" +arch=('any') +license=('Apache') +url="http://ant.apache.org/" +_mirror=http://archive.apache.org/dist +source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2 + ${pkgname}.sh ${pkgname}.csh) +depends=('java-environment') + +# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies +declare -A _opts +_opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar' +_opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar' +_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar' +#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar' +#_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar' +_opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar' +#_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar' +_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar' +_opts[jython]='Python with <script> task;/opt/jython/jython.jar' +#_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar' +#_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar' +_opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar' +#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar' +#_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar' +_opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar' +#_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar' +#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar' +#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar" +#_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar' +#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar' +#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar' +#_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar" +#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar' +#_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar' + +for pkg in "${!_opts[@]}"; do + optdepends+=("$pkg: ${_opts[$pkg]%;*}") + makedepends+=("$pkg") +done + +build() { + # This directory is what becomes + # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 + # which is what Arch uses + rm -rf "${srcdir}"/${pkgname}-${pkgver}-bin + mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin + + cd "${srcdir}"/${pkgname}-${pkgver} + # Symlink to external optional libraries + for jar in ${_opts[@]#*;}; do + ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}` + done + # Build + sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver}-bin + source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var + + ## Install profile.d script + install -d "${pkgdir}"/etc/profile.d + install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/ + + ## Install the main distribution + install -d "${pkgdir}"/${ANT_HOME} + cp -Rp * "${pkgdir}"/${ANT_HOME} + + ## Fix the distribution + # Remove Windows .bat/.cmd files + rm -f "${pkgdir}"/${ANT_HOME}/bin/*.{bat,cmd} + # Fix python2 path + sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py + # Symlink to external optional libraries + for jar in ${_opts[@]#*;}; do + ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}` + done + + ## Symlink the /opt distribution to the normal places + install -d "${pkgdir}"/usr/bin + install -d "${pkgdir}"/usr/share/doc/${pkgname} + install -d "${pkgdir}"/usr/share/licenses/${pkgname} + + cd "${pkgdir}"/${ANT_HOME} + for prog in bin/*; do + ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin + done + ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname} + ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html + ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname} +} + +md5sums=('0d9e108afcd15b820150b8085c96d2b1' + 'bd63c881be406f515fc4d22635e8326a' + '298e8ba2e99ccda7706113ea37e030f2') diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh new file mode 100644 index 000000000..490a17b65 --- /dev/null +++ b/libre/apache-ant/apache-ant.csh @@ -0,0 +1,3 @@ +#!/bin/csh +setenv ANT_HOME /usr/share/java/apache-ant +setenv PATH ${PATH}:${ANT_HOME}/bin diff --git a/libre/apache-ant/apache-ant.sh b/libre/apache-ant/apache-ant.sh new file mode 100644 index 000000000..6e4809da5 --- /dev/null +++ b/libre/apache-ant/apache-ant.sh @@ -0,0 +1,2 @@ +#!/bin/sh +export ANT_HOME=/opt/apache-ant diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index d77f392b6..3443dacb4 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160716 2012-06-04 15:02:22Z dreisner $ +# $Id: PKGBUILD 160797 2012-06-06 10:14:15Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=filesystem pkgver=2012.6 -pkgrel=1 +pkgrel=2 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 8cef64bb6..f880b6496 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -1,11 +1,11 @@ post_install() { - [ -f var/log/lastlog ] || : >var/log/lastlog - [ -f var/log/wtmp ] || : >var/log/wtmp - [ -f var/log/btmp ] || (: >var/log/btmp && chmod 600 var/log/btmp) + [ -f var/log/lastlog ] || : >var/log/lastlog + [ -f var/log/wtmp ] || : >var/log/wtmp + [ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; } # workaround for bug #7194 # readded due to bug #9465 # please do not remove! - chmod 1777 var/spool/mail tmp var/tmp var/lock + chmod 1777 var/spool/mail tmp var/tmp } # args: <group> [options] diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index b03b8196b..8e03cb882 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -9,12 +9,12 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=12.0 -_debrel=7 +_debver=13.0 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } -_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca csb cs cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu) +_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu) pkgbase=iceweasel-i18n pkgname=($(for lang in ${_langpacks[@]} @@ -56,87 +56,87 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('5ff63ad5c05d6d1b6602ad5741a0ebbe' - 'ba39d79b5d311942e638668e2e4ed2c9' - '7f090255a9fe67dd690659ee174ee7a8' - '4c6bd176a604e52c72d9d879aa16ef92' - '2a5589be415e0fe395c16d59cdc7c91a' - '9e7908cee8a30ca2514bfb30ad8a73a1' - '19d7de55b66a939400384d5ff463b6e8' - 'd9270f14e3119d6395345a1e211ae6be' - '3becb7d177c66b261a21af21b7ec9cb5' - '68758f2d56daa04c456b53852b811ae6' - 'c128c138f022a1d81313fcbfa332dfe3' - 'af0f6166f137fcd886e39e6f09c6bdf1' - 'fea6cbd83d51a6c07b36ff33ffc0dd64' - 'cf2c157ee82b06ca7d10fed9f0c3e71a' - '85816cd36489cbee7e3ac8ebde0f6217' - 'a34727f3cb2e32133a280978dc354b01' - 'e31213480521b80600207fd67adda16a' - '53b15a8b5ef4659bf67dc66ba946e2d2' - '4fa7defd9b33e26231e3d236b0fd9d8c' - '6788e9cdd0cc01b82d9a49800ce809ed' - '26cbb5f5afe5fbaa26716a297b6b2a46' - 'df5c334e257805af2ebdf685a643e706' - '898a92607281f0263d670b4eb28ca224' - '8aa4093d5f55587dcf951201301c5246' - '1f4531c0c5f41a5095d811c107d276ac' - '907f8599e1e4a342b3b19072661cc72e' - '4db5b7af448becc5dd56e0a0cb9f908d' - '0fb24139ee7ea7b7c340d31e9e58ae04' - '7ff7ae7d1cd9a713dad7070c38dd4f42' - 'f8f6385a9f6c1ecaa8d299ac72aa046e' - '49c99a2a04144e6b33cafed7e33b47ea' - 'bc9a4b47fd087ceefce8745a2cedd615' - 'd7a4703936bfde284cc46d68dede421f' - '615df26846bf62714466a7e1dd2a7e5e' - '3c666f8153645a9d958753eb5e910ef2' - '5217d26e9f4465db7433e77b7bbc5233' - 'd3ffdf2ece6ca4d84fc0061371690b28' - 'ccf85e0bc3be22824e1aa5ad99873248' - 'e3bf49a5c040bf88583d5aa1b886eeea' - 'a3c545319134c7febf801bb45722ab6f' - '48c9d21d50e2b5ccb3c0d1a5f8b46bb5' - 'df6a5bedd8f5684f8b8b3f6fc11e7ceb' - 'f82373a67a80e8ab9c39678e3eb92353' - '72084f9a0960ca6d3ac4a3b16b27e6e5' - '66763631a58e597fbd0e69f73bf08c94' - 'af8c4e38439d6ad799eb071a9e59742f' - 'fba1d988df08fbd991b961a35ccfd56e' - 'b1792658b67d09c6cb1b28c73253668a' - 'd0398797d63b6ba71478cb6ea00bae35' - '8cb0fa6026c0303b603969563b2ef911' - 'f1d6d2f4a6a937f802040dc295e4e112' - '0f57699e98cc355de7c3bdaccbbfb832' - '7b86f62efab9124feda8793fda381a3a' - '84f27e886c65c91a2aeb3cfc9bfddff4' - 'b55de8bc0f7c5a24de8b53a2fea82478' - '954f672c975029c170e7a77156e23557' - 'f4758ff2db7be02c7498f635c17505a3' - 'f24a6033051be1d638790dc5b1fa9198' - '573df4582c8fd6941b044f40900d4c99' - 'a413353b6d7b50659b681d76cdd8f776' - '3a9147ba480b4aececbc70aa33fc9917' - '37319736f6e25d70add33217eff30818' - '2a4bc9f1c0b55f37e7fc92ef3ab8cf5d' - '1fff9acffe3326545beb09c740d44b6b' - '62d690efe261982864d3fa32e0239a96' - '082d3648630d6598a39f677da29cff36' - '228708e4516f88e68f829f1a9db61c57' - '9cc41239414fdc754c3b793f1d7e3687' - '760e3e973ba13d237eeec5242d2ac844' - '631e269b9b67af6a5051c66fe83817c0' - '0a87ae60bf970f9fa37b00d9682e2213' - 'dc02816eb0a9abe9ebd92aa80b7d494a' - '11d5de175fc96065d89d06474f6aaeeb' - '5e0d0cfe252ad6209ca1fb5dba69e0f7' - 'ddb128f54193c45b88640cf157420f3b' - '53d1ecb05a575de362868efcfdd6043f' - 'b7440790e099bc475f5e5fe18440dbe4' - '6affd9862729c6c6697f96464c7475bc' - 'd6ddadc8f0d32c2c3e601ae825881fac' - '4dfb121fdaab263e650fe741f6d353c3' - '45b4d8707e1bfd30e0b5393bb2e09533' - '51d955380bd47c8c6709a6a47b54f600' - '9f6818419d059157cb995a86892ad1f7' - 'b7a7679359068b22efc4ba5902a7db39') +md5sums=('e35b6b08fb314569174a12fb5d289f21' + 'f7b4e4e93fc8a34b38af201d3dc5665d' + '16b41103c5ae2325884d266a4fa6ef2e' + '86829f63977541a6f8b241b352891fc8' + '442b5518d9e91a577de05e5e7bd4c1a3' + '771de4f956802cd2199e9a153ad7e93b' + '55612034c6b9aed03268f9387f6af846' + '00a47e3c42377a060d3b73a015a53615' + '10b1bd554a5390b15e441ee631663052' + '54780d957f68d12c1a22a014b099f504' + 'dcdbb703a40aec783f62a994765a6298' + 'eddaa79e00457f6a8ecab407fac979b1' + '49b6f4928bc1d0411368809ba47580b3' + 'd0570b0084e5ec860626887e08ccdd90' + 'a19c12048002e057afc3d1ca5bae4ad9' + '0a492ec08fa304b4bf6d83a65b549ff9' + '76f67c9ee46feca9d18d2bb30014816f' + 'c3d9f562c28598307c740e4d4dd7348e' + '7567922156989828cd5c0e28a315e195' + 'df91ab90a3e1fef34f5848a9f6444468' + '7d8e45e6e3da8b7d4a1cf94548583262' + 'a661b6a102c5d98de9649d86cab880e0' + '51695205bfdddf982bb746cf4468ea1b' + '19de09fc98cde75bfa88c5274eff7cae' + 'a59ef12c791749a6eca60ee001617751' + '53cbe9dfb8b124d579fcabaf8dcfafce' + '44de34e679070df84e74dee75c70c544' + 'ee98508a21f6ff480f65924c1069965d' + '9827926ba6f4bba2858410b998fcb05b' + '0833c07b595ce249a384b1dda8f34963' + '0f3f0c3cf0813e91f570141b7e0212a4' + 'f6fd9346dc9a0c16058ad765a808809b' + '8284e350944633e38c86d3ce6b30a23e' + 'f67a900d496426c87478ad9bbc6ebbb0' + '3d67d29fcf015a4726a3b63c3e56efa6' + 'a4dd7eecd30aa8e5675239ecb2aac643' + '17e14278b65190304b174fe2cb7f0ba7' + '7919d3e268fbe9a9385ae61da767972a' + '8ca4ea94c9433fa93270d6942f7bbdca' + '163c71e0d58891e4e4812c6f410b34e3' + '3e343f4039ba87817cbe4209f0828da2' + 'c0993d2d4409635d5a5cc55a5dc22afa' + '9e9ebb4b90e64dc3bda9912ec68f5919' + 'bf8f1b84ea8dbea3b35bef433cf0f513' + 'f3c00bf1812f3f2ed940372100ef6baa' + 'b8789e2547a5c507297fd75d10c61e47' + '8cafb2f5804a985f521d0fd8c4ac38e6' + 'e74a59d6927b4f56804a412a70354be2' + '4d680519a811201ebf57944201c92522' + 'fe24a7f2620b8743604784bc56600b0f' + 'dfdb2c6b135ab98e2652c19136496c12' + '504fdcaf8730829d5c6d48b5fa8c89a8' + '459400531f8414c5b527a98cf5c854cd' + 'b24b7067ba0a293f12e23a80998de2b8' + '2ffebdb22377309bacfa4f35e78e53ee' + '7f32199165b0aeca6dffb43ddd4e7934' + '9cddba25c3042a29d43e7d986ae9a2fe' + 'b10c6b5ba44de100402a451fb0f87a0b' + '7ff013fd4b1eb6343d4d94c80697b0b8' + '24987ec9124fe40503d6218943f7f2c1' + '88ccdd6115de5e0e121aba11d8881f9d' + 'f53d6573ab123cc740edff0a0f051214' + 'bb8ebd84fbb6e85716633730986f8afb' + '308ab080c1a1978916d50277d7b1e170' + '6954762d9100f3f59f83a04833c6fc8b' + '11cbdb81af5cb5691b362a6fbb54522e' + '06df7af5c296be68853fbcaf6c11d354' + '321f8f412ad21213ee4bc9e5831e6061' + '4f7177bab3fb5e3f31f954e73403803f' + '6edd087d6c667739687426922961cdcf' + 'b3d74b6ceab4befa4c42d245cbdfdbe4' + '3f6df88d121bd305740014e1677328f8' + 'df58cc660670b906925aa22a5136aeaf' + '590727cebf9bdb599358b4b2d3ed40f9' + 'f4d0f0184e77f3ea9585296b820de2cd' + 'd074f5f4167585fc62ae802b7929669e' + 'd5810f44cc19b5629183da39b234f92c' + '777d7caca99c317c3e71f464f53983d6' + 'f9cfe429a139e450c3bb859d2224441c' + '468a90cc6648bd4ed7b39afc3e3dc253' + 'de53d77cc1cd0126de3f00ddc24afe08' + 'dddedd2b83b3083ce01ae25824a2eaf5' + '1e3122decb28bf37b630f84b05e02be8' + '9666c6e23b39f07d3b0b286e7514e3fd') diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index f4684ee7f..26395f4f3 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -6,8 +6,8 @@ pkgname=luxrender-libre pkgver=1.0rc1 _pkgver=08ae99830f8e -pkgrel=1 -pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)" +pkgrel=1.1 +pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index be42680ad..eb120c0ad 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -5,7 +5,7 @@ pkgname=texlive-core-libre _pkgname=texlive-core pkgver=2011.24722 _revnr=${pkgver#2011.} -pkgrel=1 +pkgrel=1.1 pkgdesc="TeX Live core distribution" license=('GPL') arch=(any) @@ -21,7 +21,7 @@ optdepends=( ) groups=('texlive-most') conflicts=('tetex' 'texlive-latex3' 'texlive-core') -provides=('tetex' 'texlive-latex3' 'texlive-core') +provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver") replaces=('tetex' 'texlive-latex3' 'texlive-core') url='http://tug.org/texlive/' source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch new file mode 100644 index 000000000..4da03a569 --- /dev/null +++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -0,0 +1,271 @@ +From: Mike Hommey <mh@glandium.org>
+Date: Tue, 5 Jun 2012 08:57:06 +0200
+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
+
+---
+ browser/components/migration/content/migration.js | 15 ++++++++++-----
+ browser/components/migration/content/migration.xul | 2 +-
+ .../migration/src/BrowserProfileMigrators.manifest | 2 +-
+ .../components/migration/src/FirefoxProfileMigrator.js | 2 +-
+ browser/components/migration/src/ProfileMigrator.js | 4 ++++
+ .../en-US/chrome/browser/migration/migration.dtd | 2 --
+ .../en-US/chrome/browser/migration/migration.properties | 11 +++++------
+ toolkit/content/aboutSupport.js | 8 ++++----
+ toolkit/content/jar.mn | 2 +-
+ toolkit/content/resetProfile.js | 6 ++----
+ toolkit/profile/nsIProfileMigrator.idl | 10 +++++++++-
+ toolkit/xre/nsAppRunner.cpp | 2 +-
+ 83 files changed, 394 insertions(+), 382 deletions(-)
+
+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
+index ffb0c34..442a5ff 100644
+--- a/browser/components/migration/content/migration.js
++++ b/browser/components/migration/content/migration.js
+@@ -314,7 +314,7 @@ var MigrationWizard = {
+ }
+
+ var bundle = document.getElementById("brandBundle");
+- // These strings don't exist when not using official branding. If that's
++ // These strings may not exist when not using official branding. If that's
+ // the case, just skip this page.
+ try {
+ var pageTitle = bundle.getString("homePageMigrationPageTitle");
+@@ -346,8 +346,8 @@ var MigrationWizard = {
+ case "chrome":
+ source = "sourceNameChrome";
+ break;
+- case "firefox":
+- source = "sourceNameFirefox";
++ case "self":
++ source = "brand";
+ break;
+ }
+
+@@ -357,8 +357,13 @@ var MigrationWizard = {
+ var oldHomePageURL = this._migrator.sourceHomePageURL;
+
+ if (oldHomePageURL && source) {
+- var bundle2 = document.getElementById("bundle");
+- var appName = bundle2.getString(source);
++ var appName;
++ if (source == "brand") {
++ appName = bundle.GetStringFromName("brandFullName");
++ } else {
++ var bundle2 = document.getElementById("bundle");
++ appName = bundle2.getString(source);
++ }
+ var oldHomePageLabel = bundle.getFormattedString("homePageImport",
+ [appName]);
+ var oldHomePage = document.getElementById("oldHomePage");
+diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
+index f8653b1..f3ac62a 100644
+--- a/browser/components/migration/content/migration.xul
++++ b/browser/components/migration/content/migration.xul
+@@ -76,7 +76,7 @@
+ #endif
+ #endif
+ <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
+- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
++ <radio id="self" hidden="true"/>
+ <radio id="fromfile" label="&importFromHTMLFile.label;" accesskey="&importFromHTMLFile.accesskey;" hidden="true"/>
+ <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
+ </radiogroup>
+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
+index f49e481..e490ddf 100644
+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
+@@ -3,4 +3,4 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
+ component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
+-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
++contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
+index 7b4a6e4..add5bc4 100644
+--- a/browser/components/migration/src/FirefoxProfileMigrator.js
++++ b/browser/components/migration/src/FirefoxProfileMigrator.js
+@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {
+ ]),
+
+ classDescription: "Firefox Profile Migrator",
+- contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",
++ contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",
+ classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")
+ };
+
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index ea66675..fe4df10 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {
+ params);
+ },
+
++ canMigrate: function PM__canMigrate(aMigratorKey) {
++ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
++ },
++
+ _toCString: function PM__toCString(aStr) {
+ let cstr = Cc["@mozilla.org/supports-cstring;1"].
+ createInstance(Ci.nsISupportsCString);
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+index 86e9d0b..8df7864 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+@@ -13,8 +13,6 @@
+ <!ENTITY importFromSafari.accesskey "S">
+ <!ENTITY importFromChrome.label "Chrome">
+ <!ENTITY importFromChrome.accesskey "C">
+-<!ENTITY importFromFirefox.label "Firefox">
+-<!ENTITY importFromFirefox.accesskey "X">
+ <!ENTITY importFromHTMLFile.label "From an HTML File">
+ <!ENTITY importFromHTMLFile.accesskey "F">
+
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
+index 495ed78..0272654 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
+@@ -4,7 +4,6 @@ profileName_format=%S %S
+ sourceNameIE=Internet Explorer
+ sourceNameSafari=Safari
+ sourceNameChrome=Google Chrome
+-sourceNameFirefox=Mozilla Firefox
+
+ importedBookmarksFolder=From %S
+ importedSearchURLsFolder=Keyword Searches (From %S)
+@@ -21,27 +20,27 @@ importedSafariBookmarks=From Safari
+ 2_ie=Cookies
+ 2_safari=Cookies
+ 2_chrome=Cookies
+-2_firefox=Cookies
++2_self=Cookies
+
+ 4_ie=Browsing History
+ 4_safari=Browsing History
+ 4_chrome=Browsing History
+-4_firefox=Browsing History
++4_self=Browsing History
+
+ 8_ie=Saved Form History
+ 8_safari=Saved Form History
+ 8_chrome=Saved Form History
+-8_firefox=Saved Form History
++8_self=Saved Form History
+
+ 16_ie=Saved Passwords
+ 16_safari=Saved Passwords
+ 16_chrome=Saved Passwords
+-16_firefox=Saved Passwords
++16_self=Saved Passwords
+
+ 32_ie=Favorites
+ 32_safari=Bookmarks
+ 32_chrome=Bookmarks
+-32_firefox=Bookmarks
++32_self=Bookmarks
+
+ 64_ie=Other Data
+ 64_safari=Other Data
+diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
+index c86d80c..ff1ccfe 100644
+--- a/toolkit/content/aboutSupport.js
++++ b/toolkit/content/aboutSupport.js
+@@ -608,13 +608,13 @@ function populateResetBox() {
+ .getService(Ci.nsIToolkitProfileService);
+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-
+ // Only show the reset box for the default profile if the self-migrator used for reset exists.
+ try {
+ if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||
+- !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc))
++ !("@mozilla.org/toolkit/profile-migrator;1" in Cc))
++ return;
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ if (!("canMigrate" in pm) || !pm.canMigrate("self"))
+ return;
+ document.getElementById("reset-box").style.visibility = "visible";
+ } catch (e) {
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 6f0d2d6..da7342b 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -38,7 +38,7 @@ toolkit.jar:
+ + content/global/mozilla.xhtml (mozilla.xhtml)
+ *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
+ content/global/resetProfile.css (resetProfile.css)
+-* content/global/resetProfile.js (resetProfile.js)
++ content/global/resetProfile.js (resetProfile.js)
+ * content/global/resetProfile.xul (resetProfile.xul)
+ * content/global/treeUtils.js (treeUtils.js)
+ *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index 975a9ed..d8e46b1 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+
+ // based on onImportItemsPageShow from migration.js
+ function onResetProfileLoad() {
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+ const MAX_MIGRATED_TYPES = 16;
+
+ var migratedItems = document.getElementById("migratedItems");
+- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
++ var bundle = Services.strings.createBundle("chrome://browser" +
+ "/locale/migration/migration.properties");
+
+ // Loop over possible data to migrate to give the user a list of what will be preserved. This
+@@ -21,7 +19,7 @@ function onResetProfileLoad() {
+ var itemID = Math.pow(2, i);
+ try {
+ var checkbox = document.createElement("label");
+- checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));
++ checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));
+ migratedItems.appendChild(checkbox);
+ } catch (x) {
+ // Catch exceptions when the string for a data type doesn't exist because it's not migrated
+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
+index e941336..5b264af 100644
+--- a/toolkit/profile/nsIProfileMigrator.idl
++++ b/toolkit/profile/nsIProfileMigrator.idl
+@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports
+ * @client Toolkit (Startup code)
+ * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
+ */
+-[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
++[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
+ interface nsIProfileMigrator : nsISupports
+ {
+ /**
+@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports
+ * @note The startup code ignores COM exceptions thrown from this method.
+ */
+ void migrate(in nsIProfileStartup aStartup, in ACString aKey);
++
++ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ bool canMigrate(in ACString aKey);
+ };
+
+ %{C++
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 32eef5c..dbe1580 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ pm->Migrate(&dirProvider, aKey);
+ // Set the new profile as the default after migration.
+ rv = SetCurrentProfileAsDefault(profileSvc, profD);
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index af4b45aae..001eb5f48 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $ +# $Id: PKGBUILD 160908 2012-06-06 17:03:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,8 +6,8 @@ # We're getting this from Debian Sid _debname=iceweasel -_debver=12.0 -_debrel=3 +_debver=13.0 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -26,17 +26,17 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" mozconfig mozilla-pkgconfig.patch - gcc47.patch) + Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('b45f57bfe21b0e6db4f0683e794917cb' - '2b66fb2e51631ef3b07de89ef9d17d0c' - '552adcf5da3b07757e7fe29c8bd2ec2d' +md5sums=('e440446bb92dc1c0311346c68024590b' + 'cb8bfb543002a5d78db7e8661f9f87ec' + 'a9848e41461776bc4bf8d2de824b1204' 'f2f4f4a573f549e8b494e33b3ad226bc' '27271ce647a83906ef7a24605e840d61' - '5a8563f8fda7ad30405c86764267a19c') + '41ce105f0c1877fe22e0c0ec45e09565') dpkg-source() { # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc @@ -50,6 +50,9 @@ dpkg-source() { # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true +# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it + rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true + quilt push -a find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? cd .. @@ -68,12 +71,14 @@ if [ $NOEXTRACT -eq 0 ]; then cp "$srcdir/mozconfig" .mozconfig +# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch + patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" + # Fails, claiming the page size to have changed. [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" - patch -Np1 -i "$srcdir/gcc47.patch" fi export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver}" diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index cbf5b9c60..84a6f47fa 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Parabola Project <dev@list.parabolagnulinux.org> pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=2 +pkgrel=1 pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free." arch=('any') url="https://parabolagnulinux.org" @@ -23,4 +23,4 @@ package() { sort -u )) } -md5sums=('c4ecf01611d55df03b5e4412dca4e70d') +md5sums=('0025025765e754425e381e8e2d136740') diff --git a/multilib/lib32-libphobos/PKGBUILD b/multilib/lib32-libphobos/PKGBUILD new file mode 100644 index 000000000..2b6acfd17 --- /dev/null +++ b/multilib/lib32-libphobos/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 72006 2012-06-05 14:34:01Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Chris Brannon <cmbrannon79@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgname=('lib32-libphobos') +_pkgname=dmd +pkgver=2.059 +pkgrel=1 +pkgdesc="The phobos D standard library for DMD (32-bit)" +arch=('x86_64') +url="http://www.digitalmars.com/d/2.0/" +source=(http://ftp.digitalmars.com/$_pkgname.$pkgver.zip) +makedepends=('dmd') +md5sums=('803b182e71c4b021dfd1811066201140') +license=('custom') + +build() { + cd $srcdir/dmd2/src/ + + cd druntime + make -f posix.mak MODEL=32 + + cd ../phobos + make -f posix.mak MODEL=32 +} + +package() { + install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux32.a $pkgdir/usr/lib32/libdruntime.a + install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/32/libphobos2.a $pkgdir/usr/lib32/libphobos2.a + + install -Dm644 $srcdir/dmd2/src/druntime/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime + install -Dm644 $srcdir/dmd2/src/phobos/phoboslicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos +} diff --git a/staging/mediastreamer/PKGBUILD b/staging/mediastreamer/PKGBUILD new file mode 100644 index 000000000..54da3e832 --- /dev/null +++ b/staging/mediastreamer/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 160758 2012-06-05 07:24:49Z eric $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Adrià Arrufat <swiftscythe@gmail.com> + +pkgname=mediastreamer +pkgver=2.8.2 +pkgrel=2 +pkgdesc="A library written in C that allows you to create and run audio and video streams" +arch=('i686' 'x86_64') +url="http://www.linphone.org/" +license=('GPL') +depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') +makedepends=('intltool') +options=('!libtool') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + mediastreamer-ffmpeg.patch) +md5sums=('e51ea9d5fce1396b374d10473dfbadec' + '805da7def98f367e621363fa0c951fe8' + 'f147546489a973f148ce3dd2dba36834') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/staging/mediastreamer/mediastreamer-ffmpeg.patch b/staging/mediastreamer/mediastreamer-ffmpeg.patch new file mode 100644 index 000000000..944d4b833 --- /dev/null +++ b/staging/mediastreamer/mediastreamer-ffmpeg.patch @@ -0,0 +1,205 @@ +diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h +index 5ae8a63..86edf86 100644 +--- mediastreamer2/include/mediastreamer2/msvideo.h ++++ mediastreamer2/include/mediastreamer2/msvideo.h +@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #define msvideo_h + + #include <mediastreamer2/msfilter.h> ++#ifndef INT64_C ++#define INT64_C(c) (c ## LL) ++#define UINT64_C(c) (c ## ULL) ++#endif ++#include <libavutil/avutil.h> ++#include <libavcodec/version.h> + + /* some global constants for video MSFilter(s) */ + #define MS_VIDEO_SIZE_SQCIF_W 128 +@@ -206,7 +212,9 @@ extern "C"{ + MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); + MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); + MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + MS2_PUBLIC void ms_ffmpeg_check_init(void); ++#endif + MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); + MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h); + MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h); +diff --git a/src/h264dec.c b/src/h264dec.c +index 223de3d..8c40a7c 100644 +--- mediastreamer2/src/h264dec.c ++++ mediastreamer2/src/h264dec.c +@@ -44,7 +44,9 @@ typedef struct _DecData{ + static void ffmpeg_init(){ + static bool_t done=FALSE; + if (!done){ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + avcodec_init(); ++#endif + avcodec_register_all(); + done=TRUE; + } +diff --git a/src/mscommon.c b/src/mscommon.c +index 2cab005..bebb946 100644 +--- mediastreamer2/src/mscommon.c ++++ mediastreamer2/src/mscommon.c +@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "mediastreamer2/mscodecutils.h" + #include "mediastreamer2/msfilter.h" + #include <ortp/ortp_srtp.h> ++#ifndef INT64_C ++#define INT64_C(c) (c ## LL) ++#define UINT64_C(c) (c ## ULL) ++#endif ++#include <libavutil/avutil.h> ++#include <libavcodec/version.h> + + extern void __register_ffmpeg_encoders_if_possible(void); ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + extern void ms_ffmpeg_check_init(); ++#endif + extern bool_t libmsandroiddisplay_init(void); + extern void libmsandroiddisplaybad_init(void); + extern void libmsandroidopengldisplay_init(void); +@@ -645,7 +653,9 @@ void ms_init(){ + } + } + #if !defined(NO_FFMPEG) ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + __register_ffmpeg_encoders_if_possible(); + #endif + #endif +diff --git a/src/videodec.c b/src/videodec.c +index c04e1e9..a455075 100644 +--- mediastreamer2/src/videodec.c ++++ mediastreamer2/src/videodec.c +@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "mediastreamer2/msvideo.h" + #include "mediastreamer2/msticker.h" + #include "rfc2429.h" ++#ifndef INT64_C ++#define INT64_C(c) (c ## LL) ++#define UINT64_C(c) (c ## ULL) ++#endif ++#include <libavutil/avutil.h> ++#include <libavcodec/version.h> + +- ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + extern void ms_ffmpeg_check_init(); ++#endif + + + typedef struct DecState{ +@@ -50,7 +57,9 @@ typedef struct DecState{ + + static void dec_init(MSFilter *f, enum CodecID cid){ + DecState *s=(DecState *)ms_new0(DecState,1); ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + + avcodec_get_context_defaults(&s->av_context); + s->av_codec=NULL; +diff --git a/src/videoenc.c b/src/videoenc.c +index 21d016f..520f06a 100644 +--- mediastreamer2/src/videoenc.c ++++ mediastreamer2/src/videoenc.c +@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #define RATE_CONTROL_MARGIN 15000 /*bits/second*/ + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + static bool_t avcodec_initialized=FALSE; ++#endif + + #ifdef ENABLE_LOG_FFMPEG + +@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) + + #endif + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + void ms_ffmpeg_check_init(){ + if(!avcodec_initialized){ + avcodec_init(); +@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){ + #endif + } + } ++#endif + + /* the goal of this small object is to tell when to send I frames at startup: + at 2 and 4 seconds*/ +@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec) + { + EncState *s=(EncState *)ms_new(EncState,1); + f->data=s; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + s->profile=0;/*always default to profile 0*/ + s->comp_buf=NULL; + s->fps=15; +@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){ + if (s->profile==0){ + s->codec=CODEC_ID_H263; + }else{ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + c->flags|=CODEC_FLAG_H263P_UMV; ++#endif + c->flags|=CODEC_FLAG_AC_PRED; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; ++#endif + /* + c->flags|=CODEC_FLAG_OBMC; + c->flags|=CODEC_FLAG_AC_PRED; +@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){ + // assume video size is CIF or QCIF + if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; + else header->b_wptr[1] = 0x40; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; ++#else ++ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; ++#endif + header->b_wptr += 4; + header->b_cont = *packet; + *packet = header; +@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ + s->req_vfu=TRUE; + } + if (s->req_vfu){ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + pict.pict_type=FF_I_TYPE; ++#else ++ pict.pict_type=AV_PICTURE_TYPE_I; ++#endif + s->req_vfu=FALSE; + } + comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; +@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ + if (s->framenum==1){ + video_starter_first_frame (&s->starter,f->ticker->time); + } ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + if (c->coded_frame->pict_type==FF_I_TYPE){ ++#else ++ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ ++#endif + ms_message("Emitting I-frame"); + } + comp_buf->b_wptr+=error; +@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={ + #endif + + void __register_ffmpeg_encoders_if_possible(void){ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + if (avcodec_find_encoder(CODEC_ID_MPEG4)) + ms_filter_register(&ms_mpeg4_enc_desc); + if (avcodec_find_encoder(CODEC_ID_H263)){ diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD new file mode 100644 index 000000000..b19dfedf5 --- /dev/null +++ b/testing/bison/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 160796 2012-06-06 02:47:05Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> + +pkgname=bison +pkgver=2.5.1 +pkgrel=1 +pkgdesc="The GNU general-purpose parser generator" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/bison/bison.html" +depends=('glibc' 'm4' 'sh') +groups=('base-devel') +install=bison.install +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('012708d801a3c986d8654aa673530b61' + '6c7e9276aa8b89879126a611384897a8') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --datadir=/usr/share + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/bison/bison.install b/testing/bison/bison.install new file mode 100644 index 000000000..0081a194f --- /dev/null +++ b/testing/bison/bison.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file=bison.info.gz + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file $infodir/dir 2> /dev/null +} diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD new file mode 100644 index 000000000..ef7313c2b --- /dev/null +++ b/testing/dbus-python/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 160769 2012-06-05 09:29:16Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=dbus-python +pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') +pkgver=1.1.0 +pkgrel=1 +pkgdesc="Python bindings for DBUS" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +makedepends=('docutils' 'dbus-glib' 'python' 'python2') +options=('!libtool') +source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) +md5sums=('41a459bbbb5fd92eeebd632623af0bd7') + +build() { + cd "${srcdir}" + mkdir build-python2 build-python3 + cd "${srcdir}/build-python2" + PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr + make + + + cd "${srcdir}/build-python3" + ../${pkgbase}-${pkgver}/configure --prefix=/usr + make +} + +package_python-dbus-common() { + pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" + + cd "${srcdir}/build-python3" + make DESTDIR="${pkgdir}" install-data + rm -rf "${pkgdir}"/usr/lib/python* +} + +package_python-dbus() { + depends=('python-dbus-common' 'python' 'dbus-core') + optdepends=('dbus-glib: glib mainloop support') + pkgdesc="Python 3.2 bindings for DBUS" + + cd "${srcdir}/build-python3" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/pkgconfig" +} + +package_python2-dbus() { + depends=('python-dbus-common' 'python2' 'dbus-core') + optdepends=('dbus-glib: glib mainloop support') + pkgdesc="Python 2.7 bindings for DBUS" + replaces=('dbus-python') + conflicts=('dbus-python') + provides=("dbus-python=$pkgver") + + cd "${srcdir}/build-python2" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/pkgconfig" +} |