diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-30 19:03:43 -0600 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-30 19:03:43 -0600 |
| commit | 62dd9e5afb68fd2beae6365337d2d7c08e0963bc (patch) | |
| tree | e022df998f428b41d3d75b340c23d4f9621d7b8d | |
| parent | 689d0526475686014ee1f3cc4fd728db02dcfb34 (diff) | |
| parent | 0d8ecfa1948a782678aea98ce57638f0430de78b (diff) | |
Merge branch 'master' of gitpar:abslibre-mips64el
209 files changed, 5523 insertions, 772 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index fed44e432..2c24c2470 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.13.0 -pkgrel=2 +pkgver=1.14.0 +pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -md5sums=('b86a5bd4a94e465a58656f71b48c90b9') +md5sums=('577b3b5f19c28de4451cd1a32de76eeb') build() { cd aria2-${pkgver} diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD index 069524e3e..057c61125 100644 --- a/community/bibletime/PKGBUILD +++ b/community/bibletime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61103 2011-12-21 20:53:10Z andrea $ +# $Id: PKGBUILD 61169 2011-12-23 14:46:29Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> pkgname=bibletime -pkgver=2.9.0 -pkgrel=2 +pkgver=2.9.1 +pkgrel=1 pkgdesc="Bible study tool for KDE4" arch=('x86_64' 'i686') url="http://www.bibletime.info/" @@ -12,13 +12,15 @@ depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit') makedepends=('cmake' 'boost-libs') install=$pkgname.install source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('0190b64de5892fc5f45e9a3d46bb29d6') +sha256sums=('308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5') build() { cd "$srcdir/$pkgname-$pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release "$srcdir/$pkgname-$pkgver" + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + "$srcdir/$pkgname-$pkgver" make } diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD index 33ec82e75..622528c4a 100644 --- a/community/calc/PKGBUILD +++ b/community/calc/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 37217 2011-01-12 14:33:47Z spupykin $ +# $Id: PKGBUILD 61256 2011-12-26 12:59:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=calc -pkgver=2.12.4.3 +pkgver=2.12.4.4 pkgrel=1 pkgdesc="console calculator" arch=(i686 x86_64 'mips64el') url="http://www.isthe.com/chongo/tech/comp/calc/" license=('GPL') depends=(glibc) -source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) -md5sums=('d95dccde71cc8d920af0f8375e85e9c8') +#source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) +source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2) +md5sums=('1ad16a9304df7137cd8626a1f50b6aae') build() { cd $srcdir/calc-$pkgver @@ -53,5 +54,5 @@ EOF make -j1 make T=$pkgdir install - mv $pkgdir/usr/bin/cscript $startdir/pkg/usr/share/calc/ + mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/ } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5bda97fa5..fa28ea23d 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60656 2011-12-16 15:19:32Z giovanni $ +# $Id: PKGBUILD 61189 2011-12-24 00:16:51Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.31 +pkgver=0.8.32 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('c2373e34d83b81a321cebea043d5f160' +md5sums=('ee973514615fc104be7cc41adf0862a6' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index 741b8e036..68d86922c 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58036 2011-11-05 17:31:00Z plewis $ +# $Id: PKGBUILD 61252 2011-12-26 11:59:59Z andrea $ # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Emanuele Rossi <newdna1510@yahoo.it> @@ -6,7 +6,7 @@ pkgname=choqok pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url="http://choqok.gnufolks.org/" license=('GPL') diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD index 32f7ebcb0..4a019dfba 100644 --- a/community/clementine/PKGBUILD +++ b/community/clementine/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 55879 2011-09-24 16:48:26Z stephane $ +# $Id: PKGBUILD 61276 2011-12-28 00:29:21Z stephane $ #Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +#Contributor: BlackEagle <ike.devolder@gmail.com> #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=clementine -pkgver=0.7.1 -pkgrel=7 +pkgver=1.0.0 +pkgrel=1 pkgdesc="A music player and library organizer" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') +depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' + 'qjson' 'libcdio' 'protobuf') makedepends=('cmake' 'boost') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') -source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz - clementine-0.7.1-fix-devicekit.patch) -sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' - 'd595e2746949363680e0d64fe2fb97b524c8d27c') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +sha1sums=('ba49c686ea5759e33d6b89179965503fd369cf30') install=clementine.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make } diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 2722803ac..5c57a031e 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58574 2011-11-15 15:35:36Z spupykin $ +# $Id: PKGBUILD 61260 2011-12-26 21:33:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Previous Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.0 -pkgrel=1git20111115 +pkgrel=2git20111115 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -21,7 +21,7 @@ backup=('etc/couchdb/local.ini' source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz" "rc-script.patch") md5sums=('b4236a36a473e3a1c81e7548de194c47' - '559b5e1483c3fb3e4327a9c58181a46c') + '8a3b1a1ff98a6411827ad991db7a355b') build() { cd "$srcdir/apache-$pkgname-$pkgver" @@ -30,14 +30,14 @@ build() { sed -i 's|-ljs|-lmozjs185|' configure [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make - patch etc/init/couchdb <$srcdir/rc-script.patch + patch -R etc/init/couchdb <$srcdir/rc-script.patch } package() { cd "$srcdir/apache-$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 etc/default/couchdb $pkgdir/etc/conf.d/couchdb + install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index ef7be39df..1dd723ffc 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,40 +1,40 @@ ---- couchdb.orig 2011-11-15 19:06:16.000000000 +0400 -+++ couchdb 2011-11-15 19:08:24.000000000 +0400 -@@ -1,4 +1,6 @@ --#!/bin/sh -e -+#!/bin/bash -+. /etc/rc.conf -+. /etc/rc.d/functions +--- couchdb 2011-12-27 01:21:59.000000000 +0400 ++++ couchdb.my 2011-12-27 01:21:18.000000000 +0400 +@@ -1,6 +1,4 @@ +-#!/bin/bash +-. /etc/rc.conf +-. /etc/rc.d/functions ++#!/bin/sh -e # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy of -@@ -29,7 +31,7 @@ +@@ -31,7 +29,7 @@ NAME=couchdb SCRIPT_NAME=`basename $0` COUCHDB=/usr/bin/couchdb --CONFIGURATION_FILE=/etc/default/couchdb -+CONFIGURATION_FILE=/etc/conf.d/couchdb +-CONFIGURATION_FILE=/etc/conf.d/couchdb ++CONFIGURATION_FILE=/etc/default/couchdb RUN_DIR=/var/run/couchdb LSB_LIBRARY=/lib/lsb/init-functions -@@ -42,16 +44,14 @@ +@@ -44,14 +42,16 @@ fi log_daemon_msg () { -- # Dummy function to be replaced by LSB library. -- -- echo $@ -+ stat_busy $@ +- stat_busy $@ ++ # Dummy function to be replaced by LSB library. ++ ++ echo $@ } log_end_msg () { -- # Dummy function to be replaced by LSB library. -- ++ # Dummy function to be replaced by LSB library. ++ if test "$1" != "0"; then -- echo "Error with $DESCRIPTION: $NAME" -+ stat_fail -+ else -+ stat_done +- stat_fail +- else +- stat_done ++ echo "Error with $DESCRIPTION: $NAME" fi return $1 } @@ -42,8 +42,16 @@ command="$command $COUCHDB_OPTIONS" fi if test -n "$COUCHDB_USER"; then -- if su $COUCHDB_USER -c "$command"; then -+ if su $COUCHDB_USER -s /bin/bash -c "$command"; then +- if su $COUCHDB_USER -s /bin/bash -c "$command"; then ++ if su $COUCHDB_USER -c "$command"; then return $SCRIPT_OK else return $SCRIPT_ERROR +@@ -84,7 +84,6 @@ + # Start Apache CouchDB as a background process. + + mkdir -p "$RUN_DIR" +- chown -R $COUCHDB_USER "$RUN_DIR" + command="$COUCHDB -b" + if test -n "$COUCHDB_STDOUT_FILE"; then + command="$command -o $COUCHDB_STDOUT_FILE" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 6bf329e70..4403207ff 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58992 2011-11-20 19:44:35Z spupykin $ +# $Id: PKGBUILD 61213 2011-12-24 17:41:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,16 +6,16 @@ pkgname=darktable pkgver=0.9.3 _pkgver=0.9 -pkgrel=3 +pkgrel=4 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') -makedepends=('intltool>=0.40' 'cmake') +makedepends=('intltool>=0.40' 'cmake' 'librsvg') # 'gnome-doc-utils' 'libxslt' 'fop') -optdepends=( 'librsvg') +optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index c6597a9ac..8af32da0d 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 57536 2011-10-30 12:24:25Z ttopper $ +# $Id: PKGBUILD 61137 2011-12-22 11:13:11Z spupykin $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=dia -pkgver=0.97.1 -pkgrel=5 +pkgver=0.97.2 +pkgrel=1 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,9 +16,9 @@ depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2') makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') options=('!libtool' 'docs') -source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.bz2" +source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" "dia-overflow-fix.patch") -md5sums=('57e44bb9f387559a0506b52a134deaf0' +md5sums=('1e1180a513fb567709b09bc19f12105e' '8fd9a2ad35b5a6fd8c758d7c73dbfe66') build() { @@ -26,7 +26,7 @@ build() { export PYTHON=/usr/bin/python2 sed -i 's#python2\.1#python2 python2.1#' configure - patch -p1 <$srcdir/dia-overflow-fix.patch +# patch -p1 <$srcdir/dia-overflow-fix.patch ./configure --prefix=/usr \ --with-cairo \ diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 6431e90b3..5bcc12094 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=64772 +pkgver=66402 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 4e8053ec8..25dc19715 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61304 2011-12-28 09:16:51Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=64801 +pkgver=66577 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index f893b61ff..583517b06 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61302 2011-12-28 09:16:20Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=64761 +pkgver=66326 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 12e599935..4b70bf268 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61292 2011-12-28 09:13:58Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=64802 +pkgver=66578 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index a3b51cc3b..689561d26 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61298 2011-12-28 09:15:21Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=64793 +pkgver=66561 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 27346f8b4..552028dde 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61288 2011-12-28 09:12:48Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=64494 +pkgver=66148 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 11886aae4..b901f211a 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: bluebugs pkgname=eeze-svn -pkgver=63230 +pkgver=66151 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 6d6dd57ea..1cf3671cd 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61300 2011-12-28 09:15:52Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=64137 +pkgver=66149 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 65b508ece..59699a08d 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61286 2011-12-28 09:12:19Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=64778 +pkgver=66483 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index e65d7a2f7..0176ddd82 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -3,19 +3,18 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=64794 +pkgver=66566 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64' 'mips64el') groups=('e17-libs-svn' 'e17-svn') url="http://www.enlightenment.org" license=('BSD') -depends=('ecore-svn' 'eina-svn' 'evas-svn' 'edje-svn' 'e_dbus-svn' - 'efreet-svn') +depends=('edje-svn' 'e_dbus-svn' 'efreet-svn') makedepends=('subversion') conflicts=('elementary') provides=('elementary') -options=(!libtool) +options=(!libtool !emptydirs) source=() md5sums=() diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index ecade52fa..c850dfc16 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61296 2011-12-28 09:14:55Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=64802 +pkgver=66150 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') groups=('e17-libs-svn' 'e17-svn') url="http://www.enlightenment.org" license=('BSD') -depends=('glibc') +depends=('glibc' 'eina-svn') makedepends=('svn') conflicts=('embryo') provides=('embryo') diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 95e1ae93f..6aaeb8fe3 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 61290 2011-12-28 09:13:15Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=64779 +pkgver=66570 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index 85eb1d089..387f78b70 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60343 2011-12-11 19:59:55Z spupykin $ +# $Id: PKGBUILD 61165 2011-12-23 11:47:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> #pkgbase=freedroidrpg #pkgname=('freedroidrpg' 'freedroidrpg-data') pkgname='freedroidrpg' -pkgver=0.15rc2 +pkgver=0.15 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') @@ -17,7 +17,7 @@ license=("GPL") source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz freedroidrpg.jpg freedroidrpg.desktop) -md5sums=('0e098aae0b16b6f87ffe5f7932580491' +md5sums=('003a3f34619cfaa87add2030fea5d120' 'b73d9dac44c7e83a6c80fbe4eb96ba79' '9a10c2a2064439cdcff5b945dfb1c3ac') diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index e0d056345..c5dc7c94b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61105 2011-12-21 20:56:54Z andrea $ +# $Id: PKGBUILD 61221 2011-12-24 21:45:52Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,8 +12,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.6 -pkgrel=5 +pkgver=2.99.7 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -27,7 +27,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('746aaae5494c4b267bdae802c5c006d5' +md5sums=('674f73cd7d4d37b3c62a4b9261dadb5d' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD index 0ffa19b42..6668ed55e 100644 --- a/community/gluon/PKGBUILD +++ b/community/gluon/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 61254 2011-12-26 12:01:45Z andrea $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ivan Sichmann Freitas <ivansichfreitas@gmail.com> pkgname=gluon pkgver=0.71.0 _pkgver=0.71 -pkgrel=2 +pkgrel=3 pkgdesc="A free and open source platform for creating and distributing games" arch=('i686' 'x86_64' 'mips64el') url="http://gluon.gamingfreedom.org/" diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index ee67ea9c8..69c9df902 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59850 2011-12-01 08:07:01Z spupykin $ +# $Id: PKGBUILD 61360 2011-12-28 17:15:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') @@ -14,13 +14,13 @@ depends=('gnunet' 'glade' 'adns') makedepends=('pkgconfig') source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz drop_gtk2.patch) -md5sums=('5df53665628889a6a12d2bc323003f8d' +md5sums=('7034d34dbc4cdb219b23873d8056bba5' 'f709c0195beffd0ca64d498be83a118b') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/drop_gtk2.patch - autoreconf -fi +# patch -Np1 -i $srcdir/drop_gtk2.patch +# autoreconf -fi ./configure --prefix=/usr --with-gnunet=/usr make } diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index 436345e04..8cf2333a6 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59848 2011-12-01 08:06:10Z spupykin $ +# $Id: PKGBUILD 61358 2011-12-28 17:14:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,13 @@ depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'curl' 'libmicrohttpd') makedepends=('gettext' 'pkgconfig') backup=(etc/gnunetd.conf) options=('!libtool' '!makeflags') +install=gnunet.install source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz gnunet.rc gnunet.conf.d defaults.conf) -md5sums=('e114291bbaf92de085a0ac6f2bfbe54c' - '0d62ab7f2a28af3ac082015696ee6ef3' +md5sums=('f5ff4c6a87e7b24047319af46113e5c3' + '5baf691913b007fb33e365239e3f7217' 'f161b46915736e4017e77ad735521453' '0fe23b2ca5b3fc47a0b5645e04406da0') diff --git a/community/gnunet/gnunet.install b/community/gnunet/gnunet.install new file mode 100644 index 000000000..b9aff1dfe --- /dev/null +++ b/community/gnunet/gnunet.install @@ -0,0 +1,7 @@ +post_install() { + echo 'Change nobody to proper username in /etc/conf.d/gnunetd' +} + +post_upgrade() { + echo 'Change nobody to proper username in /etc/conf.d/gnunetd' +} diff --git a/community/gnunet/gnunet.rc b/community/gnunet/gnunet.rc index 34c7c5fe1..30ac4d2ad 100644 --- a/community/gnunet/gnunet.rc +++ b/community/gnunet/gnunet.rc @@ -6,11 +6,11 @@ GNUNETD_USER=nobody . /etc/rc.conf . /etc/rc.d/functions -PID=$(pidof -o %PPID /usr/bin/gnunetd) +PID=$(pidof -o %PPID /usr/bin/gnunet-arm) case "$1" in start) - stat_busy "Starting gnunetd" - [ -z "$PID" ] && /usr/bin/gnunetd -c /etc/gnunetd.conf -u $GNUNETD_USER 1>/dev/null 2>/dev/null & + stat_busy "Starting gnunet services" + [ -z "$PID" ] && su -c '/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf' - $GNUNETD_USER 1>/dev/null 2>/dev/null & if [ $? -gt 0 ]; then stat_fail else @@ -19,7 +19,7 @@ case "$1" in fi ;; stop) - stat_busy "Stopping gnunetd" + stat_busy "Stopping gnunet services" [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index abb7ae4ed..0a2ae1e12 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60124 2011-12-05 19:50:21Z ibiru $ +# $Id: PKGBUILD 61211 2011-12-24 17:06:50Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.1 -pkgrel=2 +pkgver=4.1.1 +pkgrel=1 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3wm.org/" @@ -19,13 +19,13 @@ optdepends=('rxvt-unicode: The terminal emulator used in the default config.' 'i3status: To display systeminformation with a bar.' 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') -source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2) -md5sums=('1a05d605624506c2b4b9f1272fd84a5a') +source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2") +md5sums=('25bc29349b65000a2b0afc0655a80035') build() { cd "$srcdir/$_pkgsourcename-$pkgver" - # To avoid problems with bison use only a single process + # In order to avoid problems with bison use only a single process MAKEFLAGS="-j1" make } diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD index a174d3eb9..4556016c0 100644 --- a/community/i3status/PKGBUILD +++ b/community/i3status/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 52225 2011-07-22 05:51:08Z ttopper $ +# $Id: PKGBUILD 61262 2011-12-27 10:18:54Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3status -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="Generates status bar to use with dzen2 or xmobar" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('wireless_tools' 'confuse' 'alsa-lib') makedepends=('asciidoc') install=i3status.install options=('docs') -source=(http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2) -md5sums=('6a74863c525908be4465c0353ed5b999') +source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2") +md5sums=('5854250c6bd4f2d1def986efc516aeb3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index bf7e5856b..880fbd1ed 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -5,7 +5,7 @@ pkgname=inn pkgver=2.5.2 -pkgrel=6 +pkgrel=8 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64' 'mips64el') @@ -53,7 +53,7 @@ source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz nnrpd.conf site.make.patch) md5sums=('a6e577dceb90d07501b96149508b974b' - '2ad5138dac7c7535278f73f30020d656' + 'a243d9498568f1beee20da5684b5fbfc' 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' 'bb4bbe86ae52fbbf08b0f6f370dea052' diff --git a/community/inn/innd.rc b/community/inn/innd.rc index e88bd0c39..5e36aec0d 100644 --- a/community/inn/innd.rc +++ b/community/inn/innd.rc @@ -4,11 +4,15 @@ . /etc/rc.d/functions [ -f /etc/conf.d/innd ] && . /etc/conf.d/innd [ -z "$NEWS_USER" ] && print "Please set news username" && exit 1; +[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1; case "$1" in start) stat_busy "Starting InterNetNews" - [ -d /var/run/inn ] || mkdir -p /var/run/inn + [ -d /var/run/inn ] || { + mkdir -p /var/run/inn + chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn + } su $NEWS_USER -c /usr/bin/rc.news 2>&- >&- if [ $? -gt 0 ]; then stat_fail @@ -21,10 +25,12 @@ case "$1" in ;; stop) stat_busy "Stopping InterNetNews" + ctlinnd throttle "shutting down" 2>&- >&- su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&- if [ $? -gt 0 ]; then stat_fail else + kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&- rm /var/run/innd.pid rm_daemon innd stat_done diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index f457100d7..1f876dec7 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60072 2011-12-04 18:08:53Z schiv $ +# $Id: PKGBUILD 61228 2011-12-25 08:59:30Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -8,8 +8,8 @@ pkgbase=jack2 pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack -pkgver=1.9.7 -pkgrel=3 +pkgver=1.9.8 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -19,10 +19,10 @@ makedepends=('python2' 'doxygen' 'libffado' [ "$CARCH" = "mips64el" ] && \ makedepends=('python2' 'doxygen' 'libsamplerate' 'dbus-core' 'celt') -source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2" +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" '99-audio.conf' '40-hpet-permissions.rules') -md5sums=('9759670feecbd43eeccf1c0f743ec199' +md5sums=('1dd2ff054cab79dfc11d134756f27165' 'ae65b7c9ebe0fff6c918ba9d97ae342d' '471aad533ff56c5d3cbbf65ce32cadef') @@ -48,7 +48,7 @@ _isbuild() { } build() { - cd "$srcdir" + cd "$srcdir/$_tarname-$pkgver" # fix doxygen building sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript @@ -76,12 +76,11 @@ build() { } package_jack2() { - ! _isbuild jack2 && return + ! _isbuild jack2 && return 0 pkgdesc="The next-generation JACK with SMP support" - depends=('libsamplerate') + depends=('libsamplerate' 'celt') optdepends=('libffado: FireWire support' - 'celt: NetJACK2 driver' 'dbus-core: jackdbus' 'python2: jack_control') [ "$CARCH" = "mips64el" ] && \ @@ -89,10 +88,9 @@ package_jack2() { 'dbus-core: jackdbus' 'python2: jack_control') conflicts=('jack') - provides=('jack' 'jack-audio-connection-kit' - 'jackmp' 'jackdmp' 'jackdbus') + provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') - cd "$srcdir/$_tarname-$pkgver" + cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver" python2 waf install --destdir="$pkgdir" @@ -109,21 +107,19 @@ package_jack2() { } package_jack2-dbus() { - ! _isbuild jack2-dbus && return + ! _isbuild jack2-dbus && return 0 pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" - depends=('libsamplerate' 'dbus-core') + depends=('libsamplerate' 'celt' 'dbus-core') optdepends=('libffado: FireWire support' - 'celt: NetJACK2 driver' 'python2: jack_control') [ "$CARCH" = "mips64el" ] && \ optdepends=('celt: NetJACK2 driver' 'python2: jack_control') conflicts=('jack' 'jack2') - provides=('jack' 'jack2' 'jack-audio-connection-kit' - 'jackmp' 'jackdmp' 'jackdbus') + provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') - cd "$srcdir/$_tarname-dbus-$pkgver" + cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver" python2 waf install --destdir="$pkgdir" diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 38674cb01..2dd156623 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 57971 2011-11-05 09:47:31Z kkeen $ +# $Id: PKGBUILD 61131 2011-12-22 05:37:54Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20111105 +pkgver=20111222 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('5d4c6d40ef4497473445931e777e280b') +md5sums=('bcc8b8b6e8c09af7d053471a473ef6e8') build() { cd "$srcdir/$pkgname" diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index 433626ab2..c7dd280e1 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 58611 2011-11-16 15:32:03Z spupykin $ +# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: James Fryman <jfryman@gmail.com> pkgname=libdnet pkgver=1.12 -pkgrel=5 +pkgrel=6 pkgdesc="A simplified, portable interface to several low-level networking routines" arch=(i686 x86_64 'mips64el') makedepends=(python2) optdepends=(python2) -install=libdnet.install license=("BSD") url="http://code.google.com/p/libdnet/" options=('!libtool') @@ -17,18 +16,19 @@ source=(http://libdnet.googlecode.com/files/libdnet-$pkgver.tgz) md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9') build() { - mkdir -p $pkgdir/usr/bin + cd $srcdir/$pkgname-$pkgver - [ $CARCH == "x86_64" ] && export CFLAGS=-fPIC - [ $CARCH == "mips64el" ] && export CFLAGS+=-fPIC + autoreconf -I config --force --install + ./configure --prefix=/usr + make +} +package() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --target=${CHOST} --host=${CHOST} --build=${CHOST} - make && make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir/" install cd python && \ python2 setup.py install --root=$pkgdir install -D -m0644 ../LICENSE $pkgdir/usr/share/licenses/libdnet/license - mv $pkgdir/usr/man $startdir/pkg/usr/share/ } diff --git a/community/libdnet/libdnet.install b/community/libdnet/libdnet.install index cb8146f24..3264378fd 100644 --- a/community/libdnet/libdnet.install +++ b/community/libdnet/libdnet.install @@ -1,3 +1,3 @@ post_install() { - /sbin/ldconfig + /sbin/ldconfig } diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD index c2b2b6d0c..3b9916ac0 100644 --- a/community/libexosip2/PKGBUILD +++ b/community/libexosip2/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 47119 2011-05-17 07:23:32Z andrea $ +# $Id: PKGBUILD 61348 2011-12-28 15:42:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=libexosip2 -pkgver=3.5.0 +pkgver=3.6.0 pkgrel=1 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/exosip/" license=('GPL') -depends=('libosip2>=3.5.0' 'openssl') +depends=('libosip2>=3.6.0' 'openssl') options=(!libtool) source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz) -md5sums=('51e85725571870614e448f63c33c8996') +md5sums=('6fef4c110f1305048a8b307f440933d9') build() { cd "$srcdir/libeXosip2-${pkgver/_/-}" ./configure --prefix=/usr make } + package() { cd "$srcdir/libeXosip2-${pkgver/_/-}" make DESTDIR="$pkgdir" install diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD index 5ab3ef63f..ee400283b 100644 --- a/community/libosip2/PKGBUILD +++ b/community/libosip2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47083 2011-05-16 14:18:27Z jelle $ +# $Id: PKGBUILD 61350 2011-12-28 15:43:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Hybner <dta081@gmail.com> pkgname=libosip2 -pkgver=3.5.0 +pkgver=3.6.0 pkgrel=1 pkgdesc="oSIP is an implementation of SIP" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=(glibc) options=(!emptydirs !libtool) source=(http://ftp.gnu.org/gnu/osip/libosip2-${pkgver/_/-}.tar.gz) -md5sums=('7691546f6b3349d10007fc1aaff0f4e0') +md5sums=('92fd1c1698235a798497887db159c9b3') build() { cd $srcdir/libosip2-${pkgver/_/-}/ diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 080dc9ed7..ec27ab915 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49813 2011-06-21 09:18:21Z spupykin $ +# $Id: PKGBUILD 61352 2011-12-28 15:43:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone -pkgver=3.4.3 -pkgrel=4 +pkgver=3.5.0 +pkgrel=3 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng" @@ -14,16 +14,13 @@ depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4 makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite') optdepends=('pulseaudio') options=('!libtool' '!emptydirs') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.4.x/sources/linphone-$pkgver.tar.gz" - "disable-v4l1.patch") -md5sums=('66e21f36d62c2094f7b4360262c46f20' - '7ee15689eed1adbdcf0ddab8fadca34a') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz") +md5sums=('ad89cd6030a131f2b17ea50eb6f4c6f2') build() { cd "$srcdir/$pkgname-$pkgver" export PKG_CONFIG=/usr/bin/pkg-config unset SGML_CATALOG_FILES -# patch -p1 <$srcdir/disable-v4l1.patch ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \ --enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \ --libexecdir=/usr/lib/$pkgname \ diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD new file mode 100644 index 000000000..7983e7bad --- /dev/null +++ b/community/luaposix/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 61274 2011-12-27 22:28:27Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Contributor: Laszlo Papp <djszapi at archlinux us> +# Contributor: Donald Ephraim Curtis <dcurtis@gmail.com> + +pkgname=luaposix +pkgver=5.1.15 +pkgrel=1 +pkgdesc='A POSIX library for Lua programming language' +arch=('i686' 'x86_64') +url='http://luaforge.net/projects/luaposix/' +license=('GPL' 'LGPL') +depends=('lua') +options=('!libtool') +source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('c492541a768302fb67ad14a294306f3a') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr \ + --libdir=/usr/lib/lua/5.1 \ + --datadir=/usr/share/lua/5.1 + make +} + +package() { + cd $pkgname-$pkgver + + make PREFIX=/usr DESTDIR="$pkgdir/" install + + # examples + install -d "$pkgdir/usr/share/$pkgname/examples" + install -D -m 644 *.lua "$pkgdir/usr/share/$pkgname/examples" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index 2d4d83d47..e890567e6 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 53158 2011-07-31 08:25:21Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id: PKGBUILD 61193 2011-12-24 11:33:27Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel pkgver=0.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="Panel of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data') -source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz + battery.patch) optdepends=(pcmanfm) -md5sums=('129fae75d1cd3983fd94542c573a70a1') build() { cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/battery.patch" + ./configure --sysconfdir=/etc --prefix=/usr make } @@ -25,3 +29,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('129fae75d1cd3983fd94542c573a70a1' + '5fadb4d5aca09c81138677e91f995d98') +md5sums=('129fae75d1cd3983fd94542c573a70a1' + '5fadb4d5aca09c81138677e91f995d98') diff --git a/community/lxpanel/battery.patch b/community/lxpanel/battery.patch new file mode 100644 index 000000000..5d701ea6d --- /dev/null +++ b/community/lxpanel/battery.patch @@ -0,0 +1,72 @@ +diff --git plugins/batt/batt_sys.c plugins/batt/batt_sys.c +index 54ff678..1eebab5 100644 +--- a/src/plugins/batt/batt_sys.c ++++ b/src/plugins/batt/batt_sys.c +@@ -35,15 +35,6 @@ + #include <stdlib.h> + #include <string.h> + +-battery* battery_new() { +- static int battery_num = 1; +- battery * b = g_new0 ( battery, 1 ); +- battery_reset(b); +- b->battery_num = battery_num; +- battery_num++; +- return b; +-} +- + void battery_reset( battery * b) { + b->type_battery = TRUE; + b->capacity_unit = "mAh"; +@@ -58,6 +49,15 @@ void battery_reset( battery * b) { + b->state = NULL; + } + ++battery* battery_new() { ++ static int battery_num = 1; ++ battery * b = g_new0 ( battery, 1 ); ++ battery_reset(b); ++ b->battery_num = battery_num; ++ battery_num++; ++ return b; ++} ++ + static gchar* parse_info_file(char *filename) + { + char *buf = NULL; +@@ -194,7 +194,7 @@ void battery_update( battery *b ) { + + /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */ + if (b->last_capacity_unit != -1 && b->last_capacity == -1) { +- if (b->voltage != -1) { ++ if (b->voltage > 0) { + b->last_capacity = b->last_capacity_unit * 1000 / b->voltage; + } else { + b->last_capacity = b->last_capacity_unit; +@@ -202,7 +202,7 @@ void battery_update( battery *b ) { + } + } + if (b->design_capacity_unit != -1 && b->design_capacity == -1) { +- if (b->voltage != -1) { ++ if (b->voltage > 0) { + b->design_capacity = b->design_capacity_unit * 1000 / b->voltage; + } else { + b->design_capacity = b->design_capacity_unit; +@@ -210,7 +210,7 @@ void battery_update( battery *b ) { + } + } + if (b->remaining_energy != -1 && b->remaining_capacity == -1) { +- if (b->voltage != -1) { ++ if (b->voltage > 0) { + b->remaining_capacity = b->remaining_energy * 1000 / b->voltage; + b->present_rate = b->present_rate * 1000 / b->voltage; + } else { +@@ -220,7 +220,7 @@ void battery_update( battery *b ) { + if (b->last_capacity < MIN_CAPACITY) + b->percentage = 0; + else +- b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; ++ b->percentage = (float) b->remaining_capacity * 100 / b->last_capacity; + + if (b->percentage > 100) + b->percentage = 100; diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD index 0dd8bdea3..215b5012f 100644 --- a/community/miniupnpc/PKGBUILD +++ b/community/miniupnpc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=miniupnpc pkgver=1.6 pkgrel=2 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" license=('BSD') depends=('sh') diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index 2748143b3..d8f99ecc3 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 58662 2011-11-17 11:26:44Z lfleischer $ +# $Id: PKGBUILD 61280 2011-12-28 01:40:23Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Ryan Coyner <rcoyner@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mixxx -pkgver=1.9.2 +pkgver=1.10.0 pkgrel=1 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64' 'mips64el') url='http://www.mixxx.org' license=('GPL') depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi' - 'qt>=4.5' 'taglib') + 'qt>=4.5' 'taglib' 'qtwebkit') makedepends=('mesa' 'scons' 'libshout') source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('f84095951f66b12af5cf45d19200ff82') +md5sums=('d92bf422491fa92adf7ed6c2998e67fb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index d08ffc87d..efe7ae2d5 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=17.4 +pkgver=17.5 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('9d8b33fe0edbc54a6ebc8050dec7d56b') +md5sums=('1b18b9fab54a778f21ee4cd95fca5c63') build() { cd ${pkgname}-${pkgver} diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index 9bad89c5d..08f9e0d71 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite -pkgver=1.75.3 -pkgrel=2 +pkgver=1.76 +pkgrel=1 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64' 'mips64el') url="http://oolite-linux.berlios.de" @@ -11,13 +11,13 @@ license=('GPL2') depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu') makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip') options=(!makeflags) -source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2) +source=(oolite http://download2.berlios.de/oolite-linux/oolite-source-${pkgver}.tar.bz2) md5sums=('b182976fade9b64a3b3702e2a8c72bf0' - 'e6c3d1e41f60f8cf410f766a3ecadcc7') + 'd540486facd8275dc6bceebae8428dce') build() { cd $srcdir - cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build + cp -r ${srcdir}/oolite-source-${pkgver} ${srcdir}/${pkgname}-build cd ${srcdir}/${pkgname}-build sed -i "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions/" GNUmakefile diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD index 452fc41ff..b8e9b7352 100644 --- a/community/ozerocdoff/PKGBUILD +++ b/community/ozerocdoff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60103 2011-12-05 08:41:04Z spupykin $ +# $Id: PKGBUILD 61135 2011-12-22 10:38:39Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> pkgname=ozerocdoff pkgver=2 -pkgrel=4 +pkgrel=5 pkgdesc="Userspace driver for Option High Speed Mobile Devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.pharscape.org/ozerocdoff.html" @@ -13,7 +13,7 @@ options=('!emptydirs') source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;topic=545.0;attach=4" "remove-old-rules.patch") md5sums=('88a78f9380d9591f8d20a657b72e3e5c' - '2b28c8310b615e7283c2c38f62533c4f') + '213737cfccde2fe49a334db2b681c3f5') build() { cd "${srcdir}/udev" diff --git a/community/ozerocdoff/remove-old-rules.patch b/community/ozerocdoff/remove-old-rules.patch index 0a5e7fecc..c395280cb 100644 --- a/community/ozerocdoff/remove-old-rules.patch +++ b/community/ozerocdoff/remove-old-rules.patch @@ -1,7 +1,16 @@ diff -wbBur udev/hso.udev udev.my/hso.udev --- udev/hso.udev 2008-06-19 14:34:07.000000000 +0400 -+++ udev.my/hso.udev 2011-12-05 12:36:34.000000000 +0400 -@@ -63,60 +63,6 @@ ++++ udev.my/hso.udev 2011-12-22 14:31:29.000000000 +0400 +@@ -1,8 +1,5 @@ + ACTION!="add", GOTO="hso_end" + +-# Syntax switch, need possibly for upcoming Distros +-ATTR{dev}!="?*", GOTO="hso_old_syntax" +- + ############################### NEW SYNTAX ############################### + + LABEL="hso_new_syntax" +@@ -63,60 +60,6 @@ SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTR{hsotype}=="PCSC", SYMLINK+="wpcsc0" GOTO="hso_tty_permission" diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index ccccee3f5..40b0d07ee 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56001 2011-09-28 15:01:26Z spupykin $ +# $Id: PKGBUILD 61330 2011-12-28 15:12:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-berkeleydb -pkgver=0.49 +pkgver=0.50 pkgrel=1 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic') depends=('perl' 'db') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('8a1883f87ba82fc1614a636c8f899ea5') +md5sums=('6afc8f49133c262c606d1b96e1412863') build() { cd $srcdir/BerkeleyDB-$pkgver diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 887484957..1f8b53b9d 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59956 2011-12-02 21:00:04Z ibiru $ +# $Id: PKGBUILD 61223 2011-12-24 23:23:29Z lcarlier $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus -pkgver=0.7.5 -pkgrel=2 +pkgver=0.7.6 +pkgrel=1 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" @@ -11,9 +11,9 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48') makedepends=('scons' 'boost>=1.48' 'mesa') source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) -md5sums=('68e0bd1327e0eedcaab64d64528540ba' +md5sums=('561798686f34d3fa4e69135d655f47ac' '9eec34047bdcff49e08f41e81764e20c') -sha1sums=('65493f9c9914bb401dbcfe1fe6bf2fad2388b755' +sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487' '579a1144f161ce89e6e024cea37210149b89c0c0') build() { diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index b222d50b4..97626639c 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59194 2011-11-21 14:53:22Z lfleischer $ +# $Id: PKGBUILD 61278 2011-12-28 01:38:00Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy -pkgver=3.0.18 +pkgver=3.0.19 pkgrel=1 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src 'privoxy' 'privoxy.logrotate.d' 'privoxy.conf.d') -md5sums=('baf0b13bb591ec6e1ba15b720ddea65c' +md5sums=('57acc79059565cc42eda67982842785d' '1b4ed8c4e7e5b04b10ef41b597dc3f3b' '79480f311313cc43974f6cbe6b672927' '27830ef79418e277b90c1c1fa933f876') diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD index 65c20847a..bc8e85fcf 100644 --- a/community/python2-pyopencl/PKGBUILD +++ b/community/python2-pyopencl/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 60633 2011-12-15 21:15:10Z stephane $ +# $Id: PKGBUILD 61157 2011-12-22 18:02:54Z ibiru $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=python2-pyopencl pkgver=2011.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64' 'mips64el') url="http://mathema.tician.de/software/pyopencl" license=('custom') -depends=('python2' 'python2-numpy' 'python-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa') +depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa') makedepends=('ctags' 'python2-distribute') provides=('pyopencl=${pkgver}') replaces=('pyopencl') diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD index 637179fe1..cd0e6c5dd 100644 --- a/community/quilt/PKGBUILD +++ b/community/quilt/PKGBUILD @@ -8,7 +8,7 @@ pkgname=quilt pkgver=0.50 pkgrel=1 pkgdesc='Manage a series of patches by keeping track of the changes each patch makes' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://savannah.nongnu.org/projects/quilt' license=('GPL2') depends=('diffstat' 'gawk' 'patch' 'diffutils' 'gettext') diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 0994d635c..f2afabf04 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59579 2011-11-28 12:47:33Z spupykin $ +# $Id: PKGBUILD 61232 2011-12-25 17:05:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('8aec2c38b7d70956688cbfe3a99495fa' +md5sums=('babeb1a1d05281b5e00ca0a519cfc3f9' '9726d06d0a0c60cb5d55a31b3dc1e55d' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD index eb6c882d1..d1358029e 100644 --- a/community/sdcc/PKGBUILD +++ b/community/sdcc/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 40227 2011-02-22 02:15:34Z stephane $ +# $Id: PKGBUILD 61264 2011-12-27 15:33:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jose Negron <josenj.arch@mailnull.net> pkgname=sdcc -pkgver=3.0.0 -pkgrel=2 +pkgver=3.1.0 +pkgrel=1 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('bash' 'gcc-libs') -makedepends=('gputils' 'flex' 'bison' 'patch') +depends=('bash' 'gcc-libs' 'boost-libs') +makedepends=('gputils' 'flex' 'bison' 'patch' 'boost') optdepends=('python') url="http://sdcc.sourceforge.net/" options=(!strip) source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) -md5sums=('20fbd49a3421e09fe65577c45524c89e') +md5sums=('92202e970071a8b506fea62a913bd2d2') build() { cd $srcdir/$pkgname LDFLAGS="-lm" ./configure --prefix=$pkgdir/usr + + # gcc -O2 bug workaround + [ $CARCH == "i686" ] && ( + cd src && + make SDCCy.h && + gcc -g -O0 -I. -I.. -I./../support/util -c SDCCicode.c -o SDCCicode.o + ) + make make install strip $pkgdir/usr/bin/* || true diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index ba7b6d89a..ab8c8cddc 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59692 2011-11-29 12:22:12Z arodseth $ +# $Id: PKGBUILD 61248 2011-12-26 01:05:59Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=setconf -pkgver=0.2 -pkgrel=8 -pkgdesc="A utility to easily change settings in Makefiles and other configuration files" +pkgver=0.3 +pkgrel=1 +pkgdesc="Utility to easily change settings in Makefiles and other configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" license=('GPL') depends=('pcre' 'gc') makedepends=('shedskin>=0.1.2') -md5sums=('ccd0ca9527d8406d5393d77a6a56686b') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") +sha256sums=('94d37bcc74d59dfa60770308e2ab3b669dc2e0716a23fda584bf71cf037f1183') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,10 +23,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$pkgname.1.gz" \ - "$pkgdir/usr/share/man/man1/$pkgname.1.gz" - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 1f8d2451b..a5f192e51 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 60207 2011-12-07 16:26:35Z svenstaro $ +# $Id: PKGBUILD 61151 2011-12-22 17:17:17Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.84.0 -_pkgver=84.0 -pkgrel=2 +pkgver=0.85.0 +_pkgver=85.0 +pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl') -makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') +depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' + 'libxcursor') +makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environment') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('2aae395c055adceec5326fb3faec92ba') +md5sums=('ea90c264faa517e4d70542fb2082a2f3') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/stow/PKGBUILD b/community/stow/PKGBUILD index c362a08d0..d52341b39 100644 --- a/community/stow/PKGBUILD +++ b/community/stow/PKGBUILD @@ -5,14 +5,14 @@ # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=stow -pkgver=2.1.0 +pkgver=2.1.2 pkgrel=1 pkgdesc='GNU Stow is a program for managing the installation of software packages' url='http://www.gnu.org/software/stow/' arch=('i686' 'x86_64') source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz") license=('GPL2') -md5sums=('5526fdb8c76d0aee35eb304d7f55d2f6') +md5sums=('82857e43531cf6936aed99ef3b86b446') build() { cd $pkgname-$pkgver diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 6f228be5b..e4bb96b47 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60289 2011-12-08 23:55:42Z lfleischer $ +# $Id: PKGBUILD 61258 2011-12-26 17:36:12Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel pkgver=4.50 -pkgrel=1 +pkgrel=3 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') url="http://www.stunnel.org" @@ -15,11 +15,14 @@ install=$pkgname.install options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' - 'stunnel.rc.d') + 'stunnel.rc.d' + 'stunnel.tmpfiles.conf') + md5sums=('d68b4565294496a8bdf23c728a679f53' 'ea9e85daef0cc96ce21649901b3514f7' 'f15398497e10e080c2406d2fc541660c' - 'cb647c71ff4cb1e035b6e515d5f13ebf') + 'cb647c71ff4cb1e035b6e515d5f13ebf' + '2e065a39998e57727ee79887bbd1751e') build() { cd "$srcdir/$pkgname-$pkgver" @@ -46,9 +49,14 @@ package() { install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" install -Dm755 "$srcdir/stunnel.rc.d" "$pkgdir/etc/rc.d/stunnel" + install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" + + # move systemd service into place + install -dm755 "$pkgdir/lib/systemd/system" + mv "tools/stunnel.service" "$pkgdir/lib/systemd/system/" sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ - -e "s:nobody:stunnel:g" -e "s:nogroup:stunnel:g" \ + -e "s:no\(body\|group\):stunnel:g" \ -i "$pkgdir/etc/stunnel/stunnel.conf-sample" } diff --git a/community/stunnel/stunnel.install b/community/stunnel/stunnel.install index f7bbbffcb..d9998e4da 100644 --- a/community/stunnel/stunnel.install +++ b/community/stunnel/stunnel.install @@ -1,35 +1,31 @@ post_install() { # add stunnel group - if [ ! `grep stunnel /etc/group` ]; then - groupadd -g 16 stunnel &>/dev/null + if ! getent group stunnel >/dev/null 2>&1; then + groupadd -g 16 stunnel fi # add stunnel user - id stunnel &>/dev/null || \ + if ! getent passwd stunnel >/dev/null 2>&1; then useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel - + fi + # create chroot dir if necessary. if [ ! -d /var/run/stunnel ]; then - install -d -m 770 -o stunnel -g stunnel /var/run/stunnel + install -dm770 -o stunnel -g stunnel /var/run/stunnel fi - - cat << EOF - -NOTE ----- -Copy /etc/stunnel/stunnel.conf-sample to /etc/stunnel/stunnel.conf -& edit it to match your setup before invoking the daemon (/etc/rc.d/stunnel). - -EOF } post_upgrade() { - post_install $1 + post_install "$@" } pre_remove() { # remove users & groups - userdel stunnel &> /dev/null - groupdel stunnel &> /dev/null - rm -rf /var/run/stunnel + if getent passwd stunnel >/dev/null 2>&1; then + userdel stunnel + fi + + if getent group stunnel >/dev/null 2>&1; then + groupdel stunnel + fi } diff --git a/community/stunnel/stunnel.rc.d b/community/stunnel/stunnel.rc.d index 15816abe8..ee67e20ce 100644 --- a/community/stunnel/stunnel.rc.d +++ b/community/stunnel/stunnel.rc.d @@ -3,26 +3,35 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/bin/stunnel` +pidfile=/var/run/stunnel.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + case "$1" in start) stat_busy "Starting stunnel" - [ -z "$PID" ] && /usr/bin/stunnel - if [ $? -gt 0 ]; then - stat_fail - else + if [[ -z $PID ]] && /usr/bin/stunnel; then add_daemon stunnel stat_done + else + stat_fail + exit 1 fi ;; stop) stat_busy "Stopping stunnel" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else + if [[ $PID ]] && kill $PID &>/dev/null; then rm_daemon stunnel stat_done + else + stat_fail + exit 1 fi ;; restart) @@ -31,6 +40,5 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac -exit 0 diff --git a/community/stunnel/stunnel.tmpfiles.conf b/community/stunnel/stunnel.tmpfiles.conf new file mode 100644 index 000000000..f118e68a0 --- /dev/null +++ b/community/stunnel/stunnel.tmpfiles.conf @@ -0,0 +1 @@ +d /var/run/stunnel 0770 stunnel stunnel - diff --git a/community/tcpreplay/PKGBUILD b/community/tcpreplay/PKGBUILD new file mode 100644 index 000000000..e23d33089 --- /dev/null +++ b/community/tcpreplay/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 61217 2011-12-24 18:01:44Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Sébastien Duquette <ekse.0x@gmail.com> +# Contributor: Dawid Wrobel <cromo@klej.net> +pkgname=tcpreplay +pkgver=3.4.4 +pkgrel=3 +pkgdesc="Gives the ability to replay previously captured traffic in a libpcap format" +url="http://tcpreplay.synfin.net" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3') +depends=('libpcap' 'libdnet') +makedepends=('tcpdump') +optdepends=('tcpdump: decoding of packets support') +options=('!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/tcpreplay/${pkgname}-${pkgver}.tar.gz") +md5sums=('22725feb9b2590809f9350308ec65180') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-dynamic-link --with-tcpdump=/usr/sbin/tcpdump + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD index 0d7c36aa6..cf6abf2ea 100644 --- a/community/tellico/PKGBUILD +++ b/community/tellico/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55957 2011-09-26 19:23:41Z schiv $ +# $Id: PKGBUILD 61284 2011-12-28 02:21:17Z seblu $ # Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=tellico pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A collection manager for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://tellico-project.org/" diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 710f4c4a8..04196b219 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61099 2011-12-21 20:52:54Z andrea $ +# $Id: PKGBUILD 61145 2011-12-22 15:39:01Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: furester <xfurester@hotmail.com> @@ -6,15 +6,15 @@ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> pkgname=texmaker -pkgver=3.1 -pkgrel=2 +pkgver=3.2 +pkgrel=1 pkgdesc='Free cross-platform latex editor' arch=('i686' 'x86_64' 'mips64el') url="http://www.xm1math.net/texmaker/index.html" license=('GPL') depends=('poppler-qt' 'ghostscript' 'qtwebkit') source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2") -md5sums=('10a14c75abbb7234d4e5e58a7c85b110') +md5sums=('506f8b234e1266b188e73e2fc61c68d5') build() { cd ${pkgname}-${pkgver} diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index b9d82940a..b1ea69203 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -7,7 +7,7 @@ pkgname=tinc pkgver=1.0.16 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'openssl') diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index f1fd5c300..68b048614 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 58972 2011-11-20 18:14:02Z spupykin $ +# $Id: PKGBUILD 61364 2011-12-28 19:37:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 _pkgdata=20111023 pkgdesc="Activating switchable USB devices on Linux." @@ -14,8 +14,8 @@ makedepends=('gcc' 'make') backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" - "http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('1932ab96d6e3c5e0a6bdfac863338627' + "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") +md5sums=('d228f74e4045e1ba05d80db4fe0f4144' '6e7cb67d0428bda241600b038ba11aeb' '1378c0319520c817d49c7e9457c7d6e3') @@ -37,7 +37,7 @@ package() { mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch.sh rmdir ${pkgdir}/lib/udev/usb_modeswitch mv ${pkgdir}/lib/udev/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch - cp $srcdir/device_reference.txt $pkgdir/etc/usb_modeswitch.setup + cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup cd $srcdir/usb-modeswitch-data-${_pkgdata} make DESTDIR=$pkgdir install diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 6f896a7c9..40d3a2a99 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $ +# $Id: PKGBUILD 61185 2011-12-23 22:04:01Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> @@ -9,7 +9,7 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=6 +pkgrel=7 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64' 'mips64el') url='http://www.vtk.org' @@ -24,11 +24,13 @@ optdepends=('python2: python bindings' source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" 'fixkernelversioncheck.diff' - 'ffmpeg-0.8.diff') + 'ffmpeg-0.8.diff' + 'fix-boost-graph-api-changes.diff') md5sums=('37b7297d02d647cc6ca95b38174cb41f' 'a05295b81930e894fc0e31866f399151' '9e137af23701f76fc727222ebac23389' - 'e992321c9d1def6034d0fa6607b40c5a') + 'e992321c9d1def6034d0fa6607b40c5a' + 'e715aef2aea26fc05f904efb5d0d5627') build() { cd VTK @@ -41,6 +43,10 @@ build() { # remove next pkgver bump patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff + # fix compilation error: http://vtk.org/Bug/view.php?id=12772 + # remove next pkgver bump + patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff + cd ${srcdir} rm -rf build @@ -82,6 +88,7 @@ build() { -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ ${srcdir}/VTK make diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff new file mode 100644 index 000000000..2162e7a28 --- /dev/null +++ b/community/vtk/fix-boost-graph-api-changes.diff @@ -0,0 +1,42 @@ +commit d3ecc2c459dd1df937fc97887581ace1036da533 +Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> +Date: Tue Dec 13 15:36:06 2011 -0500 + + BUG: 12772 fixes for change in Boost graph API + + This fixes bug 12772, where an API change in Boost was causing + compilation failures using Boost 1.38. Thanks to Orion Poplawski for + reporting the issue and posting the patch. + + Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 + +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index c789f6b..cf7cd47 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -47,6 +47,15 @@ using namespace boost; + vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); + + ++namespace { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ return e.Id; ++ } ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { ++ return e.underlying_desc.Id; ++ } ++} ++ + // Redefine the bfs visitor, the only visitor we + // are using is the tree_edge visitor. + template <typename IdMap> +@@ -95,7 +104,8 @@ public: + + // Copy the vertex and edge data from the graph to the tree. + tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); +- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); ++ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), ++ unwrap_edge_id(e), tree_e.Id); + } + + private: diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index 3c326284e..b71dd9630 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48643 2011-06-03 16:57:46Z stephane $ +# $Id: PKGBUILD 61282 2011-12-28 01:58:33Z seblu $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,8 +6,8 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.1.7 -pkgrel=2 +pkgver=4.2.24 +pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -15,7 +15,7 @@ url="http://www.indexdata.dk/yaz" depends=('openssl' 'libxslt' 'icu') options=('!libtool') source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('d4b94fc70bfc105fc034c4b51b7b5cae') +md5sums=('204486e174159e70c4ce6341e7af3b0a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index 75f0f8f89..88ffd0291 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 122457 2011-05-04 07:52:42Z ibiru $ +# $Id: PKGBUILD 145721 2011-12-28 18:28:07Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils -pkgver=2.0.23 -pkgrel=1 +pkgver=2.1.0 +pkgrel=2 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64' 'mips64el') url="http://www.nilfs.org/" license=('GPL2' 'LGPL2.1') backup=('etc/nilfs_cleanerd.conf') -depends=('util-linux-ng') +depends=('util-linux') options=(!libtool) -source=(http://www.nilfs.org/download/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7f7e835d02e14642e8b7b32a36b7fab0') +source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('738f7bee062051c14dcff444bb17ada7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --libdir=/lib + cd "$srcdir/$pkgname-$pkgver" + ./configure --libdir=/lib --enable-libmount make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install LDCONFIG=/bin/true + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install LDCONFIG=/bin/true } diff --git a/core/pacman/pacman.conf.mips64el b/core/pacman/pacman.conf.mips64el deleted file mode 100644 index 09a5c8d5a..000000000 --- a/core/pacman/pacman.conf.mips64el +++ /dev/null @@ -1,86 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - -f %u > %o -#CleanMethod = KeepInstalled -Architecture = mips64el - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options (all disabled by default) -#UseSyslog -#ShowSize -#UseDelta -#TotalDownload -#CheckSpace - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[libre-testing] -#Include = /etc/pacman.d/mirrorlist - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[libre] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#Server = file:///home/custompkgs - diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch deleted file mode 100644 index c07000edb..000000000 --- a/extra/abiword/abiword-2.8.6-no-undefined.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am ---- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 -+++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 -@@ -107,7 +107,7 @@ - - AbiWord_LDFLAGS = \ - $(DEPS_LIBS) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic \ - -headerpad_max_install_names -@@ -129,7 +129,7 @@ - - abiword_LDFLAGS = \ - $(platform_ldflags) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic - diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index d50a08cfe..276498660 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 142782 2011-11-15 06:11:07Z andrea $ +# $Id: PKGBUILD 145659 2011-12-26 12:00:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica -pkgver=0.2.9 +pkgver=0.3.0 pkgrel=1 -pkgdesc='A library to access Open Collaboration Service providers' +pkgdesc='A Qt library that implements the Open Collaboration Services API' arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' +url='https://projects.kde.org/projects/kdesupport/attica' license=('LGPL') depends=('qt') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7dadb6ca7dec09f89d41cd868ea6dc39') +md5sums=('5a77f678422e7a52e3a3abb2d7ad0499') build() { cd "${srcdir}" diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD index 1623c55c4..5b21ffbe5 100644 --- a/extra/botan/PKGBUILD +++ b/extra/botan/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $ +# $Id: PKGBUILD 145616 2011-12-24 05:45:52Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: d'Ronin <daronin@2600.com> pkgname=botan -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=1 pkgdesc="BSD-licensed crypto library written in C++" license=('BSD') @@ -12,7 +12,7 @@ url="http://botan.randombit.net/" depends=('gcc-libs' 'sh') makedepends=('python2') source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz) -md5sums=('1f03a6a84f402a12e50665868dddae99') +md5sums=('5e1e7f3458e2e6aa56f7e41941eefb9d') build() { cd ${srcdir}/Botan-${pkgver} diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD index 11d431a9c..09105e4f7 100644 --- a/extra/desktop-file-utils/PKGBUILD +++ b/extra/desktop-file-utils/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 108960 2011-02-05 09:46:18Z andyrtr $ +# $Id: PKGBUILD 145704 2011-12-28 10:22:56Z jgc $ # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=desktop-file-utils -pkgver=0.18 -pkgrel=1.1 +pkgver=0.19 +pkgrel=1 pkgdesc="Command line utilities for working with desktop entries" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" license=('GPL') depends=('glib2') -source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.bz2) -md5sums=('d966b743eb394650f98d5dd56b9aece1') +source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz) +md5sums=('cbb2427593b7f6d36e52e9d221fce82f') build() { cd "${srcdir}/desktop-file-utils-${pkgver}" @@ -22,4 +22,3 @@ package() { cd "${srcdir}/desktop-file-utils-${pkgver}" make DESTDIR="${pkgdir}" install } - diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index eb145f5c0..83e0d1ff3 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145112 2011-12-17 04:54:41Z bisson $ +# $Id: PKGBUILD 145680 2011-12-27 03:33:44Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.6.0 +pkgver=2.6.8 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,8 +18,8 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5' - '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') +sha1sums=('4f8c002fb28ae9342adc9232c6d101270b910395' + '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70') install=install diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch index abc15950e..c47248beb 100644 --- a/extra/gcin/qt4-lib64.patch +++ b/extra/gcin/qt4-lib64.patch @@ -1,6 +1,6 @@ diff -aur old/configure new/configure ---- old/configure 2011-11-07 06:51:12.000000000 +1100 -+++ new/configure 2011-11-25 14:02:10.819256960 +1100 +--- old/configure 2011-12-21 00:48:03.000000000 +1100 ++++ new/configure 2011-12-25 04:06:14.424317251 +1100 @@ -188,7 +188,7 @@ @@ -10,9 +10,18 @@ diff -aur old/configure new/configure echo "testing if you have qt4 support" pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then +@@ -245,7 +245,7 @@ + mv gcin.spec gcin.spec.tmp + grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec + else +- for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc ++ for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc + do + [ -x $i ] && QT4_MOC=$i + done diff -aur old/qt4-im/Makefile new/qt4-im/Makefile ---- old/qt4-im/Makefile 2011-06-08 23:03:50.000000000 +1000 -+++ new/qt4-im/Makefile 2011-11-25 14:05:28.844110772 +1100 +--- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100 ++++ new/qt4-im/Makefile 2011-12-25 04:06:14.424317251 +1100 @@ -1,5 +1,5 @@ include ../config.mak -QT=qt4 @@ -20,12 +29,3 @@ diff -aur old/qt4-im/Makefile new/qt4-im/Makefile QTIM=$(QT)/plugins/inputmethods IMMODULES=$(libdir)/$(QTIM) -@@ -15,7 +15,7 @@ - $(CXX) -E $(CFLAGS) $(INCS) $< > $@ - - moc_gcin-qt.cpp: gcin-qt.h -- /usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp -+ /usr/bin/moc $< -o moc_gcin-qt.cpp - - im-gcin.so: $(OBJS) - export LD_RUN_PATH=$(gcinlibdir) ;\ diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD index aedce43a2..c9c90548b 100644 --- a/extra/gob2/PKGBUILD +++ b/extra/gob2/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 79820 2010-05-08 10:48:54Z jgc $ +# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $ # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=gob2 -pkgver=2.0.17 +pkgver=2.0.18 pkgrel=1 pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('glib2') url="http://www.5z.com/jirka/gob.html" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e9f52fff7ada88a36da1d412f8b2b57b44cc0527e545cf2f5d873c002c0da7f4') +source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz) +md5sums=('cd08248762962aec88100ddaaff4f9e0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD index 88de2bc72..08b389fa0 100644 --- a/extra/gphoto2/PKGBUILD +++ b/extra/gphoto2/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 97700 2010-11-01 13:01:49Z ibiru $ +# $Id: PKGBUILD 145713 2011-12-28 15:08:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=gphoto2 -pkgver=2.4.10 +pkgver=2.4.11 pkgrel=1 pkgdesc="A digital camera download and access program." arch=(i686 x86_64 'mips64el') url="http://www.gphoto.org" license=('GPL' 'LGPL') -depends=('libgphoto2>=2.4.10' 'popt' 'aalib' 'readline>=6.1') +depends=('libgphoto2>=2.4.11' 'popt' 'aalib' 'readline') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3c86c9824b9bfc57a52be5f84ad205f7') +md5sums=('2635075f702b40eb2e95a80658bd4773') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index b24becb80..673bbdffa 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143086 2011-11-22 17:32:42Z stephane $ +# $Id: PKGBUILD 145717 2011-12-28 15:42:53Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.3 +pkgver=1.3.1 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4d4de0f48f8b9a1eaf75d55bc93e0e624f6194eb') +sha1sums=('1051c937c3d2a4c98922903f313a1fa021bb35ba') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index d5424ed9e..076ebcaab 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,42 +4,23 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.1.4 -#_date=20110925 -#pkgrel=0.${_date}.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'xulrunner') -source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz - http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz - #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz - icedtea-web-1.1.4-npapi-fix.patch) -md5sums=('1ed24b7e58da26471187dfae80b020b6' - '81ac36e05ea1b55f1580bdb28c24f4db') +makedepends=('jdk7-openjdk' 'zip' 'gtk' 'npapi-sdk' 'rhino' 'junit') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +md5sums=('1ed24b7e58da26471187dfae80b020b6') + _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk -mksource() { - mkdir /tmp/${pkgbase}-${_date} - pushd /tmp/${pkgbase}-${_date} - hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date} - rm -rf ${pkgbase}-${_date}/.hg* - tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz * - popd -} - build() { - cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + cd "${srcdir}"/icedtea-web* . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - #autoreconf --force --install - - # fix build with Xulrunner 8 - patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch - ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ --with-jdk-home=${_jvmdir} @@ -47,7 +28,7 @@ build() { } check() { - cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + cd "${srcdir}"/icedtea-web* make -k check } @@ -88,8 +69,7 @@ package_icedtea-web-java7-doc() { pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}" -# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib + cd "${srcdir}"/icedtea-web* make DESTDIR="${pkgdir}" install-data-local # remove javaws about and man page rm -rf ${pkgdir}/usr/lib diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 35d3d66a9..febd4be1a 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,28 +1,22 @@ -# $Id: PKGBUILD 142413 2011-11-09 05:54:47Z andyrtr $ +# $Id: PKGBUILD 145641 2011-12-25 14:34:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') pkgver=1.1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('openjdk6' 'zip' 'xulrunner') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - icedtea-web-1.1.4-npapi-fix.patch) -md5sums=('1ed24b7e58da26471187dfae80b020b6' - '81ac36e05ea1b55f1580bdb28c24f4db') +makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +md5sums=('1ed24b7e58da26471187dfae80b020b6') -build() { _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk +build() { cd "$srcdir/$pkgname-$pkgver" - - # fix build with Xulrunner 8 - patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch - ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make @@ -40,9 +34,6 @@ package_icedtea-web() { depends=('openjdk6' 'gtk2' 'desktop-file-utils') install=$pkgname.install - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - cd "$srcdir/$pkgname-$pkgver" # possible make target (see bottom of Makefile.am: install-exec-local install-data-local make DESTDIR="$pkgdir" install-exec-local install-data-local @@ -73,11 +64,7 @@ package_icedtea-web-doc() { pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - cd "$srcdir/$pkgbase-$pkgver" -# install -m755 -d $pkgdir/${_jvmdir}/jre/lib make DESTDIR="$pkgdir" install-data-local # remove javaws about and man page rm -rf ${pkgdir}/usr/lib diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD index 8e36c9202..54cb8a771 100644 --- a/extra/k9copy/PKGBUILD +++ b/extra/k9copy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143762 2011-11-29 00:20:34Z giovanni $ +# $Id: PKGBUILD 145676 2011-12-26 22:21:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=k9copy -pkgver=2.3.7 -pkgrel=2 +pkgver=2.3.8 +pkgrel=1 pkgdesc="A small utility which allows the copy of DVD under Linux" arch=('i686' 'x86_64' 'mips64el') url="http://k9copy.sourceforge.net" @@ -13,13 +13,12 @@ depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor') makedepends=('automoc4' 'cmake') install=k9copy.install source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz") -md5sums=('bbfda2937f5027d31495df67dc29efa4') +md5sums=('584f6cc50f28befbeb0d5c1ec9476456') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop - sed -i -e "s:CODEC_TYPE_VIDEO:AVMEDIA_TYPE_VIDEO:g" src/import/k9avidecode.cpp cmake -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index fa02ce80e..7a1d81709 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144615 2011-12-08 09:18:15Z andrea $ +# $Id: PKGBUILD 145651 2011-12-26 11:44:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 685bb939b..2dcec58c4 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 144627 2011-12-08 09:18:32Z andrea $ +# $Id: PKGBUILD 145672 2011-12-26 14:44:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdebindings-smokeqt') +depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") sha1sums=('b4b3d8ce2b08af62202f5ae79fe57bde60dd9a85') @@ -20,6 +20,7 @@ build() { cd build cmake ../perlqt-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 7d809f25d..8a32428f4 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 144629 2011-12-08 09:18:34Z andrea $ +# $Id: PKGBUILD 145595 2011-12-23 10:46:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1') diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index a84b14362..4da16b1db 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144625 2011-12-08 09:18:30Z andrea $ +# $Id: PKGBUILD 145652 2011-12-26 11:44:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index f586f9a5e..9f3912dd6 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145327 2011-12-21 20:47:05Z andrea $ +# $Id: PKGBUILD 145657 2011-12-26 12:00:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 1392bfbbc..1c0f90d48 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144737 2011-12-08 09:21:34Z andrea $ +# $Id: PKGBUILD 145653 2011-12-26 11:44:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -73,7 +73,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.7.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL') diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index e4516607c..729d51907 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,37 +1,35 @@ -# $Id: PKGBUILD 101286 2010-11-28 17:59:39Z ibiru $ +# $Id: PKGBUILD 145711 2011-12-28 14:52:22Z jgc $ # Maintainer: Eduardo Romero <eduardo@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=libgphoto2 -pkgver=2.4.10.1 -pkgrel=2.1 +pkgver=2.4.11 +pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64 'mips64el') url="http://www.gphoto.org" license=(LGPL) -depends=('libexif>=0.6.19' 'libjpeg>=8' 'gd' 'libtool>=2.4' 'libusb-compat') +depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat') install=libgphoto2.install options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) -md5sums=('8bf2bd1e267909203ec1e7f6ea3f83a0') +md5sums=('a2230c31e320acb7ececd90bc02fe515') build() { cd "${srcdir}/${pkgname}-${pkgver}" udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all --disable-static --disable-rpath - LD_PRELOAD="" make + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a - install -m755 -d "${pkgdir}/usr/share/hal/fdi/information/20thirdparty" install -m755 -d "${pkgdir}/lib/udev/rules.d" LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \ - "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hal-fdi > \ - "${pkgdir}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" - - LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ - CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \ "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > \ "${pkgdir}/lib/udev/rules.d/40-gphoto.rules" diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 78018661f..2dd96a307 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $ +# $Id: PKGBUILD 145614 2011-12-24 03:54:58Z dreisner $ # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="library implementation of the Media Transfer Protocol" arch=("i686" "x86_64" 'mips64el') url="http://libmtp.sourceforge.net" license=('LGPL') depends=('libusb-compat') -makedepends=('doxygen') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('fd7b293436528f4c780a9da6e5cc5398') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('073e1c2a00ba377f68dce47727e185ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules + ./configure --prefix=/usr make } diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD index 8a86b2f38..c5e5899da 100644 --- a/extra/libmythes/PKGBUILD +++ b/extra/libmythes/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144883 2011-12-08 21:25:55Z andyrtr $ +# $Id: PKGBUILD 145626 2011-12-24 14:41:49Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmythes -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 epoch=1 pkgdesc="a simple thesaurus" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('hunspell') options=('!libtool') provides=('mythes') source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz) -md5sums=('54b310488dda6929cf31ae859928c945') +md5sums=('e1e255dc43dbcbb34cb19e8a0eba90ae') build() { cd ${srcdir}/${pkgname/lib/}-$pkgver diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD index e6051915a..069eb2ea6 100644 --- a/extra/libxfce4ui/PKGBUILD +++ b/extra/libxfce4ui/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 145607 2011-12-23 17:37:26Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=libxfce4ui -pkgver=4.8.0 -pkgrel=3.1 -pkgdesc="share commonly used Xfce widgets among the Xfce applications" +pkgver=4.8.1 +pkgrel=1 +pkgdesc="Commonly used Xfce widgets among Xfce applications" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://www.xfce.org/" -depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') +license=('GPL2') +depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification') makedepends=('intltool' 'gtk-doc' 'glade') optdepends=('glade: for using the included glade module') #replaces=('libxfcegui4') - later when all is ported options=('!libtool') -source=(http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('df9acb3328dff905bd0777b84532b69f') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --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/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 90eee20de..d500fb58a 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145122 2011-12-17 08:47:23Z andyrtr $ +# $Id: PKGBUILD 145628 2011-12-24 14:44:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.4.4 +pkgver=1.4.5 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 XExtInt-align-classes-n32.diff) -sha1sums=('e4ca1b45368214ba246bfad398ea087125c79f31' +sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737' '30931831efa9a7f8a888f41bb9284fa32f2e2392') build() { diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 8b5dbf8b6..de3e672d2 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $ +# $Id: PKGBUILD 145447 2011-12-22 13:02:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.12.02 +pkgver=2011.12.20 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,6 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") +md5sums=('1bcbd2e45149c0d918c63df8f6d7d0e0') build() { cd ${srcdir}/live @@ -37,4 +38,3 @@ package() { install ${testprog} ${pkgdir}/usr/bin done } -md5sums=('4f10d93d33f6714a980fd1655ead69cd') diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index ed4634c49..87cb99e44 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,30 +1,27 @@ -# $Id: PKGBUILD 142632 2011-11-12 17:15:28Z ibiru $ +# $Id: PKGBUILD 145637 2011-12-25 11:01:07Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Adrià Arrufat <swiftscythe@gmail.com> pkgname=mediastreamer -pkgver=2.7.3 -pkgrel=4 +pkgver=2.8.0 +pkgrel=1 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') -makedepends=('cmake' 'automoc4') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "disable-v4l1.patch") -md5sums=('5213307f557d86aa648f1a53a885138c' - '7ee15689eed1adbdcf0ddab8fadca34a') +depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') +makedepends=('intltool') +#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('79f6e4d927ebf15e9967511d8a88ce74') options=('!libtool') build() { - cd "${srcdir}"/$pkgname-$pkgver/ - patch -p2 -i "${srcdir}"/disable-v4l1.patch - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/mediastreamer/ + cd "${srcdir}"/$pkgname-$pkgver + ./autogen.sh + ./configure --prefix=/usr make } diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD index 0ce9aabe5..bd0e7d0aa 100644 --- a/extra/minicom/PKGBUILD +++ b/extra/minicom/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 144449 2011-12-05 22:54:28Z giovanni $ +# $Id: PKGBUILD 145702 2011-12-28 10:18:27Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com> pkgname=minicom -pkgver=2.5 -pkgrel=3 +pkgver=2.6 +pkgrel=1 pkgdesc="A serial communication program" arch=('i686' 'x86_64' 'mips64el') url="http://alioth.debian.org/projects/minicom/" @@ -14,8 +14,8 @@ license=('GPL') depends=('bash' 'ncurses') optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols') backup=('etc/minirc.dfl') -source=("http://alioth.debian.org/frs/download.php/3487/${pkgname}-${pkgver}.tar.gz") -md5sums=('a5117d4d21e2c9e825edb586ee2fe8d2') +source=("http://alioth.debian.org/frs/download.php/3689/${pkgname}-${pkgver}.tar.gz") +md5sums=('74088234773b9beb0a1fc2bfcc2cc5cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 7a8d322d5..b08a21be8 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145236 2011-12-19 19:17:54Z jgc $ +# $Id: PKGBUILD 145700 2011-12-28 10:05:27Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss pkgver=3.13.1 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" @@ -14,12 +14,14 @@ makedepends=('perl') replaces=('nss-nspr') options=('!strip') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz + bug702090.patch nss-no-rpath.patch nss.pc.in nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6' + '057dd510ba567d344e705062436a786beb5592b6' 'c8fcdb153af9d39689243119adb475905a657284' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' @@ -28,6 +30,7 @@ sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6' build() { cd "${srcdir}/${pkgname}-${pkgver}/mozilla" + patch -Np2 -i "${srcdir}/bug702090.patch" # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch" # Adds transitional SSL renegotiate support - patch from Debian diff --git a/extra/nss/bug702090.patch b/extra/nss/bug702090.patch new file mode 100644 index 000000000..e25148554 --- /dev/null +++ b/extra/nss/bug702090.patch @@ -0,0 +1,20 @@ +--- ./mozilla/security/nss/lib/util/pkcs11n.h.orig 2011-09-14 10:21:10.000000000 +0900 ++++ ./mozilla/security/nss/lib/util/pkcs11n.h 2011-11-19 00:45:01.131860104 +0900 +@@ -346,7 +346,7 @@ + * labels have never been accurate to what was really implemented. + * The new labels correctly reflect what the values effectively mean. + */ +-#if __GNUC__ > 3 ++#if defined(__GNUC__) && (__GNUC__ > 3) + /* make GCC warn when we use these #defines */ + /* + * This is really painful because GCC doesn't allow us to mark random +@@ -362,7 +362,7 @@ + * cast the resulting value to the deprecated type in the #define, thus + * producting the warning when the #define is used. + */ +-#if (__GNUC__ == 4) && (__GNUC_MINOR < 5) ++#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5) + /* The mac doesn't like the friendlier deprecate messages. I'm assuming this + * is a gcc version issue rather than mac or ppc specific */ + typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated)); diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 9464444f6..56624f596 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143934 2011-11-30 21:30:13Z andrea $ +# $Id: PKGBUILD 145633 2011-12-25 10:45:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp -pkgver=4.2.6.p4 -_realver=4.2.6p4 -pkgrel=2.1 +pkgver=4.2.6.p5 +_realver=4.2.6p5 +pkgrel=1 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -18,7 +18,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpdate' 'ntp.conf' 'ntpd.conf') -sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' +sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' '97b41b8bc34f259f4e525ab2e58707c9724e72e2' '63572457586379aa6bf75b6e899e71d651e643f4' 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e' diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index c27dbcd5e..4b9bbf1f2 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142902 2011-11-17 19:06:36Z ibiru $ +# $Id: PKGBUILD 145723 2011-12-28 18:31:54Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=3.14 +pkgver=3.15 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" @@ -13,7 +13,7 @@ depends=('libxml2' 'openssl' 'libproxy') makedepends=('intltool') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('c7e73dfa58c7c49683c93800a3506a0f') +md5sums=('94245f4bac42a288100becab0b4ca29a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD index c36da3a25..1fde192fd 100644 --- a/extra/ortp/PKGBUILD +++ b/extra/ortp/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 117400 2011-04-01 15:13:40Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 145635 2011-12-25 10:59:41Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=ortp -pkgver=0.16.5 +pkgver=0.18.0 pkgrel=1 pkgdesc="A Real-time Transport Protocol (RTP) library" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng/code_review/ortp" license=('LGPL') -depends=('openssl') +depends=('glibc') options=('!libtool') -source=("http://ftp.cc.uoc.gr/mirrors/nongnu.org/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz") -md5sums=('94546901d14b85f97342f4ecf39489b1') +#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz") +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('cc319356d2b548e5777feef90ae23bac') build() { cd ${srcdir}/${pkgname}-${pkgver} - # Don't turn warnings into errors, it's bad. - ./configure --prefix=/usr --disable-strict + ./autogen.sh + ./configure --prefix=/usr make } diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index a257a5c38..3a7e1755d 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $ +# $Id: PKGBUILD 145472 2011-12-22 22:17:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon @@ -11,7 +11,7 @@ license=('LGPL') pkgdesc="The multimedia framework for KDE" depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') -makedepends=('cmake' 'automoc4' 'pulseaudio') +makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173') @@ -22,7 +22,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=/usr -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \ -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer make diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index f3523f20f..e44555352 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145329 2011-12-21 20:47:08Z andrea $ +# $Id: PKGBUILD 145605 2011-12-23 14:48:45Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -6,18 +6,23 @@ pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.6 +pkgver=4.9 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" + 'fix-qthelp-build.patch') +md5sums=('61619500d09d87b6c2a25bd3ea994504' + '356a453331a33c507b1baba4a9771764') build() { cd "${srcdir}" + + patch -p0 -i "${srcdir}"/fix-qthelp-build.patch + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch new file mode 100644 index 000000000..cd565e646 --- /dev/null +++ b/extra/pyqt/fix-qthelp-build.patch @@ -0,0 +1,11 @@ +--- PyQt-x11-gpl-4.9/configure.py~ 2011-12-23 14:53:07.981490550 +0100 ++++ PyQt-x11-gpl-4.9/configure.py 2011-12-23 14:52:38.384984221 +0100 +@@ -1264,7 +1264,7 @@ + opengl = (mname == "QtOpenGL") + + qt = [mname] +- if mname in ("QtOpenGL", "QtWebKit"): ++ if mname in ("QtHelp", "QtOpenGL", "QtWebKit"): + qt.append("QtCore") + + makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD index a71fc67fb..ca5cfcea0 100644 --- a/extra/python-markupsafe/PKGBUILD +++ b/extra/python-markupsafe/PKGBUILD @@ -1,22 +1,41 @@ -# $Id: PKGBUILD 113450 2011-03-08 17:36:15Z ibiru $ +# $Id: PKGBUILD 145461 2011-12-22 18:14:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Alex Anthony <alex.anthony28991@gmail.com> -pkgname=python-markupsafe -pkgver=0.12 -pkgrel=0 +pkgname=('python-markupsafe' 'python2-markupsafe') +pkgver=0.15 +pkgrel=1 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/MarkupSafe" license=('custom') -depends=('python2') -makedepends=('setuptools') -source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz) -md5sums=('edd4b6950f6d4ddc6e23fa322f8f0f53') +makedepends=('python-distribute' 'python2-distribute') +source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz") +md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186') build() { + cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} cd ${srcdir}/MarkupSafe-${pkgver} + python setup.py build + + cd ${srcdir}/python2-MarkupSafe-${pkgver} + python2 setup.py build +} + +package_python-markupsafe() { + depends=('python') + + cd ${srcdir}/MarkupSafe-${pkgver} + python setup.py install --root=${pkgdir} --optimize=1 + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE +} + +package_python2-markupsafe() { + depends=('python2') + + cd ${srcdir}/python2-MarkupSafe-${pkgver} python2 setup.py install --root=${pkgdir} --optimize=1 - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE } diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index b29fdccd6..08fec228f 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -3,21 +3,40 @@ # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> -pkgname=python-urwid -pkgver=0.9.9.2 +pkgname=('python-urwid' 'python2-urwid') +pkgver=1.0.1 pkgrel=1 pkgdesc="Urwid is a curses-based user interface library." license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('python2') +makedepends=('python2-distribute' 'python-distribute') url="http://excess.org/urwid/" source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('e58b86a983fe5474a07749501748b728') +md5sums=('828f7144b94920205e755c249d2e297f') build() { - cd $startdir/src/urwid-$pkgver + cp -r urwid-$pkgver python2-urwid-$pkgver + + cd $srcdir/urwid-$pkgver + python setup.py build + + cd $srcdir/python2-urwid-$pkgver sed -i 's#bin/python#bin/python2#' urwid/*.py - python2 setup.py install --prefix=/usr --root=$startdir/pkg || return 1 + + python2 setup.py build +} + +package_python-urwid() { + depends=('python') - rm -rf $startdir/src/$_hgname-build + cd $srcdir/urwid-$pkgver + python setup.py install --prefix=/usr --root=$pkgdir --optimize=1 } + +package_python2-urwid() { + depends=('python2') + + cd $srcdir/python2-urwid-$pkgver + python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1 +} + diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 657199f72..47e381721 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $ +# $Id: PKGBUILD 145611 2011-12-23 20:54:15Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') pkgver=2.6 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -58,9 +58,6 @@ package_python-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" - - # Fix RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -69,7 +66,4 @@ package_python2-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Fix RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so } diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index ad8e6471d..651370de9 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 145321 2011-12-21 20:46:56Z andrea $ +# $Id: PKGBUILD 145469 2011-12-22 22:02:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.2.0 -pkgrel=3 +pkgver=2.2.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' license=('LGPL2.1' 'GPL3') -depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base') +depends=('qt' 'gperf' 'bison' 'gstreamer0.10-base') makedepends=('python2' 'mesa' 'chrpath') conflicts=('qt<4.8') -source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" +#source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz" 'python2-path.patch') -sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7' +sha1sums=('283fc116882157df0474af496be73bb9b34cb001' 'b0ef3d5596171e3900a685df9bcfac3068ad6330') build() { diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 6eb3ce681..f95604103 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 139425 2011-10-01 19:01:11Z ibiru $ +# $Id: PKGBUILD 145457 2011-12-22 17:55:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.90.1.git20110928 +pkgver=2.90.1.git20111222 pkgrel=1 -pkgdesc="An iTunes-like music player/libary" +pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.rhythmbox.org" depends=('libgpod' 'gvfs-afc' 'totem-plparser' 'libmusicbrainz3' 'libmtp' 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'python2-gobject' - 'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'grilo' 'dconf') + 'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python2-mako' 'grilo' 'dconf' 'libnotify') makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' @@ -19,11 +19,11 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' options=('!libtool' '!emptydirs' '!strip') install=rhythmbox.install #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b95b2aed0cd485198fbefdcb8dbf2a1ca3d4eb7d31b1e02d610fb16384191e8a') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('06cb3dda1871060c192e32c7f8237c046d120946a3647ebe2041695bce90a839') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" export CFLAGS="$CFLAGS -g -O1" export CXXFLAGS="$CXXFLAGS -g -O1" PYTHON=/usr/bin/python2 ./autogen.sh @@ -36,7 +36,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog index a374f7b27..f343b86cb 100644 --- a/extra/rxvt-unicode/ChangeLog +++ b/extra/rxvt-unicode/ChangeLog @@ -1,4 +1,7 @@ 2011-12-02 Angel Velasquez <angvp@archlinux.org> + * Version bump to 9.14 + +2011-12-02 Angel Velasquez <angvp@archlinux.org> * Moved perl from optdepend to depend (closes FS#25782) 2011-05-22 Angel Velasquez <angvp@archlinux.org> diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD index ef8c89f59..9f688a959 100644 --- a/extra/rxvt-unicode/PKGBUILD +++ b/extra/rxvt-unicode/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 144079 2011-12-03 04:45:00Z angvp $ +# $Id: PKGBUILD 145618 2011-12-24 05:53:53Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode -pkgver=9.12 -pkgrel=2 +pkgver=9.14 +pkgrel=1 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" arch=('i686' 'x86_64' 'mips64el') url="http://software.schmorp.de/pkg/rxvt-unicode.html" @@ -15,9 +15,9 @@ optdepends=('gtk2-perl: to use the urxvt-tabbed') changelog=ChangeLog source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \ ${pkgname}.desktop) -md5sums=('945af37d661c8c45a7cac292160e7c70' +md5sums=('022235a9a8b012c29e72c49177be6ce4' '3de6c13126a45bc3bc9f6bba077a1311') -sha1sums=('4cbf0516b8304dfb041b9f3e5aaba662fee4b979' +sha1sums=('e303b7591225b06bc04e18a875461438c635014e' '962aebc88982dbeb62a7c4a051ff567e015f61a0') build() { diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index bd17db2be..9b061a986 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141389 2011-10-30 11:14:14Z andrea $ +# $Id: PKGBUILD 145600 2011-12-23 10:58:52Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -6,14 +6,14 @@ pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.13 +pkgver=4.13.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('21b4e2cad56e4156df2220143264b8ff') +md5sums=('3f61fd39d5b0c8fa9e43b59af04de924') build() { cd "${srcdir}" diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index c0c7fe001..3cc1ea230 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,35 +1,25 @@ -# $Id: PKGBUILD 98594 2010-11-11 17:27:01Z ibiru $ +# $Id: PKGBUILD 145719 2011-12-28 18:26:36Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: shamrok <szamrok@gmail.com> pkgname=smplayer -pkgver=0.6.9 -pkgrel=3 +pkgver=0.6.10 +pkgrel=1 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64' 'mips64el') url="http://smplayer.sourceforge.net/" license=('GPL') -depends=('qt>=4.7.1' 'mplayer') +depends=('qt' 'mplayer') +install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2) -md5sums=('dfe874b386509de5df78537489f95004') +md5sums=('9f5ee3319bebc0ed5efe636cf7f0efad') build() { cd ${srcdir}/${pkgname}-${pkgver} - # remove broken translation - sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro - make PREFIX=/usr make PREFIX=${pkgdir}/usr install - - install -dm755 ${pkgdir}/usr/share/pixmaps - ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \ - ${pkgdir}/usr/share/pixmaps/ - - sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop - sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \ - ${pkgdir}/usr/share/applications/smplayer_enqueue.desktop } diff --git a/extra/smplayer/smplayer.install b/extra/smplayer/smplayer.install new file mode 100644 index 000000000..6481cee07 --- /dev/null +++ b/extra/smplayer/smplayer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD index 333ad967f..be447b2ae 100644 --- a/extra/source-highlight/PKGBUILD +++ b/extra/source-highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144063 2011-12-02 20:54:47Z ibiru $ +# $Id: PKGBUILD 145696 2011-12-28 00:18:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=source-highlight -pkgver=3.1.5 -pkgrel=2 +pkgver=3.1.6 +pkgrel=1 pkgdesc="Convert source code to syntax highlighted document" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/src-highlite/" @@ -14,7 +14,7 @@ makedepends=('ctags' 'boost') options=('!libtool') install=$pkgname.install source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") -md5sums=('3117ee47c1c6b0668667e20d2aca3757') +md5sums=('44856c15a5dc8694e30d92f640ed348f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index 1e1228bba..ad1e703de 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,39 +1,44 @@ -# $Id: PKGBUILD 142551 2011-11-12 00:27:55Z dreisner $ +# $Id: PKGBUILD 145645 2011-12-26 07:05:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=vpnc _vpncver=0.5.3 -pkgver=$_vpncver.svn472 +pkgver=$_vpncver.svn481 pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" license=('GPL') depends=('libgcrypt' 'openssl' 'iproute2') optdepends=('openresolv: Let vpnc manage resolv.conf') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('51c350341ad4e7f8efbba19810b138a3' +md5sums=('42edf29f8b9f05cd2e708d5130deb770' 'a3f4e0cc682f437e310a1c86ae198e45') mktarball() { + [[ -d tarball ]] || mkdir tarball + + pushd tarball + svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk - pushd trunk - _svnrev=$(svn info | awk '/^Revision:/ { print $2 }') - popd + _svnrev=$(cd trunk >/dev/null; svn info | awk '/^Revision:/ { print $2 }') git clone git://git.infradead.org/users/dwmw2/vpnc-scripts.git cp vpnc-scripts/vpnc-script trunk/ find trunk/ -type d -name .svn -exec rm -rf {} + mv trunk "$pkgname-$_vpncver.svn$_svnrev" - tar cJf "$pkgname-$_vpncver.svn$_svnrev"{.tar.xz,} + tar cJf "../$pkgname-$_vpncver.svn$_svnrev.tar.xz" "$pkgname-$_vpncver.svn$_svnrev/" + + popd + rm -rf tarball } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" # Build hybrid support sed -i 's|^#OPENSSL|OPENSSL|g' Makefile @@ -41,11 +46,11 @@ build() { # fix resolvconf location for community/openresolv sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-script - make PREFIX=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" PREFIX=/usr install diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index 8f57230a6..1f253d1d0 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,43 +1,49 @@ -# $Id: PKGBUILD 130064 2011-07-01 20:39:13Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 145609 2011-12-23 17:39:17Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfconf -pkgver=4.8.0 -pkgrel=3 -pkgdesc="a simple client-server configuration storage and query system" +pkgver=4.8.1 +pkgrel=1 +pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') # http://www.xfce.org/documentation/requirements -# keep dbus and gtk2, see also http://bugs.archlinux.org/task/14536 -depends=( "libxfce4util>=4.8.0" "dbus-glib" 'dbus' 'gtk2') +# keep dbus, see also http://bugs.archlinux.org/task/14536 +depends=('libxfce4util' 'dbus-glib' 'dbus') makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' -'perl-xml-parser' 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') + 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') options=('!libtool' '!emptydirs') -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0f11ed1ec7789c5c4c3fcc7cdb3c2940') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --with-perl-options=INSTALLDIRS="vendor" \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --with-perl-options=INSTALLDIRS="vendor" \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + # remove unneeded dynloader bootstrap file - rm ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs - + rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs" + # fix insecure rpath, http://bugs.archlinux.org/task/19980 - chrpath -d ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so + chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 3bb44bf29..a387ab785 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145292 2011-12-21 10:20:13Z ibiru $ +# $Id: PKGBUILD 145467 2011-12-22 20:32:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=9.0 +pkgver=9.0.1 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/f mozilla-pkgconfig.patch) options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('d8d0c8c79660752b02d9e9ab69a68f94' +md5sums=('7cf2bd379792a9b232267c6a79680566' '8dfb78c5bd0581c8cf4753813132bf0b' '27271ce647a83906ef7a24605e840d61') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e45da8749..05507bbaa 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -83,11 +83,8 @@ build() { #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" #patch -Np1 -i "$srcdir/firefox-version.patch" -<<<<<<< HEAD [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig -======= ->>>>>>> libre/master # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in diff --git a/libre/kernel26-libre/Kbuild b/libre/kernel26-libre/Kbuild deleted file mode 100644 index 8a9d7dceb..000000000 --- a/libre/kernel26-libre/Kbuild +++ /dev/null @@ -1,19 +0,0 @@ -# Fail on warnings - also for files referenced in subdirs -# -Werror can be disabled for specific files using: -# CFLAGS_<file.o> := -Wno-error -subdir-ccflags-y := -Wno-error - -# platform specific definitions -include arch/mips/Kbuild.platforms -obj-y := $(platform-y) - -# make clean traverses $(obj-) without having included .config, so -# everything ends up here -obj- := $(platform-) - -# mips object files -# The object files are linked as core-y files would be linked - -obj-y += kernel/ -obj-y += mm/ -obj-y += math-emu/ diff --git a/libre/kernel26-libre/Kbuild.platforms b/libre/kernel26-libre/Kbuild.platforms deleted file mode 100644 index 90a226888..000000000 --- a/libre/kernel26-libre/Kbuild.platforms +++ /dev/null @@ -1,6 +0,0 @@ -# All platforms listed in alphabetic order - -platforms += loongson - -# include the platform specific files -include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms)) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e3b949f1d..a4b891b52 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -65,7 +65,7 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile msg2 "Adding loongson-community patches" - patch -Np1 -i ${srcdir}/${_basekernel}-*-loongson-community.patch + patch -Np1 -i ${srcdir}/${_basekernel}.*-*-loongson-community.patch patch -Np0 -i "${srcdir}/lxo-config.patch" # ensure N32 @@ -342,3 +342,16 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } +md5sums=('d73df15ab1d36fe3c102755d8f42117f' + '06b461d4db995ddcbecbf345ae3b8987' + '84475b01ec148cb1f367bba20025a148' + '7d8fac41f4c4c2d14d8c65645fb676bd' + '2a0302eda795903d3b01e41ba807c91e' + 'a8a3843046926eb7ab81312cd438c5c5' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + 'a50c9076012cb2dda49952dc6ec3e9c1' + '52d41fa61e80277ace2b994412a0c856') diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index dd0ff5fda..e6f53188a 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -3,11 +3,7 @@ pkgname=pacman pkgver=3.5.4 -<<<<<<< HEAD pkgrel=4.2 -======= -pkgrel=4 ->>>>>>> libre/master pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -25,15 +21,12 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.mips64el makepkg.conf 0001-makepkg-fix-removing-symbolic-link.patch) -<<<<<<< HEAD -======= md5sums=('2dd3a85d55ee3dd89abd349aa837447c' 'ba85525fe868f030bef209b0487dd5a5' '7aaccf24479f396d4a5987c8ccd2f3a2' '150a2854816cd67b1608e00f99701c1c' 'be10d3d2e533515a0470237761415568' '749a4ddc6d8418d8d031f1c9b4e09d6f') ->>>>>>> libre/master # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -74,11 +67,7 @@ package() { mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" -<<<<<<< HEAD myldflags="-Wl,--as-needed" -======= - myldflags="" ->>>>>>> libre/master ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ @@ -97,9 +86,3 @@ package() { } # vim: set ts=2 sw=2 et: -md5sums=('2dd3a85d55ee3dd89abd349aa837447c' - 'ba85525fe868f030bef209b0487dd5a5' - '7aaccf24479f396d4a5987c8ccd2f3a2' - '150a2854816cd67b1608e00f99701c1c' - 'be10d3d2e533515a0470237761415568' - '749a4ddc6d8418d8d031f1c9b4e09d6f') diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index 06aff86fd..14306a43f 100644 --- a/libre/thunderbird-libre/PKGBUILD +++ b/libre/thunderbird-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 145298 2011-12-21 14:25:49Z ibiru $ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Anders Bostrom <anders.bostrom@home.se> pkgname=thunderbird-libre -pkgver=8.0 +pkgver=9.0 pkgrel=1 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc thunderbird-3.0-lang.patch thunderbird-install-dir.patch channel-prefs.js) -md5sums=('332f60036aebdce7dec6ee2b1af4941d' +md5sums=('681bdf6362945b59b2bec23f8aecc7e7' 'ca98c2bf1017b33e19dae22fdcef2e73' 'af3e5b344d2edf1c7d61bb0a5a96de9a' '25b6fe16ac24cd5c852213e5c1adb272' diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD new file mode 100644 index 000000000..d49c373bc --- /dev/null +++ b/libre/unzip-libre/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ +# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: Robson Peixoto + +_pkgname=unzip +pkgname=unzip-libre +pkgver=6.0 +pkgrel=5 +pkgdesc="Unpacks .zip archives such as those made by PKZIP" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.info-zip.org/" +license=('custom') +depends=('bzip2' 'bash') +provides=("${_pkgname}=${pkgver}") +conflicts=("${_pkgname}") +replaces=("${_pkgname}") +source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz") + + +build() { + cd ${srcdir}/${_pkgname}${pkgver/./} + + # set CFLAGS -- from Debian + export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ + -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ + -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ + -DUSE_BZIP2 -DNATIVE" + + # make -- from Debian + make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ + D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips + +} + +package(){ + cd ${srcdir}/${_pkgname}${pkgver/./} + + # install -- from Debian + make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install + + # install the license file + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE + + # fix manpage location + mkdir -p ${pkgdir}/usr/share + mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ +} + +md5sums=('8e8a774e2006617d8787d095bb78c78a') diff --git a/libre/unzip-libre/SRCBUILD b/libre/unzip-libre/SRCBUILD new file mode 100644 index 000000000..a9ada936b --- /dev/null +++ b/libre/unzip-libre/SRCBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ +# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: Robson Peixoto + +_pkgname=unzip +pkgname=unzip-libre +pkgver=6.0 +pkgrel=5 +pkgdesc="Unpacks .zip archives such as those made by PKZIP" +arch=('any') +url="http://www.info-zip.org/" +license=('custom') +depends=('bzip2' 'bash') +source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' +# from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch + 'match.patch') +md5sums=('62b490407489521db863b523a7f86375' + 'e6d9f0c204c2abe6a57dc5e1637d5140') + +build() { + cd ${srcdir}/${_pkgname}${pkgver/./} + + patch -Np0 -i ${srcdir}/match.patch +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${SRCDEST} + + mv ${srcdir}/${_pkgname}${pkgver/./} ${pkgdir}/ + +} diff --git a/libre/unzip-libre/match.patch b/libre/unzip-libre/match.patch new file mode 100644 index 000000000..6ba65fee0 --- /dev/null +++ b/libre/unzip-libre/match.patch @@ -0,0 +1,472 @@ +--- match.c 2011-09-07 23:00:58.037644003 +0200 ++++ match.final.c 2011-09-07 23:32:19.433644002 +0200 +@@ -27,16 +27,14 @@ + + --------------------------------------------------------------------------- + +- Copyright on recmatch() from Zip's util.c (although recmatch() was almost +- certainly written by Mark Adler...ask me how I can tell :-) ): ++ Copyright on recmatch() from Zip's util.c ++ Copyright (c) 1990-2005 Info-ZIP. All rights reserved. + +- Copyright (C) 1990-1992 Mark Adler, Richard B. Wales, Jean-loup Gailly, +- Kai Uwe Rommel and Igor Mandrichenko. ++ See the accompanying file LICENSE, version 2004-May-22 or later ++ for terms of use. ++ If, for some reason, both of these files are missing, the Info-ZIP license ++ also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html + +- Permission is granted to any individual or institution to use, copy, +- or redistribute this software so long as all of the original files are +- included unmodified, that it is not sold for profit, and that this copy- +- right notice is retained. + + --------------------------------------------------------------------------- + +@@ -53,7 +51,7 @@ + + A set is composed of characters or ranges; a range looks like ``character + hyphen character'' (as in 0-9 or A-Z). [0-9a-zA-Z_] is the minimal set of +- characters allowed in the [..] pattern construct. Other characters are ++ characters ALlowed in the [..] pattern construct. Other characters are + allowed (i.e., 8-bit characters) if your system will support them. + + To suppress the special syntactic significance of any of ``[]*?!^-\'', in- +@@ -101,8 +99,32 @@ + # define WILDCHAR '?' + # define BEG_RANGE '[' + # define END_RANGE ']' ++# define WILDCHR_SINGLE '?' ++# define DIRSEP_CHR '/' ++# define WILDCHR_MULTI '*' + #endif + ++#ifdef WILD_STOP_AT_DIR ++ int wild_stop_at_dir = 1; /* default wildcards do not include / in matches */ ++#else ++ int wild_stop_at_dir = 0; /* default wildcards do include / in matches */ ++#endif ++ ++ ++ ++/* ++ * case mapping functions. case_map is used to ignore case in comparisons, ++ * to_up is used to force upper case even on Unix (for dosify option). ++ */ ++#ifdef USE_CASE_MAP ++# define case_map(c) upper[(c) & 0xff] ++# define to_up(c) upper[(c) & 0xff] ++#else ++# define case_map(c) (c) ++# define to_up(c) ((c) >= 'a' && (c) <= 'z' ? (c)-'a'+'A' : (c)) ++#endif /* USE_CASE_MAP */ ++ ++ + #if 0 /* GRR: add this to unzip.h someday... */ + #if !(defined(MSDOS) && defined(DOSWILD)) + #ifdef WILD_STOP_AT_DIR +@@ -114,8 +136,8 @@ + int ignore_case __WDLPRO)); + #endif + #endif /* 0 */ +-static int recmatch OF((ZCONST uch *pattern, ZCONST uch *string, +- int ignore_case __WDLPRO)); ++static int recmatch OF((ZCONST char *, ZCONST char *, ++ int)); + static char *isshexp OF((ZCONST char *p)); + static int namecmp OF((ZCONST char *s1, ZCONST char *s2)); + +@@ -154,192 +176,236 @@ + } + dospattern[j-1] = '\0'; /* nuke the end "." */ + } +- j = recmatch((uch *)dospattern, (uch *)string, ignore_case __WDL); ++ j = recmatch(dospattern, string, ignore_case); + free(dospattern); + return j == 1; + } else + #endif /* MSDOS && DOSWILD */ +- return recmatch((uch *)pattern, (uch *)string, ignore_case __WDL) == 1; ++ return recmatch(pattern, string, ignore_case) == 1; + } + + + +-static int recmatch(p, s, ic __WDL) +- ZCONST uch *p; /* sh pattern to match */ +- ZCONST uch *s; /* string to which to match it */ +- int ic; /* true for case insensitivity */ +- __WDLDEF /* directory sepchar for WildStopAtDir mode, or 0 */ ++static int recmatch(p, s, cs) ++ZCONST char *p; /* sh pattern to match */ ++ZCONST char *s; /* string to match it to */ ++int cs; /* flag: force case-sensitive matching */ + /* Recursively compare the sh pattern p with the string s and return 1 if +- * they match, and 0 or 2 if they don't or if there is a syntax error in the +- * pattern. This routine recurses on itself no more deeply than the number +- * of characters in the pattern. */ ++ they match, and 0 or 2 if they don't or if there is a syntax error in the ++ pattern. This routine recurses on itself no deeper than the number of ++ characters in the pattern. */ + { +- unsigned int c; /* pattern char or start of range in [-] loop */ ++ int c; /* pattern char or start of range in [-] loop */ ++ /* Get first character, the pattern for new recmatch calls follows */ ++ /* borrowed from Zip's global.c */ ++ int no_wild = 0; ++ int allow_regex=1; ++ /* This fix provided by akt@m5.dion.ne.jp for Japanese. ++ See 21 July 2006 mail. ++ It only applies when p is pointing to a doublebyte character and ++ things like / and wildcards are not doublebyte. This probably ++ should not be needed. */ + +- /* Get first character, the pattern for new recmatch calls follows */ +- c = *p; INCSTR(p); ++#ifdef _MBCS ++ if (CLEN(p) == 2) { ++ if (CLEN(s) == 2) { ++ return (*p == *s && *(p+1) == *(s+1)) ? ++ recmatch(p + 2, s + 2, cs) : 0; ++ } else { ++ return 0; ++ } ++ } ++#endif /* ?_MBCS */ + +- /* If that was the end of the pattern, match if string empty too */ +- if (c == 0) +- return *s == 0; ++ c = *POSTINCSTR(p); + +- /* '?' (or '%') matches any character (but not an empty string). */ +- if (c == WILDCHAR) +-#ifdef WILD_STOP_AT_DIR +- /* If uO.W_flag is non-zero, it won't match '/' */ +- return (*s && (!sepc || *s != (uch)sepc)) +- ? recmatch(p, s + CLEN(s), ic, sepc) : 0; +-#else +- return *s ? recmatch(p, s + CLEN(s), ic) : 0; +-#endif ++ /* If that was the end of the pattern, match if string empty too */ ++ if (c == 0) ++ return *s == 0; ++ ++ /* '?' (or '%' or '#') matches any character (but not an empty string) */ ++ if (c == WILDCHR_SINGLE) { ++ if (wild_stop_at_dir) ++ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0; ++ else ++ return *s ? recmatch(p, s + CLEN(s), cs) : 0; ++ } + +- /* '*' matches any number of characters, including zero */ ++ /* WILDCHR_MULTI ('*') matches any number of characters, including zero */ + #ifdef AMIGA +- if (c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */ +- c = '*', p++; ++ if (!no_wild && c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */ ++ c = WILDCHR_MULTI, p++; + #endif /* AMIGA */ +- if (c == '*') { +-#ifdef WILD_STOP_AT_DIR +- if (sepc) { +- /* check for single "*" or double "**" */ +-# ifdef AMIGA +- if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */ +- c = '*', p++; +- if (c != '*') { +-# else /* !AMIGA */ +- if (*p != '*') { +-# endif /* ?AMIGA */ +- /* single "*": this doesn't match the dirsep character */ +- for (; *s && *s != (uch)sepc; INCSTR(s)) +- if ((c = recmatch(p, s, ic, sepc)) != 0) +- return (int)c; +- /* end of pattern: matched if at end of string, else continue */ +- if (*p == '\0') +- return (*s == 0); +- /* continue to match if at sepc in pattern, else give up */ +- return (*p == (uch)sepc || (*p == '\\' && p[1] == (uch)sepc)) +- ? recmatch(p, s, ic, sepc) : 2; +- } +- /* "**": this matches slashes */ +- ++p; /* move p behind the second '*' */ +- /* and continue with the non-W_flag code variant */ +- } +-#endif /* WILD_STOP_AT_DIR */ ++ if (!no_wild && c == WILDCHR_MULTI) ++ { ++ if (wild_stop_at_dir) { ++ /* Check for an immediately following WILDCHR_MULTI */ ++# ifdef AMIGA ++ if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */ ++ c = WILDCHR_MULTI, p++; ++ if (c != WILDCHR_MULTI) { ++# else /* !AMIGA */ ++ if (*p != WILDCHR_MULTI) { ++# endif /* ?AMIGA */ ++ /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */ ++ for (; *s && *s != DIRSEP_CHR; INCSTR(s)) ++ if ((c = recmatch(p, s, cs)) != 0) ++ return c; ++ /* end of pattern: matched if at end of string, else continue */ + if (*p == 0) +- return 1; +- if (isshexp((ZCONST char *)p) == NULL) { +- /* Optimization for rest of pattern being a literal string: +- * If there are no other shell expression chars in the rest +- * of the pattern behind the multi-char wildcard, then just +- * compare the literal string tail. +- */ +- ZCONST uch *srest; +- +- srest = s + (strlen((ZCONST char *)s) - strlen((ZCONST char *)p)); +- if (srest - s < 0) +- /* remaining literal string from pattern is longer than rest +- * of test string, there can't be a match +- */ +- return 0; +- else +- /* compare the remaining literal pattern string with the last +- * bytes of the test string to check for a match +- */ ++ return (*s == 0); ++ /* continue to match if at DIRSEP_CHR in pattern, else give up */ ++ return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR)) ++ ? recmatch(p, s, cs) : 2; ++ } ++ /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */ ++ p++; /* move p past the second WILDCHR_MULTI */ ++ /* continue with the normal non-WILD_STOP_AT_DIR code */ ++ } /* wild_stop_at_dir */ ++ ++ /* Not wild_stop_at_dir */ ++ if (*p == 0) ++ return 1; ++ if (!isshexp((char *)p)) ++ { ++ /* optimization for rest of pattern being a literal string */ ++ ++ /* optimization to handle patterns like *.txt */ ++ /* if the first char in the pattern is '*' and there */ ++ /* are no other shell expression chars, i.e. a literal string */ ++ /* then just compare the literal string at the end */ ++ ++ ZCONST char *srest; ++ ++ srest = s + (strlen(s) - strlen(p)); ++ if (srest - s < 0) ++ /* remaining literal string from pattern is longer than rest of ++ test string, there can't be a match ++ */ ++ return 0; ++ else ++ /* compare the remaining literal pattern string with the last bytes ++ of the test string to check for a match */ + #ifdef _MBCS +- { +- ZCONST uch *q = s; ++ { ++ ZCONST char *q = s; + +- /* MBCS-aware code must not scan backwards into a string from +- * the end. +- * So, we have to move forward by character from our well-known +- * character position s in the test string until we have +- * advanced to the srest position. +- */ +- while (q < srest) +- INCSTR(q); +- /* In case the byte *srest is a trailing byte of a multibyte +- * character in the test string s, we have actually advanced +- * past the position (srest). +- * For this case, the match has failed! +- */ +- if (q != srest) +- return 0; +- return ((ic +- ? namecmp((ZCONST char *)p, (ZCONST char *)q) +- : strcmp((ZCONST char *)p, (ZCONST char *)q) +- ) == 0); +- } ++ /* MBCS-aware code must not scan backwards into a string from ++ * the end. ++ * So, we have to move forward by character from our well-known ++ * character position s in the test string until we have advanced ++ * to the srest position. ++ */ ++ while (q < srest) ++ INCSTR(q); ++ /* In case the byte *srest is a trailing byte of a multibyte ++ * character, we have actually advanced past the position (srest). ++ * For this case, the match has failed! ++ */ ++ if (q != srest) ++ return 0; ++ return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0); ++ } + #else /* !_MBCS */ +- return ((ic +- ? namecmp((ZCONST char *)p, (ZCONST char *)srest) +- : strcmp((ZCONST char *)p, (ZCONST char *)srest) +- ) == 0); ++ return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0); + #endif /* ?_MBCS */ +- } else { +- /* pattern contains more wildcards, continue with recursion... */ +- for (; *s; INCSTR(s)) +- if ((c = recmatch(p, s, ic __WDL)) != 0) +- return (int)c; +- return 2; /* 2 means give up--match will return false */ +- } + } +- +- /* Parse and process the list of characters and ranges in brackets */ +- if (c == BEG_RANGE) { +- int e; /* flag true if next char to be taken literally */ +- ZCONST uch *q; /* pointer to end of [-] group */ +- int r; /* flag true to match anything but the range */ +- +- if (*s == 0) /* need a character to match */ +- return 0; +- p += (r = (*p == '!' || *p == '^')); /* see if reverse */ +- for (q = p, e = 0; *q; INCSTR(q)) /* find closing bracket */ +- if (e) +- e = 0; +- else +- if (*q == '\\') /* GRR: change to ^ for MS-DOS, OS/2? */ +- e = 1; +- else if (*q == END_RANGE) +- break; +- if (*q != END_RANGE) /* nothing matches if bad syntax */ +- return 0; +- for (c = 0, e = (*p == '-'); p < q; INCSTR(p)) { +- /* go through the list */ +- if (!e && *p == '\\') /* set escape flag if \ */ +- e = 1; +- else if (!e && *p == '-') /* set start of range if - */ +- c = *(p-1); +- else { +- unsigned int cc = Case(*s); +- +- if (*(p+1) != '-') +- for (c = c ? c : *p; c <= *p; c++) /* compare range */ +- if ((unsigned)Case(c) == cc) /* typecast for MSC bug */ +- return r ? 0 : recmatch(q + 1, s + 1, ic __WDL); +- c = e = 0; /* clear range, escape flags */ +- } +- } +- return r ? recmatch(q + CLEN(q), s + CLEN(s), ic __WDL) : 0; +- /* bracket match failed */ ++ else ++ { ++ /* pattern contains more wildcards, continue with recursion... */ ++ for (; *s; INCSTR(s)) ++ if ((c = recmatch(p, s, cs)) != 0) ++ return c; ++ return 2; /* 2 means give up--shmatch will return false */ + } ++ } + +- /* if escape ('\\'), just compare next character */ +- if (c == '\\' && (c = *p++) == 0) /* if \ at end, then syntax error */ +- return 0; ++#ifndef VMS /* No bracket matching in VMS */ ++ /* Parse and process the list of characters and ranges in brackets */ ++ if (!no_wild && allow_regex && c == '[') ++ { ++ int e; /* flag true if next char to be taken literally */ ++ ZCONST char *q; /* pointer to end of [-] group */ ++ int r; /* flag true to match anything but the range */ ++ ++ if (*s == 0) /* need a character to match */ ++ return 0; ++ p += (r = (*p == '!' || *p == '^')); /* see if reverse */ ++ for (q = p, e = 0; *q; q++) /* find closing bracket */ ++ if (e) ++ e = 0; ++ else ++ if (*q == '\\') ++ e = 1; ++ else if (*q == ']') ++ break; ++ if (*q != ']') /* nothing matches if bad syntax */ ++ return 0; ++ for (c = 0, e = *p == '-'; p < q; p++) /* go through the list */ ++ { ++ if (e == 0 && *p == '\\') /* set escape flag if \ */ ++ e = 1; ++ else if (e == 0 && *p == '-') /* set start of range if - */ ++ c = *(p-1); ++ else ++ { ++ uch cc = (cs ? (uch)*s : case_map((uch)*s)); ++ uch uc = (uch) c; ++ if (*(p+1) != '-') ++ for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++) ++ /* compare range */ ++ if ((cs ? uc : case_map(uc)) == cc) ++ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs); ++ c = e = 0; /* clear range, escape flags */ ++ } ++ } ++ return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0; ++ /* bracket match failed */ ++ } ++#endif /* !VMS */ + +- /* just a character--compare it */ +-#ifdef QDOS +- return QMatch(Case((uch)c), Case(*s)) ? +- recmatch(p, s + CLEN(s), ic __WDL) : 0; +-#else +- return Case((uch)c) == Case(*s) ? +- recmatch(p, s + CLEN(s), ic __WDL) : 0; +-#endif ++ /* If escape ('\'), just compare next character */ ++ if (!no_wild && c == '\\') ++ if ((c = *p++) == '\0') /* if \ at end, then syntax error */ ++ return 0; ++ ++#ifdef VMS ++ /* 2005-11-06 SMS. ++ Handle "..." wildcard in p with "." or "]" in s. ++ */ ++ if ((c == '.') && (*p == '.') && (*(p+ CLEN( p)) == '.') && ++ ((*s == '.') || (*s == ']'))) ++ { ++ /* Match "...]" with "]". Continue after "]" in both. */ ++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ ++ /* Else, look for a reduced match in s, until "]" in or end of s. */ ++ for (; *s && (*s != ']'); INCSTR(s)) ++ if (*s == '.') ++ /* If reduced match, then continue after "..." in p, "." in s. */ ++ if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0) ++ return (int)c; ++ ++ /* Match "...]" with "]". Continue after "]" in both. */ ++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ ++ /* No reduced match. Quit. */ ++ return 2; ++ } ++ ++#endif /* def VMS */ ++ ++ /* Just a character--compare it */ ++ return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ? ++ recmatch(p, s + CLEN(s), cs) : 0; ++} + +-} /* end function recmatch() */ + + + ++/*************************************************************************************************/ + static char *isshexp(p) + ZCONST char *p; + /* If p is a sh expression, a pointer to the first special character is diff --git a/mozilla-testing/icecat-i18n/Makefile b/mozilla-testing/icecat-i18n/Makefile new file mode 100644 index 000000000..5dd818e62 --- /dev/null +++ b/mozilla-testing/icecat-i18n/Makefile @@ -0,0 +1,33 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - grep +# - pacman +# - sed +# - wget + +pkgver=9.0.1 + +default: PHONY all +all: PHONY PKGBUILD +.PRECIOUS: PKGBUILD + +index.html: Makefile + rm -f $@ + wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ +langpacks.txt: index.html Makefile + egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ +PKGBUILD: langpacks.txt Makefile + sed \ + -e 's/^pkgver=.*/pkgver=$(pkgver)/' \ + -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \ + -e '/md5sums/,$$d' \ + $@ > $@.$$$$ && \ + makepkg -g >> $@.$$$$ && \ + mv $@.$$$$ $@ + +clean: PHONY + rm -f index.html langpacks.txt *.xpi + +.PHONY: PHONY FORCE diff --git a/mozilla-testing/icecat-i18n/PKGBUILD b/mozilla-testing/icecat-i18n/PKGBUILD new file mode 100644 index 000000000..117d6a6bf --- /dev/null +++ b/mozilla-testing/icecat-i18n/PKGBUILD @@ -0,0 +1,127 @@ +# Maintainer: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Based on firefox-i18n package + +# When updating to a newer upstream release: +# - Edit pkgver= in Makefile. +# - Run 'make'. It will take care of everything else for you. + +_langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) + +pkgbase='icecat-i18n' +pkgname=($(for lang in ${_langpacks[@]} + do echo icecat-i18n-$lang | tr A-Z a-z + done)) +_pkgver=9.0 +pkgver=9.0.1 +pkgrel=1 +pkgdesc="Language packs for GNUzilla IceCat." +arch=('any') +license=('MPL') +url="http://www.gnu.org/software/gnuzilla/" +depends=("icecat=${pkgver}") +source=($(for lang in ${_langpacks[@]} + do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi + done)) +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +build() { + cd "${srcdir}" +} + +_path="/usr/lib/icecat-$_pkgver/extensions/" + +for lang in ${_langpacks[@]} +do + eval " +package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + +md5sums=('20e67c29a5e666c102b04a1e60b7f5a6' + 'f2bb72158cd9a9e26d682dcdff297e86' + '31daa3abbe40461f5292b6521ba45179' + '38ed2043b03f27bf9c6c30956c90f0af' + 'c263a1d5a3560c9a4538561ebe1bd332' + '9e19e7a56922d3df37844067d6c59a23' + '665ae571412f563f562c556cb6790bca' + '598725cd42bad8beec856525cd9d85c0' + '3e45f1097a1453ef6f3615d5826ff508' + '8388434818c995ae50b977d2e7f36996' + 'fa0afac9df234a977fd8da2905c0eda2' + '258d9b993065f3860c2f8d79ed86aa20' + 'dadeb5e0e03ac6c4a58104ae60c4214a' + '17edd78ea185761e3ac1ab69947aa483' + '6544c77cb37f97e1eb5c9180902f9767' + '579a5a4f3a98f47cba481242faece354' + '7a47d59e8a90b852a852d3d8182636e3' + '5e5f806e1f6f386dddd32136a9ea0c44' + '5985bb817858d6fffad0158df60b926b' + '9a9048af47cf7e1eff4a901287321cbf' + 'ecf628acf988b4efee254f5dd43ed839' + '0879552d267febf40ab51a25fd56e126' + 'd0054611a7cb17f265bbbb2145fa24fd' + '86dc6ac2c9fa2d891449dc0fee74925d' + '672433eda992ca42468ce736fb679233' + '7c1722a1a7b36259b170c601122a025b' + 'd315044c39fa8e3e404355a12a065cf2' + '2e498d9076b814887f0da334fda1e289' + 'b4c42b439c3db8e77e53f2c0e03197cb' + '1c356d82117d92d19474ab0a6c804c6b' + 'bb2a2bc43106be951ef51b62719f1213' + 'eda3b14c45b3dd6cc95f93b5fa0fd6cf' + '5521ad4ab8cdf1f8863fc0f454c02ee2' + '38f8d1533f7d1a6123eb80555e719f6f' + '14bb8cf18b6d24f103da376c5d8580b5' + '1d0ea799b72c59b9a6922d66c84e63d2' + '57a457aaa98d7d93667cfce913632976' + '90d589d5cd4d199f579e882c1b1e9287' + 'a0d354fb2b69828777642ef5abd0e963' + 'cce959f03a6357ee7a1d2efc6c6af309' + '4c9b695d540fb5289600a089e2972aca' + 'f4e3330139f500b0e37207bd00ad7e81' + 'e41ca6ea7716bec98956a4138bb091ce' + 'd59931f40b6e62dc2899eff46da2ac1e' + 'b21a2c345c8c74d8c4da80273aecd083' + '147357710c4712439c646f18b27bf4d0' + 'f90e382593e105ff697145338162c64e' + 'c6517c6002fe56527b7a773b8060f553' + '52bd84145281204c23b3c608a597f9e8' + 'e79089b54a3c8401afc7fbd48565d373' + 'ce49b2490566964e786e2f8c03560bb8' + 'ec943a3e4e531f8295f03131f2056053' + '99ea4eaae77a8c680949e673ef5ff1b7' + '74f4139ea78aee64c054468d5cf5528b' + 'efbd2c801479fbfd82d3da168e582a67' + '490f7390148623d6e6805aa04c8dc6f3' + '5b51ca012f369e61d505d4f05342b1a7' + '90a9774bfe34428b915bda7f5701e8d9' + '784924bb0615debf3eba37ea9edced69' + 'b2be9f59bdf8c2d0e35a4ab2e944f73e' + '5607205459f9db6d229235070e45e866' + '396231537b4e51b15fa8c781deb27988' + '96274f3f8a2bb807f79e896e28132f58' + 'a31bc07e9bd969665dcf6fe99ac89415' + '29bb94f65797299ca5355f0cb64142aa' + '9f0d68e0fa81beb81a3f905118f02c55' + 'af200de2fc6126e10e73d81dd05047ea' + '60b7717d3306e2fb18b22804719d0fd2' + '15c789baa59d27786d6d1d4c4a7a24ee' + '48841ff67fee9f3e1f1ee8ff485a1bbc' + '77af86e85548ec10486d23c6e2436d46' + '3e6bee3482370be47fd3128f468b806f' + '36d41a4885ebf5d04548a9c38e2d2e9c' + 'fea6e7c1c9f743e348ee5409e0182693' + 'ddea2e6de27762f1ad505e6c43a87349' + '759c0a37cc97aac128b52ec14bc86bb6' + 'bc2e3922c92c3b4fe49fae5ef46a7f7b' + '0a6e0092e9c052b8571ba09bd40b6d4a' + 'db1c3a4581fc893deba60322350593fb' + 'b79bdfa5ef8c65de1787fe1be6c48afa' + 'e4878942c64c3b6da87a84bd87918511' + '77e7b5d62449d5be99865c8ba43183b8' + '878ab3f21c1ae1fef8eb1198ee3e9af6') diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD new file mode 100644 index 000000000..af040596a --- /dev/null +++ b/mozilla-testing/icecat/PKGBUILD @@ -0,0 +1,122 @@ +# Maintainer: Figue <ffigue at gmail> +# Contributor: Figue <ffigue at gmail> +# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor (Parabola): vando <facundo@esdebian.org> +# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Thank you very much to the older contributors: +# Contributor: evr <evanroman at gmail> +# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> + +# If you are updating this package, don't forget to update the version number in +# the value for 'browser.dictionaries.download.url' in 'libre.patch' + +pkgname=icecat +_pkgver=9.0 +pkgver=9.0.1 +pkgrel=1 +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/gnuzilla/" +license=('MPL' 'GPL' 'LGPL') +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'libidl2' + 'mesa' + 'p7zip-libre' + 'pkg-config' + 'python2' + 'wireless_tools' + 'xorg-server-xvfb' + 'yasm' + 'zip' +) +options=(!buildflags !distcc) +install=icecat.install +source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz + mozconfig + mozconfig.old + mozconfig.default + libre.patch + parabola.patch + icecat.desktop + icecat-safe.desktop) + +build() { + ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR + cd "${srcdir}/${pkgname}-${pkgver}" + + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff + patch -Np1 -i "$srcdir/parabola.patch" # Parabola settings + + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in + + export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR" + export PYTHON="/usr/bin/python2" + + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + kill $! || true +} + +package() { + ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR + cd "${srcdir}/${pkgname}-${pkgver}" + + make -j1 -f client.mk DESTDIR="$pkgdir" install + + msg2 "Finishing..." + install -m755 -d "${pkgdir}/usr/share/pixmaps" + install -m644 browser/branding/unofficial/default48.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + + install -m755 -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/icecat.desktop" "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/icecat-safe.desktop" "${pkgdir}/usr/share/applications" + + ln -s "${pkgname}-${pkgver}" "${pkgdir}/usr/lib/${pkgname}-${_pkgver}" # WHY???!!! + ln -s "${pkgname}-${_pkgver}" "${pkgdir}/usr/lib/${pkgname}" + + rm -rf "${pkgdir}${ICECATDIR}/"{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell "${pkgdir}${ICECATDIR}/dictionaries" + ln -sf /usr/share/hyphen "${pkgdir}${ICECATDIR}/hyphenation" + ln -sf /usr/lib/mozilla/plugins "${pkgdir}${ICECATDIR}/plugins" + ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}${ICECATDIR}/searchplugins" + + # We don't want the development stuff + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/${pkgname}-devel-${pkgver}" + rm -rf "${pkgdir}/usr/share/idl" + + # Workaround for now: + # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf "${ICECATDIR}/${pkgname}-bin" "${pkgdir}${ICECATDIR}/$pkgname" +} + +md5sums=('a135581da2fd2845f268d7ca91054c06' + '9c0cd5b45a3c4b04b872b6a900f62286' + '0e5057d9427c6cd5e2f3b78fe34f50d9' + '44959606e4a704e68a913e73fc941926' + '07e65752416e615fe04ce586bc58f86b' + '037b44b6e07d7115e0fb221d67b94272' + 'e81ad01dbc16ba28bf92ba4b7c309ca7' + 'd93fe402b87cd000a869e1fd6badc6c9') diff --git a/mozilla-testing/icecat/icecat-safe.desktop b/mozilla-testing/icecat/icecat-safe.desktop new file mode 100644 index 000000000..87acc970c --- /dev/null +++ b/mozilla-testing/icecat/icecat-safe.desktop @@ -0,0 +1,78 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/icecat -safe-mode %u +Icon=icecat +Type=Application +Terminal=false +MultipleArgs=false +Name=GNU IceCat - Safe Mode +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +MimeType=text/html +StartupNotify=false +Categories=Application;Network; diff --git a/mozilla-testing/icecat/icecat.desktop b/mozilla-testing/icecat/icecat.desktop new file mode 100644 index 000000000..8a7cad93d --- /dev/null +++ b/mozilla-testing/icecat/icecat.desktop @@ -0,0 +1,78 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/icecat %u +Icon=icecat +Type=Application +Terminal=false +MultipleArgs=false +Name=GNU IceCat +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +MimeType=text/html +StartupNotify=false +Categories=Application;Network; diff --git a/extra/abiword/abiword.install b/mozilla-testing/icecat/icecat.install index 2eaa60550..c1fe8284a 100644 --- a/extra/abiword/abiword.install +++ b/mozilla-testing/icecat/icecat.install @@ -1,5 +1,6 @@ post_install() { update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { @@ -9,3 +10,4 @@ post_upgrade() { post_remove() { post_install $1 } + diff --git a/mozilla-testing/icecat/libre.patch b/mozilla-testing/icecat/libre.patch new file mode 100644 index 000000000..c5f59d858 --- /dev/null +++ b/mozilla-testing/icecat/libre.patch @@ -0,0 +1,66 @@ +--- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-26 23:11:39.000000000 -0500 ++++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-26 23:12:15.000000000 -0500 +@@ -74,7 +76,7 @@ + pref("extensions.update.autoUpdateDefault", true); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/9.0.1/"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -876,7 +878,7 @@ + pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); + + // base url for the wifi geolocation network provider +-pref("geo.wifi.uri", "https://www.google.com/loc/json"); ++pref("geo.wifi.uri", "http://geomena.org"); + pref("geo.wifi.protocol", 0); + + // Whether to use a panel that looks like an OS X sheet for customization +--- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 07:34:23.000000000 -0500 ++++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 19:59:04.000000000 -0500 +@@ -1,27 +1,19 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Duck Duck Go (SSL) + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo ++browser.search.order.1=Duck Duck Go (SSL) ++browser.search.order.2=Duck Duck Go (Lite) + +-# This is the default set of web based feed handlers shown in the reader +-# selection UI +-browser.contentHandlers.types.0.title=Bloglines +-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s +-browser.contentHandlers.types.1.title=My Yahoo +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.2.title=Google +-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s + + # 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=https://duckduckgo.com/?q= + + # 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=https://duckduckgo.com/?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 +--- icecat-9.0.1.orig/browser/app/Makefile.in 2011-12-27 00:22:26.000000000 -0500 ++++ icecat-9.0.1/browser/app/Makefile.in 2011-12-27 00:23:10.000000000 -0500 +@@ -269,7 +269,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) + endif + endif + diff --git a/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig new file mode 100644 index 000000000..5a04038be --- /dev/null +++ b/mozilla-testing/icecat/mozconfig @@ -0,0 +1,92 @@ +# We are building the browser +ac_add_options --enable-application=browser +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +# Branding +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial + +# GNUzilla things +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Operating system things +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --with-pthreads + +ac_add_options --enable-toolkit-cairo-gtk2 +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-svg-renderer=cairo + +ac_add_options --disable-toolkit-qt + +ac_add_options --enable-system-cairo +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-system-bz2 +ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-png +ac_add_options --with-system-zlib + +ac_add_options --enable-freetype2 +ac_add_options --enable-pango +ac_add_options --enable-startup-notification + + +# Enable/Disable web technologies +ac_add_options --enable-canvas +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-smil +ac_add_options --enable-svg + +# Enable/Disable "user-y" features +ac_add_options --enable-extensions="default spellcheck" + +ac_add_options --disable-safe-browsing +ac_add_options --enable-url-classifier +ac_add_options --disable-chatzilla +ac_add_options --disable-accessibility +ac_add_options --disable-calendar +ac_add_options --disable-composer + +# Enable/Disable "system-y" features +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-updater + +ac_add_options --disable-gnomevfs +ac_add_options --disable-javaxpcom +ac_add_options --enable-gio +ac_add_options --enable-libnotify +ac_add_options --enable-printing +ac_add_options --enable-xinerama +ac_add_options --enable-xterm-updates + +# Build settings +ac_add_options --disable-mochitest +ac_add_options --disable-pedantic +ac_add_options --disable-static +ac_add_options --disable-tests +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-optimize +ac_add_options --enable-strip + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default new file mode 100644 index 000000000..21aaa0edd --- /dev/null +++ b/mozilla-testing/icecat/mozconfig.default @@ -0,0 +1,70 @@ +# This is a better commented version of the default .mozconfig from 9.0.1 + +# We are building the browser +ac_add_options --enable-application=browser +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +# Branding +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial + +# GNUzilla things +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Operating system things +ac_add_options --prefix=/usr/local +#ac_add_options --with-default-mozilla-five-home=/usr/local/lib +#ac_add_options --with-pthreads + +ac_add_options --enable-toolkit-cairo-gtk2 +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-svg-renderer=cairo + +ac_add_options --disable-toolkit-qt + +ac_add_options --disable-system-cairo +ac_add_options --with-system-jpeg +#ac_add_options --with-system-png +ac_add_options --with-system-zlib + +ac_add_options --enable-freetype2 +ac_add_options --enable-pango + +# Enable/Disable web technologies +ac_add_options --enable-crypto +#ac_add_options --enable-postscript +ac_add_options --enable-svg +ac_add_options --enable-xft + +# Enable/Disable "user-y" features +ac_add_options --enable-extensions="default spellcheck" + +ac_add_options --disable-chatzilla +ac_add_options --disable-accessibility +ac_add_options --disable-calendar +ac_add_options --disable-composer + +# Enable/Disable "system-y" features +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-updater + +#ac_add_options --disable-jsd +#ac_add_options --disable-libxul +ac_add_options --disable-ipc +ac_add_options --disable-ldap +ac_add_options --disable-mailnews +ac_add_options --disable-negotiateauth +ac_add_options --disable-profilesharing +ac_add_options --disable-xinerama +ac_add_options --disable-xprint + +# Build settings +ac_add_options --disable-elf-dynstr-gc +ac_add_options --disable-mochitest +ac_add_options --disable-tests +ac_add_options --enable-optimize="-pipe -O3" +ac_add_options --enable-strip diff --git a/mozilla-testing/icecat/mozconfig.old b/mozilla-testing/icecat/mozconfig.old new file mode 100644 index 000000000..3ae3e1c2e --- /dev/null +++ b/mozilla-testing/icecat/mozconfig.old @@ -0,0 +1,85 @@ +# This is a better commented version of the .mozconfig used by the Parabola +# package < v9 + +# We are building the browser +. $topsrcdir/browser/config/mozconfig + +# Branding +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial + +# GNUzilla things +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Operating system things +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --with-pthreads + +ac_add_options --enable-default-toolkit=cairo-gtk2 + + +ac_add_options --enable-system-cairo +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-system-bz2 +ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-png +ac_add_options --with-system-zlib + +ac_add_options --enable-pango +ac_add_options --enable-startup-notification + + +# Enable/Disable web technologies +ac_add_options --enable-canvas +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-smil +ac_add_options --enable-svg + +# Enable/Disable "user-y" features +ac_add_options --enable-extensions=default + +ac_add_options --disable-safe-browsing +ac_add_options --enable-url-classifier + +# Enable/Disable "system-y" features +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-update + +ac_add_options --disable-gnomevfs +ac_add_options --disable-javaxpcom +ac_add_options --enable-gio +ac_add_options --enable-libnotify +ac_add_options --enable-printing +ac_add_options --enable-xinerama +ac_add_options --enable-xterm-updates + +# Build settings +ac_add_options --disable-mochitest +ac_add_options --disable-pedantic +ac_add_options --disable-static +ac_add_options --disable-tests +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-optimize +ac_add_options --enable-strip + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/mozilla-testing/icecat/parabola.patch b/mozilla-testing/icecat/parabola.patch new file mode 100644 index 000000000..b8000c3ea --- /dev/null +++ b/mozilla-testing/icecat/parabola.patch @@ -0,0 +1,22 @@ +diff -ru icecat-9.0.1.orig/browser/app/profile/firefox.js icecat-9.0.1/browser/app/profile/firefox.js +--- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-27 00:11:30.000000000 -0500 ++++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-27 00:11:39.000000000 -0500 +@@ -48,6 +48,8 @@ + #endif + #endif + ++pref("general.startup.browser", true); ++ + pref("browser.chromeURL","chrome://browser/content/"); + pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul"); + +@@ -487,6 +489,9 @@ + pref("browser.gesture.twist.left", ""); + pref("browser.gesture.tap", "cmd_fullZoomReset"); + ++// Use LANG environment variable to choose locale ++pref("intl.locale.matchOS", true); ++ + // 0=lines, 1=pages, 2=history , 3=text size + #ifdef XP_MACOSX + // On OS X, if the wheel has one axis only, shift+wheel comes through as a diff --git a/mozilla-testing/iceweasel-i18n/Makefile b/mozilla-testing/iceweasel-i18n/Makefile new file mode 100644 index 000000000..a0a767c3d --- /dev/null +++ b/mozilla-testing/iceweasel-i18n/Makefile @@ -0,0 +1,36 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - pacman +# - sed + +default: PHONY all +all: PHONY + $(MAKE) clean + $(MAKE) PKGBUILD +.PRECIOUS: PKGBUILD + +PKGBUILD.g: Makefile + sed \ + -e '/This line is here/,$$d' \ + -e 's/^pkgname=/_pkgname=/' \ + PKGBUILD > $@ + echo 'pkgname=foo' >> $@ + echo 'package() { exit 0; }' >> $@ + makepkg -gp $@ >> $@ +langpacks.txt: PKGBUILD.g Makefile + makepkg -dp $< + ls src/*/upstream | sed 's/\.xpi//' > $@ +PKGBUILD: langpacks.txt Makefile + sed \ + -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \ + -e '/md5sums/,$$d' \ + $@ > $@.$$$$ && \ + makepkg -g >> $@.$$$$ && \ + mv $@.$$$$ $@ + +clean: PHONY + rm -f PKGBUILD.g langpacks.txt + +.PHONY: PHONY FORCE diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD new file mode 100644 index 000000000..45555b019 --- /dev/null +++ b/mozilla-testing/iceweasel-i18n/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +# When updating to a newer upstream release: +# - Update pkgver= and _deb*= below. +# - Run "make". This will do everything else for you. + +# We're getting this from Debian Sid +_debname=iceweasel-l10n +_debver=9.0+debian +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=(af ak ar ast as be bg bn-BD bn-IN br bs ca cs cy da de dz-BT el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa-IR fa fi fr fur-IT fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja ka kk kn ko ku lg lt lv mai mk ml mn mr nb-NO ne-NP nl nn-NO nso oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) + +pkgbase=iceweasel-i18n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=9.0 +pkgver=${_debver}.${_debrel} +pkgrel=1 + + +pkgdesc="Language packs for Debian Iceweasel." +arch=('any') +url="http://www.geticeweasel.org/" +license=('MPL') +depends=("iceweasel=${_pkgver}") +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz") +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +build() { + cd "${srcdir}" + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + cd "${_debname}-${_debver}" + patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff" +} + +_path="/usr/lib/iceweasel-${_pkgver}/extensions" + +# This line is here for auto-regeneration purposes. DO NOT EDIT! + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + +md5sums=('d0dc0653b9d7642e6d346b54fb1782ae' + '493920a716fa40daeb5bd8cdfdbfe6a6') diff --git a/mozilla-testing/iceweasel/PKGBUILD b/mozilla-testing/iceweasel/PKGBUILD new file mode 100644 index 000000000..992476d43 --- /dev/null +++ b/mozilla-testing/iceweasel/PKGBUILD @@ -0,0 +1,135 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Henry Jensen <hjensen@connochaetos.org> + +# We're getting this from Debian Sid +_debname=iceweasel +_debver=9.0.1 +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=iceweasel +pkgname=iceweasel +_pkgver=9.0 +pkgver=${_debver}.${_debrel} +pkgrel=1 + +pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." +arch=('i586' 'i686' 'x86_64' 'mips64el') +url="http://www.geticeweasel.org/" +license=('GPL2' 'MPL' 'LGPL') +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'libidl2' + 'mesa' + 'p7zip-libre' + 'pkg-config' + 'python2' + 'quilt' + 'wireless_tools' + 'yasm' + 'zip' +) +options=(!buildflags !distcc) +install=iceweasel.install +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + mozconfig + libre.patch + # Default configuration + mozilla-firefox-1.0-lang.patch + xulrunner-copy-stub.patch + region.properties) + +build() { + msg2 "Applying Debian patches..." + cd "${srcdir}" + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_debname}-${_debver}" + mv debian "${_debname}-${_debver}" + cd "${_debname}-${_debver}" + quilt push -a + find .pc -name .timestamp -delete # why isn't --no-timestamps doing this? + + # This will make life more sane + cd "${srcdir}" + ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}" + + msg2 "Starting normal build..." + cd "${srcdir}/${_pkgname}-${pkgver}/" + patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch" + patch -p1 -i "${srcdir}/libre.patch" + + cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ + + msg2 "Starting build..." + + cp "${srcdir}/mozconfig" .mozconfig + #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + ./configure + #touch config* + make MOZ_MAKE_FLAGS="${MAKEFLAGS}" + + msg2 "Build complete" +} + +package() { + + cd "${srcdir}/${_pkgname}-${pkgver}/" + #make -j1 -f client.mk DESTDIR="${pkgdir}" install + make install DESTDIR="${pkgdir}" + + msg2 "Finishing..." + + install -m755 -d ${pkgdir}/usr/share/applications + install -m755 -d ${pkgdir}/usr/share/pixmaps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps + + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1 + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg + + + rm -rf ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins + ln -sf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins + + rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver} + rm -rvf ${pkgdir}/usr/include + +} + +md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d' + '6cde9fe38df1434fdcc0f3a078b0238e' + '5e2574eef71ee1437e2f8e7481c67893' + '9609e77182cc300e3fe9d4b0c7e7efb4' + 'bd5db57c23c72a02a489592644f18995' + 'a485a2b5dc544a8a2bd40c985d2e5813' + 'f1c76e7e244257856a386ca2de69bdf0') diff --git a/mozilla-testing/iceweasel/iceweasel.install b/mozilla-testing/iceweasel/iceweasel.install new file mode 100644 index 000000000..376600ec2 --- /dev/null +++ b/mozilla-testing/iceweasel/iceweasel.install @@ -0,0 +1,21 @@ +#[ "${ICDIR}" = "" ] && ICECATDIR="/usr/lib/icecat" +post_install () { + echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session" + echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/iceweasel* directories" + update-desktop-database -q +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} + +#op=$1 +#shift + +#$op $* diff --git a/mozilla-testing/iceweasel/libre.patch b/mozilla-testing/iceweasel/libre.patch new file mode 100644 index 000000000..e29e22a67 --- /dev/null +++ b/mozilla-testing/iceweasel/libre.patch @@ -0,0 +1,391 @@ +diff -urN iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-21 12:55:22.404066176 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // 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-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 12:55:28.116066178 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // 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-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:35.104062780 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // 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.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-16 20:29:37.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:43.184062783 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // 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.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", ""); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -234,7 +234,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -324,7 +324,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -563,7 +563,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // 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-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/browser/base/content/syncSetup.js +--- iceweasel-9.0-orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000 +@@ -59,7 +59,7 @@ + // Broader than we'd like, but after this changed from api-secure.recaptcha.net + // we had no choice. At least we only do this for the duration of setup. + // See discussion in Bugs 508112 and 653307. +-const RECAPTCHA_DOMAIN = "https://www.google.com"; ++const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com"; + + Cu.import("resource://services-sync/main.js"); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties +--- iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # 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 + +@@ -17,7 +17,7 @@ + # 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} + + # 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 +diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in +--- iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000 +@@ -11,14 +11,12 @@ + <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> + <DD>@bookmarks_toolbarfolder_description@ + <DL><p> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> +- <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A> ++ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</a> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</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> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" 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:#$42iCK1">@firefox_community@</A> +- <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> + </DL><p> + </DL><p> +diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html +--- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +@@ -143,7 +143,7 @@ + </p> + <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> + </p> + <p> + <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> +diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul +--- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 ++++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 +@@ -301,6 +301,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + </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"/> + <label id="messageLog" value="" crop="center"/> + </window> +diff -urN iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0/layout/ipc/test-ipcbrowser.xul +--- iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000 ++++ iceweasel-9.0/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000 +@@ -69,6 +69,6 @@ + label="setViewportScale"/> + </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" + remote="true"/> + </window> +diff -urN iceweasel-9.0-orig/mobile/app/mobile.js iceweasel-9.0/mobile/app/mobile.js +--- iceweasel-9.0-orig/mobile/app/mobile.js 2011-12-16 20:29:36.000000000 +0000 ++++ iceweasel-9.0/mobile/app/mobile.js 2011-12-21 10:04:04.976062646 +0000 +@@ -217,12 +217,13 @@ + /* preferences for the Get Add-ons pane */ + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%"); +-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/"); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++ ++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); + + /* preference for the locale picker */ + pref("extensions.getLocales.get.url", ""); +@@ -239,7 +240,7 @@ + pref("privacy.popups.showBrowserMessage", true); + + 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("accessibility.typeaheadfind", false); + pref("accessibility.typeaheadfind.timeout", 5000); +diff -urN iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0/mobile/locales/en-US/chrome/region.properties +--- iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000 ++++ iceweasel-9.0/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google ++browser.search.order.1=DuckDuckGo + + # 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 + + # 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= + + # 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 +diff -urN iceweasel-9.0-orig/modules/libpref/src/init/all.js iceweasel-9.0/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // 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.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties +--- iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000 ++++ iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000 +@@ -4,10 +4,10 @@ + pluginStartupMessage=Starting Plugin for type + + # plug-ins URLs +-more_plugins_label=mozilla.org +-more_plugins_url=https://pfs.mozilla.org/plugins/ +-pluginupdates_label=mozilla.com/plugincheck +-pluginupdates_url=http://www.mozilla.com/plugincheck/ +-plugindoc_label=plugindoc.mozdev.org +-plugindoc_url=http://plugindoc.mozdev.org/ ++more_plugins_label=gnuzilla.gnu.org ++more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html ++pluginupdates_label=gnuzilla.gnu.org ++pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html ++plugindoc_label=gnuzilla.gnu.org ++plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html + diff --git a/mozilla-testing/iceweasel/mozconfig b/mozilla-testing/iceweasel/mozconfig new file mode 100644 index 000000000..8344f6967 --- /dev/null +++ b/mozilla-testing/iceweasel/mozconfig @@ -0,0 +1,39 @@ +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +#ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-pthreads +ac_add_options --enable-optimize +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-strip +ac_add_options --enable-pango +#ac_add_options --enable-system-cairo +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-libxul +ac_add_options --disable-crashreporter +ac_add_options --disable-safe-browsing +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-xprint +ac_add_options --disable-installer +ac_add_options --disable-libnotify +ac_add_options --disable-pedantic +ac_add_options --disable-gnomevfs +ac_add_options --disable-mochitest +ac_add_options --disable-updater +ac_add_options --with-default-mozilla-five-home=/usr/lib/iceweasel + +ac_add_options --with-branding=debian/branding +ac_add_options --build=i586-pc-linux-gnu +ac_add_options --host=i586-pc-linux-gnu + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +export USE_SHORT_LIBNAME=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options USE_SHORT_LIBNAME=1 diff --git a/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch b/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch new file mode 100644 index 000000000..f0f7325a5 --- /dev/null +++ b/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch @@ -0,0 +1,12 @@ +--- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100 ++++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100 +@@ -253,6 +253,9 @@ + pref("font.language.group", "chrome://global/locale/intl.properties"); + pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); + ++// Use LANG environment variable to choose locale ++pref("intl.locale.matchOS", true); ++ + // 0=lines, 1=pages, 2=history , 3=text size + pref("mousewheel.withcontrolkey.action",3); + pref("mousewheel.withshiftkey.action",2); diff --git a/mozilla-testing/iceweasel/region.properties b/mozilla-testing/iceweasel/region.properties new file mode 100644 index 000000000..2e980987e --- /dev/null +++ b/mozilla-testing/iceweasel/region.properties @@ -0,0 +1,23 @@ +# Default search engine +browser.search.defaultenginename=Duck Duck Go (SSL) + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=Duck Duck Go (SSL) +browser.search.order.2=Duck Duck Go (Lite) + + +# Keyword URL (for location bar searches) +keyword.URL=https://duckduckgo.com/?q= + +# 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=https://duckduckgo.com/?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 +# profile database. Note that "new" is defined as "has a different URL"; this +# means that it's not possible to update the name of existing handler, so +# don't make any spelling errors here. +#gecko.handlerService.defaultHandlersVersion=3 diff --git a/mozilla-testing/iceweasel/xulrunner-copy-stub.patch b/mozilla-testing/iceweasel/xulrunner-copy-stub.patch new file mode 100644 index 000000000..e3b8e9376 --- /dev/null +++ b/mozilla-testing/iceweasel/xulrunner-copy-stub.patch @@ -0,0 +1,11 @@ +--- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 ++++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 +@@ -257,7 +257,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) + endif + endif + diff --git a/mozilla-testing/mozilla-searchplugins/PKGBUILD b/mozilla-testing/mozilla-searchplugins/PKGBUILD new file mode 100644 index 000000000..c86c9514a --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net +# Contributor: Figue <ffigue at gmail> +# Contributor: Figue <ffigue at gmail> +# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor (Parabola): vando <facundo@esdebian.org> +# 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 +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 + wikipedia.xml + yacy.xml +) + +package() { + install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" +} + +md5sums=('e1bda0854de7d764f7401c81bb82b5ef' + 'c5f00b6b24222aacd5a749d1f59c4d24' + '462c68585461f8cdc23c93c46f6ee4cf' + '2d492295c4308f9bba9ece28d8b3af2d' + '937ac0e5392b060d93bd33e761fbfa51' + 'cf97082e77e3ef5f1bd74b1db9329965' + 'c35f4971feff8387e0570d7a165eb6fa' + '24528ca3f7f1e1a0ba735231aa3ac1de') diff --git a/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml b/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml new file mode 100644 index 000000000..3142d3410 --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.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>Duck Duck Go (Lite)</os:ShortName> +<os:Description>Search Duck Duck Go (Lite)</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image> +<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml b/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml new file mode 100644 index 000000000..4fb1391ab --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.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>Duck Duck Go (SSL)</os:ShortName> +<os:Description>Search Duck Duck Go (SSL)</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image> +<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/mozilla-testing/mozilla-searchplugins/internet-archive.xml b/mozilla-testing/mozilla-searchplugins/internet-archive.xml new file mode 100644 index 000000000..1556a2d8c --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/internet-archive.xml @@ -0,0 +1,12 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Internet Archive</os:ShortName> +<os:Description>Search www.archive.org</os:Description> +<os:InputEncoding>ISO-8859-1</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7</os:Image> +<UpdateInterval>7</UpdateInterval> +<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.src</UpdateUrl> +<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.gif</IconUpdateUrl> +<SearchForm>http://www.archive.org/</SearchForm> +<os:Url type="text/html" method="GET" template="http://www.archive.org/search.php?sourceid=Mozilla-search&query={searchTerms}&sort=-%2Fadditional%2Fitem%2Fdownloads"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/mozilla-testing/mozilla-searchplugins/jamendo-en.xml b/mozilla-testing/mozilla-searchplugins/jamendo-en.xml new file mode 100644 index 000000000..91d6df6e4 --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/jamendo-en.xml @@ -0,0 +1,12 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Jamendo (en)</os:ShortName> +<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg==</os:Image> +<UpdateInterval>7</UpdateInterval> +<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl> +<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico</IconUpdateUrl> +<SearchForm>http://www.jamendo.com/en</SearchForm> +<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search/all/{searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/mozilla-testing/mozilla-searchplugins/logless-search.xml b/mozilla-testing/mozilla-searchplugins/logless-search.xml new file mode 100644 index 000000000..1538d1ef0 --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/logless-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>Logless Search</os:ShortName> +<os:Description>Use logless.com to search the Internet in privacy, with no search logs.</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</os:Image> +<os:Url type="text/html" method="GET" template="http://www.logless.com/?q={searchTerms}"> +</os:Url> +</SearchPlugin> diff --git a/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml b/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml new file mode 100644 index 000000000..f817dce40 --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml @@ -0,0 +1,14 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Scroogle SSL English</os:ShortName> +<os:Description>Scroogle SSL English</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA</os:Image> +<UpdateInterval>7</UpdateInterval> +<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml</UpdateUrl> +<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico</IconUpdateUrl> +<SearchForm>https://ssl.scroogle.org/scrapen8.html</SearchForm> +<os:Url type="text/html" method="GET" template="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi"> + <os:Param name="Gw" value="{searchTerms}"/> + <os:Param name="l" value="en"/> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/mozilla-testing/mozilla-searchplugins/wikipedia.xml b/mozilla-testing/mozilla-searchplugins/wikipedia.xml new file mode 100644 index 000000000..36b8ed494 --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/wikipedia.xml @@ -0,0 +1,15 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>Wikipedia (en)</ShortName> +<Description>Wikipedia, the free encyclopedia</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image> +<Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php"> + <Param name="action" value="opensearch"/> + <Param name="search" value="{searchTerms}"/> +</Url> +<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search"> + <Param name="search" value="{searchTerms}"/> + <Param name="sourceid" value="Mozilla-search"/> +</Url> +<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm> +</SearchPlugin> diff --git a/mozilla-testing/mozilla-searchplugins/yacy.xml b/mozilla-testing/mozilla-searchplugins/yacy.xml new file mode 100644 index 000000000..61201ad20 --- /dev/null +++ b/mozilla-testing/mozilla-searchplugins/yacy.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>YaCy</os:ShortName> +<os:Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer 'kupferhammer-keller'.</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00</os:Image> +<os:Url type="text/html" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.html?query={searchTerms}"> +</os:Url><os:Url type="application/rss+xml" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.rss?query={searchTerms}&maximumRecords=10&verify=false"> +</os:Url> +</SearchPlugin> diff --git a/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch b/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch new file mode 100644 index 000000000..808cf8d7c --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch @@ -0,0 +1,27 @@ +From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Fri, 7 Oct 2011 09:31:27 +0200 +Subject: [PATCH] Horrible workaround for horribly broken software + +--- + elf/rtld.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 978c609..8422b9f 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\ + char *copy = malloc (len); + if (copy == NULL) + _dl_fatal_printf ("out of memory\n"); +- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len); ++ l->l_libname->name = memcpy (copy, dsoname, len); ++ if (GLRO(dl_debug_mask)) ++ l->l_name = copy; + } + + /* Add the vDSO to the object list. */ +-- +1.7.3.4 + diff --git a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch new file mode 100644 index 000000000..f532b95e8 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch @@ -0,0 +1,229 @@ +diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 +@@ -137,7 +137,6 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 18f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx + movl %ebp, %edx + xorl %esi, %esi +@@ -151,9 +150,6 @@ __pthread_cond_wait: + sete 16(%esp) + je 19f + +- cmpl $-EAGAIN, %eax +- je 91f +- + /* Normal and PI futexes dont mix. Use normal futex functions only + if the kernel does not support the PI futex functions. */ + cmpl $-ENOSYS, %eax +@@ -398,78 +394,6 @@ __pthread_cond_wait: + #endif + call __lll_unlock_wake + jmp 11b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- +- /* Get internal lock. */ +- movl $1, %edx +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %edx, (%ebx) +-#else +- cmpxchgl %edx, cond_lock(%ebx) +-#endif +- jz 92f +- +-#if cond_lock == 0 +- movl %ebx, %edx +-#else +- leal cond_lock(%ebx), %edx +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_lock_wait +- +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- addl $1, cond_futex(%ebx) +- movl cond_futex(%ebx), %ebp +- +- /* Unlock. */ +- LOCK +-#if cond_lock == 0 +- subl $1, (%ebx) +-#else +- subl $1, cond_lock(%ebx) +-#endif +- je 93f +-#if cond_lock == 0 +- movl %ebx, %eax +-#else +- leal cond_lock(%ebx), %eax +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_unlock_wake +- +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorl %ecx, %ecx +- movl dep_mutex(%ebx), %edi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -642,10 +566,6 @@ __condvar_w_cleanup: + .long .LcleanupEND-.Lsub_cond_futex + .long __condvar_w_cleanup-.LSTARTCODE + .uleb128 0 +- .long .LcleanupSTART2-.LSTARTCODE +- .long .LcleanupEND2-.LcleanupSTART2 +- .long __condvar_w_cleanup-.LSTARTCODE +- .uleb128 0 + .long .LcallUR-.LSTARTCODE + .long .LENDCODE-.LcallUR + .long 0 +Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig +diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000 +@@ -23,7 +23,6 @@ + #include <lowlevelcond.h> + #include <tcb-offsets.h> + #include <pthread-pi-defines.h> +-#include <pthread-errnos.h> + + #include <kernel-features.h> + +@@ -137,14 +136,11 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 61f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi + movl $SYS_futex, %eax + syscall + + movl $1, %r8d +- cmpq $-EAGAIN, %rax +- je 91f + #ifdef __ASSUME_REQUEUE_PI + jmp 62f + #else +@@ -331,70 +327,6 @@ __pthread_cond_wait: + + 13: movq %r10, %rax + jmp 14b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- movq 8(%rsp), %rdi +- +- /* Get internal lock. */ +- movl $1, %esi +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %esi, (%rdi) +-#else +- cmpxchgl %esi, cond_lock(%rdi) +-#endif +- jz 92f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- callq __lll_lock_wait +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- incl cond_futex(%rdi) +- movl cond_futex(%rdi), %edx +- +- /* Release internal lock. */ +- LOCK +-#if cond_lock == 0 +- decl (%rdi) +-#else +- decl cond_lock(%rdi) +-#endif +- jz 93f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- /* The call preserves %rdx. */ +- callq __lll_unlock_wake +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorq %r10, %r10 +- movq dep_mutex(%rdi), %r8 +- leaq cond_futex(%rdi), %rdi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -547,15 +479,11 @@ __condvar_cleanup1: + .uleb128 .LcleanupSTART-.LSTARTCODE + .uleb128 .LcleanupEND-.LcleanupSTART + .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 +- .uleb128 .LcleanupSTART2-.LSTARTCODE +- .uleb128 .LcleanupEND2-.LcleanupSTART2 +- .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 ++ .uleb128 0 + .uleb128 .LcallUR-.LSTARTCODE + .uleb128 .LENDCODE-.LcallUR + .uleb128 0 +- .uleb128 0 ++ .uleb128 0 + .Lcstend: + + +Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig +Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej diff --git a/social/ahcpd/PKGBUILD b/social/ahcpd/PKGBUILD new file mode 100644 index 000000000..a2f1e336f --- /dev/null +++ b/social/ahcpd/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Yann Lopez <arch at lonewulf dot net> +pkgname=ahcpd +pkgver=0.53 +pkgrel=1 +pkgdesc="Ad-Hoc Configuration Protocol" +arch=(i686 x86_64 mips64el) +url="http://www.pps.jussieu.fr/~jch/software/ahcp/" +license=('custom') +depends=('sh') +source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's/\$(PREFIX)\/man/$(PREFIX)\/share\/man/g' Makefile + make PREFIX="/usr" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make install TARGET=${pkgdir} PREFIX=/usr + + install -d $pkgdir/usr/share/licenses/ahcpd + install -m 644 LICENCE $pkgdir/usr/share/licenses/ahcpd/ +} +md5sums=('a1a610bf20965aa522cd766bf3d5829a') diff --git a/testing/glibc/glibc-2.15-lddebug-scopes.patch b/testing/glibc/glibc-2.15-lddebug-scopes.patch new file mode 100644 index 000000000..808cf8d7c --- /dev/null +++ b/testing/glibc/glibc-2.15-lddebug-scopes.patch @@ -0,0 +1,27 @@ +From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Fri, 7 Oct 2011 09:31:27 +0200 +Subject: [PATCH] Horrible workaround for horribly broken software + +--- + elf/rtld.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 978c609..8422b9f 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\ + char *copy = malloc (len); + if (copy == NULL) + _dl_fatal_printf ("out of memory\n"); +- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len); ++ l->l_libname->name = memcpy (copy, dsoname, len); ++ if (GLRO(dl_debug_mask)) ++ l->l_name = copy; + } + + /* Add the vDSO to the object list. */ +-- +1.7.3.4 + diff --git a/testing/glibc/glibc-2.15-revert-c5a0802a.patch b/testing/glibc/glibc-2.15-revert-c5a0802a.patch new file mode 100644 index 000000000..f532b95e8 --- /dev/null +++ b/testing/glibc/glibc-2.15-revert-c5a0802a.patch @@ -0,0 +1,229 @@ +diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 +@@ -137,7 +137,6 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 18f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx + movl %ebp, %edx + xorl %esi, %esi +@@ -151,9 +150,6 @@ __pthread_cond_wait: + sete 16(%esp) + je 19f + +- cmpl $-EAGAIN, %eax +- je 91f +- + /* Normal and PI futexes dont mix. Use normal futex functions only + if the kernel does not support the PI futex functions. */ + cmpl $-ENOSYS, %eax +@@ -398,78 +394,6 @@ __pthread_cond_wait: + #endif + call __lll_unlock_wake + jmp 11b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- +- /* Get internal lock. */ +- movl $1, %edx +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %edx, (%ebx) +-#else +- cmpxchgl %edx, cond_lock(%ebx) +-#endif +- jz 92f +- +-#if cond_lock == 0 +- movl %ebx, %edx +-#else +- leal cond_lock(%ebx), %edx +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_lock_wait +- +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- addl $1, cond_futex(%ebx) +- movl cond_futex(%ebx), %ebp +- +- /* Unlock. */ +- LOCK +-#if cond_lock == 0 +- subl $1, (%ebx) +-#else +- subl $1, cond_lock(%ebx) +-#endif +- je 93f +-#if cond_lock == 0 +- movl %ebx, %eax +-#else +- leal cond_lock(%ebx), %eax +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_unlock_wake +- +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorl %ecx, %ecx +- movl dep_mutex(%ebx), %edi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -642,10 +566,6 @@ __condvar_w_cleanup: + .long .LcleanupEND-.Lsub_cond_futex + .long __condvar_w_cleanup-.LSTARTCODE + .uleb128 0 +- .long .LcleanupSTART2-.LSTARTCODE +- .long .LcleanupEND2-.LcleanupSTART2 +- .long __condvar_w_cleanup-.LSTARTCODE +- .uleb128 0 + .long .LcallUR-.LSTARTCODE + .long .LENDCODE-.LcallUR + .long 0 +Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig +diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000 +@@ -23,7 +23,6 @@ + #include <lowlevelcond.h> + #include <tcb-offsets.h> + #include <pthread-pi-defines.h> +-#include <pthread-errnos.h> + + #include <kernel-features.h> + +@@ -137,14 +136,11 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 61f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi + movl $SYS_futex, %eax + syscall + + movl $1, %r8d +- cmpq $-EAGAIN, %rax +- je 91f + #ifdef __ASSUME_REQUEUE_PI + jmp 62f + #else +@@ -331,70 +327,6 @@ __pthread_cond_wait: + + 13: movq %r10, %rax + jmp 14b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- movq 8(%rsp), %rdi +- +- /* Get internal lock. */ +- movl $1, %esi +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %esi, (%rdi) +-#else +- cmpxchgl %esi, cond_lock(%rdi) +-#endif +- jz 92f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- callq __lll_lock_wait +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- incl cond_futex(%rdi) +- movl cond_futex(%rdi), %edx +- +- /* Release internal lock. */ +- LOCK +-#if cond_lock == 0 +- decl (%rdi) +-#else +- decl cond_lock(%rdi) +-#endif +- jz 93f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- /* The call preserves %rdx. */ +- callq __lll_unlock_wake +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorq %r10, %r10 +- movq dep_mutex(%rdi), %r8 +- leaq cond_futex(%rdi), %rdi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -547,15 +479,11 @@ __condvar_cleanup1: + .uleb128 .LcleanupSTART-.LSTARTCODE + .uleb128 .LcleanupEND-.LcleanupSTART + .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 +- .uleb128 .LcleanupSTART2-.LSTARTCODE +- .uleb128 .LcleanupEND2-.LcleanupSTART2 +- .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 ++ .uleb128 0 + .uleb128 .LcallUR-.LSTARTCODE + .uleb128 .LENDCODE-.LcallUR + .uleb128 0 +- .uleb128 0 ++ .uleb128 0 + .Lcstend: + + +Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig +Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej diff --git a/testing/graphicsmagick/PKGBUILD b/testing/graphicsmagick/PKGBUILD new file mode 100644 index 000000000..962bd3cc6 --- /dev/null +++ b/testing/graphicsmagick/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 145647 2011-12-26 08:27:47Z bisson $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Anton Leontiev <bunder@t-25.ru> + +pkgname=graphicsmagick +pkgver=1.3.13 +pkgrel=1 +pkgdesc='Image processing system' +url='http://www.graphicsmagick.org/' +arch=('i686' 'x86_64') +license=('MIT') +makedepends=('perl') +depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' + 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") +sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6') + +build() { + cd "${srcdir}/GraphicsMagick-$pkgver" + + ./configure \ + --prefix=/usr \ + --with-perl \ + --enable-shared \ + --disable-static \ + --with-gs-font-dir=/usr/share/fonts/Type1 \ + + make +} + +package() { + cd "${srcdir}/GraphicsMagick-$pkgver" + + make DESTDIR="${pkgdir}" install + + # Install MIT license + install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/$pkgname/Copyright.txt" + + # Install perl bindings + # The patching was introduced in order to build perl module without installing package itself and + # not to introduce unnecessary path into LD_RUN_PATH + cd PerlMagick + sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL + perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}" + sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile + make + make install + + # Remove perllocal.pod and .packlist + rm -rf "${pkgdir}/usr/lib/perl5/core_perl" + rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist" +} diff --git a/testing/ntp/PKGBUILD b/testing/ntp/PKGBUILD new file mode 100644 index 000000000..92fee77b1 --- /dev/null +++ b/testing/ntp/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 145678 2011-12-27 02:24:38Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> + +pkgname=ntp +pkgver=4.2.6.p5 +_realver=4.2.6p5 +pkgrel=2 +pkgdesc='Network Time Protocol reference implementation' +url='http://www.ntp.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('openssl' 'readline' 'libcap') +makedepends=('perl-html-parser') +backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" + 'ntpd' + 'ntpdate' + 'ntp.conf' + 'ntpd.conf') +sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' + '4e324e625c1f080b5c028be5092aa71adbf9bd99' + '01394b8a952f5edc85d19df8335eeac3980320f4' + 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e' + '6cfcb7bbd34499b30e31dffca2f3e1a036010271') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${_realver}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-linux-caps \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-$_realver" + + make DESTDIR="${pkgdir}" install + + install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd + install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate + install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf + install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf + + cd html + ../scripts/html2man + install -d "${pkgdir}"/usr/share/man + mv man/man* "${pkgdir}"/usr/share/man + mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + cd .. + + rmdir "${pkgdir}"/usr/{lib,sbin} + install -d "${pkgdir}/var/lib/ntp" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + touch "${pkgdir}"/var/lib/ntp/.placeholder +} diff --git a/testing/ntp/install b/testing/ntp/install new file mode 100644 index 000000000..926b4126e --- /dev/null +++ b/testing/ntp/install @@ -0,0 +1,19 @@ +post_upgrade() { + if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then + cat <<EOF + +==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf +==> If you made changes to the former, please update the latter. + +EOF + fi + if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then + cat <<EOF + +==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid +==> and the new rc.d script only takes the latter into account. +==> To stop your old ntpd process, please kill it manually. + +EOF + fi +} diff --git a/testing/ntp/ntp.conf b/testing/ntp/ntp.conf new file mode 100644 index 000000000..49b2f2bb7 --- /dev/null +++ b/testing/ntp/ntp.conf @@ -0,0 +1,23 @@ +# With the default settings below, ntpd will only synchronize your clock. +# +# For details, see: +# - the ntp.conf man page +# - http://support.ntp.org/bin/view/Support/GettingStarted +# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon + +# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/ +server 0.pool.ntp.org +server 1.pool.ntp.org +server 2.pool.ntp.org + +# Only allow read-only access from localhost +restrict default nomodify nopeer +restrict 127.0.0.1 +restrict ::1 + +# Location of drift and log files +driftfile /var/lib/ntp/ntp.drift +logfile /var/log/ntp.log + +# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing +# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/testing/ntp/ntpd b/testing/ntp/ntpd new file mode 100755 index 000000000..480fa1088 --- /dev/null +++ b/testing/ntp/ntpd @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/ntpd.conf + +unset PID +PIDFILE='/run/ntpd.pid' + +if [[ -r ${PIDFILE} ]]; then + read -r PID <"${PIDFILE}" + if [[ -n ${PID} && ! -d /proc/${PID} ]]; then + rm -f "${PIDFILE}" + unset PID + fi +fi + +case "$1" in + start) + stat_busy "Starting NTP Daemon" + if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then + add_daemon ntpd + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping NTP Daemon" + if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then + rm ${PIDFILE} + rm_daemon ntpd + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/ntp/ntpd.conf b/testing/ntp/ntpd.conf new file mode 100644 index 000000000..e728db579 --- /dev/null +++ b/testing/ntp/ntpd.conf @@ -0,0 +1,5 @@ +# client options for "ntpd -q" - ntpdate equivalent +NTP_CLIENT_OPTION="-g" + +# arguments passed to ntpd when started +NTPD_ARGS="-g" diff --git a/testing/ntp/ntpdate b/testing/ntp/ntpdate new file mode 100755 index 000000000..a8e746785 --- /dev/null +++ b/testing/ntp/ntpdate @@ -0,0 +1,29 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/ntpd.conf + +case "$1" in + start) + stat_busy "Starting NTP Client" + if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then + add_daemon ntpdate + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping NTP Client" + rm_daemon ntpdate + stat_done + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD new file mode 100644 index 000000000..216379b31 --- /dev/null +++ b/testing/valgrind/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 145691 2011-12-27 10:54:37Z allan $ +# Maintainer: Dan McGee <dan@archlinux.org> +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=valgrind +pkgver=3.7.0 +pkgrel=2 +pkgdesc="A tool to help find memory-management problems in programs" +arch=('i686' 'x86_64') +license=('GPL') +url="http://valgrind.org/" +depends=('glibc>=2.15' 'glibc<2.16' 'perl') +makedepends=('gdb') +options=('!emptydirs') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 + valgrind-3.7.0-glibc-2.15.patch) +md5sums=('a855fda56edf05614f099dca316d1775' + 'f534b79b358cdced0319b375aafde4d5') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch + + if [ "${CARCH}" = "x86_64" ]; then + ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit + else + ./configure --prefix=/usr --mandir=/usr/share/man + fi + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch b/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch new file mode 100644 index 000000000..fa400b953 --- /dev/null +++ b/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch @@ -0,0 +1,30 @@ +diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure +--- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000 ++++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000 +@@ -6402,6 +6402,17 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.15) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5 ++$as_echo "2.15 family" >&6; } ++ ++$as_echo "#define GLIBC_2_15 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; ++ + darwin) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 + $as_echo "Darwin" >&6; } +@@ -6422,7 +6433,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 + $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } +- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 ++ as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; + esac diff --git a/~fauno/afew/LICENSE b/~fauno/afew/LICENSE new file mode 100644 index 000000000..aab8c3624 --- /dev/null +++ b/~fauno/afew/LICENSE @@ -0,0 +1,15 @@ +# +# Copyright (c) Justus Winter <4winter@informatik.uni-hamburg.de> +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD new file mode 100644 index 000000000..c03ccc7c8 --- /dev/null +++ b/~fauno/afew/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com> +pkgname=afew +pkgver=2011.12.1 +_gitver=20111222 +pkgrel=1 +pkgdesc="afew is an initial tagging script for notmuch mail" +arch=(any) +url="https://github.com/teythoon/afew" +license=('custom:BSD') +depends=('python2' 'notmuch' 'dbacl') +source=("https://repo.parabolagnulinux.org/other/${pkgname}-${_gitver}-${pkgrel}-any.src.tar.gz" + 'LICENSE') + +build() { + cd "$srcdir/$pkgname" + + python2 setup.py build +} + +package() { + cd "$srcdir/$pkgname" + python2 setup.py install --prefix="$pkgdir/usr" + + install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: +md5sums=('e99de6dc7390e22701fa60cfed1a52b8' + '295b245540aa61538f9a3556c4be846c') diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD new file mode 100644 index 000000000..eea293021 --- /dev/null +++ b/~fauno/afew/SRCBUILD @@ -0,0 +1,36 @@ +# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com> +pkgname=afew +pkgver=20111222 +pkgrel=1 +pkgdesc="afew is an initial tagging script for notmuch mail" +arch=(any) +url="https://github.com/teythoon/afew" +license=('custom:BSD') +makedepends=('git') + +_gitroot='https://github.com/teythoon/afew.git' +_gitname='afew' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + +} + +package() { + PKGEXT=${SRCEXT} + PKGDEST=${SRCDEST} + cp -a ${srcdir}/* ${pkgdir}/ +} + +# vim:set ts=2 sw=2 et: + diff --git a/~fauno/dbacl/PKGBUILD b/~fauno/dbacl/PKGBUILD new file mode 100644 index 000000000..a92679444 --- /dev/null +++ b/~fauno/dbacl/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com? +pkgname=dbacl +pkgver=1.12 +pkgrel=1 +pkgdesc="Digramic Bayesian classifier" +arch=('i686' 'x86_64') +url="http://dbacl.sourceforge.net/" +license=('GPL') +depends=('gawk' 'perl') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('048d8cf68e277ba2ab5d159dc395a65d') +sha256sums=('9fcb05a0951527c7b33aeb20735747f84bca88a4e122c93537120d1014f650e9') + +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 + mv "$pkgdir/usr/man" "$pkgdir/usr/share" +} + +# vim:set ts=2 sw=2 et: diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules index 37ea75649..51f80cf54 100644 --- a/~lukeshu/android-udev/51-android.rules +++ b/~lukeshu/android-udev/51-android.rules @@ -19,10 +19,6 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="and # Asus SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" -# Blade -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" - # Dell SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers" @@ -233,4 +229,4 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers" # Blade SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_fastboot" + diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile index 238877f5a..f20930c66 100644 --- a/~lukeshu/android-udev/Makefile +++ b/~lukeshu/android-udev/Makefile @@ -1,4 +1,10 @@ -# Use this to update the package from AUR. +#!/usr/bin/make -f +# Use this script to update the package from AUR. +# This script depends on: +# - coreutils +# - pacman +# - sed +# - wget default: PHONY all all: PHONY 51-android.rules PKGBUILD diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD index f495690bb..6900b46da 100644 --- a/~lukeshu/android-udev/PKGBUILD +++ b/~lukeshu/android-udev/PKGBUILD @@ -10,7 +10,6 @@ arch=('any') url="http://developer.android.com/guide/developing/device.html" license=('unknown') source=('51-android.rules') -md5sums=('818395c180666e4e9a4a5f1d18434674') depends=('udev' 'libmtp') conflicts=('udev-android-rules') install='android-udev.install' @@ -20,3 +19,4 @@ package() { install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules" } +md5sums=('909eb7629683efae838c6e9d65966b3b') diff --git a/~lukeshu/git-svn-abandon-git/PKGBUILD b/~lukeshu/git-svn-abandon-git/PKGBUILD new file mode 100644 index 000000000..51cd83817 --- /dev/null +++ b/~lukeshu/git-svn-abandon-git/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=git-svn-abandon +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="http://blog.woobling.org/2009/06/git-svn-abandon.html" +license=('MIT') +depends=('git') +makedepends=('git' 'python-markdown') + +_gitroot=https://github.com/nothingmuch/git-svn-abandon.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + markdown README.mkdn > README.html +} + +package() { + cd "$srcdir/$_gitname-build" + install -d "$pkgdir/usr/lib/git-core" + install -m755 git-* "$pkgdir/usr/lib/git-core" + + install -D -m644 README.mkdn "$pkgdir/usr/doc/git-svn-abandon/README.md" + install -D -m644 README.html "$pkgdir/usr/doc/git-svn-abandon/README.html" + install -D -m644 LICENSE "$pkgdir/usr/licenses/git-svn-abandon/LICENSE" +} diff --git a/~lukeshu/iceweasel-libre-current/PKGBUILD b/~lukeshu/iceweasel-libre-current/PKGBUILD new file mode 100644 index 000000000..b09d42d90 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/PKGBUILD @@ -0,0 +1,124 @@ +# Maintainer: Henry Jensen <hjensen@connochaetos.org> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=iceweasel +_pkgver=9.0 +_debver=9.0.1 +_debrel='1~bpo60+1' # bpo=backport (from sid to sqeeze) +_repo_url=http://mozilla.debian.net/pool/iceweasel-release/i/iceweasel + +pkgname=$_pkgname-libre-current +pkgver=${_debver}.${_debrel} +pkgrel=1 + +pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." +arch=('i586' 'i686' 'x86_64') +url="http://www.geticeweasel.org/" +license=('GPL2' 'MPL' 'LGPL') +depends=('desktop-file-utils') +makedepends=('zip' 'pkg-config' 'diffutils' 'python' 'wireless_tools' 'yasm' 'mesa' 'quilt') +provides=("${_pkgname}") +conflicts=('firefox' 'icecat' "${_pkgname}") +replaces=('firefox' 'icecat') +install=iceweasel.install +source=("${_repo_url}/iceweasel_${_debver}.orig.tar.bz2" + "${_repo_url}/iceweasel_${_debver}-${_debrel}.debian.tar.gz" + mozconfig + libre.patch + # Search engines + arch-linux-wiki.xml + internet-archive.xml + jamendo-en.xml + logless-search.xml + scroogle-ssl-english.xml + yacy.xml + duck-duck-go-ssl.xml + duck-duck-go-lite.xml + # Default configuration + mozilla-firefox-1.0-lang.patch + xulrunner-copy-stub.patch + region.properties) + +build() { + msg2 "Applying Debian patches..." + cd "${srcdir}" + # This will simulate dpkg-source -x iceweasel_${_debver}-${_debrel}.dsc + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_pkgname}-${_debver}" + mv debian "${_pkgname}-${_debver}" + cd "${_pkgname}-${_debver}" + quilt push -a + find .pc -name .timestamp -delete # why isn't --no-timestamps doing this? + + # This will make life more sane + cd "${srcdir}" + ln -s "${_pkgname}-${_debver}" "${_pkgname}-${pkgver}" + + msg2 "Applying Parabola/ConnochaetOS patches..." + cd "${srcdir}/${_pkgname}-${pkgver}/" + patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch" + patch -p1 -i "${srcdir}/libre.patch" + + cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ + + msg2 "Starting build..." + + cp "${srcdir}/mozconfig" .mozconfig + #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + ./configure +# touch config* + make MOZ_MAKE_FLAGS="${MAKEFLAGS}" + + msg2 "Build complete" +} + +package() { + + cd "${srcdir}/${_pkgname}-${pkgver}/" + #make -j1 -f client.mk DESTDIR="${pkgdir}" install + make install DESTDIR="${pkgdir}" + + msg2 "Finishing..." + + install -m755 -d ${pkgdir}/usr/share/applications + install -m755 -d ${pkgdir}/usr/share/pixmaps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps + + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1 + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg + + + msg2 "Removing proprietary and anti-privacy search engines" + rm -f ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml + msg2 "And provide better ones..." + install -m755 -d ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/ + install -m644 ${srcdir}/*.xml ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/ + rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver} + rm -rvf ${pkgdir}/usr/include + +} + +md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d' + '8846b9cce4ce7a82ec9995510efce867' + '5e2574eef71ee1437e2f8e7481c67893' + '9609e77182cc300e3fe9d4b0c7e7efb4' + '3403175087e584a8c5e840cc62310cd9' + '462c68585461f8cdc23c93c46f6ee4cf' + '2d492295c4308f9bba9ece28d8b3af2d' + '937ac0e5392b060d93bd33e761fbfa51' + 'cf97082e77e3ef5f1bd74b1db9329965' + '24528ca3f7f1e1a0ba735231aa3ac1de' + 'c5f00b6b24222aacd5a749d1f59c4d24' + 'e1bda0854de7d764f7401c81bb82b5ef' + 'bd5db57c23c72a02a489592644f18995' + 'a485a2b5dc544a8a2bd40c985d2e5813' + 'f1c76e7e244257856a386ca2de69bdf0') diff --git a/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml new file mode 100644 index 000000000..9e21b92e2 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml @@ -0,0 +1,12 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Arch Linux Wiki</os:ShortName> +<os:Description>searches on the arch linux wiki</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG8SURBVDiNjZM/iBNBFMZ/MzvJunfmYFfwtjgbEzk4jhSKoNa2goiNaGXhCaYRDAiHNlprcYuVhaCNWIj4BxSusBJRhNtDRTF6nCkWPUQMJJe4s2PhBhIvE/yaebz3vY/fDIwwxmBTGMX7JwtSNRbmX9g8yrr9V+ccISYAa4CwEey6sbpDCJpFR6rZwJ19fLzyeZRP2pIni3LBU3IbGNVJs/M2nzXAU3K3pySeknTS7OTZZ+v+fwccuvPhqOuIV64Sy56S9LTxm796i6O8W95g3633xcBTDWOYSY35kRl8bYzwHNkqFWX5/rHy97EEgafqEwU54yqBMQRdnYnf2rCps1JHm0tjCeZuvpvaE7hrG+3U/9rq0dPDdK4jWlOuU1k9PfdtJMGmzupvkrbf+NntLz8A7vbnXW1KG530wkiCMIp3Ag1gez57lNSqR/LZbeBU3m8D5aRWTf4luDywDPBwoH6anwb4AtSHrhBGcRk4w7A+DdRv+8SAC9wbCgCuAoW8XgOuAR8HAprAdWAdqADLYRSfABDTSyt7gdfAE+BKUqu+ZIzCKD4ILAKHgXkxvbRyEXie1KrWHzcm6MAfcSib4f24CrwAAAAASUVORK5CYII=</os:Image> +<UpdateInterval>7</UpdateInterval> +<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.xml</UpdateUrl> +<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.png</IconUpdateUrl> +<SearchForm>http://wiki.archlinux.org/index.php/Main_Page</SearchForm> +<os:Url type="text/html" method="GET" template="http://wiki.archlinux.org/index.php/Special:Search?go=Go&search={searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml new file mode 100644 index 000000000..3142d3410 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.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>Duck Duck Go (Lite)</os:ShortName> +<os:Description>Search Duck Duck Go (Lite)</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image> +<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml new file mode 100644 index 000000000..4fb1391ab --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.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>Duck Duck Go (SSL)</os:ShortName> +<os:Description>Search Duck Duck Go (SSL)</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image> +<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/iceweasel.install b/~lukeshu/iceweasel-libre-current/iceweasel.install new file mode 100644 index 000000000..376600ec2 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/iceweasel.install @@ -0,0 +1,21 @@ +#[ "${ICDIR}" = "" ] && ICECATDIR="/usr/lib/icecat" +post_install () { + echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session" + echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/iceweasel* directories" + update-desktop-database -q +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} + +#op=$1 +#shift + +#$op $* diff --git a/~lukeshu/iceweasel-libre-current/internet-archive.xml b/~lukeshu/iceweasel-libre-current/internet-archive.xml new file mode 100644 index 000000000..1556a2d8c --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/internet-archive.xml @@ -0,0 +1,12 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Internet Archive</os:ShortName> +<os:Description>Search www.archive.org</os:Description> +<os:InputEncoding>ISO-8859-1</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7</os:Image> +<UpdateInterval>7</UpdateInterval> +<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.src</UpdateUrl> +<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.gif</IconUpdateUrl> +<SearchForm>http://www.archive.org/</SearchForm> +<os:Url type="text/html" method="GET" template="http://www.archive.org/search.php?sourceid=Mozilla-search&query={searchTerms}&sort=-%2Fadditional%2Fitem%2Fdownloads"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/jamendo-en.xml b/~lukeshu/iceweasel-libre-current/jamendo-en.xml new file mode 100644 index 000000000..91d6df6e4 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/jamendo-en.xml @@ -0,0 +1,12 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Jamendo (en)</os:ShortName> +<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg==</os:Image> +<UpdateInterval>7</UpdateInterval> +<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl> +<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico</IconUpdateUrl> +<SearchForm>http://www.jamendo.com/en</SearchForm> +<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search/all/{searchTerms}"> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/libre.patch b/~lukeshu/iceweasel-libre-current/libre.patch new file mode 100644 index 000000000..e29e22a67 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/libre.patch @@ -0,0 +1,391 @@ +diff -urN iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-21 12:55:22.404066176 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // 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-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 12:55:28.116066178 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // 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-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:35.104062780 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // 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.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-16 20:29:37.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:43.184062783 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // 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.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", ""); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -234,7 +234,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -324,7 +324,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -563,7 +563,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // 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-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/browser/base/content/syncSetup.js +--- iceweasel-9.0-orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000 +@@ -59,7 +59,7 @@ + // Broader than we'd like, but after this changed from api-secure.recaptcha.net + // we had no choice. At least we only do this for the duration of setup. + // See discussion in Bugs 508112 and 653307. +-const RECAPTCHA_DOMAIN = "https://www.google.com"; ++const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com"; + + Cu.import("resource://services-sync/main.js"); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties +--- iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # 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 + +@@ -17,7 +17,7 @@ + # 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} + + # 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 +diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in +--- iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000 +@@ -11,14 +11,12 @@ + <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> + <DD>@bookmarks_toolbarfolder_description@ + <DL><p> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> +- <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A> ++ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</a> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</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> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" 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:#$42iCK1">@firefox_community@</A> +- <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> + </DL><p> + </DL><p> +diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html +--- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +@@ -143,7 +143,7 @@ + </p> + <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> + </p> + <p> + <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> +diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul +--- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 ++++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 +@@ -301,6 +301,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + </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"/> + <label id="messageLog" value="" crop="center"/> + </window> +diff -urN iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0/layout/ipc/test-ipcbrowser.xul +--- iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000 ++++ iceweasel-9.0/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000 +@@ -69,6 +69,6 @@ + label="setViewportScale"/> + </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" + remote="true"/> + </window> +diff -urN iceweasel-9.0-orig/mobile/app/mobile.js iceweasel-9.0/mobile/app/mobile.js +--- iceweasel-9.0-orig/mobile/app/mobile.js 2011-12-16 20:29:36.000000000 +0000 ++++ iceweasel-9.0/mobile/app/mobile.js 2011-12-21 10:04:04.976062646 +0000 +@@ -217,12 +217,13 @@ + /* preferences for the Get Add-ons pane */ + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%"); +-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/"); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++ ++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); + + /* preference for the locale picker */ + pref("extensions.getLocales.get.url", ""); +@@ -239,7 +240,7 @@ + pref("privacy.popups.showBrowserMessage", true); + + 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("accessibility.typeaheadfind", false); + pref("accessibility.typeaheadfind.timeout", 5000); +diff -urN iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0/mobile/locales/en-US/chrome/region.properties +--- iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000 ++++ iceweasel-9.0/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google ++browser.search.order.1=DuckDuckGo + + # 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 + + # 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= + + # 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 +diff -urN iceweasel-9.0-orig/modules/libpref/src/init/all.js iceweasel-9.0/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // 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.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties +--- iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000 ++++ iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000 +@@ -4,10 +4,10 @@ + pluginStartupMessage=Starting Plugin for type + + # plug-ins URLs +-more_plugins_label=mozilla.org +-more_plugins_url=https://pfs.mozilla.org/plugins/ +-pluginupdates_label=mozilla.com/plugincheck +-pluginupdates_url=http://www.mozilla.com/plugincheck/ +-plugindoc_label=plugindoc.mozdev.org +-plugindoc_url=http://plugindoc.mozdev.org/ ++more_plugins_label=gnuzilla.gnu.org ++more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html ++pluginupdates_label=gnuzilla.gnu.org ++pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html ++plugindoc_label=gnuzilla.gnu.org ++plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html + diff --git a/~lukeshu/iceweasel-libre-current/logless-search.xml b/~lukeshu/iceweasel-libre-current/logless-search.xml new file mode 100644 index 000000000..1538d1ef0 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/logless-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>Logless Search</os:ShortName> +<os:Description>Use logless.com to search the Internet in privacy, with no search logs.</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</os:Image> +<os:Url type="text/html" method="GET" template="http://www.logless.com/?q={searchTerms}"> +</os:Url> +</SearchPlugin> diff --git a/~lukeshu/iceweasel-libre-current/mozconfig b/~lukeshu/iceweasel-libre-current/mozconfig new file mode 100644 index 000000000..8344f6967 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/mozconfig @@ -0,0 +1,39 @@ +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +#ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-pthreads +ac_add_options --enable-optimize +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-strip +ac_add_options --enable-pango +#ac_add_options --enable-system-cairo +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-libxul +ac_add_options --disable-crashreporter +ac_add_options --disable-safe-browsing +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-xprint +ac_add_options --disable-installer +ac_add_options --disable-libnotify +ac_add_options --disable-pedantic +ac_add_options --disable-gnomevfs +ac_add_options --disable-mochitest +ac_add_options --disable-updater +ac_add_options --with-default-mozilla-five-home=/usr/lib/iceweasel + +ac_add_options --with-branding=debian/branding +ac_add_options --build=i586-pc-linux-gnu +ac_add_options --host=i586-pc-linux-gnu + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +export USE_SHORT_LIBNAME=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options USE_SHORT_LIBNAME=1 diff --git a/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch b/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch new file mode 100644 index 000000000..f0f7325a5 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch @@ -0,0 +1,12 @@ +--- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100 ++++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100 +@@ -253,6 +253,9 @@ + pref("font.language.group", "chrome://global/locale/intl.properties"); + pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); + ++// Use LANG environment variable to choose locale ++pref("intl.locale.matchOS", true); ++ + // 0=lines, 1=pages, 2=history , 3=text size + pref("mousewheel.withcontrolkey.action",3); + pref("mousewheel.withshiftkey.action",2); diff --git a/~lukeshu/iceweasel-libre-current/region.properties b/~lukeshu/iceweasel-libre-current/region.properties new file mode 100644 index 000000000..2e980987e --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/region.properties @@ -0,0 +1,23 @@ +# Default search engine +browser.search.defaultenginename=Duck Duck Go (SSL) + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=Duck Duck Go (SSL) +browser.search.order.2=Duck Duck Go (Lite) + + +# Keyword URL (for location bar searches) +keyword.URL=https://duckduckgo.com/?q= + +# 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=https://duckduckgo.com/?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 +# profile database. Note that "new" is defined as "has a different URL"; this +# means that it's not possible to update the name of existing handler, so +# don't make any spelling errors here. +#gecko.handlerService.defaultHandlersVersion=3 diff --git a/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml b/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml new file mode 100644 index 000000000..f817dce40 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml @@ -0,0 +1,14 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>Scroogle SSL English</os:ShortName> +<os:Description>Scroogle SSL English</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA</os:Image> +<UpdateInterval>7</UpdateInterval> +<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml</UpdateUrl> +<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico</IconUpdateUrl> +<SearchForm>https://ssl.scroogle.org/scrapen8.html</SearchForm> +<os:Url type="text/html" method="GET" template="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi"> + <os:Param name="Gw" value="{searchTerms}"/> + <os:Param name="l" value="en"/> +</os:Url> +</SearchPlugin>
\ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch b/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch new file mode 100644 index 000000000..e3b8e9376 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch @@ -0,0 +1,11 @@ +--- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 ++++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 +@@ -257,7 +257,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) + endif + endif + diff --git a/~lukeshu/iceweasel-libre-current/yacy.xml b/~lukeshu/iceweasel-libre-current/yacy.xml new file mode 100644 index 000000000..61201ad20 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/yacy.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>YaCy</os:ShortName> +<os:Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer 'kupferhammer-keller'.</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00</os:Image> +<os:Url type="text/html" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.html?query={searchTerms}"> +</os:Url><os:Url type="application/rss+xml" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.rss?query={searchTerms}&maximumRecords=10&verify=false"> +</os:Url> +</SearchPlugin> diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD new file mode 100644 index 000000000..f7f7cd0b1 --- /dev/null +++ b/~lukeshu/make-graph/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 138004 2011-09-14 05:05:12Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +_pkgname=make +pkgname=$_pkgname-graph +pkgver=3.82 +pkgrel=4.1 +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +pkgdesc="GNU make utility to maintain groups of programs, with patch to dump a Graphviz dependency graph." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/make" +license=('GPL3') +groups=('base-devel') +depends=('glibc' 'sh') +install=$_pkgname.install +source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + bug30612.patch + bug30723.patch + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) +md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c8f496b22191f9fb9420ab14c1a19a47' + '662e6450e19a5acdaa5c9fcb8ad78dea' + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') + +source+=('make-graph.patch') +md5sums+=('c1f1d652004a36c69b1f7f42a6849356') +depends+=('graphviz') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + # http://savannah.gnu.org/bugs/?30612 + patch -Np1 -i $srcdir/bug30612.patch + + # http://savannah.gnu.org/bugs/?30723 + patch -Np1 -i $srcdir/bug30723.patch + + # https://bugs.archlinux.org/task/22733 (fix from Fedora) + patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + + # https://savannah.gnu.org/patch/?7447 + patch -Np1 -i $srcdir/make-graph.patch + + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${_pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/~lukeshu/make-graph/bug30612.patch b/~lukeshu/make-graph/bug30612.patch new file mode 100644 index 000000000..fb843bcd9 --- /dev/null +++ b/~lukeshu/make-graph/bug30612.patch @@ -0,0 +1,66 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c +--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 ++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/~lukeshu/make-graph/bug30723.patch b/~lukeshu/make-graph/bug30723.patch new file mode 100644 index 000000000..84e7ebe7a --- /dev/null +++ b/~lukeshu/make-graph/bug30723.patch @@ -0,0 +1,12 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/~lukeshu/make-graph/make-3.82-makeflags.patch b/~lukeshu/make-graph/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); diff --git a/~lukeshu/make-graph/make-3.82-sort-blank.patch b/~lukeshu/make-graph/make-3.82-sort-blank.patch new file mode 100644 index 000000000..2e73f5b7c --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-sort-blank.patch @@ -0,0 +1,17 @@ +diff -urp make-3.82/function.c make-3.82-pm/function.c +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/~lukeshu/make-graph/make-graph.patch b/~lukeshu/make-graph/make-graph.patch new file mode 100644 index 000000000..083db55e4 --- /dev/null +++ b/~lukeshu/make-graph/make-graph.patch @@ -0,0 +1,273 @@ +diff -ur make-3.82/file.c make-wch/file.c +--- make-3.82/file.c 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/file.c 2010-08-19 23:28:20.162660391 -0400 +@@ -1021,6 +1021,129 @@ + hash_print_stats (&files, stdout); + } + ++/* Dump the dependency graph to a Graphviz file (on stdout) */ ++ ++void ++print_graph_prereqs (const char *filename, const struct dep *deps) ++{ ++ const struct dep *ood = 0; ++ ++ /* Print all normal dependencies; note any order-only deps. */ ++ for (; deps != 0; deps = deps->next) ++ if (! deps->ignore_mtime) ++ printf (" \"%s\" -> \"%s\";\n", filename, dep_name (deps)); ++ ++ /* Print order-only deps, if we have any. */ ++ if (ood) ++ { ++ for (ood = ood->next; ood != 0; ood = ood->next) ++ if (ood->ignore_mtime) ++ printf (" %s -> %s [style=dotted];\n", filename, dep_name (ood)); ++ /* XXX: we need to distinguish these some how. ++ * Is dotting them the right way? */ ++ } ++} ++ ++static void ++print_graph_file (const void *item) ++{ ++ const struct file *f = item; ++ ++ int built_in_special_target=( ++ (0==strcmp(f->name,".PHONY")) ++ || (0==strcmp(f->name,".SUFFIXES")) ++ || (0==strcmp(f->name,".DEFAULT")) ++ || (0==strcmp(f->name,".PRECIOUS")) ++ || (0==strcmp(f->name,".INTERMEDIATE")) ++ || (0==strcmp(f->name,".SECONDARY")) ++ || (0==strcmp(f->name,".SECONDEXPANSION")) ++ || (0==strcmp(f->name,".DELETE_ON_ERROR")) ++ || (0==strcmp(f->name,".IGNORE")) ++ || (0==strcmp(f->name,".LOW_RESOLUTION_TIME")) ++ || (0==strcmp(f->name,".SILENT")) ++ || (0==strcmp(f->name,".EXPORT_ALL_VARIABLES")) ++ || (0==strcmp(f->name,".NOTPARALLEL")) ++ || (0==strcmp(f->name,".ONESHELL")) ++ || (0==strcmp(f->name,".POSIX")) ++ ); ++ if ((f->is_target) && (!built_in_special_target)) ++ { ++ printf (" \"%s\" [", f->name); ++ /* XXX some of these should be attached to the nodes in some way; ++ * though I'm not sure what style changes should be made for which ones. ++ * ~ LukeShu ++ if (f->double_colon) puts (_("// Double-colon rule.")); ++ if (f->precious) puts (_("// Precious file (prerequisite of .PRECIOUS).")); ++ */if (f->phony) puts (_(" color=blue "));/* ++ if (f->cmd_target) puts (_("// Command line target.")); ++ if (f->dontcare) puts (_("// A default, MAKEFILES, or -include/sinclude makefile.")); ++ if (f->tried_implicit) puts (_("// Implicit rule search has been done.")); ++ else puts (_("// Implicit rule search has not been done.")); ++ if (f->stem != 0) printf (_("// Implicit/static pattern stem: `%s'\n"), f->stem); ++ if (f->intermediate) puts (_("// File is an intermediate prerequisite.")); ++ if (f->also_make != 0) ++ { ++ const struct dep *d; ++ fputs (_("# Also makes:"), stdout); ++ for (d = f->also_make; d != 0; d = d->next) ++ printf (" %s\n", dep_name (d)); ++ } ++ if (f->last_mtime == UNKNOWN_MTIME) puts (_("// Modification time never checked.")); ++ else if (f->last_mtime == NONEXISTENT_MTIME) puts (_("// File does not exist.")); ++ else if (f->last_mtime == OLD_MTIME) puts (_("// File is very old.")); ++ else ++ { ++ char buf[FILE_TIMESTAMP_PRINT_LEN_BOUND + 1]; ++ file_timestamp_sprintf (buf, f->last_mtime); ++ printf (_("// Last modified %s\n"), buf); ++ } ++ if (f->updated) puts (_("// File has been updated.")); ++ else puts (_("// File has not been updated.")); ++ switch (f->command_state) ++ { ++ case cs_running: puts (_("// Update: Running (THIS IS A BUG).")); break; ++ case cs_deps_running: puts (_("// Update: Dependencies running (THIS IS A BUG).")); break; ++ case cs_not_started: ++ case cs_finished: ++ switch (f->update_status) ++ { ++ case -1: break; ++ case 0: puts (_("// Update: Successfully")); break; ++ case 1: assert (question_flag); ++ puts (_("// Update: Needs to be (-q is set)")); break; ++ case 2: puts (_("// Update: Failed")); break; ++ default: puts (_("// Update: Invalid `update_status' value)); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ break; ++ default: puts (_("// Update: Invalid `command_state' value")); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ if (f->variables != 0) print_file_variables (f); ++ if (f->cmds != 0) print_commands (f->cmds); ++ */ ++ puts("];"); ++ print_graph_prereqs (f->name, f->deps); ++ } ++ ++ if (f->prev) ++ print_graph_file ((const void *) f->prev); ++} ++ ++void ++print_graph (void) ++{ ++ printf ("%sgraph make%i {\n", ++ (makelevel==0)?"di":"sub", ++ getpid()); ++ hash_map (&files, print_graph_file); ++ puts ("}"); ++} ++ + /* Verify the integrity of the data base of files. */ + + #define VERIFY_CACHED(_p,_n) \ +diff -ur make-3.82/filedef.h make-wch/filedef.h +--- make-3.82/filedef.h 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/filedef.h 2010-08-19 21:09:34.314660209 -0400 +@@ -116,6 +116,7 @@ + char *build_target_list (char *old_list); + void print_prereqs (const struct dep *deps); + void print_file_data_base (void); ++void print_graph (void); + + #if FILE_TIMESTAMP_HI_RES + # define FILE_TIMESTAMP_STAT_MODTIME(fname, st) \ +diff -ur make-3.82/main.c make-wch/main.c +--- make-3.82/main.c 2010-07-19 03:10:53.000000000 -0400 ++++ make-wch/main.c 2010-08-21 22:32:56.818417305 -0400 +@@ -175,6 +175,11 @@ + + int print_data_base_flag = 0; + ++/* Nonzero means don't remake anything, just print the dependency graph ++ that results from reading the makefile (-g). */ ++ ++int print_graph_flag = 0; ++ + /* Nonzero means don't remake anything; just return a nonzero status + if the specified targets are not up to date (-q). */ + +@@ -321,6 +326,9 @@ + -f FILE, --file=FILE, --makefile=FILE\n\ + Read FILE as a makefile.\n"), + N_("\ ++ -g, --graph Print make's internal dependency graph\n\ ++ in Graphviz format, without remaking makefiles.\n"), ++ N_("\ + -h, --help Print this message and exit.\n"), + N_("\ + -i, --ignore-errors Ignore errors from recipes.\n"), +@@ -385,6 +393,7 @@ + #endif + { 'e', flag, &env_overrides, 1, 1, 0, 0, 0, "environment-overrides", }, + { 'f', filename, &makefiles, 0, 0, 0, 0, 0, "file" }, ++ { 'g', flag, &print_graph_flag, 1, 1, 0, 0, 0, "graph" }, + { 'h', flag, &print_usage_flag, 0, 0, 0, 0, 0, "help" }, + { 'i', flag, &ignore_errors_flag, 1, 1, 0, 0, 0, "ignore-errors" }, + { 'I', filename, &include_directories, 1, 1, 0, 0, 0, +@@ -1946,7 +1955,10 @@ + define_makeflags (1, 1); + + rebuilding_makefiles = 1; +- status = update_goal_chain (read_makefiles); ++ if (print_graph_flag) ++ status = -1; ++ else ++ status = update_goal_chain (read_makefiles); + rebuilding_makefiles = 0; + + switch (status) +@@ -2278,33 +2290,37 @@ + + { + int status; ++ if (print_graph_flag) ++ status=0; ++ else ++ { ++ switch (update_goal_chain (goals)) ++ { ++ case -1: ++ /* Nothing happened. */ ++ case 0: ++ /* Updated successfully. */ ++ status = makefile_status; ++ break; ++ case 1: ++ /* We are under -q and would run some commands. */ ++ status = MAKE_TROUBLE; ++ break; ++ case 2: ++ /* Updating failed. POSIX.2 specifies exit status >1 for this; ++ but in VMS, there is only success and failure. */ ++ status = MAKE_FAILURE; ++ break; ++ default: ++ abort (); ++ } + +- switch (update_goal_chain (goals)) +- { +- case -1: +- /* Nothing happened. */ +- case 0: +- /* Updated successfully. */ +- status = makefile_status; +- break; +- case 1: +- /* We are under -q and would run some commands. */ +- status = MAKE_TROUBLE; +- break; +- case 2: +- /* Updating failed. POSIX.2 specifies exit status >1 for this; +- but in VMS, there is only success and failure. */ +- status = MAKE_FAILURE; +- break; +- default: +- abort (); +- } +- +- /* If we detected some clock skew, generate one last warning */ +- if (clock_skew_detected) +- error (NILF, +- _("warning: Clock skew detected. Your build may be incomplete.")); +- ++ /* If we detected some clock skew, generate one last warning */ ++ if (clock_skew_detected) ++ error (NILF, ++ _("warning: Clock skew detected. Your build may be incomplete.")); ++ } ++ + /* Exit. */ + die (status); + } +@@ -3042,7 +3058,7 @@ + { + static int printed_version = 0; + +- char *precede = print_data_base_flag ? "# " : ""; ++ char *precede = (print_data_base_flag||print_graph_flag) ? "# " : ""; + + if (printed_version) + /* Do it only once. */ +@@ -3188,6 +3204,10 @@ + if (print_data_base_flag) + print_data_base (); + ++ ++ if (print_graph_flag) ++ print_graph (); ++ + verify_file_data_base (); + + clean_jobserver (status); diff --git a/~lukeshu/make-graph/make.install b/~lukeshu/make-graph/make.install new file mode 100644 index 000000000..6cf8b0dc4 --- /dev/null +++ b/~lukeshu/make-graph/make.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(make.info make.info-1 make.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/~lukeshu/redo/PKGBUILD b/~lukeshu/redo/PKGBUILD new file mode 100644 index 000000000..95e75dd0e --- /dev/null +++ b/~lukeshu/redo/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=redo +pkgver=0.06 +pkgrel=1 +pkgdesc="A competitor to make based on essays by DJB.") +arch=('any') +url="https://github.com/apenwarr/$pkgname" +license=('GPL2') +depends=('python2') +source=("$pkgname-$pkgver.tar.gz::https://github.com/apenwarr/$pkgname/tarball/$pkgname-$pkgver") + +build() { + cd "$srcdir/apenwarr-$pkgname-"* + + # Make everything use python2 + sed -i 's@^#!/usr/bin/python$@#!/usr/bin/python2@' *.py + sed -i 's@/usr/bin/env python@/usr/bin/env python2@' Documentation/md2man.py + sed -i -e 's@^python @python2 @' \ + -e 's@/usr/bin/python$@/usr/bin/python2@' \ + install.do + + make +} + +check() { + cd "$srcdir/apenwarr-$pkgname-"* + make test +} + +package() { + cd "$srcdir/apenwarr-$pkgname-"* + make install DESTDIR="$pkgdir" +} + +md5sums=('0faa0e98f3d60fdcdea826dad59923c8') diff --git a/~lukeshu/stow/PKGBUILD b/~lukeshu/stow/PKGBUILD new file mode 100644 index 000000000..24a2dcb1c --- /dev/null +++ b/~lukeshu/stow/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=stow +pkgver=2.1.2 +pkgrel=1 +pkgdesc="A program for managing the installation of software packages, keeping them separate while making them appear to be installed in the same place." +arch=(any) +url="https://www.gnu.org/software/$pkgname/" +license=('GPL2') +depends=('perl>=5.6.1') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +md5sums=('82857e43531cf6936aed99ef3b86b446') diff --git a/~lukeshu/terminal-colors/PKGBUILD b/~lukeshu/terminal-colors/PKGBUILD new file mode 100644 index 000000000..662e5b5ef --- /dev/null +++ b/~lukeshu/terminal-colors/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=terminal-colors +pkgver=1.3 +pkgrel=1 +pkgdesc="Displays charts for 256/88/16 terminal color modes. Also supports converting between 256/88 color values." +arch=('any') +url="http://zhar.net/projects/shell/" +license=('GPL3') +depends=('python2') +source=("terminal-colors.py::http://zhar.net/projects/shell/terminal-colors") + +build() { + cd "$srcdir" + sed 's@/usr/bin/env python$@/usr/bin/env python2@' < terminal-colors.py > terminal-colors +} + +package() { + cd "$srcdir" + install -D -m755 terminal-colors "$pkgdir/usr/bin/terminal-colors" +} + +md5sums=('30e3ab6cde416df110110244ce40eb94') diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD new file mode 100644 index 000000000..5ef2c1c56 --- /dev/null +++ b/~lukeshu/thingutils-git/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=thingutils +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="https://gitorious.org/thingutils" +license=('MIT') +depends=( + 'php' # roll, urldecode + 'bash' # daemon, newegg, sysfiles + 'emacs' # emacsmail, emacsterm, e + 'wget' # whatismyip + 'findutils' # maildups, whatismyip + 'sysstat' # sysfiles + 'offlineimap' # offlineimap-runner + 'wdiff' # chardiff +) +makedepends=('git') + +_gitroot=https://git.gitorious.org/thingutils/thingutils.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + make prefix=/usr +} + +package() { + cd "$srcdir/$_gitname-build" + make install prefix=/usr DESTDIR="$pkgdir" +} diff --git a/~lukeshu/wdiff/PKGBUILD b/~lukeshu/wdiff/PKGBUILD new file mode 100644 index 000000000..6092b3d76 --- /dev/null +++ b/~lukeshu/wdiff/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=wdiff +pkgver=1.1.0 +pkgrel=1 +pkgdesc="A front end to diff for comparing files on a word per word basis." +arch=('i686' 'x86_64') +url="https://www.gnu.org/software/$pkgname/" +license=('GPL3') +depends=('diffutils') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +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 +} + +md5sums=('aa4dd87a9140a96ee85d2502673d19f3') diff --git a/~lukeshu/xml2rfc/PKGBUILD b/~lukeshu/xml2rfc/PKGBUILD new file mode 100644 index 000000000..b52ab21a8 --- /dev/null +++ b/~lukeshu/xml2rfc/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=xml2rfc +pkgver=1.36 +pkgrel=1 +pkgdesc="A tool to parse RFC 2629 XML files, and render them to TXT, PDF, HTML, and other formats." +arch=('any') +url="http://xml.resource.org/" +license=('custom:BSD-3') +depends=('tcl>=8') +optdepends=('tk: for xml2sgml and graphical xml2rfc') +makedepends=('java-environment') +source=("http://xml.resource.org/authoring/$pkgname-$pkgver.tgz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + install -d "$pkgdir/usr/share/doc/$pkgname" + install -m644 README.* draft-mrose-writing-rfcs.* example.* "$pkgdir/usr/share/doc/$pkgname" + + install -d "$pkgdir/usr/share/$pkgname" + install -m644 rfc2629.* "$pkgdir/usr/share/$pkgname" + + install -D -m755 xml2rfc.tcl "$pkgdir/usr/bin/xml2rfc" + install -D -m755 xml2sgml.tcl "$pkgdir/usr/bin/xml2sgml" +} + +md5sums=('f96aa187e2ef86affe2843b556556b60') |