diff options
60 files changed, 1917 insertions, 245 deletions
diff --git a/community-staging/electricsheep/PKGBUILD b/community-staging/electricsheep/PKGBUILD new file mode 100644 index 000000000..3f57554a2 --- /dev/null +++ b/community-staging/electricsheep/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 72469 2012-06-15 00:54:28Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=electricsheep +pkgver=2.7b33 +pkgrel=1 +pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" +arch=('i686' 'x86_64') +url="http://community.electricsheep.org/" +license=('GPL') +depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee') +makedepends=('boost' 'tinyxml') +optdepends=('xscreensaver: to use electricsheep with xscreensaver') +options=('!emptydirs') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd' + 'fda3aae435507d03973f0c4d1ed3509067657f06') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=r125 + _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic" + _svnmod="${pkgname}-${pkgver}" + mkdir ${pkgname}-${pkgver} + pushd ${pkgname}-${pkgver} + svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod} + find . -depth -type d -name .svn -exec rm -rf {} \; + (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \ + Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig) + tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* + popd + rm -r ${pkgname}-${pkgver} + gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's/wx-config/wx-config-2.9/g' configure.ac + sed -i '12 i\ +#include <cstdio>' Common/Singleton.h + ./autogen.sh + ./configure --prefix=/usr + make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" + install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png" +} diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 47c0f06fb..82c044c67 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69418 2012-04-16 09:39:14Z spupykin $ +# $Id: PKGBUILD 72451 2012-06-14 19:06:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=2 +pkgrel=4 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -26,7 +26,7 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail.rc.d) md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'e7f72bc360decdb2475266391ad12329' - '6e287912650675011169b2dff42822cc') + '30774513fb016b9da08e9cf6f2a0b8e7') build() { cd $srcdir/dbmail-${pkgver/_/-}/ diff --git a/community/dbmail/dbmail.rc.d b/community/dbmail/dbmail.rc.d index 9286809df..f849b1679 100644 --- a/community/dbmail/dbmail.rc.d +++ b/community/dbmail/dbmail.rc.d @@ -23,9 +23,11 @@ case "$1" in stop) for daemon in $DBMAIL_DAEMONS; do stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/dbmail/${daemon}.pid) - kill $pid - sleep 4 + pid=$(cat /var/run/dbmail/${daemon}.pid 2>/dev/null) + kill $pid 2>/dev/null + while kill -0 "$pid" 2>/dev/null; do + sleep 0.2 + done stat_done done rm_daemon dbmail diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD index f4fa6cdfa..6373fede7 100644 --- a/community/girara/PKGBUILD +++ b/community/girara/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69164 2012-04-09 22:09:19Z spupykin $ +# $Id: PKGBUILD 72431 2012-06-14 15:06:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mlq <mlq@pwmt.org> pkgbase=girara pkgname=(girara-common girara-gtk2 girara-gtk3) -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="user interface library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://pwmt.org/projects/girara" license=('custom') makedepends=('gtk3' 'gtk2') source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) -md5sums=('78ff028a4ba6ad259fd8e42b2fcc259a') +md5sums=('61b2a564c1b79b1b831a8bf517d4644e') build() { true diff --git a/community/glee/PKGBUILD b/community/glee/PKGBUILD new file mode 100644 index 000000000..ca0b404fb --- /dev/null +++ b/community/glee/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 72465 2012-06-14 23:53:43Z ebelanger $ +# Maintainer : SpepS <dreamspepser at yahoo dot it> +# Contributor: Philipp Brüschweiler <blei42 at gmail dot com > + +pkgname=glee +pkgver=5.4 +pkgrel=4 +pkgdesc="Free cross-platform extension loading library for OpenGL." +arch=('i686' 'x86_64') +url="http://elf-stone.com/glee.php" +license=('BSD') +depends=('gcc-libs' 'libgl') +makedepends=('mesa') +source=("http://elf-stone.com/downloads/GLee/GLee-5.4.0-src.tar.gz") +md5sums=('0bd03db136dbc075488b6c6e83f326ae') + +build() { + cd "$srcdir" + + [ "$CARCH" = 'x86_64' ] && export CXXFLAGS="$CXXFLAGS -fPIC" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir" + + # lib and headers + install -Dm755 libGLee.so "$pkgdir/usr/lib/libGLee.so" + install -Dm644 GLee.h "$pkgdir/usr/include/GLee.h" + + # license + install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + sed -i '9,32!d' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 941892808..bad366f9f 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72413 2012-06-13 22:11:36Z arodseth $ +# $Id: PKGBUILD 72457 2012-06-14 22:33:08Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -9,10 +9,10 @@ # Contributor: Daniel YC Lin <dlin.tw@gmail.com> pkgname=go -pkgver=1.0.1 -pkgrel=6 +pkgver=1.0.2 +pkgrel=1 epoch=2 -pkgdesc='Google Go compiler and tools (release version)' +pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') url="http://golang.org/" license=('custom') @@ -23,7 +23,7 @@ install=go.install backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" "$pkgname.sh") -sha256sums=('29cdba7bc909df7091d81f52049de023502b5b3351cd206094f2c2d9961c0315' +sha256sums=('70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') build() { diff --git a/community/libclastfm/PKGBUILD b/community/libclastfm/PKGBUILD new file mode 100644 index 000000000..b566ae17a --- /dev/null +++ b/community/libclastfm/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 72448 2012-06-14 16:10:56Z ttopper $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +pkgname=libclastfm +pkgver=0.5 +pkgrel=1 +pkgdesc="An unofficial C-API for the Last.fm web service" +arch=("i686" "x86_64") +url="http://liblastfm.sourceforge.net/" +license=('GPL') +depends=("curl") +source=("http://downloads.sourceforge.net/liblastfm/$pkgname-$pkgver.tar.gz") +sha1sums=('9e2fdd42b14c8c375b0cb4981eb11fc1aebeebf5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: + diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 291c66d85..981d50cef 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69760 2012-04-23 09:15:22Z ibiru $ +# $Id: PKGBUILD 72429 2012-06-14 12:17:07Z lcarlier $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient pkgver=2.5.1.26351 -pkgrel=2 +pkgrel=3 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64') url="http://www.firebirdsql.org/" @@ -38,4 +38,8 @@ package() { install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin mkdir -p $srcdir/usr/share/licenses/$pkgname/ install -D -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + # Add libgds support FS#30062 FS#30282 + cd $pkgdir/usr/lib + ln -s libfbclient.so libgds.so.0 + ln -s libfbclient.so libgds.so } diff --git a/community/libsieve/PKGBUILD b/community/libsieve/PKGBUILD index 459d10b59..b9e1477b8 100644 --- a/community/libsieve/PKGBUILD +++ b/community/libsieve/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 66205 2012-02-23 03:19:36Z spupykin $ +# $Id: PKGBUILD 72453 2012-06-14 19:07:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libsieve -pkgver=2.2.7 -pkgrel=3 +pkgver=2.3.1 +pkgrel=1 pkgdesc="sieve interpretator lib" arch=(i686 x86_64) url="http://libsieve.sourceforge.net/" license=('GPL') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/libsieve/libsieve-$pkgver.tar.gz) -md5sums=('7415e7cfe40cfc6cf43ae26efb5f0fb7') +source=("https://github.com/downloads/sodabrew/libsieve/libsieve-$pkgver.tar.gz") +md5sums=('bb48eecf877cc7fdb2b0dfe757b48d7a') build() { - cd "$srcdir/$pkgname-$pkgver/src" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make make DESTDIR="$pkgdir/" install diff --git a/community/lilv/PKGBUILD b/community/lilv/PKGBUILD new file mode 100644 index 000000000..89af2303f --- /dev/null +++ b/community/lilv/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 72423 2012-06-14 07:57:59Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=lilv +pkgver=0.14.2 +pkgrel=1 +pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications." +arch=(i686 x86_64) +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('python2' 'sratom' 'jack') +makedepends=('swig') +optdepends=('bash-completion: auto-complete words') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('1aea6761f3e44007c0fb4eb20630655d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + export PYTHON="/usr/bin/python2" + + # remove ldconfig + sed -i "/ldconfig/d" wscript + + python2 ./waf configure --prefix=/usr \ + --mandir=/usr/share/man \ + --configdir=/etc \ + --dyn-manifest \ + --bindings + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD index 3a9a34262..651e3b33e 100644 --- a/community/mosh/PKGBUILD +++ b/community/mosh/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: Thomas Weißschuh <thomas_weissschuh lavabit.com> pkgname=mosh -pkgver=1.2.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing' arch=('x86_64' 'i686') url="http://mosh.mit.edu/" license=('GPL3') depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty') #optdepends=('libutempter: record of session in {u,t}wmp (recompile mosh afterwards)') -source=("https://github.com/downloads/keithw/mosh/mosh-1.2.1.tar.gz") -sha1sums=('73b95b11699d8321c749a9590e0c12caeed52405') +source=("https://github.com/downloads/keithw/mosh/$pkgname-$pkgver.tar.gz") +sha1sums=('f0227800298d80e9f1353db3b29a807de833d7d2') options=('!emptydirs') build() { diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD index 231c569ee..415ad5810 100644 --- a/community/perl-params-util/PKGBUILD +++ b/community/perl-params-util/PKGBUILD @@ -1,48 +1,43 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 71823 2012-06-02 10:31:54Z bluewind $ +# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> +# $Id: PKGBUILD 72466 2012-06-15 00:05:46Z juster $ pkgname=perl-params-util -pkgver=1.04 -pkgrel=2 -pkgdesc="Simple, compact and correct param-checking functions" +pkgver=1.07 +pkgrel=1 +pkgdesc='Simple, compact and correct param-checking functions' arch=(i686 x86_64) license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.5.30' 'perl-scalar-list-utils') -makedepends=('perl-extutils-cbuilder>=0.27' 'perl-extutils-makemaker>=6.52' - 'perl-pathtools') -checkdepends=('perl-test-simple') +depends=('perl>=5.5.30') url=https://metacpan.org/release/Params-Util -source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${pkgver}.tar.gz") -md5sums=(84bfb0a16cff67f2077ece0e24408b0f) -sha512sums=(086b6e37ce24a423439e346c4fc7069cbb5bde6af5c259fa765616bf637597105ee379df5edca82fdeb3bb0e44d83c7704ea1fe09170acea389ffb54d77f3d3d) -_distdir="${srcdir}/Params-Util-${pkgver}" +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz") +md5sums=(02db120c0eef87aae1830cc62bdec37b) +sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56) +_dir="$srcdir/Params-Util-$pkgver" -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null +build() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + unset PERL5LIB PERL_MM_OPT + /usr/bin/perl Makefile.PL + make +) - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} +check() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 + unset PERL5LIB + make test +) -check() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" - make test - ) -} - -package() { - cd "$_distdir" - make DESTDIR="$pkgdir" install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} +package() +( + cd "$_dir" + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +) # Local Variables: # mode: shell-script diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 7b3fb1b93..6da0d19e4 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 70293 2012-05-03 18:11:39Z ttopper $ +# $Id: PKGBUILD 72449 2012-06-14 17:35:54Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') url="http://pragha.wikispaces.com/" license=('GPL3') depends=('libnotify' 'libcdio' 'gstreamer0.10-base' 'taglib' 'hicolor-icon-theme' 'gtk2' - 'dbus-glib' 'sqlite' 'desktop-file-utils') + 'dbus-glib' 'sqlite' 'desktop-file-utils' + 'libclastfm') optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 5dfee7b83..dbd439de8 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69475 2012-04-16 15:31:59Z spupykin $ +# $Id: PKGBUILD 72439 2012-06-14 15:09:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=6.2.0 -pkgrel=2 +pkgver=6.2.2 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('03e237abaa5d47f92c6e655f92f22532' +md5sums=('b797b8222d6ea4d5dfa007efe8aafa7f' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/serd/PKGBUILD b/community/serd/PKGBUILD new file mode 100644 index 000000000..0caa08e58 --- /dev/null +++ b/community/serd/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 72424 2012-06-14 07:58:39Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=serd +pkgver=0.14.0 +pkgrel=1 +pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples." +arch=(i686 x86_64) +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('glibc') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('405b11ee92f3f19ce4a757ba34953886') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig + sed -i "/ldconfig/d" wscript + + python2 ./waf configure --prefix=/usr \ + --mandir=/usr/share/man + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/sord/PKGBUILD b/community/sord/PKGBUILD new file mode 100644 index 000000000..3ee624983 --- /dev/null +++ b/community/sord/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 72425 2012-06-14 07:59:09Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=sord +pkgver=0.8.0 +pkgrel=1 +pkgdesc="A lightweight C library for storing RDF data in memory." +arch=(i686 x86_64) +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('serd' 'pcre') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('62be6a2cd6e9bc2933d1297afeacda30') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig + sed -i "/ldconfig/d" wscript + + python2 ./waf configure --prefix=/usr \ + --mandir=/usr/share/man + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/sratom/PKGBUILD b/community/sratom/PKGBUILD new file mode 100644 index 000000000..c20fc5c66 --- /dev/null +++ b/community/sratom/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 72426 2012-06-14 07:59:39Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=sratom +pkgver=0.2.0 +pkgrel=1 +pkgdesc="An LV2 Atom RDF serialisation library" +arch=(i686 x86_64) +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('lv2' 'sord') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('c03cf2849186818610ffe889be4f5b55') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig + sed -i '/ldconfig/d' wscript + + python2 waf configure --prefix=/usr + python2 waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir/" python2 waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/suil/PKGBUILD b/community/suil/PKGBUILD new file mode 100644 index 000000000..e44474115 --- /dev/null +++ b/community/suil/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 72427 2012-06-14 08:00:19Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=suil +pkgver=0.6.2 +pkgrel=1 +pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" +arch=(i686 x86_64) +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('lv2') +makedepends=('python2' 'qt' 'gtk2') +optdepends=('qt: Qt UIs wrapping support' + 'gtk2: Gtk2 UIs wrapping support') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('062f1166786cf59a28b3b9bfbda6f15c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig + sed -i "/ldconfig/d" wscript + + python2 ./waf configure --prefix=/usr \ + --mandir=/usr/share/man + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 4b2805e9f..5e1543134 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72377 2012-06-13 10:27:38Z tredaelli $ +# $Id: PKGBUILD 72455 2012-06-14 19:38:37Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia pkgver=0.2.19 -pkgrel=1 +pkgrel=2 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64') @@ -12,13 +12,17 @@ license=('GPL') depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install -source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) +source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc} + revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch) md5sums=('caf92b44ad2932bbc1c40d6405951c39' - '1ba45d7c91797e880d79a3fc85818dee') + '1ba45d7c91797e880d79a3fc85818dee' + '72de3a292b8481b381f67016cb2a677c') build() { [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh + patch "$srcdir"/$pkgname-$pkgver/src/vidalia/MainWindow.cpp "$srcdir"/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch + cd "$srcdir" mkdir build cd build diff --git a/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch b/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch new file mode 100644 index 000000000..d61f3e86e --- /dev/null +++ b/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch @@ -0,0 +1,86 @@ +diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp +index 85bc62e..b13f80b 100644 +--- a/src/vidalia/MainWindow.cpp ++++ b/src/vidalia/MainWindow.cpp +@@ -626,9 +626,6 @@ MainWindow::launchBrowserFromDirectory() + + /** Directory for the browser */ + QString browserDirectory = settings.getBrowserDirectory(); +- if(QDir(browserDirectory).isRelative()) +- browserDirectory = QDir(QDir::toNativeSeparators(QCoreApplication::applicationDirPath() +- + "/" + browserDirectory)).canonicalPath(); + + /** Relative path to the browser executable from the browserDirectory */ + QString browserExecutable = QDir::toNativeSeparators(browserDirectory + "/" + settings.getBrowserExecutable()); +@@ -1068,20 +1065,6 @@ MainWindow::start() + QString torrc = settings.getTorrc(); + QFileInfo torrcInfo(torrc); + +- if(QDir(torrcInfo.filePath()).isRelative()) { +- torrc = QCoreApplication::applicationDirPath() + "/" + torrc; +- +- QFileInfo newTorrcInfo(torrc); +- if(!newTorrcInfo.exists() and torrcInfo.exists()) { +- torrc = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torrcInfo.absoluteFilePath()); +- vWarn("Automigrating configuration for Torrc:\nOld path: %1\nNew path: %2") +- .arg(newTorrcInfo.filePath()) +- .arg(torrc); +- settings.setTorrc(torrc); +- torrc = QCoreApplication::applicationDirPath() + "/" + torrc; +- } +- } +- + if(settings.bootstrap()) { + QString boottorrc = settings.bootstrapFrom(); + vNotice(tr("Bootstrapping torrc from %1 to %2") +@@ -1104,20 +1087,6 @@ MainWindow::start() + QString dataDirectory = settings.getDataDirectory(); + QFileInfo dataDirectoryInfo(dataDirectory); + +- if(QDir(dataDirectory).isRelative()) { +- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; +- +- QFileInfo newDataDirectoryInfo(dataDirectory); +- if(!newDataDirectoryInfo.exists() and dataDirectoryInfo.exists()) { +- dataDirectory = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(dataDirectoryInfo.absoluteFilePath()); +- vWarn("Automigrating configuration for DataDirectory:\nOld path: %1\nNew path: %2") +- .arg(newDataDirectoryInfo.absoluteFilePath()) +- .arg(dataDirectory); +- settings.setDataDirectory(dataDirectory); +- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; +- } +- } +- + QString expDataDirectory = QDir(expand_filename(dataDirectory)).canonicalPath(); + if (!dataDirectory.isEmpty()) + args << "DataDirectory" << expDataDirectory; +@@ -1175,20 +1144,6 @@ MainWindow::start() + QString torExecutable = settings.getExecutable(); + QFileInfo torExecutableInfo(torExecutable); + +- if(QDir(torExecutableInfo.filePath()).isRelative()) { +- torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; +- +- QFileInfo newTorExecutableInfo(torExecutable); +- if(!newTorExecutableInfo.exists() and torExecutableInfo.exists()) { +- torExecutable = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torExecutableInfo.absoluteFilePath()); +- vWarn("Automigrating configuration for TorExecutable:\nOld path: %1\nNew path: %2") +- .arg(newTorExecutableInfo.filePath()) +- .arg(torExecutable); +- settings.setExecutable(torExecutable); +- torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; +- } +- } +- + _torControl->start(torExecutable, args); + } + +@@ -1251,8 +1206,6 @@ MainWindow::started() + /* Try to connect to Tor's control port */ + if(settings.autoControlPort()) { + QString dataDirectory = settings.getDataDirectory(); +- if(QDir(dataDirectory).isRelative()) +- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + + QFile file(QString("%1/port.conf").arg(QDir(expand_filename(dataDirectory)).canonicalPath())); + int tries = 0, maxtries = 5; diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD new file mode 100644 index 000000000..702455d04 --- /dev/null +++ b/community/wxgtk2.9/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 72461 2012-06-14 23:31:54Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=wxgtk2.9 +pkgver=2.9.3.1 +pkgrel=1 +pkgdesc="GTK+ implementation of wxWidgets API for GUI" +arch=('i686' 'x86_64') +url="http://wxwidgets.org" +license=('custom:wxWindows') +depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxGTK-2.9.3.1-collision.patch) +sha1sums=('0202f64e1e99fb69d22d7be0d38cf7dcf3d80d79' + '69eace867fb20dba9271b57292756e144bb698ce') + +build() { + cd "${srcdir}/wxPython-src-${pkgver}" + patch -p1 -i ../wxGTK-2.9.3.1-collision.patch + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ + --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make + make -C locale allmo +} + +package() { + cd "${srcdir}/wxPython-src-${pkgver}" + make DESTDIR="${pkgdir}" install + rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch b/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch new file mode 100644 index 000000000..cd6c1c13b --- /dev/null +++ b/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch @@ -0,0 +1,77 @@ +Prevent file collisions between multiple installed SLOTs. + + - Don't install wxwin.m4. It is installed with app-admin/eselect-wxwidgets. + - Version the bakefile preset filenames. Unversioned symlinks to these files + are handled by eselect. + - Version wx-config and wxrc. The unversioned forms are wrapper scripts + installed with eselect-wxwidgets. + - Version wxstd.mo and modify AddStdCatalog to use it. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + + install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal +- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) + $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) ++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ ++ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) + $(DYLIB_RPATH_INSTALL) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + for f in setup.h $(RCDEFS_H); do \ +@@ -14964,15 +14964,16 @@ install-wxconfig: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) +- ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ ++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale + for l in $(LOCALE_LINGUAS) ; do \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \ ++ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + +--- a/build/bakefiles/wx.bkl ++++ b/build/bakefiles/wx.bkl +@@ -138,7 +138,7 @@ + <using module="gettext"/> + <gettext-catalogs id="locale"> + <srcdir>$(SRCDIR)/locale</srcdir> +- <catalog-name>wxstd</catalog-name> ++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> + <linguas> + ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk + zh zh_CN zh_TW +--- a/src/common/translation.cpp ++++ b/src/common/translation.cpp +@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c + + bool wxTranslations::AddStdCatalog() + { +- if ( !AddCatalog(wxS("wxstd")) ) ++ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) + return false; + + // there may be a catalog with toolkit specific overrides, it is not +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -124,7 +124,6 @@ distclean: clean + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) + @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) + @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) +-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) + + @COND_USE_XRC_1@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD index 4dc4fb58a..c744afd4b 100644 --- a/community/zathura-djvu/PKGBUILD +++ b/community/zathura-djvu/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 69556 2012-04-18 10:59:51Z spupykin $ +# $Id: PKGBUILD 72435 2012-06-14 15:08:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-djvu -pkgver=0.1.1 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Adds DjVu support to zathura by using the djvulibre library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" license=('custom') depends=('djvulibre' 'zathura') source=(https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz) -md5sums=('d76bf25ad5c3bef220aebef693ff6aad') +md5sums=('5358fc3c89a10016061637f1ca38f1cf') build(){ cd ${srcdir}/zathura-djvu-$pkgver diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD index e35f9315e..507f76adf 100644 --- a/community/zathura-pdf-poppler/PKGBUILD +++ b/community/zathura-pdf-poppler/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-pdf-poppler -pkgver=0.1.1 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Adds pdf support to zathura by using the poppler engine" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" license=('custom') depends=('poppler-glib' 'zathura') source=(https://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-$pkgver.tar.gz) -md5sums=('a43db96a893e0b37c446f23202b930d2') +md5sums=('e8a6222f28d86ca2ff43de156355be2b') -build(){ +build() { cd ${srcdir}/zathura-pdf-poppler-$pkgver make make DESTDIR="$pkgdir" install diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD index 7be83cdf7..8f8b2cbdb 100644 --- a/community/zathura-ps/PKGBUILD +++ b/community/zathura-ps/PKGBUILD @@ -3,15 +3,15 @@ # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-ps -pkgver=0.1.0 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Adds ps support to zathura by using the libspectre library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-ps/" license=('custom') depends=('libspectre' 'zathura') source=(https://pwmt.org/projects/zathura/plugins/download/zathura-ps-$pkgver.tar.gz) -md5sums=('103d2e25529492cdba702484aab643f5') +md5sums=('aaec6d2abad1f557b38aaad26d86fb64') build(){ cd ${srcdir}/zathura-ps-$pkgver diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index d693be4f5..0d9b79ed3 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 69464 2012-04-16 14:22:25Z spupykin $ +# $Id: PKGBUILD 72433 2012-06-14 15:07:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura -pkgver=0.1.2 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="a document viewer" arch=('i686' 'x86_64') url="http://pwmt.org/projects/zathura/" license=('custom') depends=('girara-gtk2' 'cairo' 'sqlite') -makedepends=('docutils') +makedepends=('python2-docutils') optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') install=zathura.install source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz bash-completion) -md5sums=('c018b0385a392adb87b465b0f759aaf9' +md5sums=('fb53e2aa4b52c717f50f2e6c80425464' 'cac20c37f0e77ba62a8138788f4ccabb') build() { diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index f84c6413a..42c6663c9 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 158558 2012-05-04 23:56:48Z allan $ +# $Id: PKGBUILD 161792 2012-06-14 10:14:53Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.5 -pkgrel=3 +pkgrel=4 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') url="http://www.kernel.org/pub/linux/libs/pam/" -depends=('glibc' 'db' 'cracklib' 'libtirpc') +depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase') makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') -backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment) +backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment) source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 - ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2 - other) + ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2) options=('!libtool' '!emptydirs') md5sums=('927ee5585bdec5256c75117e9348aa47' - 'e2788389a6c59224110a45fcff30e02b' - '6e6c8719e5989d976a14610f340bd33a') + 'e2788389a6c59224110a45fcff30e02b') build() { cd $srcdir/Linux-PAM-$pkgver @@ -34,7 +32,6 @@ build() { package() { cd $srcdir/Linux-PAM-$pkgver make DESTDIR=$pkgdir install - install -D -m644 ../other $pkgdir/etc/pam.d/other # build pam_unix2 module # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 @@ -61,6 +58,3 @@ _EOT # set unix_chkpwd uid chmod +s $pkgdir/sbin/unix_chkpwd } -md5sums=('927ee5585bdec5256c75117e9348aa47' - 'e2788389a6c59224110a45fcff30e02b' - '6e6c8719e5989d976a14610f340bd33a') diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 18a75f5a5..a85c8b939 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146461 2012-01-11 15:21:50Z stephane $ +# $Id: PKGBUILD 161800 2012-06-14 15:33:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -19,11 +19,14 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('df9f1657d7f34959a2205344d952c2e3') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + buildfix_gnutls3.diff) +md5sums=('df9f1657d7f34959a2205344d952c2e3' + '0c0956755ddcec939d916af35310ee3f') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/buildfix_gnutls3.diff sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py diff --git a/extra/claws-mail/buildfix_gnutls3.diff b/extra/claws-mail/buildfix_gnutls3.diff new file mode 100644 index 000000000..1a71ff43a --- /dev/null +++ b/extra/claws-mail/buildfix_gnutls3.diff @@ -0,0 +1,18 @@ +Index: src/common/ssl_certificate.c +=================================================================== +RCS file: //claws/src/common/ssl_certificate.c,v +retrieving revision 1.4.2.40 +retrieving revision 1.4.2.41 +diff -u -r1.4.2.40 -r1.4.2.41 +--- src/common/ssl_certificate.c 30 Aug 2011 06:18:09 -0000 1.4.2.40 ++++ src/common/ssl_certificate.c 16 May 2012 05:43:14 -0000 1.4.2.41 +@@ -686,7 +686,7 @@ + gnutls_x509_privkey * key, + gnutls_x509_crt_t * cert) + { +- gnutls_pkcs12_bag bag = NULL; ++ gnutls_pkcs12_bag_t bag = NULL; + int index = 0; + int ret; + + diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 8d4259c1a..9148b09f6 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160627 2012-06-02 21:15:26Z andyrtr $ +# $Id: PKGBUILD 161798 2012-06-14 14:46:00Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> @@ -7,20 +7,20 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 pkgbase=java7-openjdk _java_ver=7 -_updatever=u4 +_updatever=u5 _openjdk_build=b21 _openjdk_date=27_jun_2011 -_icedtea_ver=2.2 +_icedtea_ver=2.2.1 _date=20110922 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=3231f3e9c517 -_HOTSPOT_CHANGESET=bfe5efd70bce -_JAXP_CHANGESET=0036fe6fe7dc -_JAXWS_CHANGESET=abfb890c262a -_JDK_CHANGESET=839d0155f7cc -_LANGTOOLS_CHANGESET=f855bdb37537 -_OPENJDK_CHANGESET=49a6fc8f712f +_CORBA_CHANGESET=38deb372c569 +_HOTSPOT_CHANGESET=889dffcf4a54 +_JAXP_CHANGESET=335fb0b059b7 +_JAXWS_CHANGESET=5471e01ef43b +_JDK_CHANGESET=6c3b742b735d +_LANGTOOLS_CHANGESET=beea46c7086b +_OPENJDK_CHANGESET=0b776ef59474 _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -50,23 +50,25 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar fix_corba_cmds_path.diff openjdk7_fix_jdk_cmds_path.diff openjdk7_nonreparenting-wm.diff + disable_Werror.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5' - '9a5e9342111263f76aae4b86ac38e912b60cd81fb49943c3868c8f63e2e21130' - '26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54' - '9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274' - '245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2' - 'e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a' - '19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7' - 'd46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19' - '86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514' +sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6' + '0c987bff8e490a57d1e16e328a54665073ef920166342a0a08e5593aa20cd215' + '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe' + 'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93' + 'ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd' + '1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d' + '48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e' + '17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb' + 'b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' + 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' @@ -93,7 +95,7 @@ build() { # default is to build with first found java-environment found in our repos - is jdk7-openjdk [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh - unset MAKEFLAGS # parallel build is currently broken +# unset MAKEFLAGS # parallel build is currently broken export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" @@ -101,7 +103,7 @@ build() { . /etc/profile.d/apache-ant.sh cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/disable_Werror.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" diff --git a/extra/java7-openjdk/disable_Werror.diff b/extra/java7-openjdk/disable_Werror.diff new file mode 100644 index 000000000..fa8887a10 --- /dev/null +++ b/extra/java7-openjdk/disable_Werror.diff @@ -0,0 +1,11 @@ +--- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2012-06-14 15:32:44.967695139 +0200 +@@ -150,7 +150,7 @@ + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++#WARNINGS_ARE_ERRORS = -Werror + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/extra/libmusicbrainz5/PKGBUILD b/extra/libmusicbrainz5/PKGBUILD new file mode 100644 index 000000000..9cccbd2b3 --- /dev/null +++ b/extra/libmusicbrainz5/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 161787 2012-06-14 09:28:16Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libmusicbrainz5 +pkgver=5.0.1 +pkgrel=1 +pkgdesc="Library That Provides Access to the MusicBrainz Server" +arch=('i686' 'x86_64') +url="http://musicbrainz.org/" +license=('LGPL2.1') +depends=('neon') +makedepends=('cmake') +source=("https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-$pkgver.tar.gz" + 'support-out-of-source-build.patch') +md5sums=('a0406b94c341c2b52ec0fe98f57cadf3' + '78348e0c9a0864c7be2dcced5aab6d38') + +build() { + cd "${srcdir}"/libmusicbrainz-${pkgver} + patch -p1 -i "${srcdir}"/support-out-of-source-build.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../libmusicbrainz-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="$pkgdir" install +} diff --git a/extra/libmusicbrainz5/support-out-of-source-build.patch b/extra/libmusicbrainz5/support-out-of-source-build.patch new file mode 100644 index 000000000..eeb3bc2c7 --- /dev/null +++ b/extra/libmusicbrainz5/support-out-of-source-build.patch @@ -0,0 +1,131 @@ +From b74fd9680c20f8cbdbcf6cdff9ee1074c55fe1c1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lalinsky@gmail.com> +Date: Thu, 14 Jun 2012 09:58:41 +0200 +Subject: [PATCH] Support out-of-source build + +http://tickets.musicbrainz.org/browse/LMB-10 +https://github.com/metabrainz/libmusicbrainz/issues/1 +--- + examples/CMakeLists.txt | 5 ++++- + src/CMakeLists.txt | 9 +++++++-- + src/make-c-interface.cc | 8 ++++---- + tests/CMakeLists.txt | 5 ++++- + 4 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 3e11469..000d4aa 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -1,4 +1,7 @@ +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include) ++INCLUDE_DIRECTORIES( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../include ++ ${CMAKE_CURRENT_BINARY_DIR}/../include ++) + LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES}) + + ADD_EXECUTABLE(cdlookup cdlookup.cc) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2ee102f..89ab63c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,5 +1,10 @@ + SET(CMAKE_INCLUDE_CURRENT_DIR ON) +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR}) ++INCLUDE_DIRECTORIES( ++ ${CMAKE_CURRENT_SOURCE_DIR}/.. ++ ${CMAKE_CURRENT_SOURCE_DIR}/../include ++ ${CMAKE_CURRENT_BINARY_DIR}/../include ++ ${NEON_INCLUDE_DIR} ++) + + SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc + Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc +@@ -13,7 +18,7 @@ ADD_EXECUTABLE(make-c-interface make-c-interface.cc xmlParser.cpp) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h + COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5 ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h + DEPENDS make-c-interface cinterface.xml *.inc + ) + +diff --git a/src/make-c-interface.cc b/src/make-c-interface.cc +index 652a65b..70dd6d7 100644 +--- a/src/make-c-interface.cc ++++ b/src/make-c-interface.cc +@@ -33,7 +33,7 @@ + + #include "musicbrainz5/xmlParser.h" + +-void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); ++void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path); + void ProcessHeader(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); + void ProcessEntity(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); + void ProcessClass(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include); +@@ -80,7 +80,7 @@ int main(int argc, const char *argv[]) + std::string Name=Node.getName(); + + if ("boilerplate"==Name) +- ProcessBoilerplate(Node,Source,Include); ++ ProcessBoilerplate(Node,Source,Include,argv[1]); + else if ("header"==Name) + ProcessHeader(Node,Source,Include); + else if ("declare"==Name) +@@ -156,13 +156,13 @@ void ProcessHeader(const XMLNode& /*Node*/, std::ofstream& Source, std::ofstream + Include << os.str() << std::endl; + } + +-void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include) ++void ProcessBoilerplate(const XMLNode& Node, std::ofstream& Source, std::ofstream& Include, const std::string& Path) + { + std::ofstream *File=GetFile(Node,Source,Include); + + if (Node.isAttributeSet("file")) + { +- std::string FileName=Node.getAttribute("file"); ++ std::string FileName=Path+"/"+Node.getAttribute("file"); + std::ifstream InFile(FileName.c_str()); + if (InFile.is_open()) + *File << InFile.rdbuf() << std::endl; +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 645f8ae..8a0b38b 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,4 +1,7 @@ +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include) ++INCLUDE_DIRECTORIES( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../include ++ ${CMAKE_CURRENT_BINARY_DIR}/../include ++) + LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES}) + ADD_EXECUTABLE(mbtest mbtest.cc) + ADD_EXECUTABLE(ctest ctest.c) +-- +1.7.10 + +From b5d4f4ea32068e296326438c747faf665c311ddd Mon Sep 17 00:00:00 2001 +From: Andy Hawkins <andy@gently.org.uk> +Date: Thu, 14 Jun 2012 09:12:27 +0000 +Subject: [PATCH] Fix install when building out of tree + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16870b4..958461c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h) + + FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/musicbrainz5/*.h) +-INSTALL(FILES ${headers} include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5) ++INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + + ADD_SUBDIRECTORY(src) +-- +1.7.10 + diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index ebc6604ad..c6e28b53e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159279 2012-05-20 14:16:33Z giovanni $ +# $Id: PKGBUILD 161806 2012-06-14 18:07:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.05.17 +pkgver=2012.06.12 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('e46d6070d7043b67c776389276d8bfed') +md5sums=('0c952d4debc674ac896fe3d231b21a0a') build() { cd ${srcdir}/live diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 7587d3e38..94b238613 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 157134 2012-04-24 18:49:00Z heftig $ +# $Id: PKGBUILD 161809 2012-06-14 18:56:19Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> -# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Will Rea <sillywilly@gmail.com> # Contributor: Valentine Sinitsyn <e_val@inbox.ru> @@ -8,14 +8,15 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.4.0 -pkgrel=4 +pkgrel=5 +_snapshot=83760a7 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/$_pkgname/" depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' 'libsoup') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc') optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' @@ -25,26 +26,21 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -#source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch - initialize-GError.patch dont-fight-over-ipv6.patch) -sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f' +#source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz +source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-$_snapshot.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) +sha256sums=('6cb6d6c87306a7cd4aeed786c3445677b6df4e56ddcc4a6c1747c09c44114091' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' - '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6' - 'cc66f2fdf59f4f9873a5b775421e1968861c5541d7e29b83b4d30351ad1f9e94') + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') build() { - cd $_pkgname-$pkgver + cd $_pkgname-$_snapshot patch -Np1 -i ../disable_set_hostname.patch patch -Np1 -i ../dnsmasq-path.patch - patch -Np1 -i ../initialize-GError.patch - patch -Np1 -i ../dont-fight-over-ipv6.patch - ./configure \ + ./autogen.sh \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -66,7 +62,7 @@ build() { } package() { - cd $_pkgname-$pkgver + cd $_pkgname-$_snapshot make DESTDIR="$pkgdir" install install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD index befd4f301..841cc9417 100644 --- a/extra/xfce4-mixer/PKGBUILD +++ b/extra/xfce4-mixer/PKGBUILD @@ -1,38 +1,37 @@ -# $Id: PKGBUILD 157863 2012-04-30 04:20:32Z foutrelis $ +# $Id: PKGBUILD 161812 2012-06-14 23:39:44Z foutrelis $ # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-mixer pkgver=4.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="The volume control plugin for the Xfce panel" -arch=(i686 x86_64) -license=('GPL2') +arch=('i686' 'x86_64') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') -depends=("xfce4-panel>=4.8.0" 'gstreamer0.10-base>=0.10.22' 'hicolor-icon-theme') +depends=('xfce4-panel' 'gstreamer0.10-base-plugins' 'hicolor-icon-theme') makedepends=('intltool') -optdepends=('gstreamer0.10-base-plugins: to support basic audio hardware' \ - 'gstreamer0.10-good-plugins: well supported hardware'\ - 'gstreamer0.10-bad-plugins: not so well supported hardware'\ - 'gstreamer0.10-ugly-plugins: might contain questionable license hardware') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3fa3a9973e18c04da26709a654e242ff') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --with-sound=alsa \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-mixer/xfce4-mixer.install b/extra/xfce4-mixer/xfce4-mixer.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-mixer/xfce4-mixer.install +++ b/extra/xfce4-mixer/xfce4-mixer.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD index 15e2b70d1..db9587850 100644 --- a/extra/xine-ui/PKGBUILD +++ b/extra/xine-ui/PKGBUILD @@ -1,38 +1,24 @@ -# $Id: PKGBUILD 148980 2012-02-05 11:58:50Z ibiru $ +# $Id: PKGBUILD 161816 2012-06-15 02:09:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-ui -pkgver=0.99.6 -pkgrel=5 +pkgver=0.99.7 +pkgrel=1 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') url="http://www.xine-project.org" -depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm' +depends=('xine-lib' 'curl' 'libpng' 'libjpeg' 'libxft' 'libxxf86vm' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'lirc-utils') makedepends=('libxt') options=('!strip') install=xine-ui.install -source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz - lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch - fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch) -sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' - 'b2df43ede3a9d1a34b80139704a4cbbc7295c584' - '8bbd39f61de7b6991385457a4944b8ea104da88b' - '2361df9ddad59c426b0f863414c6d527b463a38a' - '9c70c6543dae6815710b239b4638ffe3843bac86' - 'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14') +source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz) +sha1sums=('ca82e09cf8245d038813bc4dbd8384ba79cbf197') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" - patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" - patch -p1 < "${srcdir}/fix_lirc.diff" - patch -p1 < "${srcdir}/xine-ui-xdg.diff" - patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch" - sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c - autoconf ./configure --prefix=/usr --mandir=/usr/share/man \ --with-x --enable-lirc --without-aalib --enable-debug make diff --git a/kde-unstable/libkcddb/PKGBUILD b/kde-unstable/libkcddb/PKGBUILD index 597dcbf19..7e152a7f9 100644 --- a/kde-unstable/libkcddb/PKGBUILD +++ b/kde-unstable/libkcddb/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 161688 2012-06-13 14:19:02Z andrea $ +# $Id: PKGBUILD 161789 2012-06-14 09:31:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb pkgver=4.8.90 -pkgrel=1 +pkgrel=2 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') +depends=('kdelibs' 'libmusicbrainz5') makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 28b96bcdd..b4e914356 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -21,7 +21,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=3 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -49,7 +49,6 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" xulrunner-copy-stub.patch libre.patch iceweasel-install-dir.patch - region.properties vendor.js Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('e440446bb92dc1c0311346c68024590b' @@ -58,9 +57,8 @@ md5sums=('e440446bb92dc1c0311346c68024590b' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - 'bd7d322d89001e39b1f11972507063c7' + 'e87d5decbb4dc0013beceaa61acfc7a1' 'e529742c0a425648087bc3ce537fe4c5' - 'f1c76e7e244257856a386ca2de69bdf0' '0d053487907de4376d67d8f499c5502b' '41ce105f0c1877fe22e0c0ec45e09565') @@ -111,7 +109,6 @@ if [ $NOEXTRACT -eq 0 ]; then fi cd "$srcdir/mozilla-build" - cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ if $_pgo; then cat "$srcdir/mozconfig.pgo" >> .mozconfig diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 88a06741e..e726a58e9 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -64,28 +64,71 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow // by default we show an infobar message when pages require plugins the user has not installed, or are outdated pref("plugins.hide_infobar_for_missing_plugin", false); diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 -+++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-05 20:07:51.593611484 -0300 -@@ -1,8 +1,8 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300 +@@ -1,23 +1,23 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo ++browser.search.defaultenginename=Duck Duck Go (Lite) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -+browser.search.order.1=DuckDuckGo - browser.search.order.2=Yahoo - browser.search.order.3=Bing +-browser.search.order.2=Yahoo +-browser.search.order.3=Bing ++browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.2=Seeks Search ++browser.search.order.3=YaCy -@@ -17,7 +17,7 @@ + # This is the default set of web based feed handlers shown in the reader + # selection UI +-browser.contentHandlers.types.0.title=Google +-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s +-browser.contentHandlers.types.1.title=My Yahoo! +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s ++browser.contentHandlers.types.0.title= ++browser.contentHandlers.types.0.uri= ++browser.contentHandlers.types.1.title= ++browser.contentHandlers.types.1.uri= + + # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the +@@ -27,19 +27,19 @@ + gecko.handlerService.defaultHandlersVersion=3 + + # The default set of protocol handlers for webcal: +-gecko.handlerService.schemes.webcal.0.name=30 Boxes +-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s ++gecko.handlerService.schemes.webcal.0.name= ++gecko.handlerService.schemes.webcal.0.uriTemplate= + + # The default set of protocol handlers for mailto: +-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail +-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s +-gecko.handlerService.schemes.mailto.1.name=Gmail +-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s ++gecko.handlerService.schemes.mailto.0.name= ++gecko.handlerService.schemes.mailto.0.uriTemplate= ++gecko.handlerService.schemes.mailto.1.name= ++gecko.handlerService.schemes.mailto.1.uriTemplate= + + # The default set of protocol handlers for irc: +-gecko.handlerService.schemes.irc.0.name=Mibbit +-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s ++gecko.handlerService.schemes.irc.0.name=Freenode ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ + + # The default set of protocol handlers for ircs: +-gecko.handlerService.schemes.ircs.0.name=Mibbit +-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html --- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300 +++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300 @@ -94,7 +137,7 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b <p> <a><a> anchor</a><br> - <a href="http://www.google.com"><a> a + href</a> -+ <a href="http://www.duckduckgo.com"><a> a + href</a> ++ <a href="https://duckduckgo.com/lite"><a> a + href</a> </p> <p> <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> @@ -106,7 +149,7 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul </toolbar> - <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/> ++ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/> <label id="messageLog" value="" crop="center"/> </window> diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul @@ -117,7 +160,7 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo </toolbar> - <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content" ++ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content" remote="true"/> </window> diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul/app/mobile.js @@ -148,33 +191,57 @@ diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul pref("keyword.enabled", true); -pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q="); -+pref("keyword.URL", "http://duckduckgo.com/?q="); ++pref("keyword.URL", "https://duckduckgo.com/lite/?q="); pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties ---- mozilla-build.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300 -+++ mozilla-build/mobile/locales/en-US/chrome/region.properties 2012-06-05 20:53:03.264432170 -0300 -@@ -1,8 +1,8 @@ +--- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300 ++++ mozilla-release/mobile/locales/en-US/chrome/region.properties 2012-06-15 02:17:43.446130868 -0300 +@@ -1,18 +1,18 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo ++browser.search.defaultenginename=Duck Duck Go (Lite) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -+browser.search.order.1=DuckDuckGo ++browser.search.order.1=Duck Duck Go (Lite) # This is the default set of web based feed handlers shown in the reader # selection UI -@@ -12,7 +12,7 @@ - browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s +-browser.contentHandlers.types.0.title=My Yahoo +-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.1.title=Google +-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s ++browser.contentHandlers.types.0.title= ++browser.contentHandlers.types.0.uri= ++browser.contentHandlers.types.1.title= ++browser.contentHandlers.types.1.uri= # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+keyword.URL=http://duckduckgo.com/?q= ++keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the +@@ -22,11 +22,11 @@ + gecko.handlerService.defaultHandlersVersion=2 + + # The default set of protocol handlers for webcal: +-gecko.handlerService.schemes.webcal.0.name=30 Boxes +-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s ++gecko.handlerService.schemes.webcal.0.name= ++gecko.handlerService.schemes.webcal.0.uriTemplate= + + # The default set of protocol handlers for mailto: +-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail +-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s +-gecko.handlerService.schemes.mailto.1.name=Gmail +-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s ++gecko.handlerService.schemes.mailto.0.name= ++gecko.handlerService.schemes.mailto.0.uriTemplate= ++gecko.handlerService.schemes.mailto.1.name= ++gecko.handlerService.schemes.mailto.1.uriTemplate= diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js --- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300 +++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300 @@ -183,7 +250,7 @@ diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/mod // The first character after a period must be alphabetic. -pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", "http://duckduckgo.com/?q="); ++pref("keyword.URL", "https://duckduckgo.com/lite/?q="); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); @@ -208,16 +275,21 @@ diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region. +plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-build.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 -+++ mozilla-build/browser/locales/generic/profile/bookmarks.html.in 2012-06-05 21:03:38.239300038 -0300 -@@ -11,13 +11,12 @@ +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 15:11:46.364192476 -0300 +@@ -10,14 +10,16 @@ + <DL><p> <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ ++ <DT><H3 ID="rdf:#$ZvPhC3">Parabola GNU/Linux-libre</H3> <DL><p> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> + <DT><A HREF="https://parabolagnulinux.org/">Parabola GNU/Linux-libre</A> ++ <DT><A HREF="https://wiki.parabolagnulinux.org/">Parabola GNU/Linux-libre Wiki</A> ++ <DT><A HREF="https://labs.parabola.nu/">Parabola GNU/Linux-libre Bugs</A> </DL><p> - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> +- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> ++ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Fundation</H3> <DL><p> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> @@ -225,13 +297,118 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in - <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> + <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A> + <DT><A HREF="http://libreplanet.org/">LibrePlanet</A> -+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A> ++ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A> </DL><p> </DL><p> diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-10 03:18:01.897259931 -0300 -@@ -143,7 +143,7 @@ ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300 +@@ -38,104 +38,6 @@ + * + * ***** END LICENSE BLOCK ***** */ + +-// If a definition requires additional params, check that the final search url +-// is handled correctly by the engine. +-const SEARCH_ENGINES = { +- "Google": { +- image: "data:image/png;base64," + +- "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" +- , params: "source=hp&channel=np" +- } +- +-, "Яндекс": +- { +- image: "data:image/png;base64," + +- "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" +- } +-}; +- + // The process of adding a new default snippet involves: + // * add a new entity to aboutHome.dtd + // * add a <span/> for it in aboutHome.xhtml +@@ -143,7 +45,7 @@ // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 7a1b8cfcc..35529f458 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156321 2012-04-17 02:30:26Z eric $ +# $Id: PKGBUILD 161863 2012-06-15 23:14:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('076cde160fff49a4b8c59fdae0571659ce8acd88' +sha1sums=('c469d87da4b0512270376aa360c7a955d02153c3' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install index 5ad87f7f6..7d812ccdb 100644 --- a/libre/liferea-libre/liferea.install +++ b/libre/liferea-libre/liferea.install @@ -1,4 +1,4 @@ -pkgname=liferea-libre +pkgname=liferea post_install() { usr/sbin/gconfpkg --install ${pkgname} diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index c86c9514a..50b4d65d2 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -3,24 +3,26 @@ # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> +# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> pkgname=mozilla-searchplugins -pkgver=1.0 -pkgrel=1 +pkgver=1.2 +pkgrel=2 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') url="https://parabolagnulinux.org/" source=( duck-duck-go-lite.xml - duck-duck-go-ssl.xml internet-archive.xml jamendo-en.xml logless-search.xml - scroogle-ssl-english.xml + parabola-packages.xml + parabola-wiki-en.xml + seeks-search.xml wikipedia.xml yacy.xml ) @@ -31,10 +33,11 @@ package() { } md5sums=('e1bda0854de7d764f7401c81bb82b5ef' - 'c5f00b6b24222aacd5a749d1f59c4d24' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' - 'cf97082e77e3ef5f1bd74b1db9329965' + '3c4a7f901bfe9000a702c68f7f78428c' + '5bf9ca2558026fa3f4ec52d8e64fee47' + '86ccb1d02683e69e6bc0543cb77a06bc' 'c35f4971feff8387e0570d7a165eb6fa' '24528ca3f7f1e1a0ba735231aa3ac1de') diff --git a/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml b/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml new file mode 100644 index 000000000..124f04609 --- /dev/null +++ b/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml @@ -0,0 +1,9 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Parabola GNU/Linux-Libre Wiki (en)</os:ShortName> +<os:Description>Parabola GNU/Linux-Libre Wiki (en)</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<SearchForm>https://wiki.parabolagnulinux.org/Special:Search</SearchForm> +<os:Url type="text/html" method="GET" template="https://wiki.parabolagnulinux.org/index.php?title=Special:Search&search={searchTerms}"> +</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabolagnulinux.org/api.php?action=opensearch&search={searchTerms}&namespace=0"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml new file mode 100644 index 000000000..8f20628dc --- /dev/null +++ b/libre/mozilla-searchplugins/parabola-packages.xml @@ -0,0 +1,9 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Parabola Packages</os:ShortName> +<os:Description>Search the Parabola package repositories.</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image> +<os:Url type="text/html" method="GET" template="http://parabolagnulinux.org/packages/?q={searchTerms}"> +</os:Url><os:Url type="application/opensearchdescription+xml" method="GET" template="http://parabolagnulinux.org/opensearch/packages/" rel="self"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml new file mode 100644 index 000000000..d218b21f8 --- /dev/null +++ b/libre/mozilla-searchplugins/parabola-wiki-en.xml @@ -0,0 +1,11 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Parabola GNU/Linux-Libre Wiki (en)</os:ShortName> +<os:Description>Parabola GNU/Linux-Libre Wiki (en)</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD/// +8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image> +<SearchForm>https://wiki.parabolagnulinux.org/Special:Search</SearchForm> +<os:Url type="text/html" method="GET" template="https://wiki.parabolagnulinux.org/index.php?title=Special:Search&search={searchTerms}"> +</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabolagnulinux.org/api.php?action=opensearch&search={searchTerms}&namespace=0"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/libre/mozilla-searchplugins/seeks-search.xml b/libre/mozilla-searchplugins/seeks-search.xml new file mode 100644 index 000000000..5025f5a06 --- /dev/null +++ b/libre/mozilla-searchplugins/seeks-search.xml @@ -0,0 +1,8 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Seeks Search</os:ShortName> +<os:Description>Real-time p2p pattern matching network for social websearch.</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAwwAAAMMBnc7+MwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJCSURBVDiNpZJLSFRxGMV/f2fGGWcc8zI6U5qSmmVPyIW0kURoES1CMgODwgh72yZoU1EQRItMooLQLAiLBAsiaVGRBKFID0oqMpqy0UIdnWke1zuPe/8tNHtAwdTZfHyc75zDB0dUtiiXgAZAkBokcFlUtigyReEvSPsf8T8ZSAkYP3bz3w6TGiQ00OMgDTCM6QmQZgKr4zcDaUA8CnEN9NhM2h9g6KDrPxloIYiFp1NSgdnQIToBpTkrqaneQp5SyIexd1x/3MrngA+AEs9ialdvo8BVxJDfS2dvO0Pj76cdyg8r8lBHo0zqCflVDci+wR6pxqIyooXl1nPr5P72ehlLaDKkBmXvYI+MaGGpxafkrtZaWX5UkaLqRLG8c/AFL4eesLutDt1IkpFu51rTPWyWDBw2J97Rt+y4WENST2C12Liyp5u52fmsb16BeWneKhzWTFzOXNp23pr9zWJKZ75rAQBz7AqtjTdnOXu6gxynm1LPcsxqTKWr7yoIgfjeZgE2SwZqLIoQgshUmOHJTzOUYCTgY8D3jGQiifmptw+HSaGitJK2B2eYCI8zTyngZP0Fnnv7sVszmYqrNN8+xkR4nHxXIdurD/BwoJs3wwOYpQ6ByCQl7jKObDxNSA3icrpRY1HO3z1FliObhqp9HK87iz88hiszF7PJgj/kx9BBLGlSpJGEIs9C1ixbS5FnEaPBEbp6OxgNfgGgMLeYDRWbyclyMzjyikev7+Pzf8RkAVG2V+mUkk2p1QeQINK48Q3fpPIi5xKaPwAAAABJRU5ErkJggg==</os:Image> +<os:Url type="text/html" method="GET" template="http://www.seeks-project.info/search.php/search/txt/{searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD index d84e13b7a..08f2aea37 100644 --- a/staging/xine-lib/PKGBUILD +++ b/staging/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160700 2012-06-04 01:22:50Z eric $ +# $Id: PKGBUILD 161814 2012-06-15 00:59:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.2.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -30,14 +30,11 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'gnome-vfs: for using the gnome-vfs plugin' \ 'libvdpau: for using the VDPAU plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz - xine-lib-1.2.1-ffmpeg.patch) -sha1sums=('ebb2648456504ff4ce08c34de258d3125832bb94' - '179558f72566574e52f3a79231aac25968f18ff0') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) +sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/xine-lib-1.2.1-ffmpeg.patch" ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations make } diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD new file mode 100644 index 000000000..9de7253da --- /dev/null +++ b/testing/php/PKGBUILD @@ -0,0 +1,347 @@ +# $Id: PKGBUILD 161804 2012-06-14 17:07:05Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.4.4 +pkgrel=1 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' + 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') +md5sums=('1fd98dc3f6f3805cd67bff12a26ed77f' + '0b0bc7a917fc592bdf11dcd3c5c255e9' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'aabda9f3f2f8b9d8fdc9558c31c718db' + '825e580dd5708d959b50944afa1b12b6' + 'f56b5bb7e93c802ae8519182fbea3387' + '86c73d481f3099e740e602869bacf637' + 'c60343df74f8e1afb13b084d5c0e47ed') + +build() { + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --config-cache \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --disable-rpath \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-mbstring \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=/usr \ + --with-gd=shared \ + --with-gdbm \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl \ + --with-imap=shared \ + --with-jpeg-dir=/usr \ + --with-vpx-dir=/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=/usr \ + --with-pspell=shared \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + install='php-fpm.install' + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d + install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf + install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make install-pear INSTALL_ROOT=${pkgdir} + rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry} +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite') + pkgdesc='sqlite module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/testing/php/apache.conf b/testing/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/testing/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm new file mode 100644 index 000000000..ac2d92a36 --- /dev/null +++ b/testing/php/logrotate.d.php-fpm @@ -0,0 +1,8 @@ +/var/log/php-fpm.log { + missingok + notifempty + delaycompress + postrotate + kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..0b17182fd --- /dev/null +++ b/testing/php/php-fpm.conf.in.patch @@ -0,0 +1,52 @@ +--- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = /run/php-fpm/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written +@@ -140,7 +140,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -151,9 +152,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +@@ -442,7 +443,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/testing/php/php-fpm.install b/testing/php/php-fpm.install new file mode 100644 index 000000000..41fc37c22 --- /dev/null +++ b/testing/php/php-fpm.install @@ -0,0 +1,9 @@ +post_install() { + if [[ ! -d run/php-fpm ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf + fi +} + +post_upgrade() { + post_install +} diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service new file mode 100644 index 000000000..e29f7c236 --- /dev/null +++ b/testing/php/php-fpm.service @@ -0,0 +1,13 @@ +[Unit] +Description=FastCGI Process Manager for PHP +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/php-fpm/php-fpm.pid +PrivateTmp=true +ExecStart=/usr/sbin/php-fpm +ExecReload=/bin/kill -USR2 $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/testing/php/php-fpm.tmpfiles b/testing/php/php-fpm.tmpfiles new file mode 100644 index 000000000..801e74f1e --- /dev/null +++ b/testing/php/php-fpm.tmpfiles @@ -0,0 +1 @@ +d /run/php-fpm 755 root root diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch new file mode 100644 index 000000000..bbaae2152 --- /dev/null +++ b/testing/php/php.ini.patch @@ -0,0 +1,122 @@ +--- php.ini-production 2012-03-29 06:17:59.000000000 +0200 ++++ php.ini-production 2012-03-30 10:46:21.181340861 +0200 +@@ -305,7 +305,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -702,7 +702,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -725,7 +725,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -859,51 +859,47 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm new file mode 100644 index 000000000..3b3ec20de --- /dev/null +++ b/testing/php/rc.d.php-fpm @@ -0,0 +1,144 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /run/php-fpm/php-fpm.pid` + + wait_for_pid removed /run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /run/php-fpm/php-fpm.pid` + + wait_for_pid removed /run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/~coadde/xf86-video-nouveau-git/PKGBUILD b/~coadde/xf86-video-nouveau-git/PKGBUILD new file mode 100644 index 000000000..c8e8e24c3 --- /dev/null +++ b/~coadde/xf86-video-nouveau-git/PKGBUILD @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: buddabrod <buddabrod@gmail.com> +# Contributor: Tavian Barnes <tavianator@gmail.com> +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> + +_name=nouveau +_pkgname=xf86-video-nouveau +pkgname=xf86-video-nouveau-git +pkgver=20120612 +pkgrel=1 +pkgdesc="Libre 3D acceleration driver for nVidia cards" +arch=('i686' 'x86_64' 'mips64el') +url="http://${_name}.freedesktop.org/wiki/" +license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4 +depends=("libdrm-git" 'udev') +optdepends=('nouveau-dri-git: experimental gallium3d features') +makedepends=('xorg-server-devel' 'libdrm-git' 'xf86driproto' 'git') +conflicts=('xorg-server<1.11.99.902' "${_pkgname}") +provides=("${_pkgname}") +options=('!libtool') +install=${_pkgname}.install + +_gitroot="git://anongit.freedesktop.org/git/${_name}/${_pkgname}" +_gitname="${_pkgname}" + +build() { + cd ${srcdir} + msg "Connecting to GIT server...." + + if [ -d ${startdir}/src/${_gitname} ] ; then + cd ${_gitname} && git pull origin + msg "The local files are updated." + else + git clone ${_gitroot} + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf ${srcdir}/${_gitname}-build + cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build + cd ${srcdir}/${_gitname}-build + + ./autogen.sh --prefix=/usr + make +} + +package() { + cd ${srcdir}/${_gitname}-build + make DESTDIR=${pkgdir} install +} diff --git a/~coadde/xf86-video-nouveau-git/xf86-video-nouveau.install b/~coadde/xf86-video-nouveau-git/xf86-video-nouveau.install new file mode 100644 index 000000000..027154ff3 --- /dev/null +++ b/~coadde/xf86-video-nouveau-git/xf86-video-nouveau.install @@ -0,0 +1,16 @@ +post_install () { + cat << _EOF + ==> make sure you use KernelModeSetting (KMS) + ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more +_EOF +} + +post_upgrade() { + if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then + cat << _EOF + ==> ATTENTION: Usermode support has been dropped + ==> make sure you use KernelModeSetting (KMS) + ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more +_EOF + fi +} |