diff options
394 files changed, 35065 insertions, 3910 deletions
diff --git a/community-staging/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD deleted file mode 100644 index 8cd5aa100..000000000 --- a/community-staging/mythtv/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 69245 2012-04-11 02:54:01Z jconder $ -# Maintainer: Jonathan Conder <jonno.conder@gmail.com> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: <kleptophobiac@gmail.com> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=mythtv -pkgver=0.25 -pkgrel=1 -epoch=1 -pkgdesc="A Homebrew PVR project" -arch=('i686' 'x86_64') -url="http://www.mythtv.org/" -license=('GPL') -depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' - 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa' - 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' - 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' - 'x264') -makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm') -optdepends=('glew: for GPU commercial flagging' - 'libcec: for consumer electronics control capabilities' - 'libxml2: to read blu-ray metadata' - 'openssl: for AirTunes (RAOP) support' - 'xmltv: to download tv listings') -backup=('etc/conf.d/mythbackend') -install='mythtv.install' -source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - 'mythtv_0.25_gcc_4.7.patch' - 'mythbackend.rc' - 'mythbackend.conf') -md5sums=('e49c81de40e279c83dcb1b2aa9a45748' - '6090f5f22a8584db80b76cf19869ee41' - '62fd98347c56b1d9b795792f83269d25' - '1f72db0586f97a7c3fd3155dfa9a6c6f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - - patch -Np1 -i "$srcdir/mythtv_0.25_gcc_4.7.patch" - - ARCH="${CARCH/_/-}" - ./configure --prefix=/usr \ - --cpu="$ARCH" \ - --disable-altivec \ - --disable-audio-jack \ - --disable-ccache \ - --disable-distcc \ - --enable-libfftw3 \ - --enable-libmp3lame \ - --enable-libx264 \ - --enable-vaapi \ - --python=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make INSTALL_ROOT="$pkgdir" install - - install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend" - install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend" - install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql" - - mkdir -p "$pkgdir/usr/share/mythtv" - cp -R 'contrib' "$pkgdir/usr/share/mythtv" - mkdir -p "$pkgdir/var/log/mythtv" -} diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf deleted file mode 100644 index 15a248450..000000000 --- a/community-staging/mythtv/mythbackend.conf +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Copyright (c) by the MythTV Development Team. -# -# Derived from work by: -# -# Michael Thomson <linux at m-thomson dot net> -# Stu Tomlinson <stu at nosnilmot dot com> -# Axel Thimm <axel.thimm at atrpms dot net> -# Adopted for ArchLinux: -# Jürgen Hoetzel <juergen@archinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -############################################################################### -# -# User who should start the mythbackend process -# -# Running mythbackend as non-root requires you to ensure that audio/video -# devices used for recording have suitable user permissions. One way -# to achieve this is to modify existing or create new udev rules which -# assign these devices to a non-root group with rw permissions and add -# your mythbackend user to that group. Be aware that console.perms can -# also affect device permissions and may need additional configuration. -# Running as non-root may also introduce increased process latency. -# -# MBE_USER='root' - -# -# Startup options for mythbackend (see 'mythbackend --help' for a list). -# -# MBE_OPTS='' - -# -# Directory holding the mythbackend log file -# -# LOG_PATH='/var/log/mythtv' - -# -# Logging options for mythbackend (see 'mythbackend -v help' for a list) -# -# LOG_OPTS='' diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc deleted file mode 100644 index 2b3c2d52e..000000000 --- a/community-staging/mythtv/mythbackend.rc +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/profile - -############################################################################### -# Default values to use if none are supplied in the config file. -# -# User who should start the mythbackend process -MBE_USER='root' - -# Startup options for mythbackend -MBE_OPTS='' - -# Directory holding the mythbackend log file -LOG_PATH='/var/log/mythtv' - -# Logging options for mythbackend -LOG_OPTS='' -############################################################################### - -CONFIG_FILE=/etc/conf.d/mythbackend -PIDFILE=/var/run/mythbackend.pid - -if [[ -r "$CONFIG_FILE" ]]; then - . "$CONFIG_FILE" -fi - -PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)" -export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)" - -case "$1" in - start) - stat_busy "Starting MythTV Backend" - - if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then - stat_fail - exit 0 - fi - - touch "$PIDFILE" - chown "$MBE_USER" "$PIDFILE" "$LOG_PATH" - - MBE_CMD="/usr/bin/mythbackend --daemon \ - --logpath "$LOG_PATH" $LOG_OPTS \ - --pidfile "$PIDFILE" $MBE_OPTS" - if su "$MBE_USER" -c "$MBE_CMD"; then - add_daemon mythbackend - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping MythTV Backend" - if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then - rm_daemon mythbackend - stat_done - rm -f "$PIDFILE" - else - stat_fail - fi - ;; - restart) - "$0" stop - "$0" start - ;; - *) - echo "usage: $0 (start|stop|restart)" - ;; -esac -exit 0 diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install deleted file mode 100644 index c29a53454..000000000 --- a/community-staging/mythtv/mythtv.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!" -} - -post_upgrade() { - return -} - -post_remove() { - echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'" -} diff --git a/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch b/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch deleted file mode 100644 index 83c8244a0..000000000 --- a/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch +++ /dev/null @@ -1,107 +0,0 @@ -*** a/libs/libmythbase/compat.h 2012-03-31 20:52:30.430461503 -0400 ---- b/libs/libmythbase/compat.h 2012-03-31 20:59:05.935585911 -0400 -*************** -*** 44,49 **** ---- 44,51 ---- - # include <sys/resource.h> // for setpriority - # include <sys/socket.h> - # include <sys/wait.h> // For WIFEXITED on Mac OS X -+ # include <stdio.h> // for snprintf(), used by inline dlerror() -+ # include <unistd.h> // for usleep() - #endif - - #ifdef USING_MINGW -*** a/libs/libmyth/rssparse.h 2012-03-31 20:52:30.427453729 -0400 ---- b/libs/libmyth/rssparse.h 2012-03-31 21:51:11.687438044 -0400 -*************** -*** 13,18 **** ---- 13,19 ---- - #include <QPair> - #include <QMap> - #include <QVariant> -+ #include <sys/types.h> - - #include "mythexp.h" - -*** a/libs/libmythtv/audioinput.h 2012-03-31 22:41:55.626923063 -0400 ---- b/libs/libmythtv/audioinput.h 2012-03-31 22:41:22.478248297 -0400 -*************** -*** 22,27 **** ---- 22,28 ---- - #define _AUDIOINPUT_H_ - - #include <QString> -+ #include <unistd.h> - - class AudioInput - { -*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 20:52:29.923150437 -0400 ---- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400 -*************** -*** 398,404 **** - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ ---- 398,404 ---- - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -*************** -*** 446,452 **** - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ - : "memory"\ - );\ - tmp += 4;\ ---- 446,452 ---- - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -*************** -*** 823,829 **** - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ ---- 823,829 ---- - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -*************** -*** 878,884 **** - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" ---- 878,884 ---- - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD new file mode 100644 index 000000000..d42dafb35 --- /dev/null +++ b/community/almanah/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 69798 2012-04-23 09:46:12Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=almanah +pkgver=0.9.0 +pkgrel=1 +pkgdesc="Small GTK+ application to allow you to keep a diary of your life" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Almanah_Diary" +license=('GPL') +depends=('evolution-data-server>=3.4.0' 'gtkspell3' 'libcryptui' 'xdg-utils') +makedepends=('intltool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c8928c5beda9e7a54040ba5a87873ad8fad5feb5585546b0ab5e57d08c3aa7c6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/testing/gtkpod/gtkpod.install b/community/almanah/almanah.install index c5d357a38..6ce7836d2 100644 --- a/testing/gtkpod/gtkpod.install +++ b/community/almanah/almanah.install @@ -1,6 +1,6 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor glib-compile-schemas usr/share/glib-2.0/schemas + xdg-icon-resource forceupdate } post_upgrade() { diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index c4f532fa0..d8ae0e53b 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 68660 2012-03-30 19:41:39Z svenstaro $ +# $Id: PKGBUILD 69800 2012-04-23 09:46:22Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib pkgver=2.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') url="http://clanlib.org/" license=('zlib') -depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3') +depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite') makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) diff --git a/community/contacts/PKGBUILD b/community/contacts/PKGBUILD index 901bdae52..638c9866d 100644 --- a/community/contacts/PKGBUILD +++ b/community/contacts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68465 2012-03-25 08:49:14Z bgyorgy $ +# $Id: PKGBUILD 69724 2012-04-23 09:06:34Z ibiru $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=contacts pkgver=0.12 -pkgrel=5 +pkgrel=6 pkgdesc="Small, lightweight GTK+ address book app" arch=('i686' 'x86_64') url="http://pimlico-project.org/contacts.html" diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 5c57a031e..7d62a91bb 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 61260 2011-12-26 21:33:37Z spupykin $ +# $Id: PKGBUILD 69752 2012-04-23 09:14:35Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua -# Previous Contributor: Michael Fellinger <m.fellinger@gmail.com> +# Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.0 -pkgrel=2git20111115 +pkgrel=3 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" license=('APACHE') depends=('icu' 'erlang' 'js' 'openssl' 'curl') -makedepends=('gcc') install=couchdb.install options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -#source=("http://www.apache.org/dist/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz" - "rc-script.patch") -md5sums=('b4236a36a473e3a1c81e7548de194c47' - '8a3b1a1ff98a6411827ad991db7a355b') +source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} + "rc-script.patch" "configure-fix.patch") +md5sums=('a5cbbcaac288831b3d8a08b725657f10' + '890a85b22219ea113a4901a289c442f8' + '8a3b1a1ff98a6411827ad991db7a355b' + 'fd1669544d08bda09c3318873d51db1e') build() { cd "$srcdir/apache-$pkgname-$pkgver" - [ -x configure ] || ./bootstrap - sed -i 's|-ljs|-lmozjs185|' configure - [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + # workaround for FS#26827 + patch -Np1 < $srcdir/configure-fix.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var make + patch -R etc/init/couchdb <$srcdir/rc-script.patch } diff --git a/community/couchdb/configure-fix.patch b/community/couchdb/configure-fix.patch new file mode 100644 index 000000000..0bb68ecfe --- /dev/null +++ b/community/couchdb/configure-fix.patch @@ -0,0 +1,21 @@ +diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure +--- apache-couchdb-1.2.0/configure 2012-03-29 23:05:41.000000000 +0200 ++++ apache-couchdb-1.2.0.new/configure 2012-04-08 13:50:14.923693056 +0200 +@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err + fi + fi + +-otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" ++otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" + + if test x$otp_release \> xR13B03; then + USE_OTP_NIFS_TRUE= +@@ -18253,7 +18253,7 @@ else + fi + + +-has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` ++has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` + + if test -n "$has_crypto"; then + { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5 diff --git a/community/dates/PKGBUILD b/community/dates/PKGBUILD index 668eb6177..8c512cb21 100644 --- a/community/dates/PKGBUILD +++ b/community/dates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68466 2012-03-25 08:50:04Z bgyorgy $ +# $Id: PKGBUILD 69802 2012-04-23 09:46:41Z ibiru $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dates pkgver=0.4.11 -pkgrel=4 +pkgrel=5 pkgdesc="Small, lightweight GTK+ calendar app" arch=('i686' 'x86_64') url="http://pimlico-project.org/dates.html" diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD new file mode 100644 index 000000000..a116b0f00 --- /dev/null +++ b/community/dee/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 69804 2012-04-23 09:46:49Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=dee +pkgver=1.0.10 +pkgrel=1 +pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" +arch=('i686' 'x86_64') +url="https://launchpad.net/dee" +license=('LGPL') +depends=('glib2' 'icu') +makedepends=('python2' 'gobject-introspection' 'vala') +options=('!libtool') +source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('17b715147e1721ce9624557949408d15') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-tests \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 5042e9358..504a84e76 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 57280 2011-10-25 09:58:12Z spupykin $ +# $Id: PKGBUILD 69754 2012-04-23 09:14:53Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff pkgver=2.0 -pkgrel=1 -pkgdesc="a front-end for the diff program that operates at the word level instead of the line level" +pkgrel=2 +pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') -source=(http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz) +source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') build() { diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index c293e0612..9e1547975 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,46 +1,44 @@ -# $Id: PKGBUILD 65019 2012-02-20 01:58:47Z spupykin $ +# $Id: PKGBUILD 69776 2012-04-23 09:18:21Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.10 -pkgrel=3 -pkgdesc="An erlang jabber server" -arch=(i686 x86_64 'mips64el') +pkgrel=4 +pkgdesc="Jabber server written in Erlang" +arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" license=("GPL") -# TODO: replace net-tools usage in rc.d with iproute2 -depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' - 'net-tools') -makedepends=() -backup=(etc/ejabberd/ejabberd.cfg - etc/logrotate.d/ejabberd) -install=ejabberd.install -source=(http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz - ejabberd - ejabberd.logrotate) -md5sums=('70f0e17983114c62893e43b6ef2e9d0c' - 'c49bb73bdcb50ea7fcf411bbfed7629a' - 'f97c8a96160f30e0aecc9526c12e6606') +depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2') +backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd) +install=$pkgname.install +source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz" + "$pkgname.logrotate" + "$pkgname") +sha256sums=('9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be' + '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2' + '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6') build() { - cd ${srcdir}/${pkgname}-${pkgver}/src + cd "$srcdir/$pkgname-$pkgver/src" - sed -i "s|EJABBERDDIR = \$(DESTDIR)@prefix@/var/lib/ejabberd|EJABBERDDIR = \$(DESTDIR)@prefix@/usr/lib/ejabberd|g" ./Makefile.in - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-pam --enable-odbc + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-pam --enable-odbc make } package() { - cd ${srcdir}/${pkgname}-${pkgver}/src - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver/src" - install -D -m 0755 ${srcdir}/ejabberd ${pkgdir}/etc/rc.d/ejabberd - install -d ${pkgdir}/var/spool/ejabberd - install -d ${pkgdir}/var/lib/ejabberd - - install -D -m0644 ${srcdir}/ejabberd.logrotate ${pkgdir}/etc/logrotate.d/ejabberd - chmod ug+r ${pkgdir}/etc/ejabberd/* - rm -rf $pkgdir/var/lock + make DESTDIR="$pkgdir" install + install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" + install -d "$pkgdir/var/spool/$pkgname" + install -d "$pkgdir/var/lib/$pkgname" + install -D -m0644 "$srcdir/$pkgname.logrotate" \ + "$pkgdir/etc/logrotate.d/$pkgname" + chmod ug+r "$pkgdir/etc/$pkgname/"* + rm -rf "$pkgdir/var/lock" } + +# vim:set ts=2 sw=2 et: diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd index 48f88d282..259d4db66 100644 --- a/community/ejabberd/ejabberd +++ b/community/ejabberd/ejabberd @@ -7,10 +7,10 @@ cd /var/log/ejabberd/ get_pid() { pidof epmd >/dev/null || { echo '' ; return 0; } - # get port from 'epmd -names', then get pid from 'netstat -tlnp' + # get port from 'epmd -names', then get pid from 'ss -tlnp' PORT=`epmd -names | grep ejabberd | cut -f5 -d\ ` [ -z "$PORT" ] && { echo '' ; return 0; } - PID=`netstat -tlnp | grep $PORT | grep -oE '[[:digit:]]+/'` + PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1` [ -z "$PID" ] && { echo '' ; return 0; } echo ${PID%/} } diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install index eceb73592..9d17a911e 100644 --- a/community/ejabberd/ejabberd.install +++ b/community/ejabberd/ejabberd.install @@ -1,24 +1,26 @@ post_install() { - groupadd -r jabber - useradd -r -G jabber -d /var/lib/ejabberd ejabberd - chown -R ejabberd.jabber /var/log/ejabberd - chown -R ejabberd.jabber /var/spool/ejabberd - chown -R ejabberd.jabber /var/lib/ejabberd - chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam - chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chmod 4750 /usr/lib/ejabberd/priv/bin/epam + groupadd -r jabber + useradd -r -G jabber -d /var/lib/ejabberd ejabberd + chown -R ejabberd.jabber /var/log/ejabberd + chown -R ejabberd.jabber /var/spool/ejabberd + chown -R ejabberd.jabber /var/lib/ejabberd + chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam + chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd + chmod 4750 /usr/lib/ejabberd/priv/bin/epam } post_upgrade() { - chown -R ejabberd.jabber /var/log/ejabberd - chown -R ejabberd.jabber /var/spool/ejabberd - chown -R ejabberd.jabber /var/lib/ejabberd - chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam - chmod 4750 /usr/lib/ejabberd/priv/bin/epam + chown -R ejabberd.jabber /var/log/ejabberd + chown -R ejabberd.jabber /var/spool/ejabberd + chown -R ejabberd.jabber /var/lib/ejabberd + chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd + chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam + chmod 4750 /usr/lib/ejabberd/priv/bin/epam } post_remove() { - userdel ejabberd - groupdel jabber + userdel ejabberd + groupdel jabber } + +# vim:set ts=2 sw=2 et: diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index b52cbf059..933865d51 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,71 +1,72 @@ -# $Id: PKGBUILD 67366 2012-03-10 17:20:02Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# $Id: PKGBUILD 69792 2012-04-23 09:41:50Z ibiru $ +# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> pkgname=erlang -pkgver=R14B04 -pkgrel=2 -pkgdesc="A small concurrent functional programming language developed by Ericsson." +pkgver=R15B01 +pkgrel=1 +pkgdesc='A small concurrent functional programming language developed by Ericsson.' arch=(i686 x86_64) -url="http://www.erlang.org/index.html" +url='http://www.erlang.org/index.html' license=('custom') depends=('ncurses' 'glibc') makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') -optdepends=('wxgtk: for wx support' 'unixodbc: database') - +optdepends=('wxgtk: for wx support' + 'mesa: for wx support' + 'unixodbc: database' + 'java-environment: for Java support') options=('!makeflags') -source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz - http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz) -md5sums=('4b469729f103f52702bfb1fb24529dc0' - 'f31e72518daae4007f595c0b224dd59f') - -# please check these deps reported by namcap when you do the next build: -#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar) -#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so']) - +source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz" + "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz") +md5sums=('f12d00f6e62b36ad027d6c0c08905fad' + 'd87412c2a1e6005bbe29dfe642a9ca20') build() { cd "$srcdir/otp_src_${pkgver/./-}" + export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) - export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) + export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < \ + lib/erl_interface/vsn.mk) sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure - CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \ + --enable-threads make } package() { cd "$srcdir/otp_src_${pkgver/./-}" + make INSTALL_PREFIX="$pkgdir" install -# fix prefix - cd "$pkgdir" - for i in usr/lib/erlang/bin/erl \ - usr/lib/erlang/bin/start \ - usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \ - usr/lib/erlang/erts-${ERTSVERSION}/bin/start \ - usr/lib/erlang/releases/RELEASES ;do - sed -i "s#$pkgdir##" $i - done + # fix prefix + cd "$pkgdir/usr/lib/erlang" + sed -i "s#$pkgdir##" bin/erl bin/start "erts-${ERTSVERSION}/bin/erl" \ + "erts-${ERTSVERSION}/bin/start" releases/RELEASES -# fix symlinks - cd "$pkgdir/usr/lib/erlang/bin" - ln -sf ../erts-${ERTSVERSION}/bin/epmd + # fix symlinks + cd bin/ + ln -sf "../erts-${ERTSVERSION}/bin/epmd" cd "$pkgdir/usr/bin" for file in *; do - ln -sfv ../lib/erlang/bin/$file + ln -sfv "../lib/erlang/bin/$file" done - ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" + ln -s "../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call" \ + "$pkgdir/usr/bin/erl_call" -# install documentation + # install documentation install -d "$pkgdir/usr/share/doc/erlang" - install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" - cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + install -Dm0644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" - install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" + # install man pages + cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + # install license + install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" \ + "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD index eee11f97b..1324daaee 100644 --- a/community/esdl/PKGBUILD +++ b/community/esdl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=esdl pkgver=1.0.1 -pkgrel=1 +pkgrel=2 epoch=2 arch=('x86_64' 'i686') pkgdesc="SDL and OpenGL bindings for the Erlang programming language" diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index f914a6d91..0773f67d3 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67178 2012-03-05 08:56:50Z ibiru $ +# $Id: PKGBUILD 69756 2012-04-23 09:15:01Z ibiru $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.2.0_beta1 -pkgrel=4 +pkgrel=5 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 0c17566b7..ceb786751 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69042 2012-04-08 17:05:00Z lcarlier $ +# $Id: PKGBUILD 69722 2012-04-23 07:27:51Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ 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=3.1.0 +pkgver=3.1.1 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') @@ -28,7 +28,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=('e41982c83e8b27bd2cba8fe8c173b979' +md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') diff --git a/community/gdlmm/PKGBUILD b/community/gdlmm/PKGBUILD index bdd1c68a5..3c5d0091f 100644 --- a/community/gdlmm/PKGBUILD +++ b/community/gdlmm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 61579 2012-01-03 16:01:24Z arodseth $ +# $Id: PKGBUILD 69726 2012-04-23 09:06:41Z ibiru $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gdlmm pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="C++ bindings for the gdl library" arch=('x86_64' 'i686') url="http://git.gnome.org/browse/gdlmm/" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index ff63dd9fd..8432fa488 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63362 2012-01-31 11:48:17Z arodseth $ +# $Id: PKGBUILD 69728 2012-04-23 09:06:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.2.1 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Plugins for gedit" arch=('x86_64' 'i686' 'mips64el') license=('GPL') @@ -15,23 +15,21 @@ url="http://live.gnome.org/GeditPlugins" depends=('gedit' 'dbus-python') optdepends=('gucharmap: for charmap plugin' 'vte3: for embedded terminal') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'gnome-doc-utils' 'vte3') options=('!libtool' '!emptydirs') install=gedit-plugins.install -source=("ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz") -sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841') +source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") +sha256sums=('a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD new file mode 100644 index 000000000..37d4a74fb --- /dev/null +++ b/community/glabels/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 69806 2012-04-23 09:47:01Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Damir Perisa <damir@archlinux.org> + +pkgname=glabels +pkgver=3.0.0 +pkgrel=3 +pkgdesc="Creating labels and business cards the very easy way" +arch=('i686' 'x86_64') +url="http://glabels.sourceforge.net/" +license=('GPL' 'LGPL') +depends=('librsvg' 'evolution-data-server>=3.4.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') +makedepends=('barcode' 'intltool' 'gnome-doc-utils') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + fix-gschema.patch) +sha256sums=('a3a3db4dd25bfb1a03f4008f01c5d9045174e78e13ae77438b81bfe4bf14e64a' + 'ef4f368b49fe66fb7e9c1c4edabb96e1f10fd3e8502d695aef6b89388c38cd94') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-gschema.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-scrollkeeper --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/glabels/fix-gschema.patch b/community/glabels/fix-gschema.patch new file mode 100644 index 000000000..51e197096 --- /dev/null +++ b/community/glabels/fix-gschema.patch @@ -0,0 +1,36 @@ +diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in +--- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in 2012-04-09 13:58:25.256413359 +0000 ++++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in 2012-04-09 13:59:40.495830152 +0000 +@@ -2,10 +2,10 @@ + + + <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="glabels-3.0"> +- <child name="ui" schema="org.gnome.glabels.ui"/> +- <child name="locale" schema="org.gnome.glabels.locale"/> +- <child name="objects" schema="org.gnome.glabels.objects"/> +- <child name="history" schema="org.gnome.glabels.history"/> ++ <child name="ui" schema="org.gnome.glabels-3.ui"/> ++ <child name="locale" schema="org.gnome.glabels-3.locale"/> ++ <child name="objects" schema="org.gnome.glabels-3.objects"/> ++ <child name="history" schema="org.gnome.glabels-3.history"/> + </schema> + + +diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in +--- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in 2012-04-09 13:58:25.256413359 +0000 ++++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in 2012-04-09 13:59:32.232560783 +0000 +@@ -2,10 +2,10 @@ + + + <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@"> +- <child name="ui" schema="org.gnome.glabels.ui"/> +- <child name="locale" schema="org.gnome.glabels.locale"/> +- <child name="objects" schema="org.gnome.glabels.objects"/> +- <child name="history" schema="org.gnome.glabels.history"/> ++ <child name="ui" schema="org.gnome.glabels-3.ui"/> ++ <child name="locale" schema="org.gnome.glabels-3.locale"/> ++ <child name="objects" schema="org.gnome.glabels-3.objects"/> ++ <child name="history" schema="org.gnome.glabels-3.history"/> + </schema> + + diff --git a/community/glabels/glabels.install b/community/glabels/glabels.install new file mode 100644 index 000000000..42bb5884d --- /dev/null +++ b/community/glabels/glabels.install @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource forceupdate + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 317810951..ec5771273 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 67184 2012-03-05 08:57:17Z ibiru $ +# $Id: PKGBUILD 69730 2012-04-23 09:07:06Z ibiru $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.20.4 +pkgver=1.22.0 pkgrel=1 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" license=('GPL') depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') -makedepends=('intltool' 'gnome-doc-utils' 'python2-sphinx' 'boost') +makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('038d106313774832c56c61312bb387a54cd2ffff50e6c7e56e47bc98b8b8531b') +sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,7 +24,8 @@ build() { --with-postgres-utils=/usr/bin \ --disable-scrollkeeper \ --disable-update-mime-database \ - --disable-static + --disable-static \ + PYTHON=python2 make } diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 4a7690194..bce6b8708 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69172 2012-04-09 23:02:59Z spupykin $ +# $Id: PKGBUILD 69809 2012-04-23 10:15:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.1.1 +pkgver=1.5.1.2 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,11 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('858a1d8d06d19a1903feb5314a58c805' +md5sums=('1599803b0c60aa834cdc4f6200db5335' '62515a0e477e71e11ee24f66b5799937') build() { cd "$srcdir/gmic-$pkgver" -# CFLAGS+=" -Dcimg_use_lapack" -# LDFLAGS="-llapack" patch -p1 <$srcdir/opencv-buildfix.patch make -C src all } diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 0d2ffa8b7..ffb1c210e 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68215 2012-03-19 12:02:37Z lfleischer $ +# $Id: PKGBUILD 69732 2012-04-23 09:07:15Z ibiru $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.2.1 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64' 'mips64el') url='http://www.packagekit.org/' @@ -11,20 +11,21 @@ license=('GPL') depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'packagekit') makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower') -optdepends=('gnome-settings-daemon-updates: update and message notifications') +optdepends=('polkit-gnome: required for privileged actions' + 'gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs' '!libtool') install="$pkgname.install" -source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" - 'arch.patch') -sha256sums=('7a6383a2a91fd29c0b6fd9b8900d498efd2e38b89149470433748d989926c341' - '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac') +source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") +sha256sums=('4f23be695b70bdda8b5c15237472a735bb1745af11dbc324eead9b988f2343c6') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/arch.patch" - sed -i 's/python/python2/' python/enum-convertor.py - sed -i 's/python enum-convertor.py/python2 enum-convertor.py/' python/packagekit/Makefile.{am,in} + _mime='application/x-xz-compressed-tar;application/x-servicepack;' + sed -i "s@MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in + + sed -i 's@python@python2@' python/enum-convertor.py + sed -i 's@python enum-convertor.py@python2 enum-convertor.py@' python/packagekit/Makefile.{am,in} export PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ @@ -39,6 +40,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -s DESTDIR="$pkgdir" install - - rm -rf "$pkgdir/usr/lib/gnome-settings-daemon-3.0/gtk-modules" } diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 31e48a2b5..ced18ce73 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 68092 2012-03-17 19:45:14Z giovanni $ +# $Id: PKGBUILD 69734 2012-04-23 09:07:27Z ibiru $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.2.0 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnome.org" license=('GPL') depends=('gnome-packagekit' "$_pkgname") -makedepends=('intltool' 'gtk-doc' 'gnome-desktop') +makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom') options=('!emptydirs' '!libtool') install=$_pkgname.install +url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" + 'systemd-fallback.patch' 'arch.patch') -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' - 'e5029915c423f72256c4170f917363c385b6fcd180b87ceba0d7bb11a841d7e9') +sha256sums=('5639cbba28caa7b3e33990f49aeed11ed9325e78e76af2175d9ccd5ff298401d' + '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199' + '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e') build() { cd "$srcdir/$_pkgname-$pkgver" + patch -Np1 -i "$srcdir/arch.patch" - ./configure --prefix=/usr \ + patch -Np1 -i "$srcdir/systemd-fallback.patch" + + gnome-autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon \ --disable-static \ - --enable-pulse \ - --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids + --enable-systemd + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make -s diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch index f405d7593..6718e4db9 100644 --- a/community/gnome-settings-daemon-updates/arch.patch +++ b/community/gnome-settings-daemon-updates/arch.patch @@ -36,7 +36,7 @@ index 9510c65..191092d 100644 libupdates_la_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c -index 90ea246..d79455c 100644 +index 4ed046c..9842b32 100644 --- a/plugins/updates/gsd-updates-manager.c +++ b/plugins/updates/gsd-updates-manager.c @@ -32,6 +32,7 @@ @@ -55,7 +55,7 @@ index 90ea246..d79455c 100644 GSettings *settings_ftp; GSettings *settings_gsd; GSettings *settings_http; -@@ -1359,6 +1361,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, +@@ -1358,6 +1360,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, g_signal_connect (manager->priv->refresh, "get-updates", G_CALLBACK (due_get_updates_cb), manager); @@ -65,7 +65,7 @@ index 90ea246..d79455c 100644 /* get http settings */ manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http"); g_signal_connect (manager->priv->settings_http, "changed", -@@ -1464,6 +1469,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager) +@@ -1463,6 +1468,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager) g_object_unref (manager->priv->firmware); manager->priv->firmware = NULL; } @@ -78,7 +78,7 @@ index 90ea246..d79455c 100644 manager->priv->proxy_session = NULL; diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c new file mode 100644 -index 0000000..892acad +index 0000000..37d8778 --- /dev/null +++ b/plugins/updates/gsd-updates-watch.c @@ -0,0 +1,179 @@ @@ -125,13 +125,13 @@ index 0000000..892acad +static void +gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch) +{ -+ NotifyNotification *notification; ++ NotifyNotification *notification; + gchar *details = NULL; + const gchar *title, *message; + GError *error = NULL; + + g_return_if_fail (PK_IS_MESSAGE (item)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + + g_object_get (item, "details", &details, NULL); + title = _("More information"); @@ -148,15 +148,15 @@ index 0000000..892acad + } + + /* display a notification */ -+ notification = notify_notification_new (title, message, NULL); ++ notification = notify_notification_new (title, message, NULL); + notify_notification_set_app_name (notification, _("Software Updates")); -+ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); -+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); ++ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); ++ notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); + -+ if (!notify_notification_show (notification, &error)) { -+ g_warning ("error: %s", error->message); -+ g_error_free (error); -+ } ++ if (!notify_notification_show (notification, &error)) { ++ g_warning ("error: %s", error->message); ++ g_error_free (error); ++ } + + g_free (details); +} @@ -170,9 +170,9 @@ index 0000000..892acad + GPtrArray *array; + GError *error = NULL; + -+ g_return_if_fail (PK_IS_CLIENT (client)); ++ g_return_if_fail (PK_IS_CLIENT (client)); + g_return_if_fail (G_IS_ASYNC_RESULT (res)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + + results = pk_client_generic_finish (client, res, &error); + if (results == NULL) { @@ -206,9 +206,9 @@ index 0000000..892acad +static void +gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch) +{ -+ g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist)); -+ g_return_if_fail (tid != NULL); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist)); ++ g_return_if_fail (tid != NULL); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + + /* listen for messages */ + pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL, @@ -218,9 +218,9 @@ index 0000000..892acad +static void +gsd_updates_watch_init (GsdUpdatesWatch *watch) +{ -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + -+ watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch); ++ watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch); + watch->priv->tlist = pk_transaction_list_new (); + watch->priv->client = pk_client_new (); + @@ -231,12 +231,12 @@ index 0000000..892acad +static void +gsd_updates_watch_finalize (GObject *object) +{ -+ GsdUpdatesWatch *watch; ++ GsdUpdatesWatch *watch; + -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (object)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (object)); + -+ watch = GSD_UPDATES_WATCH (object); -+ g_return_if_fail (watch->priv != NULL); ++ watch = GSD_UPDATES_WATCH (object); ++ g_return_if_fail (watch->priv != NULL); + + if (watch->priv->tlist != NULL) { + g_object_unref (watch->priv->tlist); @@ -245,21 +245,21 @@ index 0000000..892acad + g_object_unref (watch->priv->client); + } + -+ G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object); ++ G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object); +} + +GsdUpdatesWatch * +gsd_updates_watch_new (void) +{ -+ return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL)); ++ return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL)); +} + +static void +gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass) +{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ object_class->finalize = gsd_updates_watch_finalize; -+ g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate)); ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ object_class->finalize = gsd_updates_watch_finalize; ++ g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate)); +} diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h new file mode 100644 diff --git a/community/gnome-settings-daemon-updates/systemd-fallback.patch b/community/gnome-settings-daemon-updates/systemd-fallback.patch new file mode 100644 index 000000000..ffe953c63 --- /dev/null +++ b/community/gnome-settings-daemon-updates/systemd-fallback.patch @@ -0,0 +1,154 @@ +commit b9ded09387f0b99ece97baee18595eb9e86a5b9b +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:52:54 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index 3b4789f..d522852 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) + SESSION_TRACKING=systemd + else +diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c +index 5786300..83fe21e 100644 +--- a/gnome-settings-daemon/gnome-settings-session.c ++++ b/gnome-settings-daemon/gnome-settings-session.c +@@ -30,6 +30,7 @@ + #include "gnome-settings-session.h" + + #ifdef HAVE_SYSTEMD ++#include <systemd/sd-daemon.h> + #include <systemd/sd-login.h> + + typedef struct +@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate + { + #ifdef HAVE_SYSTEMD + GSource *sd_source; +-#else ++#endif + GDBusProxy *proxy_session; + GCancellable *cancellable; +-#endif + gchar *session_id; + GnomeSettingsSessionState state; + }; +@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data) + return TRUE; + } + +-#else /* HAVE_SYSTEMD */ ++#endif /* HAVE_SYSTEMD */ + + static void + gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy, +@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d + g_object_unref (proxy_manager); + } + +-#endif /* HAVE_SYSTEMD */ +- + static void + gnome_settings_session_init (GnomeSettingsSession *session) + { + session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session); + + #ifdef HAVE_SYSTEMD +- sd_pid_get_session (getpid(), &session->priv->session_id); ++ session->priv->sd_source = NULL; ++ ++ if (sd_booted () > 0) { ++ sd_pid_get_session (getpid(), &session->priv->session_id); + +- session->priv->sd_source = sd_source_new (); +- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); +- g_source_attach (session->priv->sd_source, NULL); ++ session->priv->sd_source = sd_source_new (); ++ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); ++ g_source_attach (session->priv->sd_source, NULL); + +- sessions_changed (session); +-#else ++ sessions_changed (session); ++ return; ++ } ++#endif + session->priv->cancellable = g_cancellable_new (); + + /* connect to ConsoleKit */ +@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session) + session->priv->cancellable, + got_manager_proxy_cb, + session); +-#endif + } + + static void +@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object) + if (session->priv->sd_source != NULL) { + g_source_destroy (session->priv->sd_source); + g_source_unref (session->priv->sd_source); ++ goto out; + } +-#else ++#endif ++ + g_cancellable_cancel (session->priv->cancellable); + + if (session->priv->proxy_session != NULL) + g_object_unref (session->priv->proxy_session); + g_object_unref (session->priv->cancellable); +-#endif + ++out: + G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object); + } + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 8db04e5..9883d76 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -2031,7 +2031,7 @@ systemd_stop (void) + g_object_unref (bus); + } + +-#else ++#endif + + static void + consolekit_stop_cb (GObject *source_object, +@@ -2081,7 +2081,6 @@ consolekit_stop (void) + consolekit_stop_cb, NULL); + g_object_unref (proxy); + } +-#endif + + static void + upower_sleep_cb (GObject *source_object, +@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager, + * hibernate is not available and is marginally better + * than just powering down the computer mid-write */ + #ifdef HAVE_SYSTEMD +- systemd_stop (); +-#else +- consolekit_stop (); ++ if (sd_booted () > 0) ++ systemd_stop (); ++ else + #endif ++ consolekit_stop (); + break; + case GSD_POWER_ACTION_BLANK: + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index b245f93cc..f553e04e7 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64329 2012-02-11 23:21:43Z allan $ +# $Id: PKGBUILD 69794 2012-04-23 09:41:58Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.8.2 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 pkgdesc="A note taking application." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Gnote" @@ -13,10 +13,10 @@ makedepends=('intltool' 'gnome-doc-utils' 'boost') options=('!libtool') install=gnote.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.xz) -sha256sums=('7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992') +sha256sums=('41308f957b9cb6f885adb61a607b93ec969be069676e7d518c007ecf35f474ab') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -28,6 +28,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 4a2a82d58..b2afaf904 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 64331 2012-02-11 23:21:51Z allan $ +# $Id: PKGBUILD 69832 2012-04-24 11:08:37Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource -pkgver=0.37 -pkgrel=2 +pkgver=0.38 +pkgrel=1 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64 'mips64el') url=http://code.google.com/p/gource/ -depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') +depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew' 'boost-libs') +makedepends=('boost' 'glm') source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('9c023429a8a495e6473d4c166788278a') +md5sums=('6584241879dbb6dfaecc6ae6b58ad38c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD index f1bc12e0c..6d5200832 100644 --- a/community/gpicview/PKGBUILD +++ b/community/gpicview/PKGBUILD @@ -1,19 +1,22 @@ -# $Id: PKGBUILD 52590 2011-07-26 09:08:13Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 69882 2012-04-25 13:40:48Z bpiotrowski $ +# Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + pkgname=gpicview -pkgver=0.2.2 -pkgrel=1.1 -pkgdesc="Picture viewer of the LXDE Desktop" +pkgver=0.2.3 +pkgrel=1 +pkgdesc="lightweight image viewer" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2') +depends=('gtk2' 'desktop-file-utils') +install=$pkgname.install makedepends=('pkgconfig' 'intltool') optdepends=('librsvg: For SVG support') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('943da9f4a23541accd5acdd4fb69966f') +source=(http://ftp.de.debian.org/debian/pool/main/g/$pkgname/${pkgname}_${pkgver}.orig.tar.xz) +md5sums=('0f1275b5b0ca66e48963a7ccda8a5019') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpicview/gpicview.install b/community/gpicview/gpicview.install new file mode 100644 index 000000000..bc3abcd40 --- /dev/null +++ b/community/gpicview/gpicview.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/gtk-engine-unico/PKGBUILD b/community/gtk-engine-unico/PKGBUILD index aea29b9f9..3fd503843 100644 --- a/community/gtk-engine-unico/PKGBUILD +++ b/community/gtk-engine-unico/PKGBUILD @@ -1,17 +1,18 @@ -# Maintainer: Bartlomiej Piotrowski +# $Id: PKGBUILD 69736 2012-04-23 09:07:35Z ibiru $ +# Maintainer: Bartlomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Hilinus <itahilinus[at]hotmail[dot]it> pkgname=gtk-engine-unico -pkgver=1.0.1 -pkgrel=2 +pkgver=1.0.2 +pkgrel=1 pkgdesc="Unico GTK3 theme engine" arch=('i686' 'x86_64') url="https://launchpad.net/unico" license=('GPL') depends=("gtk3") -source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") -md5sums=('1e56ff86337120dcf1b04dd443ea4b71') options=(!libtool) +source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") +md5sums=('19fb3ecc36d4d13b4a76e26a4ebd6412') build() { diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 6b3aed518..5b612932f 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 68181 2012-03-18 21:14:51Z jlichtblau $ +# $Id: PKGBUILD 69738 2012-04-23 09:07:48Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator -pkgver=2.90.8 -pkgrel=1 +pkgver=2.91.3 +pkgrel=2 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/gtranslator/" license=('GPL') -depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell' 'iso-codes' 'libgda' 'libpeas' 'libunique' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'gnome-utils' 'gucharmap' 'json-glib') -optdepends=('gtkspell: spell check' - 'gucharmap: for charmap plugin' +depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') +makedepends=('intltool' 'gnome-doc-utils' 'gucharmap' 'json-glib') +optdepends=('gucharmap: for charmap plugin' 'json-glib: for open-tran plugin') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.90/$pkgname-$pkgver.tar.xz) -sha256sums=('89f6be55d901d62e09065ed92f471eb569834eaa7babc8a48b2255c26a105037') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) +sha256sums=('0e398cf7909d1fbaf9db66e20913553b38d1af7cad097f5bc8cc229d9ffbc594') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog index 301bec578..c9b484e39 100644 --- a/community/gtranslator/gtranslator.changelog +++ b/community/gtranslator/gtranslator.changelog @@ -1,3 +1,16 @@ +2012-04-23 Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + * gtranslator 2.91.3-2 + rebuild for gdl 3.4.2 + +2012-04-21 Balló György <ballogyor+arch at gmail dot com> + * gtranslator 2.91.3-1 + +2012-04-09 Balló György <ballogyor+arch at gmail dot com> + * gtranslator 2.91.2-1 + replace gtkspell dependency with gtkspell3 + remove unused libunique dependency + remove broken dictionary plugin + 2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * gtranslator 2.90.8-1 diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD new file mode 100644 index 000000000..739432875 --- /dev/null +++ b/community/gwibber/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 69796 2012-04-23 09:42:07Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gwibber +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku" +arch=('i686' 'x86_64') +url="http://gwibber.com/" +license=('GPL') +depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'dbus-python' 'python2-httplib2' 'python-egenix-mx-base' 'python2-oauth' 'python-imaging' 'pyxdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'vala>=0.15.0') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + lp_959068.patch) +md5sums=('cec2c692d870f7aa7fb6a7cb556617ad' + 'c15dd5289f36270f980036ead71b6c20') + +build() { + cd "$srcdir/$pkgname-$pkgver" + find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np1 -i "$srcdir/lp_959068.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile --disable-unity + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/gwibber/gwibber.install b/community/gwibber/gwibber.install new file mode 100644 index 000000000..d973d53f7 --- /dev/null +++ b/community/gwibber/gwibber.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/gwibber/lp_959068.patch b/community/gwibber/lp_959068.patch new file mode 100644 index 000000000..66b288ba7 --- /dev/null +++ b/community/gwibber/lp_959068.patch @@ -0,0 +1,27 @@ +=== modified file 'libgwibber/streams.vala' +--- old/libgwibber/streams.vala 2012-03-19 13:35:30 +0000 ++++ new/libgwibber/streams.vala 2012-04-04 20:53:49 +0000 +@@ -213,13 +213,21 @@ + model = create_model (); + } + model.row_removed.connect((_m, _i) => { ++ var to_remove = new GLib.List <string> (); + foreach (var v in seen.entries) + { + if (v.value == _i) + { +- seen.unset(v.key); ++ /* defer calling unset until after we are done iterating ++ * the HashMap, it will resize making the iterator invalid ++ * This is fixed in the 0.7 series of libgee ++ * https://bugzilla.gnome.org/show_bug.cgi?id=671327 ++ */ ++ to_remove.prepend (v.key); + } + } ++ foreach (var v in to_remove) ++ seen.unset(v); + }); + Idle.add(() => { + refresh_model_async.begin (); + diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD index a7355073f..dcc84c1d8 100644 --- a/community/ibus-qt/PKGBUILD +++ b/community/ibus-qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66611 2012-02-26 14:33:07Z lfleischer $ +# $Id: PKGBUILD 69758 2012-04-23 09:15:08Z ibiru $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: garion < garion @ mailoo.org > # Contributor: leemars pkgname=ibus-qt pkgver=1.3.1 -pkgrel=4 +pkgrel=5 pkgdesc='IBus qt library and IBus qt input method plugin' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/community/kpartsplugin/PKGBUILD b/community/kpartsplugin/PKGBUILD index c0494e486..13f9135c8 100644 --- a/community/kpartsplugin/PKGBUILD +++ b/community/kpartsplugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60774 2011-12-17 17:24:00Z tredaelli $ +# $Id: PKGBUILD 69899 2012-04-25 21:22:15Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: birdflesh <antkoul at gmail dot com> # Contributor: Frikilinux <frikilinux at frikilinux.com.ar> pkgname=kpartsplugin -pkgver=20110823 -pkgrel=2 +pkgver=20120422 +pkgrel=1 pkgdesc="This plugin uses KDE's KParts to embed file viewers into non-KDE browsers" arch=('i686' 'x86_64') url="http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/" @@ -12,7 +12,7 @@ license=('GPL3' 'BSD') depends=('kdelibs') makedepends=('automoc4' 'cmake') source=("${url}${pkgname}-${pkgver}.tar.bz2" "LICENSE") -md5sums=('d134198ff2f05ba414719920030ea71b' +md5sums=('6f1126a5f9a84374b14d99086a935026' 'c4cc811349e40e9f34e77e27b902ad96') build(){ diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 3bb9cbc28..8f607b960 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 69760 2012-04-23 09:15:22Z ibiru $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient pkgver=2.5.1.26351 -pkgrel=1 +pkgrel=2 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64' 'mips64el') url="http://www.firebirdsql.org/" diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD index 4ea8e9eaa..20ca74847 100644 --- a/community/libgexiv2/PKGBUILD +++ b/community/libgexiv2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67538 2012-03-13 11:15:40Z lcarlier $ +# $Id: PKGBUILD 69740 2012-04-23 09:07:53Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libgexiv2 -pkgver=0.3.1 +pkgver=0.4.1 pkgrel=2 pkgdesc="GObject-based wrapper around the Exiv2 library." arch=('i686' 'x86_64' 'mips64el') -url="http://trac.yorba.org/wiki/gexiv2" +url="http://redmine.yorba.org/projects/gexiv2" license=('GPL2') depends=('exiv2' 'glib2') options=('!libtool') source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('828894bb4bcb4625820b8c0c468417e9cd8c5c2f') +sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index e890567e6..a945f315b 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 61193 2011-12-24 11:33:27Z bpiotrowski $ +# $Id: PKGBUILD 69844 2012-04-24 15:37:58Z 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=2 +pkgver=0.5.9 +pkgrel=1 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 - battery.patch) -optdepends=(pcmanfm) +depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck') +makedepends=('wireless_tools') +optdepends=('wireless_tools: netstat plugin') +source=(http://ftp.de.debian.org/debian/pool/main/l/$pkgname/${pkgname}_${pkgver}.orig.tar.xz) +md5sums=('c0b5864ea53113f4b1d4b8a46e9fb8ee') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/battery.patch" - - ./configure --sysconfdir=/etc --prefix=/usr + CFLAGS+=" -lgmodule-2.0" ./configure --sysconfdir=/etc --prefix=/usr make } @@ -29,7 +28,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('129fae75d1cd3983fd94542c573a70a1' - '5fadb4d5aca09c81138677e91f995d98') -md5sums=('129fae75d1cd3983fd94542c573a70a1' - '5fadb4d5aca09c81138677e91f995d98') diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index a558800ba..8542d8063 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 67899 2012-03-15 23:14:31Z ebelanger $ +# $Id: PKGBUILD 69762 2012-04-23 09:15:36Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=15 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." +pkgrel=16 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" license=('LGPL') @@ -24,13 +24,15 @@ optdepends=('libxslt: Web Map Service' 'mod_wsgi: Web Map Service' ) makedepends=('scons' 'boost') # already in core ('pkg-config') -conflicts=('mapnik-svn') install="mapnik.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8f65fda2a792518d6f6be8a85f62fc73') +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc47.patch') +md5sums=('8f65fda2a792518d6f6be8a85f62fc73' + 'ce7933dc20de7e07427a6a6b5d4fd002') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "${srcdir}"/gcc47.patch #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct @@ -43,6 +45,7 @@ build() { DESTDIR="$pkgdir" scons } + package(){ cd "$srcdir/$pkgname-$pkgver" scons install diff --git a/community/mapnik/gcc47.patch b/community/mapnik/gcc47.patch new file mode 100644 index 000000000..0532e0c21 --- /dev/null +++ b/community/mapnik/gcc47.patch @@ -0,0 +1,11 @@ +--- mapnik-0.7.1/include/mapnik/factory.hpp~ 2010-03-22 16:40:04.000000000 +0000 ++++ mapnik-0.7.1/include/mapnik/factory.hpp 2012-04-05 15:55:13.460191219 +0000 +@@ -84,7 +84,7 @@ + { + return (pos->second)(file); + } +- return on_unknown_type(key); ++ return this->on_unknown_type(key); + } + }; + } diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch new file mode 100644 index 000000000..2debc92fe --- /dev/null +++ b/community/midori/0001-Fix-libsoup-version-check-defines.patch @@ -0,0 +1,28 @@ +From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001 +From: Christian Dywan <christian@twotoasts.de> +Date: Mon, 16 Apr 2012 17:17:23 +0000 +Subject: Fix libsoup version check #defines + +Fixes: https://bugs.launchpad.net/midori/+bug/983137 +--- +diff --git a/wscript b/wscript +index db74324..c7a0c87 100644 +--- a/wscript ++++ b/wscript +@@ -260,11 +260,11 @@ def configure (conf): + check_pkg ('libsoup-2.4', '2.27.90') + conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3): +- conf.define ('LIBSOUP_2_29_3', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_3', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91): +- conf.define ('LIBSOUP_2_29_91', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_91', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1): +- conf.define ('LIBSOUP_2_37_1', 1) ++ conf.define ('HAVE_LIBSOUP_2_37_1', 1) + check_pkg ('libxml-2.0', '2.6') + check_pkg ('sqlite3', '3.0', True, var='SQLITE') + +-- +cgit v0.9.0.3 diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 22da899e8..8e1242d7b 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,40 +1,52 @@ -# $Id: PKGBUILD 69383 2012-04-15 05:22:45Z bpiotrowski $ +# $Id: PKGBUILD 69842 2012-04-24 15:19:18Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> +# Contributor: BartÅ‚omiej Piotrowski <barthalion@gmail.com> pkgname=midori pkgver=0.4.5 -pkgrel=1 -pkgdesc="A lightweight web browser based on Gtk WebKit" -arch=('i686' 'x86_64') +pkgrel=2 +pkgdesc="Lightweight web browser based on Gtk WebKit" +arch=('x86_64' 'i686') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" license=('LGPL2.1') install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('14288197a1e2251b7c0803e1448daa0e') +options=('!emptydirs') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + 0001-Fix-libsoup-version-check-defines.patch) +sha256sums=('7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84' + '0095c23247c62b6a4b3ab4312f68b49e2d0974ce3fd701a2ce0114817c7bd399') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf - ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \ - --enable-addons \ - --disable-hildon \ - --enable-unique \ - --enable-nls \ - --enable-docs \ - --enable-apidocs + # FS#29468 + patch -Np1 -i "$srcdir"/0001-Fix-libsoup-version-check-defines.patch + + ./configure \ + --prefix=/usr \ + --jobs=${MAKEFLAGS/-j/} \ + --enable-addons \ + --disable-hildon \ + --enable-unique \ + --enable-nls \ + --enable-docs \ + --enable-apidocs 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/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index b1d8186fb..824fdd478 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -3,18 +3,18 @@ # Contributor: Bartek Piotrowski <barthalion@gmail.com> pkgname=mplayer2 -_commit=3a39fc1 -pkgver="2.0.20111114+g${_commit}" -_snapshot="${pkgname}-${_commit}" -pkgrel=1 -pkgdesc="A movie player" +pkgver=20120414 +pkgrel=4 +pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.mplayer2.org/" -depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' - 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' - 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa') -makedepends=('mesa' 'unzip' 'yasm' 'git') +install=$pkgname.install +depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' + 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' + 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau' + 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') +makedepends=('mesa' 'unzip' 'yasm') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index ac9609371..a7687df62 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 67364 2012-03-10 11:47:55Z bpiotrowski $ -# Maintainer: BartÅ‚omiej Piotrowski +# $Id: PKGBUILD 69884 2012-04-25 14:08:08Z bpiotrowski $ +# Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Pierre-Paul Paquin <pierrepaulpaquin@gmail.com> # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=0.9 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64' 'mips64el') url="http://mupdf.com" @@ -15,38 +15,25 @@ license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('76640ee16a797a27fe49cc0eaa87ce3a') +md5sums=('d986ab98e2b035b7abd61afc474562b3') build() { CFLAGS+=" -fPIC" CXXFLAGS+=" -fPIC" - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir"/$pkgname-$pkgver-source make build=release prefix="$pkgdir/usr" } package() { - # Install - cd "$srcdir/$pkgname-$pkgver" - make build=release prefix="${pkgdir}/usr" install + cd "$srcdir"/$pkgname-$pkgver-source + make build=release prefix="$pkgdir/usr" install - # Rename executables - msg "Renaming executables" - cd "${pkgdir}/usr/bin" - for i in pdf*; do - mv "$i" "$i-mupdf"; - done + sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop + sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop - # Fix mupdf.desktop - cd "$srcdir/$pkgname-$pkgver" - sed -i "s/mupdf.xpm/mupdf/" debian/mupdf.desktop - sed -i "s/application\/x-pdf/application\/x-pdf/" debian/mupdf.desktop + install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop + install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm - # Install other stuff - cd "$srcdir/$pkgname-$pkgver/debian" - install -Dm644 mupdf.desktop "$pkgdir/usr/share/applications/mupdf.desktop" - install -Dm644 mupdf.xpm "$pkgdir/usr/share/pixmaps/mupdf.xpm" - - # Fix permissions - chmod 644 $pkgdir/usr/lib/{libmuxps.a,libfitz.a,libmupdf.a} + chmod 644 "$pkgdir"/usr/lib/libfitz.a } diff --git a/community/mupdf/mupdf.install b/community/mupdf/mupdf.install index 7f12704ae..b4632d36d 100644 --- a/community/mupdf/mupdf.install +++ b/community/mupdf/mupdf.install @@ -1,5 +1,4 @@ post_install() { - [ -x /usr/bin/update-desktop-database ] || return 0 update-desktop-database -q } diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index cb798bf21..1bcf9cf0a 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69550 2012-04-18 07:41:47Z arodseth $ +# $Id: PKGBUILD 69742 2012-04-23 09:08:05Z ibiru $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 307397266..552811bc8 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69421 2012-04-16 09:40:51Z spupykin $ +# $Id: PKGBUILD 69838 2012-04-24 14:09:55Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -12,8 +12,8 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.15 -pkgrel=1 +pkgver=1.2.0 +pkgrel=2 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" "etc/conf.d/nginx") source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'nginx') -md5sums=('17da4802209b83d9bebb0f0edd975dfc' +md5sums=('a02ef93d65a7031a1ea3256ad5eba626' '0e8032d3ba26c3276e8c7c30588d375f') build() { @@ -59,7 +59,9 @@ build() { --add-module=/usr/lib/passenger/ext/nginx \ --conf-path=${_conf_path}/nginx.conf \ --http-scgi-temp-path=${_tmp_path} \ - --http-uwsgi-temp-path=${_tmp_path} + --http-uwsgi-temp-path=${_tmp_path} \ + --with-pcre-jit \ + --with-http_realip_module #--with-http_mp4_module \ #--with-http_realip_module \ #--with-http_addition_module \ diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index aa4c06173..b51bf7aab 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 68082 2012-03-17 18:55:06Z spupykin $ +# $Id: PKGBUILD 69764 2012-04-23 09:16:01Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2012.03.13 _pkgsubver=651368 -pkgrel=1 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" +arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" license=('LGPL') -depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'glib2' 'uriparser' 'libsigc++' 'libxss') +depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'uriparser' 'libsigc++' 'libxss') makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') options=('docs' '!libtool') install=$pkgname.install -source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz scripts-network.patch scripts-network-FS19541.patch open-vm-tools-X11Bool.patch @@ -36,9 +36,7 @@ md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - [ $NOEXTRACT -eq 1 ] || { - sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac - } + [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules make } diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index e4b09ffb7..884a5e45c 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 68318 2012-03-21 13:43:42Z lcarlier $ +# $Id: PKGBUILD 69766 2012-04-23 09:16:08Z ibiru $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.2.0rc3 -_realpkgver=1.2.0-RC3 +pkgver=1.2.0 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +12,11 @@ depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop- install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') -source=("http://binaries.openttd.org/releases/${_realpkgver}/${pkgname}-${_realpkgver}-source.tar.xz") -md5sums=('c1ac9bbe6ec4e71a5938280e4cc9741f') +source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") +md5sums=('7f5181fdd5119336ccbe08f47eab78c1') build() { - cd ${pkgname}-${_realpkgver} + cd ${pkgname}-${pkgver} ./configure \ --prefix-dir=/usr \ @@ -33,7 +32,7 @@ build() { } package() { - cd ${pkgname}-${_realpkgver} + cd ${pkgname}-${pkgver} make install } diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index b6a2e92e3..909f7daf3 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 67927 2012-03-16 10:14:41Z spupykin $ +# $Id: PKGBUILD 69768 2012-04-23 09:16:14Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.1.0 +pkgver=4.2.0 #_rel=stable _rel=devel -pkgrel=2 +pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686' 'mips64el') url="http://www.parrotcode.org/" license=('GPL') -depends=('gmp' 'gdbm' 'readline' 'icu' 'openssl' 'libffi') +depends=('icu' 'openssl' 'libffi') makedepends=('perl-json') optdepends=('freeglut') -options=(!emptydirs !makeflags) -source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/parrot-$pkgver.tar.gz") -md5sums=('23c37c82aeac2d5bf9fd00a7873dab0d') +options=(!makeflags) +source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,29 +24,26 @@ build() { sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm - [ $NOEXTRACT -eq 1 ] || perl Configure.pl --prefix=/usr --parrot_is_shared + perl Configure.pl --prefix=/usr \ + --parrot_is_shared \ + --disable-rpath find -type f -name Makefile | while read F; do grep "$srcdir" $F && sed -i \ - "s#-Wl,-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true + "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F grep "$srcdir" $F && sed -i \ - "s#-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true + "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F done + + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" + make all parrot_utils docs html } package() { cd "$srcdir/$pkgname-$pkgver" - OLD_LIB_PATH=$LD_LIBRARY_PATH - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$srcdir/parrot-$pkgver/blib/lib - make -j1 all parrot_utils docs html RPATH_BLIB= - - export LD_LIBRARY_PATH=`pwd`/blib/lib - make -j1 DESTDIR="$pkgdir" install-dev + make DESTDIR="$pkgdir" install-dev - sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm - - export LD_LIBRARY_PATH=$OLD_LIB_PATH + sed -i "s#$srcdir#/usr/src#" \ + $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm } - -# vim:set ts=2 sw=2 et: diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index f1603d01c..8b75abcdd 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.4 +_dcpkgver=2.1.5 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.0 -pkgrel=5 +pkgrel=6 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD index 222ec87c7..fd362da67 100644 --- a/community/pion-net/PKGBUILD +++ b/community/pion-net/PKGBUILD @@ -1,33 +1,26 @@ -# $Id: PKGBUILD 67204 2012-03-05 08:58:47Z ibiru $ +# $Id: PKGBUILD 69770 2012-04-23 09:16:19Z ibiru $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: David Watzke <david@watzke.cz> pkgname=pion-net -pkgver=4.0.7 -pkgrel=3 +pkgver=4.0.11 +pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.pion.org/projects/pion-network-library" arch=('i686' 'x86_64') license=('custom:Boost') depends=('boost-libs' 'openssl' 'log4cpp') makedepends=('boost') -source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" - "$pkgname-4.0.5-build.patch") -md5sums=('761c8af8dc54102b637f8d91d162f987' - 'd75ea2af90163a81d2bc71fda00f0c00') +source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2") +md5sums=('e5cf42a02681c5d73e7be6784d99fece') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch" - # override configure bug (forces debug even when nobody asked for it) - sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure - - ./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp + sed -i "s/ -ggdb//g" configure - find -name Makefile -print0 | xargs -0 \ - sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile + ./configure --prefix=/usr --disable-doxygen-doc # override Makefile bug sed -i "/docs:/ s/doxygen-doc//" Makefile diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 811e77238..28e00f972 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69168 2012-04-09 22:12:26Z spupykin $ +# $Id: PKGBUILD 69786 2012-04-23 09:37:03Z 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.10 +pkgver=2.4.11 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,8 +18,8 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('71938de99cbb4fdefd74d7571831fa28' - '9726d06d0a0c60cb5d55a31b3dc1e55d' +md5sums=('ccd193d80196855343840db6110bf58d' + 'f8fb4b00ee3636c7dc7c173e2f6a4e76' '9e2d75b7a9dc421122d673fe520ef17f') build() { diff --git a/community/redis/redis.d b/community/redis/redis.d index 3294963ed..afd001fd5 100644 --- a/community/redis/redis.d +++ b/community/redis/redis.d @@ -12,6 +12,9 @@ PIDFILE=/var/run/redis.pid WORKDIR=/var/lib/redis CONF="/etc/redis.conf" +PID=$(cat $PIDFILE) +[ -d /proc/${PID} ] || rm -f $PIDFILE + case "$1" in start) stat_busy "Starting $daemon_name" diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 1d50429b8..8c3ed34d6 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68963 2012-04-06 14:50:59Z ttopper $ +# $Id: PKGBUILD 69819 2012-04-23 17:44:21Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.5.3 +pkgver=2.6.2 pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -sha1sums=('cd129f98982305f0c0d38228530c449253aa3327') -md5sums=('0fb38dd5ae034345ad6615ad98c4e3aa') +sha1sums=('eca312666a1ff1412df2cddf93a12631c01d1a3a') +md5sums=('5e5dc51b3341855fdb392f736476d89d') build() { diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 0e965efba..8711dda85 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,49 +1,33 @@ -# $Id: PKGBUILD 58472 2011-11-12 22:05:25Z lcarlier $ +# $Id: PKGBUILD 69744 2012-04-23 09:08:15Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.6 +pkgver=0.12.2 pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' - 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf') -makedepends=('intltool') -# 'vala' +depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' + 'desktop-file-utils' 'dconf' 'hicolor-icon-theme') +makedepends=('intltool' 'vala') install=shotwell.install -source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" - "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2" - "fix-with-libraw-0.4.patch") -md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf' - 'bf35262cc611de447147d01cbac33767' - '488787b6d2cbc7348bc88348b78b6005') +source=("http://yorba.org/download/shotwell/0.12/shotwell-${pkgver}.tar.bz2") +md5sums=('ce3a3204ca3c1dd451ac43e3b80c28d9') build() { - cd "${srcdir}/vala-0.12.1" - ./configure --prefix=$srcdir/vala --enable-vapigen - make - make install - export PATH=$srcdir/vala/bin:$PATH - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../fix-with-libraw-0.4.patch - ./configure --prefix=/usr \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - --disable-schemas-install \ + --disable-schemas-compile \ --disable-desktop-update \ --disable-icon-update - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled } diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index f1c053ce3..afde6eb8a 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,20 +2,20 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') url='http://launchpad.net/simple-scan' license=('GPL3') depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('yelp-tools' 'intltool') install=simple-scan.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('10fba94b60cd5159d54d3491f228ac9fe83ac0ab02b983d7cd8390aa26cf2ecc') +source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.gz) +sha256sums=('e1ed8f90f95300c7b75249d0e6abbc06185db2afd4d44be4b8d98822d25d4ece') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --disable-schemas-compile @@ -23,6 +23,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index bdb8cbb72..7ddc1d49a 100644 --- a/community/sword/PKGBUILD +++ b/community/sword/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68590 2012-03-28 20:56:27Z arodseth $ +# $Id: PKGBUILD 69772 2012-04-23 09:16:25Z ibiru $ # Maintainer: Alexander Rødseth # Contributor: Andrea Scarpino # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,7 +6,7 @@ pkgname=sword pkgver=1.6.2 -pkgrel=8 +pkgrel=7 pkgdesc="Library for Bible study programs" arch=('x86_64' 'i686' 'mips64el') url="http://www.crosswire.org/sword/" @@ -29,8 +29,7 @@ build() { CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DSWORD_GLOBAL_CONF_DIR=/etc + -DCMAKE_BUILD_TYPE=Release make } diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD index e843a55bf..d75d7d3bc 100644 --- a/community/tasks/PKGBUILD +++ b/community/tasks/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 61455 2011-12-31 18:09:39Z spupykin $ +# $Id: PKGBUILD 69748 2012-04-23 09:08:34Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: lp76 <l.peduto@gmail.com> pkgname=tasks pkgver=0.20 -pkgrel=1 +pkgrel=2 pkgdesc="A simple to do list application that uses libecal" arch=(i686 x86_64 mips64el) url="http://pimlico-project.org/tasks.html" license=('GPL') -depends=('evolution-data-server>=3.2.0' 'xdg-utils' 'gtk2') +depends=('evolution-data-server>=3.4.0' 'xdg-utils' 'gtk2') makedepends=('intltool') install=tasks.install #source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index b244920cd..84aeb3912 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67575 2012-03-13 12:37:07Z spupykin $ +# $Id: PKGBUILD 69788 2012-04-23 09:37:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=32.0.1 +pkgver=32.0.2 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('64c439a40743dffbf39b7b4a156d784c' +md5sums=('0d6ff6a4601a4aaaa7f24a05c9228e0e' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 0616951eb..a85ea7973 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 64535 2012-02-15 23:50:18Z svenstaro $ +# $Id: PKGBUILD 69896 2012-04-25 19:15:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2011.10.22 -pkgrel=4 -pkgdesc="An open source driving simulation made with drift racing in mind" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=6 +pkgdesc="Open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') url="http://vdrift.net/" license=('GPL') depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') @@ -17,7 +17,9 @@ md5sums=('6f8806ab1be303e9e1e47522c9eee890') install=vdrift.install build() { - cd "$srcdir"/$pkgname-${pkgver//./-} + cd "$srcdir" + + cd $pkgname-${pkgver//./-} # select arch if [ `uname -m` = "x86_64" ]; then @@ -56,6 +58,8 @@ package() { "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png install -Dm644 data/textures/icons/vdrift-64x64.png \ "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" rm -r $pkgdir/usr/share/vdrift } diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index 0f41f7909..6a291309d 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 68367 2012-03-23 06:59:41Z svenstaro $ +# $Id: PKGBUILD 69897 2012-04-25 19:17:33Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> pkgname=widelands -pkgver=16 -_realver=build16 -pkgrel=6 +pkgver=17 +_realver=build17 +pkgrel=1 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64' 'mips64el') url="http://widelands.org/" license=('GPL') -makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') -source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 - widelands-0.16-libpng15.patch - 6233_6232.diff +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data') +makedepends=('cmake' 'boost' 'ggz-client-libs') +source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" $pkgname.desktop $pkgname.png $pkgname.sh) -md5sums=('3d8c28e145b73c64d8ed1625319d25a2' - 'e492620b071cbd1db04280173653a67c' - '9f91bff91a6867cc3ecdea407007d781' +md5sums=('bdc9bc0aa631af1aa7fb450507611a58' '15820bf099fd6f16251fe70a75c534bb' '3dfda7e9ca76ca00dd98d745d0ceb328' '7cae50aba5ed0cd2cfeea79124637b46') @@ -28,8 +25,7 @@ md5sums=('3d8c28e145b73c64d8ed1625319d25a2' build() { cd $srcdir/$pkgname-$_realver-src - patch -Np0 < $srcdir/widelands-0.16-libpng15.patch - patch -Np0 < $srcdir/6233_6232.diff + sed -i "1 i #include <unistd.h>" src/main.cc mkdir -p build/compile && cd build/compile @@ -42,8 +38,6 @@ build() { } package() { - depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16') - cd $srcdir/$pkgname-$_realver-src/build/compile make DESTDIR="$pkgdir" install diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index e81b71cea..ead5b9e68 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -5,15 +5,15 @@ pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="3D modeling program" arch=('x86_64' 'i686') url="http://www.wings3d.com/" license=('GPL') depends=('esdl' 'bash' 'desktop-file-utils') makedepends=('setconf' 'gendesk') -optdepends=('povray: rendering support via POV-Ray' - 'kerkythea: rendering support via Kerkythea') +optdepends=('povray: rendering support via POV-Ray') +# 'kerkythea: rendering support via Kerkythea' replaces=('wings' 'wings-devel') install=$pkgname.install source=("http://downloads.sourceforge.net/wings/$_pkgname-$pkgver.tar.bz2" diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index f084b5547..cdc371a1d 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 66108 2012-02-23 01:07:34Z spupykin $ +# $Id: PKGBUILD 69790 2012-04-23 09:38:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.5.2 -pkgrel=4 -pkgdesc="A graphical user interfaces for chess" +pkgver=4.6.2 +pkgrel=1 +pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/xboard/" license=('GPL3') depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi') +makedepends=('gendesk') install=${pkgname}.install -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - 'xboard.desktop') -md5sums=('2fa92fceeda344ef935bc97bef5f9fc5' - '1d9d4a7864465a703fe4a215e83f4806') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('6e6d119fac60d68139d7836426212efb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}" + gendesk + + cd "${pkgname}-${pkgver}" sed -i 's/fairymax/gnuchess/g' xboard.h xboard.conf.in ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc make @@ -27,7 +29,10 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -Dm644 ${srcdir}/${pkgname}.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 ${srcdir}/${pkgname}.png \ + ${pkgdir}/usr/share/pixmaps/${pkgname}.png } diff --git a/community/xboard/xboard.desktop b/community/xboard/xboard.desktop index ff79ab684..4bdfdbe15 100644 --- a/community/xboard/xboard.desktop +++ b/community/xboard/xboard.desktop @@ -1,9 +1,10 @@ [Desktop Entry] +Encoding=UTF-8 Type=Application -Version=1.0 -Name=XBoard -Comment=An X Window System graphical chessboard +Name=Xboard +Comment=A graphical user interfaces for chess Exec=xboard -Icon=xboard +Icon=xboard.png Terminal=false -Categories=Game;BoardGame +StartupNotify=false +Categories=Application; diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 52fc29143..6a2ab49a2 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68192 2012-03-18 22:20:01Z arodseth $ +# $Id: PKGBUILD 69782 2012-04-23 09:18:43Z ibiru $ # Maintainer: Vesa Kaihlavirta # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=yaws pkgver=1.92 -pkgrel=1 +pkgrel=2 pkgdesc='Yet Another Web Server -- The pure Erlang HTTP server/framework' arch=('x86_64' 'i686' 'mips64el') url='http://yaws.hyber.org/' @@ -22,7 +22,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var for file in www/cgi.yaws www/cgi-bin/foo.py; do # python2 fix - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i '0,/on/s//on2/' "$file" done make } diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index b71dd9630..2fee0ffbe 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61282 2011-12-28 01:58:33Z seblu $ +# $Id: PKGBUILD 69774 2012-04-23 09:16:32Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.2.24 +pkgver=4.2.29 pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64' 'mips64el') @@ -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=('204486e174159e70c4ce6341e7af3b0a') +md5sums=('584bcf12401f182a42091616c6cf7e0a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index d6e46b96e..ea2d5bf2c 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152442 2012-03-06 23:41:04Z bisson $ +# $Id: PKGBUILD 157123 2012-04-24 08:19:47Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> @@ -8,20 +8,18 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. pkgver=9.9.0 _pkgver=9.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='DNS utilities: dig host nslookup' url='http://www.isc.org/software/bind/' license=('custom:ISC') arch=('i686' 'x86_64' 'mips64el') options=('!makeflags') -depends=('openssl' 'krb5' 'idnkit') +depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'remove-bind.patch' - 'trusted-key.key') + 'remove-bind.patch') sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094' - 'b465ef6160b004838f04de9978fe1be8422af777' - 'ca93da30c89de4365b846325d6ec4674a3e4fc02') + 'b465ef6160b004838f04de9978fe1be8422af777') replaces=('bind-tools' 'host') @@ -49,7 +47,6 @@ build() { package() { cd "${srcdir}/bind-${_pkgver}" - install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" cd bin; make DESTDIR="${pkgdir}" install } diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 01c980695..08d6c4710 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 149930 2012-02-11 23:29:30Z allan $ +# $Id: PKGBUILD 157012 2012-04-23 09:23:05Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.30.2 +pkgver=2.32.1 pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -12,15 +12,18 @@ depends=('pcre' 'libffi') makedepends=('pkgconfig' 'python2') optdepends=('python2: for gdbus-codegen') options=('!libtool' '!docs' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz glib2.sh - glib2.csh) -sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82' + glib2.csh + revert-warn-glib-compile-schemas.patch) +sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { - cd "${srcdir}/glib-${pkgver}" + cd glib-$pkgver + patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-pcre=system \ @@ -29,15 +32,15 @@ build() { } package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install + cd glib-$pkgver + make DESTDIR="$pkgdir" install - install -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" - install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" + install -d "$pkgdir/etc/profile.d" + install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/" + install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/" - for _i in "${pkgdir}/etc/bash_completion.d/"*; do - chmod -x "${_i}" + for _i in "$pkgdir/etc/bash_completion.d/"*; do + chmod -x "$_i" done sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen } diff --git a/core/glib2/revert-warn-glib-compile-schemas.patch b/core/glib2/revert-warn-glib-compile-schemas.patch new file mode 100644 index 000000000..75b05103c --- /dev/null +++ b/core/glib2/revert-warn-glib-compile-schemas.patch @@ -0,0 +1,33 @@ +From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Thu, 12 Apr 2012 23:55:34 +0000 +Subject: glib-compile-schemas: warn about bad dconf paths + +For quite some time the recommended usage of GSettings and dconf has +been to use paths like /org/gnome/example/. Use of /apps/ has spilled +over from GConf and is continuing to make its way into a number of +applications as they port. + +glib-compile-schemas will now warn about these types of paths being +used. This generates a lot of noise, but hopefully it will reduce the +number of ported applications making this mistake. +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index cf02389..27d0181 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, + return; + } + ++ if (path && (g_str_has_prefix (path, "/apps/") || ++ g_str_has_prefix (path, "/desktop/") || ++ g_str_has_prefix (path, "/system/"))) ++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " ++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++ + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +cgit v0.9.0.2 diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index f32071eb9..5ac7fbe59 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 153932 2012-03-20 20:07:55Z ibiru $ +# $Id: PKGBUILD 157033 2012-04-23 09:53:11Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.2.0 -pkgrel=3 +pkgver=3.3.0 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -depends=('glibc' 'db' 'libnl') +depends=('glibc' 'db') makedepends=('linux-atm') optdepends=('linux-atm: ATM support') provides=('iproute') @@ -19,13 +19,9 @@ options=('!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz - iproute2-fhs.patch - fix-ip-l.patch - remove-libnl-headers.patch) -sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533' - '2416b11252364d7a6c742eabb4a6924a75637a46' - '2ec5513c44f89046438d65e2cda1a014010e3b73' - '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3') + iproute2-fhs.patch) +sha1sums=('25307c2418b9d4c6433d61a296f50b886da84b8c' + '2416b11252364d7a6c742eabb4a6924a75637a46') build() { cd $srcdir/$pkgname-$pkgver @@ -33,10 +29,6 @@ build() { # set correct fhs structure patch -Np1 -i "$srcdir/iproute2-fhs.patch" - #upstream fixes - patch -Np1 -i "$srcdir/fix-ip-l.patch" - patch -Np1 -i "$srcdir/remove-libnl-headers.patch" - ./configure make diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 5b0eeb6f0..57a59af85 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155732 2012-04-06 00:04:08Z tomegun $ +# $Id: PKGBUILD 157131 2012-04-24 12:21:20Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=7 -pkgrel=2 +pkgver=8 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64' 'mips64el') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -17,7 +17,7 @@ source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.t "depmod-search.conf" "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch" "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") -md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb' +md5sums=('d4e3d038b5370b1e8ff237c55666aa64' 'dd62cbf62bd8f212f51ef8c43bec9a77' 'ba73b9e98db1abbf41274f922fcfbd55' 'c9af56636c5667cf4ce3a31ea56e03d9') diff --git a/testing/ldns/Makefile.patch b/core/ldns/Makefile.patch index d98291ac9..d98291ac9 100644 --- a/testing/ldns/Makefile.patch +++ b/core/ldns/Makefile.patch diff --git a/testing/ldns/PKGBUILD b/core/ldns/PKGBUILD index d113c41ec..bd7fe152d 100644 --- a/testing/ldns/PKGBUILD +++ b/core/ldns/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156650 2012-04-22 08:06:30Z bisson $ +# $Id: PKGBUILD 157125 2012-04-24 08:19:51Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: mathieui <mathieui@mathieui.net> # Contributor: jiribb <jiribb@gmail.com> diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 49f2f87ee..49bc64e2f 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 153965 2012-03-21 06:20:49Z pierre $ +# $Id: PKGBUILD 157127 2012-04-24 08:19:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=5.9p1 -pkgrel=8 +pkgver=6.0p1 +pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' -arch=('i686' 'x86_64' 'mips64el') -license=('custom:BSD') url='http://www.openssh.org/portable.html' -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('krb5' 'openssl' 'libedit') +license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') +depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'sshd.close-sessions' 'sshd.confd' 'sshd.pam' 'sshd') -sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' +sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '3413909fd45a28701c92e6e5b59c6b65346ddb0f' '21fa88de6cc1c7912e71655f50896ba17991a1c2') +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,19 +32,27 @@ build() { --prefix=/usr \ --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh \ - --with-privsep-user=nobody \ - --with-md5-passwords \ + --with-ldns \ + --with-libedit \ + --with-ssl-engine \ --with-pam \ - --with-mantype=man \ - --with-xauth=/usr/bin/xauth \ + --with-privsep-user=nobody \ --with-kerberos5=/usr \ - --with-ssl-engine \ - --with-libedit=/usr/lib \ - --disable-strip # stripping is done by makepkg + --with-xauth=/usr/bin/xauth \ + --with-mantype=man \ + --with-md5-passwords \ make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # The connect.sh test must be run by a user with a decent login shell; + # chroot builds use nobody with /bin/false. + make tests || true +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 69602c83c..9f8d2a54b 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 141268 2011-10-27 16:31:57Z ibiru $ +# $Id: PKGBUILD 156697 2012-04-23 09:03:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.15 +pkgver=0.6.18 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') url="http://cgit.freedesktop.org/accountsservice/" license=('GPL3') -depends=('dbus-glib' 'polkit') -makedepends=('intltool' 'gobject-introspection') +depends=('glib2' 'polkit' 'libsystemd') +makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') -source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('939e58e57334801ca578b182a09141c4') +source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz) +md5sums=('31bc335f7d96b88e0d572a67a9df063d') build() { - cd "$srcdir/$pkgname-$pkgver" - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc \ + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/accountsservice \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD index e074968c5..1fee6da87 100644 --- a/extra/anjuta-extras/PKGBUILD +++ b/extra/anjuta-extras/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 139219 2011-10-01 18:55:44Z ibiru $ -# Mantainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156701 2012-04-23 09:03:26Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=anjuta-extras -pkgver=3.2.0 -pkgrel=1 +pkgver=3.4.0 +pkgrel=2 pkgdesc="Anjuta Integrated Development Environment extra plugins" arch=('i686' 'x86_64') license=('GPL') depends=('anjuta') -makedepends=('intltool') +makedepends=('intltool' 'gnome-doc-utils') install=anjuta-extras.install url="http://anjuta.sourceforge.net/" -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('cda9624952d1e9e5b442c1b972256b618b3d3c6aa3f1069bb6ae1796eecf55a4') +sha256sums=('e9aa21dfa7e182c85e15eb4c3f1d0db928826572350f0aaeeae8ee9c947440bd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 93c2775d2..77c286437 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142974 2011-11-19 10:42:16Z ibiru $ +# $Id: PKGBUILD 156699 2012-04-23 09:03:23Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.2.2 -pkgrel=1 +pkgver=3.4.0 +pkgrel=3 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('909fee6af9b86192eecac47e417f1de8bd8c759dfd2bf3ee288bb146a575683e') +sha256sums=('c8175e04e797dc0e2aaede4ae73ee9cd7f37d3e59b158961703db546d4660abf') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,7 +26,8 @@ build() { package(){ cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + # j1: Race during linking + make -j1 DESTDIR="$pkgdir" install sed -i "1s|#!/usr/bin/python$|&2|" \ $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index 726daa06f..f22cd3627 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146694 2012-01-16 14:00:07Z ibiru $ +# $Id: PKGBUILD 156703 2012-04-23 09:03:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.2.2 +pkgver=2.4.0 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,10 @@ makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b63b214cec23163bf59239c59b350d55a7fcfab7a95858ea833815e0b16a4041') +sha256sums=('28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf --force --install @@ -27,7 +27,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 1b42e0166..1a88bcd61 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146684 2012-01-16 11:06:00Z ibiru $ +# $Id: PKGBUILD 156705 2012-04-23 09:03:33Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.2.3 +pkgver=2.4.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,10 +12,10 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1') +sha256sums=('5a1d8026bbe1d40d1f5a2c956d10b9ed39766f7880a73d80f37aa6e48c6c11e5') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf --force --install @@ -26,7 +26,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD index 728d6a5bb..18e1b42a2 100644 --- a/extra/atk/PKGBUILD +++ b/extra/atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139221 2011-10-01 18:55:46Z ibiru $ +# $Id: PKGBUILD 156707 2012-04-23 09:03:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=atk -pkgver=2.2.0 +pkgver=2.4.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64 'mips64el') @@ -10,17 +10,17 @@ license=('LGPL') depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d') +sha256sums=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD new file mode 100644 index 000000000..a856594ef --- /dev/null +++ b/extra/baobab/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156709 2012-04-23 09:03:37Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=baobab +pkgver=3.4.1 +pkgrel=1 +pkgdesc="A graphical directory tree analyzer" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3' 'libgtop') +makedepends=('intltool' 'itstool') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0c9743caf8cdc6dd69d694453cd57816c1ca0514cf51111022846088021949f7') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/baobab/baobab.install b/extra/baobab/baobab.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/extra/baobab/baobab.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index fca537e8e..69951e252 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155687 2012-04-04 17:16:05Z ibiru $ +# $Id: PKGBUILD 156711 2012-04-23 09:03:40Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.49.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD index aff70e67f..e1778fb37 100644 --- a/extra/brasero/PKGBUILD +++ b/extra/brasero/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139227 2011-10-01 18:55:55Z ibiru $ +# $Id: PKGBUILD 156713 2012-04-23 09:03:43Z ibiru $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=brasero -pkgver=3.2.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -20,11 +20,11 @@ optdepends=('libburn: alternative back-end' 'vcdimager: video project') replaces=('nautilus-cd-burner') install=brasero.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-caches \ --disable-schemas-compile @@ -32,7 +32,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd "$pkgname-$pkgver" + make DESTDIR=$pkgdir install } diff --git a/extra/brasero/brasero.install b/extra/brasero/brasero.install index b6c57055e..9248062f7 100644 --- a/extra/brasero/brasero.install +++ b/extra/brasero/brasero.install @@ -1,14 +1,14 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-desktop-database -q - update-mime-database usr/share/mime > /dev/null + update-mime-database /usr/share/mime > /dev/null } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index fdcc7fc9e..e75b92674 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150160 2012-02-13 19:59:22Z ibiru $ +# $Id: PKGBUILD 156715 2012-04-23 09:03:46Z ibiru $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.3 -pkgrel=4 +pkgrel=5 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://mielke.cc/brltty" diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index 0feb4c2bc..83b4b65f6 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140843 2011-10-20 05:41:46Z ibiru $ +# $Id: PKGBUILD 156718 2012-04-23 09:03:54Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64') @@ -14,10 +14,10 @@ makedepends=('gnome-doc-utils' 'intltool') install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1') +sha256sums=('bcc64498b20c368747c3630d501a66ccf904db15d855f33fd4f963b5b19723ad') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py export PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ @@ -29,7 +29,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index 8c18eea1f..0629617f9 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,32 +1,34 @@ -# $Id: PKGBUILD 148533 2012-02-03 15:37:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156720 2012-04-23 09:04:00Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' - 'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme' 'dconf') -makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection') +depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' 'clutter-gtk' 'mx' 'libgee' + 'gnome-video-effects' 'hicolor-icon-theme' 'dconf' 'cogl') +makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool' + 'nautilus-sendto') +optdepends=('nautilus-sendto: Send images') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8f050b03365310d739c54e48c8c62f8e2d6d9a028fed3eb3c8da4c7654a9009a') +sha256sums=('b7a07c45217bdea6b9bc3ad56c19b5b7de4ddf939074efe94add7afb66a26dd0') build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cheese/cheese.install b/extra/cheese/cheese.install index c042fba42..f7e8c46ac 100644 --- a/extra/cheese/cheese.install +++ b/extra/cheese/cheese.install @@ -1,20 +1,12 @@ -pkgname=cheese - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - usr/sbin/gconfpkg --uninstall $pkgname - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index e2cc2e5be..0ed6190e9 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 146820 2012-01-18 18:28:11Z ibiru $ +# $Id: PKGBUILD 156724 2012-04-23 09:04:05Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=1.4.6 +pkgver=1.5.4 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org/" license=('LGPL') depends=('clutter' 'gstreamer0.10-base' 'libxdamage') -makedepends=('gobject-introspection' 'gtk-doc') +makedepends=('gobject-introspection') options=('!libtool') source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5368ded143b2f73c3128315dab7b45c5dd8d681341cbae8f83664d2f9bbba3c3') +sha256sums=('a137313ad134cd3737c018cc8f725ed1a4d1cf7d276012d75467b55f1f9859d7') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ --sysconfdir=/etc @@ -25,7 +25,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="${pkgdir}" install } diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD index 498ebecd3..918cc4171 100644 --- a/extra/clutter-gtk/PKGBUILD +++ b/extra/clutter-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139235 2011-10-01 18:56:12Z ibiru $ +# $Id: PKGBUILD 156726 2012-04-23 09:04:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=clutter-gtk -pkgver=1.0.4 +pkgver=1.2.0 pkgrel=1 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64' 'mips64el') @@ -10,17 +10,17 @@ url="http://clutter-project.org/" options=('!libtool') license=('LGPL') depends=('clutter' 'gtk3') -makedepends=('gobject-introspection' 'gtk-doc') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0741fd2feb7d065dd5949a0b47f9cd740272c1428ca93431dea677acb6de464e') +makedepends=('gobject-introspection') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 19e5eca84..fe18b6a1a 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148405 2012-01-31 12:11:47Z ibiru $ +# $Id: PKGBUILD 156722 2012-04-23 09:04:02Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.8.4 +pkgver=1.10.2 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') @@ -14,15 +14,15 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6fedb4c344b4cab37e249b8a5ffeccff2f384f11335dee25c6466927461e1345') +sha256sums=('d5c11b464d1a80eb6b73dbf7a98532917a055068fec3508f2a849c850e70d5b7') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 65ccfb0fe..4b8a39a66 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156521 2012-04-20 06:48:44Z andrea $ +# $Id: PKGBUILD 157165 2012-04-25 06:58:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" @@ -13,12 +13,17 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt') optdepends=('qt: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba74b22c788a0c8547976b880cd02b17') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'fix-pkg-config.patch') +md5sums=('ba74b22c788a0c8547976b880cd02b17' + '32c6a4360a2ba12dc77b6a840fa7672b') build() { cd "${srcdir}"/${pkgname}-${pkgver} + # FS#29545 + patch -p1 -i "${srcdir}"/fix-pkg-config.patch + ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cmake/fix-pkg-config.patch b/extra/cmake/fix-pkg-config.patch new file mode 100644 index 000000000..c9390aec2 --- /dev/null +++ b/extra/cmake/fix-pkg-config.patch @@ -0,0 +1,31 @@ +X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -13,11 +13,10 @@ + # When the 'QUIET' argument is set, no status messages will be printed. + # + # It sets the following variables: +-# PKG_CONFIG_FOUND ... true if pkg-config works on the system ++# PKG_CONFIG_FOUND ... if pkg-config executable was found + # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program + # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found + # (since CMake 2.8.8) +-# PKG_CONFIG_FOUND ... if pkg-config executable was found + # + # For the following variables two sets of values exist; first one is the + # common one and has the given PREFIX. The second set contains flags +@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig + REQUIRED_VARS PKG_CONFIG_EXECUTABLE + VERSION_VAR PKG_CONFIG_VERSION_STRING) + ++# This is needed because the module name is "PkgConfig" but the name of ++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically ++# handled by FPHSA. ++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") ++ + # Unsets the given variables + macro(_pkgconfig_unset var) + set(${var} "" CACHE INTERNAL "") diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index e8d745d94..141f2519a 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140849 2011-10-20 05:41:52Z ibiru $ +# $Id: PKGBUILD 156728 2012-04-23 09:04:10Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.8.2 +pkgver=1.10.2 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) @@ -10,18 +10,18 @@ url="http://www.clutter-project.org/" license=('GPL2') depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') -options=(!libtool) -source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7') +options=(!libtool !emptydirs) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 1c73468b8..903880464 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,34 +1,31 @@ -# $Id: PKGBUILD 150827 2012-02-23 11:03:34Z ibiru $ +# $Id: PKGBUILD 156730 2012-04-23 09:04:12Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.17 +pkgver=0.1.19 pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -source=($url/releases/$pkgname-$pkgver.tar.xz - fix-compilation.patch) +source=($url/releases/$pkgname-$pkgver.tar.xz) options=('!libtool') -sha1sums=('7716c58a7ab85029637c7e88bdb77e48b6cd5ce9' - 'b77dd47f623a05055e8988dd568695fcbf457500') +sha1sums=('d133c6320fcdd069be86f4a7afa723f48f99acb3') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix-compilation.patch" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD index b1eef9fce..8483f5f02 100644 --- a/extra/cups-filters/PKGBUILD +++ b/extra/cups-filters/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155821 2012-04-07 06:09:20Z andyrtr $ +# $Id: PKGBUILD 157192 2012-04-25 13:19:30Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters -pkgver=1.0.12 +pkgver=1.0.17 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ backup=() #options=(!makeflags) install= source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) -md5sums=('aace03cc690dde7809d6cb5394accfa4') +md5sums=('5132b018cc503e9338fbd029acf56e55') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD index c76ed0403..405874d97 100644 --- a/extra/cups-pk-helper/PKGBUILD +++ b/extra/cups-pk-helper/PKGBUILD @@ -1,7 +1,7 @@ -#$Id: PKGBUILD 149302 2012-02-06 18:14:45Z ibiru $ +#$Id: PKGBUILD 156732 2012-04-23 09:04:15Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cups-pk-helper -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="A helper that makes system-config-printer use PolicyKit" arch=(i686 x86_64 'mips64el') @@ -9,19 +9,18 @@ url="http://www.freedesktop.org/software/cups-pk-helper/releases/" license=('GPL') depends=(polkit libcups) makedepends=(intltool) -install= -source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('b620abc83d5e8595c533264c00c6f6d9f44ec020b62968797747687857679c9c ') +source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz) +sha256sums=('56a10efbc0f37db39a940d99d549c7f37fa95f1af4745b30b79c240b0f37cfd7') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/cups-pk-helper make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 39c34fed7..b313f77a5 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 139241 2011-10-01 18:56:24Z ibiru $ +# $Id: PKGBUILD 156734 2012-04-23 09:04:17Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.10.0 -pkgrel=1.1 +pkgver=0.12.0 +pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64 'mips64el') url="http://live.gnome.org/dconf" license=('LGPL2.1') -depends=('glib2') -makedepends=('vala' 'gobject-introspection' 'gtk3') +depends=('glib2' 'gtk-update-icon-cache') +makedepends=('vala' 'gtk3') optdepends=('gtk3: for dconf-editor') install=dconf.install -source=(http://download.gnome.org/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9f744ccfb3da20163a4bb27916c960f6bf56048b3ec1112862c85414fc064ee2') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/dconf @@ -24,8 +24,8 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install index 39bce8f45..75d713d64 100644 --- a/extra/dconf/dconf.install +++ b/extra/dconf/dconf.install @@ -1,6 +1,7 @@ post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade(){ diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index 0ef5723ed..dabafa4f7 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 139243 2011-10-01 18:56:27Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156736 2012-04-23 09:04:20Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp -pkgver=3.2.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64 'mips64el') @@ -14,17 +15,17 @@ makedepends=('pkgconfig' 'intltool' 'python2') options=('!libtool' '!emptydirs') install=devhelp.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('974b4418036fa9a63a8f275257ed9ec1b7cae61a97e8e001e56e460c8a8e310e') +sha256sums=('3d1148d45d6fac5bb9a4fdf223f19ffa5774aa56df6bbf5b6e86363d8f55552c') build() { - cd "${srcdir}/devhelp-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/devhelp-${pkgver}" + cd $pkgname-$pkgver make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 02818582e..583913187 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155947 2012-04-09 14:48:18Z andyrtr $ +# $Id: PKGBUILD 157092 2012-04-23 16:33:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.1.4 +pkgver=2.1.5 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('9a360fc39462da71e2bfd1d6928f3902' - '1ba2a0f1f7b5f226ce867ea8243abe46' +md5sums=('c857e3442f2f14b3e46f1154b13b0b4b' + '4ef0a9647b82e0a1bdc667492a151881' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index f9f40ced3..d8474a799 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152204 2012-03-05 08:55:56Z ibiru $ +# $Id: PKGBUILD 156738 2012-04-23 09:04:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) @@ -15,11 +15,14 @@ optdepends=('evolution-data-server: Evolution integration') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gcc47.patch) +sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a' + '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/gcc47.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ --disable-scrollkeeper --enable-dbus @@ -27,10 +30,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/ekiga/ekiga.install b/extra/ekiga/ekiga.install index b1d76a4a3..91f3a57a0 100644 --- a/extra/ekiga/ekiga.install +++ b/extra/ekiga/ekiga.install @@ -1,8 +1,8 @@ pkgname=ekiga post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gconfpkg --install $pkgname + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { @@ -14,9 +14,9 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/extra/ekiga/gcc47.patch b/extra/ekiga/gcc47.patch new file mode 100644 index 000000000..f12c37524 --- /dev/null +++ b/extra/ekiga/gcc47.patch @@ -0,0 +1,99 @@ +From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001 +From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> +Date: Sat, 24 Mar 2012 09:17:40 +0000 +Subject: Fix compile error with gcc 4.7 + +--- +diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h +index e16848e..b0a8775 100644 +--- a/lib/engine/account/bank-impl.h ++++ b/lib/engine/account/bank-impl.h +@@ -203,7 +203,7 @@ template<typename AccountType> + void + Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account) + { +- add_object (account); ++ this->add_object (account); + + account->questions.connect (boost::ref (questions)); + } +@@ -213,7 +213,7 @@ template<typename AccountType> + void + Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account) + { +- remove_object (account); ++ this->remove_object (account); + } + + #endif +diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h +index 711d8d9..4fea7d5 100644 +--- a/lib/engine/addressbook/book-impl.h ++++ b/lib/engine/addressbook/book-impl.h +@@ -204,7 +204,7 @@ void + Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact) + { + contact->questions.connect (boost::ref (questions)); +- add_object (contact); ++ this->add_object (contact); + } + + +@@ -212,7 +212,7 @@ template<typename ContactType> + void + Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact) + { +- remove_object (contact); ++ this->remove_object (contact); + } + + #endif +diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h +index a30cd03..630236f 100644 +--- a/lib/engine/addressbook/source-impl.h ++++ b/lib/engine/addressbook/source-impl.h +@@ -206,7 +206,7 @@ template<typename BookType> + void + Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book) + { +- add_object (book); ++ this->add_object (book); + + add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1))); + +diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h +index 245a7c6..92074a8 100644 +--- a/lib/engine/presence/cluster-impl.h ++++ b/lib/engine/presence/cluster-impl.h +@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap) + + add_connection (heap, heap->questions.connect (boost::ref (questions))); + +- add_object (heap); ++ this->add_object (heap); + } + + template<typename HeapType> +diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h +index d63c491..15fe86f 100644 +--- a/lib/engine/presence/heap-impl.h ++++ b/lib/engine/presence/heap-impl.h +@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp + { + presentity->questions.connect (boost::ref (questions)); + +- add_object (presentity); ++ this->add_object (presentity); + } + + template<typename PresentityType> + void + Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity) + { +- remove_object (presentity); ++ this->remove_object (presentity); + } + + #endif +-- +cgit v0.9.0.2 diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index d98237d68..464fa01ec 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,39 +1,44 @@ -# $Id: PKGBUILD 149338 2012-02-06 20:53:31Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 157084 2012-04-23 13:56:25Z allan $ +# Maintainer: # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=elfutils -pkgver=0.152 -pkgrel=2 +pkgver=0.153 +pkgrel=1 pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information" arch=('i686' 'x86_64' 'mips64el') url="https://fedorahosted.org/elfutils/" license=('GPL2') depends=('glibc') -#optdepends=('zlib' 'xz' 'bzip2') provides=('libelf') replaces=('libelf') conflicts=('libelf') +options=('!makeflags') source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2 http://cdn.debian.net/debian/pool/main/e/elfutils/elfutils_${pkgver}-1.debian.tar.gz) -md5sums=('39739ed58a0fa1862eff8735f111fe5c' - '687eea13e5393a6a6074740ad31c3893') +md5sums=('289a146182bc29f0236eaa15d8ebdf98' + '3bcccdf802f0a15a55543b0931c480dd') -build() -{ +build() { cd "${srcdir}/${pkgname}-${pkgver}" for patch in $(cat ../debian/patches/series) ; do patch -Np1 -i "../debian/patches/$patch" done + CFLAGS+=" -g" # required for test-suite success + ./configure --prefix=/usr --program-prefix="eu-" make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s#./alldts#testrun ./alldts#" tests/run-alldts.sh make check } -package() -{ +package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index e44a59713..5b732426c 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,41 +1,38 @@ -# $Id: PKGBUILD 142866 2011-11-17 18:34:20Z ibiru $ +# $Id: PKGBUILD 156740 2012-04-23 09:04:26Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Empathy" license=('GPL2') -depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' -'libcanberra' 'iso-codes' 'networkmanager') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') +depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'libwebkit3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') +makedepends=('intltool' 'itstool') optdepends=('telepathy-gabble: XMPP/Jabber support' - 'telepathy-butterfly: MSN support' 'telepathy-idle: IRC support' 'telepathy-salut: Link-local XMPP support' - 'telepathy-sofiasip: SIP support' + 'telepathy-rakia: SIP support' 'telepathy-haze: libpurple support') options=('!libtool') groups=('gnome-extra') install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b12493f47b932dcd3d8b5101d414a00447a6eea60a575db7211ee24cfe8c4565') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/empathy \ --disable-static \ - --disable-scrollkeeper \ --disable-schemas-compile sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/empathy/empathy.install b/extra/empathy/empathy.install index c3f7abf13..f8d2dfb1f 100644 --- a/extra/empathy/empathy.install +++ b/extra/empathy/empathy.install @@ -1,18 +1,16 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor echo "To use Empathy you need to install at least one Telepathy connection manager." } post_upgrade() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_upgrade } diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index c519e11e2..2a8287705 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143098 2011-11-22 18:39:54Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156744 2012-04-23 09:04:31Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -14,17 +14,17 @@ install=eog-plugins.install options=('!libtool') groups=(gnome-extra) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('123e50be69c33bddc5d6def0a1f618970e01207c2e959edbaf0afc56717d8975') +sha256sums=('21a63f8f6e3a5b30f2f05133edc46becd4c83343c0f462a345204326071bc139') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index 7f73d8c1b..adfc70358 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 142868 2011-11-17 18:34:22Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156742 2012-04-23 09:04:28Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') @@ -14,17 +15,17 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('315625babf04293341bd0b3ae26337d11c8696422d5dc4442ad551b25db42530') +sha256sums=('cf29997ee065341fa323abc849732bfa18ab564cc0d931d61eaa473953d3e216') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install # remove it from Xfce menu that ships its own thingy diff --git a/extra/eog/eog.install b/extra/eog/eog.install index 284b24b18..1571179ca 100644 --- a/extra/eog/eog.install +++ b/extra/eog/eog.install @@ -1,13 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall eog - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD index 7c22b9d5d..2e011b2a0 100644 --- a/extra/epiphany-extensions/PKGBUILD +++ b/extra/epiphany-extensions/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 142997 2011-11-20 09:46:20Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156748 2012-04-23 09:04:37Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=epiphany-extensions -pkgver=3.2.0 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 url="http://www.gnome.org/projects/epiphany/" pkgdesc="Various extentions for the Epiphany web browser" arch=('i686' 'x86_64' 'mips64el') @@ -12,24 +13,16 @@ depends=('epiphany' 'opensp' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') options=('!libtool' '!emptydirs') install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - rss-link-dbus-glib.patch) -sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae' - '6e1ba177e8480984b4c5447aca5e7cf8bcfacbb90bcf041fa1b6d2a4dc3e818b') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5') build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/rss-link-dbus-glib.patch" - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index a47982e99..ed5a81393 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140855 2011-10-20 05:41:59Z ibiru $ +# $Id: PKGBUILD 156746 2012-04-23 09:04:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -14,11 +14,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('01f5763340f9fac0994f689ea6655c2c9760bddd77bbd8628b9c6075d9b6ed0d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-scrollkeeper \ @@ -27,6 +27,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/epiphany/epiphany.install b/extra/epiphany/epiphany.install index 00b1abb96..8b17fa3d4 100644 --- a/extra/epiphany/epiphany.install +++ b/extra/epiphany/epiphany.install @@ -1,20 +1,13 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then - usr/sbin/gconfpkg --uninstall epiphany - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 5d2da1308..dae69b09d 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 148708 2012-02-05 11:47:44Z ibiru $ +# $Id: PKGBUILD 156750 2012-04-23 09:04:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.2.1 -pkgrel=3 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') optdepends=('texlive-bin: DVI support') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/evince \ --disable-static --enable-nautilus \ @@ -31,6 +31,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/evince/evince.install b/extra/evince/evince.install index 9643a9ba0..1571179ca 100644 --- a/extra/evince/evince.install +++ b/extra/evince/evince.install @@ -1,13 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall evince - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 88b95f5b2..80d988280 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 146465 2012-01-11 15:22:02Z stephane $ +# $Id: PKGBUILD 156754 2012-04-23 09:04:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') options=('!libtool') +install=$pkgname.install url="http://www.gnome.org" license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('378c4eedb11ea359c49734393ba764ac1f1230b298c36d2256129dae00c78298') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-openldap=yes \ --libexecdir=/usr/lib/evolution-data-server \ --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings + --enable-vala-bindings \ + --disable-schemas-install sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/evolution-data-server/evolution-data-server.install b/extra/evolution-data-server/evolution-data-server.install new file mode 100644 index 000000000..29a359805 --- /dev/null +++ b/extra/evolution-data-server/evolution-data-server.install @@ -0,0 +1,11 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade () { + post_install +} + +post_remove () { + post_install +} diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index 28f1deac6..ced4764e0 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146374 2012-01-09 21:40:58Z ibiru $ +# $Id: PKGBUILD 156756 2012-04-23 09:04:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.2.3 +pkgver=3.4.1 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64') @@ -12,16 +12,16 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0c26fb822ced5bca7c6888ade35f47821317fa45e33a93c8a2a81fcb06d6f483') +sha256sums=('afa56ce08a8bfb9878f5303308aa5c68eab4ffe67a70ba3bd54b0c4f868053ef') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/evolution --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index 806163d7f..a5c96580b 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146489 2012-01-11 15:43:47Z ibiru $ +# $Id: PKGBUILD 156758 2012-04-23 09:04:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.2.3 +pkgver=3.4.1 pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,10 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('759a73c7c49aaf45a5ea9d846b44e1314e13e78d4bfe959fc3ded311c1c690a2') +sha256sums=('a123b943e5a7128435b65219bfcd2a8f71223f8d7ef0319ec06011fbd392ea80') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/evolution --disable-static \ --with-libdb=/usr --with-krb5=/usr @@ -24,7 +24,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -m755 -d "$pkgdir/usr/share/gconf/schemas" diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD index 852e8feb9..95c25b3ae 100644 --- a/extra/evolution-groupwise/PKGBUILD +++ b/extra/evolution-groupwise/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146487 2012-01-11 15:36:59Z ibiru $ +# $Id: PKGBUILD 156760 2012-04-23 09:04:57Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=evolution-groupwise -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="GroupWise connector for evolution" arch=(i686 x86_64) url="http://projects.gnome.org/evolution/" @@ -14,10 +14,10 @@ makedepends=(intltool evolution) optdepends=('evolution: evolution plugin') options=(!libtool) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9972cf6ab05168e2364f7d7af1a5d9dd2bb994ab833fc2aaf926a4390e6b8062') +sha256sums=('b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static @@ -25,7 +25,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 67b3bf47b..1f2f03177 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 146376 2012-01-09 21:56:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156752 2012-04-23 09:04:45Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') optdepends=('bogofilter: possible junk filter plugin' 'spamassassin: possible junk filter plugin') @@ -15,27 +16,29 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('43311bc38302fc26efff98852d72981b791941622d32a2e6e346377341c1814d') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ - --disable-scrollkeeper \ --enable-nss=yes \ --with-openldap=yes \ --enable-smime=yes \ --with-krb5=/usr \ --disable-image-inline + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make make -C plugins/tnef-attachments } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install make -C plugins/tnef-attachments DESTDIR="$pkgdir" install diff --git a/extra/evolution/evolution.install b/extra/evolution/evolution.install index a2c3aaa54..500c5e2da 100644 --- a/extra/evolution/evolution.install +++ b/extra/evolution/evolution.install @@ -1,24 +1,24 @@ -pkgname=evolution - post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas + gconfpkg --install evolution update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + pre_remove } post_upgrade() { - post_install $1 + post_install } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall evolution } post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD new file mode 100644 index 000000000..ccfa4887c --- /dev/null +++ b/extra/farstream/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 156762 2012-04-23 09:05:00Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=farstream +pkgver=0.1.2 +pkgrel=1 +pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/Farstream" +license=('LGPL2.1') +depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg') +makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('farsight2') +replaces=('farsight2') +options=(!libtool) +source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz + vp8.patch) +md5sums=('5d6e561b3688d0d0c8906fec4f356df3' + 'c4e76d03d678d29b872b610f9cff42cd') + +build() { + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/vp8.patch" + ./configure --prefix=/usr \ + --with-package-name='Arch Linux farstream package' \ + --with-package-origin='http://archlinux.org' \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/farstream/vp8.patch b/extra/farstream/vp8.patch new file mode 100644 index 000000000..67009a8ad --- /dev/null +++ b/extra/farstream/vp8.patch @@ -0,0 +1,12 @@ +diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences +--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100 ++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100 +@@ -41,6 +41,8 @@ feedback:nack/pli= + [video/H263] + feedback:nack/pli= + ++[video/VP8-DRAFT-IETF-01] ++ + [video/THEORA] + #feedback:tfrc= + feedback:nack/pli= diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index d4e1868ee..2c15d7d4a 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 153564 2012-03-16 02:38:35Z eric $ +# $Id: PKGBUILD 157020 2012-04-23 09:27:29Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') -source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215') +source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) +sha1sums=('09d2e7110f652027ea7c285c5845070f8a353f38') build() { cd "${srcdir}" diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index 76bb37128..bb953854c 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145054 2011-12-15 21:54:15Z ibiru $ +# $Id: PKGBUILD 156766 2012-04-23 09:05:06Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.6.6 -pkgrel=1 +pkgver=0.6.9 +pkgrel=2 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') url="http://telepathy.freedesktop.org/wiki/Folks" @@ -11,18 +11,17 @@ license=('LGPL2.1') depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') makedepends=('gobject-introspection' 'intltool') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) -sha256sums=('3dd6a2983969a6369c6b0e25f28ec92415b5570dd6c89b25385807ecc4aeb0a8') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('cb14657f581e3d4b50884ac099ab13c7f9949c99f95806d1b8ad865345d26540') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD index 0a3431588..69f419f23 100644 --- a/extra/gcalctool/PKGBUILD +++ b/extra/gcalctool/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 139265 2011-10-01 18:56:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156768 2012-04-23 09:05:08Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gcalctool -pkgver=6.2.0 +pkgver=6.4.1.1 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gtk3' 'dconf') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'yelp-tools') groups=('gnome-extra') options=(!emptydirs) url="http://www.gnome.org" install=gcalctool.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ddc2efe25220e9341832304dfd9e5e2390a70bb6bd70d1afeb49da88023cdffb') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('6c166b1d0fec157e523caf82d6357c4a2f572cb21729272c9975003661b8c84e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \ - --localstatedir=/var --disable-scrollkeeper + --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index 7134cc0b2..a40f8e164 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141600 2011-10-31 15:48:45Z ibiru $ +# $Id: PKGBUILD 156770 2012-04-23 09:05:12Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf -pkgver=3.2.3 -pkgrel=1.1 +pkgver=3.2.5 +pkgrel=2 pkgdesc="A configuration database system" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,23 +12,23 @@ makedepends=('intltool' 'gtk-doc' 'gobject-introspection') options=('!libtool') install=gconf.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz gconf-merge-schema gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -sha256sums=('9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149' +sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') build() { - cd "${srcdir}/GConf-${pkgver}" + cd "GConf-$pkgver" # Patch from fedora - reloads gconf after installing schemas - patch -Np1 -i "${srcdir}/gconf-reload.patch" + patch -Np1 -i "$srcdir/gconf-reload.patch" # http://bugzilla.gnome.org/show_bug.cgi?id=568845 - patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" + patch -Np1 -i "$srcdir/01_xml-gettext-domain.patch" # Python2 fix sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert @@ -42,10 +42,10 @@ build() { } package() { - cd "${srcdir}/GConf-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "GConf-$pkgver" + make DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system" - install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/" - install -Dm755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/gconfpkg" + install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system" + install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/" + install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg" } diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD new file mode 100644 index 000000000..15b7d095f --- /dev/null +++ b/extra/gcr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 156772 2012-04-23 09:05:15Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gcr +pkgver=3.4.1 +pkgrel=1 +pkgdesc="A library for bits of crypto UI and parsing" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +install=gcr.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexec=/usr/lib/gcr \ + --disable-static \ + --disable-update-mime \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gcr/gcr.install b/extra/gcr/gcr.install new file mode 100644 index 000000000..8677671c4 --- /dev/null +++ b/extra/gcr/gcr.install @@ -0,0 +1,14 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade () { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index ebe8b2be6..fb5362252 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 148726 2012-02-05 11:48:20Z ibiru $ +# $Id: PKGBUILD 156774 2012-04-23 09:05:18Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=gdk-pixbuf2 -pkgver=2.24.1 -pkgrel=3 +pkgver=2.26.1 +pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('GPL2') -depends=('glib2' 'libpng>=1.5.7' 'libtiff' 'libjpeg' 'libx11') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1') +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) +sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba') build() { - cd "$srcdir/gdk-pixbuf-$pkgver" + cd "gdk-pixbuf-$pkgver" ./configure --prefix=/usr \ --without-libjasper \ @@ -25,7 +26,7 @@ build() { } package() { - cd "$srcdir/gdk-pixbuf-$pkgver" + cd "gdk-pixbuf-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gdk-pixbuf2/gdk-pixbuf2.install b/extra/gdk-pixbuf2/gdk-pixbuf2.install index 1b35942cb..f04c0967a 100644 --- a/extra/gdk-pixbuf2/gdk-pixbuf2.install +++ b/extra/gdk-pixbuf2/gdk-pixbuf2.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache + gdk-pixbuf-query-loaders --update-cache } post_upgrade() { @@ -7,5 +7,5 @@ post_upgrade() { } pre_remove() { - rm -f usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache + rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache } diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index df31e3cfa..a15ee3c45 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139625 2011-10-03 20:22:38Z ibiru $ +# $Id: PKGBUILD 156776 2012-04-23 09:05:20Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdl -pkgver=3.2.0 +pkgver=3.4.2 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64 mips64el) @@ -11,17 +11,17 @@ url="http://www.gnome.org/" depends=('gtk3') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f4839224b7837efb8fbec8666f8a3bb1ce9ea110f06c57a8b9438faa0abab533') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('66eeca8aa8e7205abf38911a9eadfbd288967f92388682bd62942ed4f1db4906') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 72a36a17e..e98d1d666 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140873 2011-10-20 05:42:19Z ibiru $ +# $Id: PKGBUILD 156778 2012-04-23 09:05:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.2.1.1 -pkgrel=1 +pkgver=3.4.1 +pkgrel=2 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,28 +14,29 @@ groups=('gnome-extra') options=('!libtool') depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') -optdepends=('gnome-shell: new login interface') +optdepends=('gnome-shell: new login interface' + 'fprintd: fingerprint authentication') install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz fix_external_program_directories.patch gdm-vt-allocation-hack.patch gdm gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) -sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd' - '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363' +sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665' + 'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' - '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' + '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2' + 'dd50f5bd28807a16c5ebe89fc868b7c47fa571138498e879f2b1c9da1ad6eb84' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' - 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' + '1a1e9b3f26de4eb9f45d1e9a0b5d0db902ca734461ba46b4bb620b0298bb98aa' + '844d5fae0df59241d34099a3d458289bd95707b2aae976627c663904294043d8' '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" - patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm \ @@ -43,24 +44,24 @@ build() { --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ --disable-scrollkeeper \ --disable-static \ - --without-tcp-wrappers + --without-tcp-wrappers \ + --disable-schemas-compile \ + --with-systemd=no sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do - install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}" + install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}" done - install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm" + install -Dm755 "$srcdir/gdm" "$pkgdir/etc/rc.d/gdm" - chmod 1770 "${pkgdir}/var/log/gdm" - chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf" - rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf" + chmod 1770 "$pkgdir/var/log/gdm" + chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm" } diff --git a/extra/gdm/fix_external_program_directories.patch b/extra/gdm/fix_external_program_directories.patch index 997ea5405..b3a0f0cf6 100644 --- a/extra/gdm/fix_external_program_directories.patch +++ b/extra/gdm/fix_external_program_directories.patch @@ -1,7 +1,7 @@ -diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c ---- gdm-3.2.0.orig/daemon/gdm-server.c 2011-10-02 01:13:37.772372528 +0000 -+++ gdm-3.2.0/daemon/gdm-server.c 2011-10-02 01:14:58.036444496 +0000 -@@ -131,7 +131,7 @@ +diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c +--- gdm-3.3.92.orig/daemon/gdm-server.c 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/daemon/gdm-server.c 2012-03-19 22:30:17.004732251 +0000 +@@ -139,7 +139,7 @@ g_return_val_if_fail (GDM_IS_SERVER (server), NULL); error = NULL; @@ -10,9 +10,9 @@ diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.session.in ---- gdm-3.2.0.orig/data/gdm-shell.session.in 2011-10-02 01:17:01.394246573 +0000 -+++ gdm-3.2.0/data/gdm-shell.session.in 2011-10-02 01:16:22.210552560 +0000 +diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in +--- gdm-3.3.92.orig/data/gdm-shell.session.in 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/data/gdm-shell.session.in 2012-03-19 22:30:17.004732251 +0000 @@ -1,5 +1,5 @@ [GNOME Session] Name=Display Manager @@ -20,9 +20,9 @@ diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.sess -IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' +IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated' FallbackSession=gdm-fallback -diff -Nur gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c ---- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:13:37.775705892 +0000 -+++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:14:58.036444496 +0000 +diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c +--- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:05.304823391 +0000 ++++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:17.004732251 +0000 @@ -131,7 +131,7 @@ ret = FALSE; diff --git a/extra/gdm/gdm-autologin.pam b/extra/gdm/gdm-autologin.pam index c77c78917..bc0193df0 100644 --- a/extra/gdm/gdm-autologin.pam +++ b/extra/gdm/gdm-autologin.pam @@ -7,6 +7,8 @@ auth requisite pam_permit.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_deny.so diff --git a/extra/gdm/gdm-fingerprint.pam b/extra/gdm/gdm-fingerprint.pam index 5b74bf6d6..38fab5782 100644 --- a/extra/gdm/gdm-fingerprint.pam +++ b/extra/gdm/gdm-fingerprint.pam @@ -7,6 +7,8 @@ auth requisite pam_fprintd.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_deny.so diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam index aa4d4dd47..eed5e1003 100644 --- a/extra/gdm/gdm-password.pam +++ b/extra/gdm/gdm-password.pam @@ -8,6 +8,8 @@ auth optional pam_gnome_keyring.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_unix.so diff --git a/extra/gdm/gdm-smartcard.pam b/extra/gdm/gdm-smartcard.pam index baacb8bed..c5c29e73f 100644 --- a/extra/gdm/gdm-smartcard.pam +++ b/extra/gdm/gdm-smartcard.pam @@ -7,6 +7,8 @@ auth requisite pam_pkcs11.so wait_for_card card_only auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_pkcs11.so diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index fda42d319..c48faf4ae 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -6,14 +6,13 @@ post_install() { passwd -l gdm > /dev/null chown -R gdm:gdm /var/lib/gdm > /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gconfpkg --install ${pkgname} - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor dconf update } -pre_remove() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then gconfpkg --uninstall ${pkgname} fi } @@ -23,9 +22,9 @@ post_upgrade() { } post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas dconf update - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor getent passwd gdm >/dev/null 2>&1 && userdel gdm getent group gdm >/dev/null 2>&1 && groupdel gdm } diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index f368a16bb..a426b882a 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 146050 2012-01-04 17:54:12Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156780 2012-04-23 09:05:29Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.6 +pkgver=3.4.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('yelp-tools' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('92b5c44203dbc222c79cb35ba43d32de115e2ef89b7bb80451239d0c3fa02f7f') +sha256sums=('9b1f0164d6c6bc08e391efde7e6a2aa9290a65bda543fe3a7adc6ef73b722a64') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --disable-scrollkeeper \ - --disable-updater --disable-schemas-compile \ + --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ --enable-python make } package(){ - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gedit/gedit.install b/extra/gedit/gedit.install index 9d88a1341..606920688 100644 --- a/extra/gedit/gedit.install +++ b/extra/gedit/gedit.install @@ -1,11 +1,11 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q } pre_upgrade() { - if [ -f usr/share/gconf/schemas/gedit.schemas ]; then - usr/sbin/gconfpkg --uninstall gedit + if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then + gconfpkg --uninstall gedit fi } diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD new file mode 100644 index 000000000..851e5725f --- /dev/null +++ b/extra/geoclue/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 156782 2012-04-23 09:05:31Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=geoclue +pkgver=0.12.0 +pkgrel=5 +pkgdesc="Modular geoinformation service built on the D-Bus messaging system." +arch=('i686' 'x86_64') +url="http://geoclue.freedesktop.org/" +license=('LGPL') +depends=('dbus-glib' 'libxml2') +optdepends=('networkmanager: geolocation' + 'gconf: geolocation' + 'libsoup-gnome: Skyhook location provider') +makedepends=('gconf' 'networkmanager' 'libsoup-gnome' 'gtk-doc') +options=('!libtool') +source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz + geoclue-gcc46.patch) +md5sums=('33af8307f332e0065af056ecba65fec2' + '0cf8ecc350be702f623ed9a9715818c5') + +build() { + cd $pkgname-$pkgver + patch -Np1 -i ../geoclue-gcc46.patch + + sed -i 's/libnm_glib/libnm-glib/g' configure.ac + sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac + autoreconf -f -i + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/geoclue/geoclue-gcc46.patch b/extra/geoclue/geoclue-gcc46.patch new file mode 100644 index 000000000..11bf48547 --- /dev/null +++ b/extra/geoclue/geoclue-gcc46.patch @@ -0,0 +1,23 @@ +From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Mon, 07 Mar 2011 23:46:15 +0000 +Subject: master: Fix warning with GCC 4.6 + +--- +diff --git a/src/master-provider.c b/src/master-provider.c +index 790c043..e4ea053 100644 +--- a/src/master-provider.c ++++ b/src/master-provider.c +@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider) + static gboolean + gc_master_provider_initialize (GcMasterProvider *provider) + { +- GcMasterProviderPrivate *priv; +- +- priv = GET_PRIVATE (provider); +- + if (!gc_master_provider_initialize_interfaces (provider)) { + return FALSE; + } +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index dd4817556..7ff77b8f8 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138657 2011-09-27 14:19:40Z ibiru $ +# $Id: PKGBUILD 156784 2012-04-23 09:05:34Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=ghex -pkgver=3.0.0 +pkgver=3.4.0 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ depends=('gtk3' 'hicolor-icon-theme') makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=ghex.install -source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/3.0/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c1b44a962ff1d6c7f1ad012ef1971a227e6d00a0de6f1275cbb714db1a96c674') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('59e409cc629fddeb06552c505b60be1d20274cea75eb22f1d65d7ca0aaf1e64d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --disable-schemas-compile @@ -25,6 +25,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index c077a7970..69e96300e 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146616 2012-01-14 12:13:58Z ibiru $ +# $Id: PKGBUILD 156786 2012-04-23 09:05:36Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gjs -pkgver=1.30.1 +pkgver=1.32.0 pkgrel=1 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f5db07ddf70458a33a5d0bdf83f84070fc234237ecb0d49a8676e67b52119a05') +sha256sums=('b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 0b90d2b4c..60303906d 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 140391 2011-10-12 06:17:27Z ibiru $ +# $Id: PKGBUILD 156788 2012-04-23 09:05:39Z ibiru $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade -pkgver=3.10.2 +pkgver=3.12.0 pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64 mips64el) license=('GPL' 'LGPL') depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject2') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject') optdepends=('python2: Python widgets support') options=('!libtool') url="http://glade.gnome.org/" install=glade.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0f59ffbd7e1e595396593fedcdb85c51fd01ed05d5ef7c6f724f3a0bcf24d5c4') +sha256sums=('70a820a0007fa3ed7761c92b011fe35ac1532038cab2f9ab30f4d29d5799d44d') build() { - cd "${srcdir}/$pkgname-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/$pkgname-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index 2e71e5455..3acb6696e 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146052 2012-01-04 17:56:55Z ibiru $ +# $Id: PKGBUILD 156790 2012-04-23 09:05:42Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.30.2 +pkgver=2.32.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,10 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc') +sha256sums=('051ab469356327404dc53ae36dda5b85b99a12e5573a838d927abb49e58fa950') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/glib-networking --disable-static @@ -24,7 +24,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/glib-networking/glib-networking.install b/extra/glib-networking/glib-networking.install index 595f1c75b..8214e1968 100644 --- a/extra/glib-networking/glib-networking.install +++ b/extra/glib-networking/glib-networking.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules + gio-querymodules /usr/lib/gio/modules } post_upgrade() { diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 7599f84f9..6985e613c 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142936 2011-11-18 15:46:22Z ibiru $ +# $Id: PKGBUILD 156794 2012-04-23 09:05:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.30.1 +pkgver=2.32.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -12,10 +12,10 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('69582b584666cab1dc4253faffee548054730bc058e28466871e6a954d7ff897') +sha256sums=('e1806f884c6e9f904ee2af0d39dd8d4de3f91a039f897f54333b0890de06f94b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } @@ -23,13 +23,13 @@ build() { package_glibmm() { pkgdesc="Glib-- (glibmm) is a C++ interface for glib" depends=('glib2' 'libsigc++2.0') - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile make DESTDIR="$pkgdir" install } package_glibmm-docs() { pkgdesc="Developer documentation for glibmm" - cd "$srcdir/$pkgbase-$pkgver/docs" + cd "$pkgbase-$pkgver/docs" make DESTDIR="$pkgdir" install } diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index c7045e669..782f6560a 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152860 2012-03-10 12:02:22Z ibiru $ +# $Id: PKGBUILD 156796 2012-04-23 09:05:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.7 +pkgver=2.6.9 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('gtk-sharp-2' 'pkgconfig') unset makedepends options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f382c2c5bba4e6a384905d536a58661d09783c389c5610e2e447f3c9853ffa1b') +sha256sums=('5ebb60a35fa5c0789fe10f6e4af5040cb7bc4a707a8a962fbd57b4fc5595c0b9') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index 87dca22fc..bdbf2f516 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 140879 2011-10-20 05:42:26Z ibiru $ +# $Id: PKGBUILD 156798 2012-04-23 09:05:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME Applets" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager' 'gnome-common') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager') options=(!emptydirs) url="http://www.gnome.org" groups=(gnome) install=gnome-applets.install -source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \ --localstatedir=/var --disable-static \ @@ -27,10 +27,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-applets-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-applets-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 07f381822..8d992fa0c 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 149409 2012-02-07 16:18:44Z heftig $ +# $Id: PKGBUILD 156801 2012-04-23 09:06:01Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeBluetooth" license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf') +depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gnome-bluetooth.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('30ba375f4d9b08fc31b9eb86f17ea2d3fc1696b3e778236270414260d4e26905' +sha256sums=('97a229e81997c14064899bdec2a62f94738d00d2f88cc18bcbeb2bdf0610e272' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -30,11 +30,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \ - "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" - install -d ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/gnome-bluetooth" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf + install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \ + "$pkgdir/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" } diff --git a/extra/gnome-bluetooth/gnome-bluetooth.install b/extra/gnome-bluetooth/gnome-bluetooth.install index 927142ee0..8c991877f 100644 --- a/extra/gnome-bluetooth/gnome-bluetooth.install +++ b/extra/gnome-bluetooth/gnome-bluetooth.install @@ -1,6 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 637f3ae26..22ae2a81a 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 148748 2012-02-05 11:49:06Z ibiru $ +# $Id: PKGBUILD 156803 2012-04-23 09:06:07Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=2 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64 'mips64el') url="http://projects.gnome.org/gnome-color-manager/" license=(GPL2) -depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash' 'shared-color-profiles' 'shared-color-targets') +depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' + 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop') makedepends=('intltool' 'gtk-doc') install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a') +sha256sums=('fcca7292d14dcffea01463bb24833346b415ee189611821399ca96d6638d812d') build(){ - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver # man pages need docbook-sgml, which we don't have - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-color-manager \ - --disable-static --disable-man-pages + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -31,6 +30,6 @@ build(){ } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index 166d1ee13..cf85ce85d 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141004 2011-10-21 08:06:14Z ibiru $ +# $Id: PKGBUILD 156806 2012-04-23 09:06:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -11,19 +11,19 @@ license=('GPL2') groups=(gnome-extra) depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop') makedepends=('intltool' 'vala') -install= -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('06d4d8fc22d72f67296ed98d35e3ee40f26d8344bcbd14affff4a720047ccd97') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/gnome-contacts/gnome-contacts.install b/extra/gnome-contacts/gnome-contacts.install new file mode 100644 index 000000000..326aa98a2 --- /dev/null +++ b/extra/gnome-contacts/gnome-contacts.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 9c5db6383..0b6c2fe47 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,29 +1,38 @@ -# $Id: PKGBUILD 142419 2011-11-09 07:46:48Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156808 2012-04-23 09:06:19Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64' 'mips64el') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet') -optdepends=('mesa-demos-libre: provides glxinfo for graphics information' +depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' + 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3' + 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' + 'libsystemd' 'cheese') +optdepends=('mesa-demos: provides glxinfo for graphics information' 'apg: adds password generation for user accounts' 'gnome-color-manager: for color management tasks') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') url="http://www.gnome.org" groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + systemd-fallback.patch) +sha256sums=('c6ce4ecf5b747aa33a5904b053c1c4fd18a39ddcd0908463558e8b4b40ec3fd1' + '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + cd $pkgname-$pkgver + + patch -Np1 -i ../systemd-fallback.patch + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-update-mimedb + --enable-systemd --with-libsocialweb \ + --disable-update-mimedb #https://bugzilla.gnome.org/show_bug.cgi?id=656229 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -31,8 +40,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } - diff --git a/extra/gnome-control-center/gnome-control-center.install b/extra/gnome-control-center/gnome-control-center.install index eb703319f..079e0fa34 100644 --- a/extra/gnome-control-center/gnome-control-center.install +++ b/extra/gnome-control-center/gnome-control-center.install @@ -1,13 +1,5 @@ -pkgname=gnome-control-center - post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-control-center/systemd-fallback.patch b/extra/gnome-control-center/systemd-fallback.patch new file mode 100644 index 000000000..709e54019 --- /dev/null +++ b/extra/gnome-control-center/systemd-fallback.patch @@ -0,0 +1,81 @@ +commit 9873a7536844f5c38c2a123be58175c2774e5dcc +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:12:11 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index aee97ac..867f061 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- SYSTEMD=libsystemd-login ++ SYSTEMD="libsystemd-login libsystemd-daemon" + AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available]) + else + SYSTEMD= +diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c +index f027754..5ebbe29 100644 +--- a/panels/user-accounts/um-user.c ++++ b/panels/user-accounts/um-user.c +@@ -37,6 +37,11 @@ + + #include <gio/gunixoutputstream.h> + ++#ifdef HAVE_SYSTEMD ++# include <systemd/sd-login.h> ++# include <systemd/sd-daemon.h> ++#endif ++ + #include "um-user.h" + #include "um-account-type.h" + #include "um-utils.h" +@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user, + } + } + +-#ifdef HAVE_SYSTEMD +- +-#include <systemd/sd-login.h> +- + gboolean + um_user_is_logged_in (UmUser *user) + { +- int n_sessions; +- +- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0; +- +- return n_sessions > 0; +-} ++#ifdef HAVE_SYSTEMD ++ if (sd_booted () > 0) { ++ int n_sessions; + +-#else ++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL); + +-gboolean +-um_user_is_logged_in (UmUser *user) +-{ ++ return n_sessions > 0; ++ } ++#endif + GVariant *result; + GVariantIter *iter; + gint n_sessions; +@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user) + return n_sessions > 0; + } + +-#endif +- + void + um_user_set_automatic_login (UmUser *user, + gboolean enabled) diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 9de1b6492..afb43a012 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153780 2012-03-19 17:06:57Z ibiru $ +# $Id: PKGBUILD 156810 2012-04-23 09:06:23Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -14,14 +14,13 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2') +sha256sums=('7b36f16eeb36bb8feec9f51b53b50036df8d75d5b1c91e28b036e85b17fdb974') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --with-gnome-distributor="Arch Linux" \ - --disable-scrollkeeper + --with-gnome-distributor="Arch Linux" make } diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD new file mode 100644 index 000000000..86a252322 --- /dev/null +++ b/extra/gnome-dictionary/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156812 2012-04-23 09:06:27Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=gnome-dictionary +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Look up words in dictionary sources" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'gnome-doc-utils') +install=$pkgname.install +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-dictionary/gnome-dictionary.install b/extra/gnome-dictionary/gnome-dictionary.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/gnome-dictionary/gnome-dictionary.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index a7eb125c8..a214e98e6 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,52 +1,30 @@ -# $Id: PKGBUILD 139202 2011-10-01 17:02:00Z heftig $ +# $Id: PKGBUILD 157100 2012-04-23 20:43:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) -pkgbase=gnome-disk-utility -pkgname=(gnome-disk-utility libgdu) -pkgver=3.0.2 -pkgrel=2 -pkgdesc="GNOME libraries and applications for dealing with storage devices" +pkgname=gnome-disk-utility +pkgver=3.4.1 +pkgrel=1 +pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org" -makedepends=('dbus-glib' 'libgnome-keyring' 'udisks' 'libunique3' 'libnotify' 'avahi' - 'hicolor-icon-theme' 'gtk-doc' 'intltool') +groups=('gnome-extra') +depends=('gtk3' 'udisks2' 'hicolor-icon-theme') +makedepends=('intltool') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz - fix-freeze.patch) -sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5' - '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526') +install=gnome-disk-utility.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('54c60a3215a144a353f78742cf14221a011641244421170d7169da39f82b0129') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-freeze.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-disk-utility \ - --disable-scrollkeeper --disable-nautilus --disable-static - make -} - -package_gnome-disk-utility() { - depends=("libgdu=$pkgver-$pkgrel" 'libunique3' 'libnotify' 'hicolor-icon-theme' 'avahi') - groups=('gnome-extra') - install=gnome-disk-utility.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc -### Split libgdu - - mkdir -p "$srcdir"/libgdu/usr/{include/gnome-disk-utility,lib/pkgconfig} - - mv "$pkgdir"/usr/lib/libgdu.so* "$srcdir/libgdu/usr/lib" - mv {"$pkgdir","$srcdir/libgdu"}/usr/include/gnome-disk-utility/gdu - mv {"$pkgdir","$srcdir/libgdu"}/usr/lib/pkgconfig/gdu.pc + make } -package_libgdu() { - pkgdesc="$pkgdesc (library)" - depends=('dbus-glib' 'libgnome-keyring' 'udisks') - - mv "$srcdir"/libgdu/* "$pkgdir" +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-disk-utility/gnome-disk-utility.install b/extra/gnome-disk-utility/gnome-disk-utility.install index 43ed0a554..71d138f2d 100644 --- a/extra/gnome-disk-utility/gnome-disk-utility.install +++ b/extra/gnome-disk-utility/gnome-disk-utility.install @@ -1,11 +1,11 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index c9d3aa3ff..8a87f9501 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142279 2011-11-07 20:29:49Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156816 2012-04-23 09:06:38Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=0.2.1 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -14,11 +14,11 @@ makedepends=('intltool') optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install -source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2b2c6b15ed9e6a46602977f1e8dc15e6655c171df8ede6a3f8a749ed6682da46') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -28,7 +28,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-documents/gnome-documents.install b/extra/gnome-documents/gnome-documents.install index 95114273e..1571179ca 100644 --- a/extra/gnome-documents/gnome-documents.install +++ b/extra/gnome-documents/gnome-documents.install @@ -1,7 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD new file mode 100644 index 000000000..9a94d6a74 --- /dev/null +++ b/extra/gnome-font-viewer/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156818 2012-04-23 09:06:42Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=gnome-font-viewer +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME font viewer and thumbnailer" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'desktop-file-utils') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +groups=('gnome-extra') +install=gnome-font-viewer.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('6311fc6e390b7ddfde4fbe5954452d0846a0b3991e9e52f179be3969e6033a76') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-font-viewer/gnome-font-viewer.install b/extra/gnome-font-viewer/gnome-font-viewer.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/gnome-font-viewer/gnome-font-viewer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index 29200b23d..a67fcd51a 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,44 +1,37 @@ -# $Id: PKGBUILD 148440 2012-01-31 22:33:21Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156820 2012-04-23 09:06:47Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.2.1 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-sudoku-fix.patch) -sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b' - '00daafd11078355e16f384fe98dab69ee7e03037c8c311e7180f8f896965a715') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('01726b0631205ccbd9f02938f7ccb1d7bd0c4c001cb4596f871fed7c3afc25d4') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/gnome-sudoku-fix.patch" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-static \ + --localstatedir=/var --disable-static --disable-schemas-compile \ --with-scores-user=root --with-scores-group=games \ --enable-introspection=yes make } package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install # Remove all scores, we generate them from postinstall rm -rf "$pkgdir/var" - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-games "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas - sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku" } diff --git a/extra/gnome-games/gnome-games.install b/extra/gnome-games/gnome-games.install index 1f67c2e01..aaa36a896 100644 --- a/extra/gnome-games/gnome-games.install +++ b/extra/gnome-games/gnome-games.install @@ -1,5 +1,4 @@ -pkgname=gnome-games -scores=(glines.Large.scores +_scores=(glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores @@ -88,66 +87,36 @@ scores=(glines.Large.scores quadrapassel.scores) post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - for sz in Large Medium Small; do - if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then - mv "opt/gnome/var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - elif [ -e "var/games/same-gnome.${sz}.scores" ]; then - mv "var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - fi - done - if [ -e "opt/gnome/var/games/gnometris.scores" ]; then - mv "opt/gnome/var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - elif [ -e "var/games/gnometris.scores" ]; then - mv "var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - fi - - for score in "${scores[@]}" ; do - if [ -e "var/games/${score}" ]; then + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then continue fi - if [ -e "opt/gnome/var/games/${score}" ]; then - mv "opt/gnome/var/games/${score}" var/games/ - else - touch "var/games/${score}" - fi - chown root:games "var/games/${score}" - chmod 664 "var/games/${score}" + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" done } pre_upgrade() { - pre_remove $1 + (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games + return 0 } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} - - if [ -f usr/share/ggz/gnect-client.dsc ]; then - ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null - fi + post_install } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q gtk-update-icon-cache -q -f -t usr/share/icons/hicolor - for score in "${scores[@]}" ; do - rm -f "var/games/${score}" + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" done } diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index a755d7963..eeaca74b2 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,35 +1,32 @@ -#$Id: PKGBUILD 145317 2011-12-21 19:21:50Z ibiru $ +#$Id: PKGBUILD 156825 2012-04-23 09:06:58Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.2.2 -pkgrel=3 +pkgver=3.4.1 +pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') -depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2') +depends=('gtk3' 'gcr' 'libcap-ng') +makedepends=('intltool') groups=('gnome') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - silence_no_socket_to_connect.patch) -sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3' - '4cf3965e9beea747a7916682d37f36bc481bee10247788d4dd53f6e27fe5c041') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/silence_no_socket_to_connect.patch" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile --disable-update-mime + --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-keyring/gnome-keyring.install b/extra/gnome-keyring/gnome-keyring.install index 9635ee505..c351377a2 100644 --- a/extra/gnome-keyring/gnome-keyring.install +++ b/extra/gnome-keyring/gnome-keyring.install @@ -1,8 +1,5 @@ post_install() { glib-compile-schemas /usr/share/glib-2.0/schemas - update-mime-database /usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon } @@ -12,7 +9,4 @@ post_upgrade() { post_remove() { glib-compile-schemas /usr/share/glib-2.0/schemas - update-mime-database /usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q } diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD index 6d96303ff..e0e00534d 100644 --- a/extra/gnome-media/PKGBUILD +++ b/extra/gnome-media/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 139627 2011-10-03 20:26:30Z ibiru $ +# $Id: PKGBUILD 156827 2012-04-23 09:07:01Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-media -pkgver=2.91.2 -pkgrel=3 +pkgver=3.4.0 +pkgrel=1 pkgdesc="GNOME Media Tools" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome-extra') options=('!libtool' '!emptydirs') install=gnome-media.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4aadc834d04c3d6f573fad667a69c6dc9668240e759cbd8cfb14d053d8e4da5f') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-media \ @@ -27,8 +27,9 @@ build() { } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd $pkgname-$pkgver make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD index a136ea22c..45c8537de 100644 --- a/extra/gnome-menus/PKGBUILD +++ b/extra/gnome-menus/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 139303 2011-10-01 18:57:57Z ibiru $ +# $Id: PKGBUILD 156829 2012-04-23 09:07:05Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.2.0.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64' 'mips64el') -depends=('glib2' 'python2') +depends=('glib2' 'python2-gobject') makedepends=('intltool' 'gobject-introspection') options=('!libtool') license=('GPL' 'LGPL') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz menus.patch) -sha256sums=('17e2ea745b1e80fba4f6ec03c4bac561aa6e7ca275fcc79a3df3d318cb64972b' +sha256sums=('199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86' 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" patch -Np0 -i "$srcdir/menus.patch" @@ -28,8 +28,8 @@ build() { } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install sed -i "1s|#!/usr/bin/env python$|&2|" \ "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index 1815fd850..bffb24ecf 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 145870 2012-01-03 14:09:44Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156831 2012-04-23 09:07:07Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=gnome-nettool -pkgver=3.0.1 +pkgver=3.1.1 pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64 mips64el) license=('GPL') -depends=('gtk3' 'libgtop' 'dnsutils' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme') +depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'nmap' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') groups=('gnome-extra') url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.0/$pkgname-$pkgver.tar.xz) -sha256sums=('2c21b44b351ee470226e1e5580bb9acf0326d9b6c3040deff75322f8ca132317') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1e0430c94084484f234864c160e6252552d54bb72c163d3e451641045429901c') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-schemas-compile + --localstatedir=/var --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index fcb4433af..adafa2cbc 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140899 2011-10-20 05:42:46Z ibiru $ +# $Id: PKGBUILD 156833 2012-04-23 09:07:10Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64 mips64el) @@ -12,17 +12,17 @@ depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme') makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('d5636b8da29aae04757ca528de65e3617d85696bd7e434c48dbd1199c105f4ae') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-online-accounts/gnome-online-accounts.install b/extra/gnome-online-accounts/gnome-online-accounts.install index 2e02b7952..525ecff63 100644 --- a/extra/gnome-online-accounts/gnome-online-accounts.install +++ b/extra/gnome-online-accounts/gnome-online-accounts.install @@ -1,5 +1,5 @@ post_install () { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index d627522a0..09f3040ad 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140901 2011-10-20 05:42:50Z ibiru $ +# $Id: PKGBUILD 157064 2012-04-23 10:29:05Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.2.1 -pkgrel=1 +pkgver=3.4.1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') pkgdesc="The GNOME Panel" @@ -12,14 +12,13 @@ depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnc makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') install=gnome-panel.install groups=('gnome') -replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('513be6e709db88babac9f3ce9e517cb597d8c89569e5c9aaa957b74e0765a77f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-panel \ @@ -29,10 +28,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-panel/gnome-panel.install b/extra/gnome-panel/gnome-panel.install index e3175df5e..0f9324937 100644 --- a/extra/gnome-panel/gnome-panel.install +++ b/extra/gnome-panel/gnome-panel.install @@ -1,9 +1,9 @@ pkgname=gnome-panel post_install() { - usr/sbin/gconfpkg --install ${pkgname} - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gconfpkg --install $pkgname + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { @@ -15,10 +15,10 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/extra/gnome-pilot/PKGBUILD b/extra/gnome-pilot/PKGBUILD index bd98ec59c..7cc25291f 100644 --- a/extra/gnome-pilot/PKGBUILD +++ b/extra/gnome-pilot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139311 2011-10-01 18:58:09Z ibiru $ +# $Id: PKGBUILD 157208 2012-04-26 02:01:26Z eric $ # Jan de Groot <jgc@archlinux.org> pkgname=gnome-pilot pkgver=2.91.93 -pkgrel=1 +pkgrel=2 pkgdesc="Pilot Support for Gnome" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -30,6 +30,6 @@ package() { make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index 7a8dd4f77..13e115b92 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 140903 2011-10-20 05:42:55Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156837 2012-04-23 09:07:16Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.2.1 -pkgrel=1.1 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Power management tools." arch=(i686 x86_64 'mips64el') url="http://www.gnome.org/projects/gnome-power-manager/" license=('GPL') depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool') options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb') +sha256sums=('2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/gnome-power-manager \ - --disable-scrollkeeper \ --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-power-manager/gnome-power-manager.install b/extra/gnome-power-manager/gnome-power-manager.install index 4666938db..f7e8c46ac 100644 --- a/extra/gnome-power-manager/gnome-power-manager.install +++ b/extra/gnome-power-manager/gnome-power-manager.install @@ -1,13 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.92) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-power-manager - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD index 1672f4955..b417190a0 100644 --- a/extra/gnome-screensaver/PKGBUILD +++ b/extra/gnome-screensaver/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 139315 2011-10-01 18:58:16Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156839 2012-04-23 09:07:19Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver -pkgver=3.2.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://live.gnome.org/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) -depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas') +depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd') makedepends=('pkgconfig' 'intltool' 'libxss') groups=('gnome') options=(!emptydirs) install=gnome-screensaver.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam) -sha256sums=('305f4a5be8736c4cf5e55b8288b7e177907bafa26e39273d1bb65ad1862295ed' - '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2') +sha256sums=('d54a253f826ff6cd48eba53724339896a6dea39029848b6a8d5972c8e162069b' + 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-screensaver \ --localstatedir=/var \ - --with-mit-ext + --with-mit-ext --with-systemd make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/gnome-screensaver.pam" "$pkgdir/etc/pam.d/gnome-screensaver" } diff --git a/extra/gnome-screensaver/gnome-screensaver.install b/extra/gnome-screensaver/gnome-screensaver.install index 3b0e06046..d1a42c6ce 100644 --- a/extra/gnome-screensaver/gnome-screensaver.install +++ b/extra/gnome-screensaver/gnome-screensaver.install @@ -2,6 +2,6 @@ pkgname=gnome-screensaver pre_upgrade() { if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall ${pkgname} fi } diff --git a/extra/gnome-screensaver/gnome-screensaver.pam b/extra/gnome-screensaver/gnome-screensaver.pam index c776a5410..453dae646 100644 --- a/extra/gnome-screensaver/gnome-screensaver.pam +++ b/extra/gnome-screensaver/gnome-screensaver.pam @@ -1,3 +1,3 @@ #%PAM-1.0 -auth required pam_unix_auth.so +auth required pam_unix_auth.so nullok auth optional pam_gnome_keyring.so diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD new file mode 100644 index 000000000..904764905 --- /dev/null +++ b/extra/gnome-screenshot/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 156841 2012-04-23 09:07:21Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-screenshot +pkgver=3.4.1 +pkgrel=1 +pkgdesc="Take pictures of your screen" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3' 'libcanberra') +makedepends=('intltool') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('47c227e43404d6cc101cf473d8f48f7572064b2b10724f2660066f9a4718d488') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-screenshot/gnome-screenshot.install b/extra/gnome-screenshot/gnome-screenshot.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/gnome-screenshot/gnome-screenshot.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-search-tool/PKGBUILD b/extra/gnome-search-tool/PKGBUILD new file mode 100644 index 000000000..7cbd3d7ef --- /dev/null +++ b/extra/gnome-search-tool/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 156843 2012-04-23 09:07:23Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-search-tool +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Utility to search for files" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('gconf' 'gtk3' 'libsm') +makedepends=('intltool' 'gnome-doc-utils') +install=$pkgname.install +options=('!emptydirs') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6c4ed39ab1196d118e5e0d2a7faa07fbbb257831454ee92ff0c6f28c0942e69c') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-install + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-search-tool/gnome-search-tool.install b/extra/gnome-search-tool/gnome-search-tool.install new file mode 100644 index 000000000..9bc909b92 --- /dev/null +++ b/extra/gnome-search-tool/gnome-search-tool.install @@ -0,0 +1,17 @@ +pkgname=gnome-search-tool + +post_install() { + gconfpkg --install $pkgname +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 1e098f700..2004e59ed 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 140905 2011-10-20 05:42:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156845 2012-04-23 09:07:26Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') -depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') +depends=('libsystemd' 'consolekit' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' + 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' + 'startup-notification' 'upower') makedepends=('intltool' 'mesa' 'xtrans') options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0ad29c2c3158b9e0109d3463e587fe09f312b810a9db51775750b9af8ce457aa') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ - --disable-schemas-compile + --disable-schemas-compile --enable-systemd make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-session/gnome-session.install b/extra/gnome-session/gnome-session.install index 74cf4ed22..f7e8c46ac 100644 --- a/extra/gnome-session/gnome-session.install +++ b/extra/gnome-session/gnome-session.install @@ -1,12 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91.3-3) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-session - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 93768bae2..895650283 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,35 +1,55 @@ -# $Id: PKGBUILD 142417 2011-11-09 07:29:52Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 157198 2012-04-25 14:06:29Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.2.2 -pkgrel=1 +pkgver=3.4.1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower') -makedepends=('intltool' 'gtk-doc' 'gnome-desktop') +depends=('colord' 'dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libgnomekbd' 'libnotify' + 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower') +makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom') options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -replaces=(gnome-settings-daemon-pulse) -conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + systemd-fallback.patch + evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6 + arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8 + mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b + glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1 + mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d) +sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed' + '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008' + '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b' + '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246' + '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc' + 'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd' + '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + + patch -Np1 -i ../systemd-fallback.patch + patch -Np1 -i ../evironment.patch + patch -Np1 -i ../arguments.patch + patch -Np1 -i ../mem-leak.patch + patch -Np1 -i ../glist-leak.patch + patch -Np1 -i ../mouse-mem-leak.patch + + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ + --enable-systemd - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ - --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-settings-daemon/gnome-settings-daemon.install b/extra/gnome-settings-daemon/gnome-settings-daemon.install index 483fb9450..f7e8c46ac 100644 --- a/extra/gnome-settings-daemon/gnome-settings-daemon.install +++ b/extra/gnome-settings-daemon/gnome-settings-daemon.install @@ -1,12 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-settings-daemon - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-settings-daemon/systemd-fallback.patch b/extra/gnome-settings-daemon/systemd-fallback.patch new file mode 100644 index 000000000..da0496623 --- /dev/null +++ b/extra/gnome-settings-daemon/systemd-fallback.patch @@ -0,0 +1,154 @@ +commit b9ded09387f0b99ece97baee18595eb9e86a5b9b +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:52:54 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index 3b4789f..d522852 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) + SESSION_TRACKING=systemd + else +diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c +index 5786300..83fe21e 100644 +--- a/gnome-settings-daemon/gnome-settings-session.c ++++ b/gnome-settings-daemon/gnome-settings-session.c +@@ -30,6 +30,7 @@ + #include "gnome-settings-session.h" + + #ifdef HAVE_SYSTEMD ++#include <systemd/sd-daemon.h> + #include <systemd/sd-login.h> + + typedef struct +@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate + { + #ifdef HAVE_SYSTEMD + GSource *sd_source; +-#else ++#endif + GDBusProxy *proxy_session; + GCancellable *cancellable; +-#endif + gchar *session_id; + GnomeSettingsSessionState state; + }; +@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data) + return TRUE; + } + +-#else /* HAVE_SYSTEMD */ ++#endif /* HAVE_SYSTEMD */ + + static void + gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy, +@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d + g_object_unref (proxy_manager); + } + +-#endif /* HAVE_SYSTEMD */ +- + static void + gnome_settings_session_init (GnomeSettingsSession *session) + { + session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session); + + #ifdef HAVE_SYSTEMD +- sd_pid_get_session (getpid(), &session->priv->session_id); ++ session->priv->sd_source = NULL; ++ ++ if (sd_booted () > 0) { ++ sd_pid_get_session (getpid(), &session->priv->session_id); + +- session->priv->sd_source = sd_source_new (); +- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); +- g_source_attach (session->priv->sd_source, NULL); ++ session->priv->sd_source = sd_source_new (); ++ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); ++ g_source_attach (session->priv->sd_source, NULL); + +- sessions_changed (session); +-#else ++ sessions_changed (session); ++ return; ++ } ++#endif + session->priv->cancellable = g_cancellable_new (); + + /* connect to ConsoleKit */ +@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session) + session->priv->cancellable, + got_manager_proxy_cb, + session); +-#endif + } + + static void +@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object) + if (session->priv->sd_source != NULL) { + g_source_destroy (session->priv->sd_source); + g_source_unref (session->priv->sd_source); ++ goto out; + } +-#else ++#endif ++ + g_cancellable_cancel (session->priv->cancellable); + + if (session->priv->proxy_session != NULL) + g_object_unref (session->priv->proxy_session); + g_object_unref (session->priv->cancellable); +-#endif + ++out: + G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object); + } + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 8db04e5..9883d76 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -2031,7 +2031,7 @@ systemd_stop (void) + g_object_unref (bus); + } + +-#else ++#endif + + static void + consolekit_stop_cb (GObject *source_object, +@@ -2081,7 +2081,6 @@ consolekit_stop (void) + consolekit_stop_cb, NULL); + g_object_unref (proxy); + } +-#endif + + static void + upower_sleep_cb (GObject *source_object, +@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager, + * hibernate is not available and is marginally better + * than just powering down the computer mid-write */ + #ifdef HAVE_SYSTEMD +- systemd_stop (); +-#else +- consolekit_stop (); ++ if (sd_booted () > 0) ++ systemd_stop (); ++ else + #endif ++ consolekit_stop (); + break; + case GSD_POWER_ACTION_BLANK: + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index e751947bd..a52368458 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 146998 2012-01-20 11:30:17Z ibiru $ +# $Id: PKGBUILD 156849 2012-04-23 09:07:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.2.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeShell" license=('GPL2') -depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 'nautilus' 'telepathy-mission-control' 'unzip') +depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip') makedepends=('intltool' 'gnome-doc-utils') optdepends=('network-manager-applet: shell integration for networkmanager') options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ @@ -29,10 +28,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-shell "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-shell/gnome-shell.install b/extra/gnome-shell/gnome-shell.install index a07105c24..27d70b19d 100644 --- a/extra/gnome-shell/gnome-shell.install +++ b/extra/gnome-shell/gnome-shell.install @@ -1,22 +1,19 @@ pkgname=gnome-shell post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas + post_install } diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD new file mode 100644 index 000000000..542a60e9e --- /dev/null +++ b/extra/gnome-system-log/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 156851 2012-04-23 09:07:33Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-system-log +pkgver=3.4.1 +pkgrel=1 +pkgdesc="View your system logs" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'gnome-doc-utils') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('288bb4db72d5e86874198f3a879a89cd0ddec373db9838d8ea772df1c5267736') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-system-log/gnome-system-log.install b/extra/gnome-system-log/gnome-system-log.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/extra/gnome-system-log/gnome-system-log.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index 7f26b0a44..6de6c4946 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 140912 2011-10-20 05:43:17Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156853 2012-04-23 09:07:36Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme') -makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool') +depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd') +makedepends=('gnome-doc-utils' 'intltool') options=(!emptydirs) url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-system-monitor/gnome-system-monitor.install b/extra/gnome-system-monitor/gnome-system-monitor.install index e2957a570..c25dff2d3 100644 --- a/extra/gnome-system-monitor/gnome-system-monitor.install +++ b/extra/gnome-system-monitor/gnome-system-monitor.install @@ -1,19 +1,11 @@ -pkgname=gnome-system-monitor - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index c4ee90d1c..26083793c 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140914 2011-10-20 05:43:22Z ibiru $ +# $Id: PKGBUILD 156855 2012-04-23 09:07:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.2.1 +pkgver=3.4.1.1 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -13,21 +13,21 @@ options=('!emptydirs') url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('14d4a252fcbadf0a5fff89f1ff65f0a84d02f5e51c42f8fc14cee73eabc43fdd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-terminal/gnome-terminal.install b/extra/gnome-terminal/gnome-terminal.install index 04c2b3c2c..1d8510f06 100644 --- a/extra/gnome-terminal/gnome-terminal.install +++ b/extra/gnome-terminal/gnome-terminal.install @@ -1,7 +1,7 @@ pkgname=gnome-terminal post_install() { - usr/sbin/gconfpkg --install ${pkgname} + gconfpkg --install $pkgname } pre_upgrade() { @@ -13,5 +13,5 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index a6d46c6ab..19ed406b9 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 140916 2011-10-20 05:43:25Z ibiru $ +# $Id: PKGBUILD 156857 2012-04-23 09:07:41Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') -url="http://abattis.org/cantarell/" +url="http://www.gnome.org" license=('GPL2') -depends=('cantarell-fonts' 'gtk3' 'gtk-engines' 'librsvg') +depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg') makedepends=('intltool') groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz) -sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0096f3d8ba5416e77a5b4d398140a7f53480ee706740cb698df3f5267540169f') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index f860a5fad..6d2fdd87a 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 140919 2011-10-20 05:43:32Z ibiru $ +# $Id: PKGBUILD 156861 2012-04-23 09:07:46Z ibiru $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64' 'mips64el') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3') +depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') makedepends=('intltool' 'gnome-doc-utils' 'nautilus') options=('!emptydirs' '!libtool') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea') +sha256sums=('34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD index 5e1fee3fd..f570b8e22 100644 --- a/extra/gobject-introspection/PKGBUILD +++ b/extra/gobject-introspection/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139334 2011-10-01 18:58:44Z ibiru $ +# $Id: PKGBUILD 156865 2012-04-23 09:07:51Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gobject-introspection -pkgver=1.30.0 -pkgrel=1.1 +pkgver=1.32.1 +pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch=('x86_64' 'i686' 'mips64el') @@ -11,19 +11,19 @@ license=('LGPL' 'GPL') depends=('glib2' 'python2') makedepends=('cairo') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.xz) -sha256sums=('8e4274579096e983fad3148cdab50295a4701e45cd9a4e02f7242fc0a04c47b2') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install sed -i '1s|#!/usr/bin/env python$|&2|' \ - "${pkgdir}"/usr/lib/gobject-introspection/giscanner/*.py + "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py } diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 4fa43443c..8c9db89c6 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 155968 2012-04-10 10:51:55Z tomegun $ -# Maintainer: +# $Id: PKGBUILD 157111 2012-04-23 23:54:24Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.4 -pkgrel=3 +pkgver=3.5 +pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') url="http://catb.org/gpsd/" @@ -21,10 +21,6 @@ options=('!libtool') install="${pkgname}.install" source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} 'gpsd' 'gpsd.conf.d') -md5sums=('c01353459faa68834309109d4e868460' - '8aea27e1b0c23f254f94861f7d898106' - '1f3402f8e33a7032b9ae6dfd077234f7' - '3e963df3f9f7ef3572ecc648ae829315') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -78,3 +74,7 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('e96881798a0ab67aa3cd5f3249f0e536' + 'f6b3718b205be7853d49bae6ef587853' + '1f3402f8e33a7032b9ae6dfd077234f7' + '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index e59f28d57..739dff6d5 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154315 2012-03-26 03:36:27Z foutrelis $ +# $Id: PKGBUILD 157022 2012-04-23 09:27:34Z ibiru $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64' 'mips64el') url="http://www.rodsbooks.com/gdisk/" diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 22a211769..d248642f9 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 146719 2012-01-16 19:50:53Z dreisner $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156867 2012-04-23 09:07:54Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins pkgver=0.1.18 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') depends=('grilo') makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt' - 'rest' 'libtracker-sparql') + 'rest' 'libtracker-sparql' 'gnome-common') optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin' @@ -22,18 +22,22 @@ optdepends=('gupnp-av: uPnP plugin' 'rest: Blip.tv plugin' 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + tracker-0.14.patch) +sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79' + 'c48201ed1633e2b0eb5132ef823d7b060e9c2cddb808c6981fb546133cd4ea63') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver + + patch -Np1 -i ../tracker-0.14.patch - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/grilo-plugins/tracker-0.14.patch b/extra/grilo-plugins/tracker-0.14.patch new file mode 100644 index 000000000..c9c79fe7c --- /dev/null +++ b/extra/grilo-plugins/tracker-0.14.patch @@ -0,0 +1,32 @@ +From 9e00790f40ee498a7359b00e0b11a7523fdd1b3e Mon Sep 17 00:00:00 2001 +From: Vincent Untz <vuntz@gnome.org> +Date: Thu, 19 Jan 2012 09:30:28 +0000 +Subject: build: Support build against tracker 0.13/0.14 + +https://bugzilla.gnome.org/show_bug.cgi?id=667855 +--- +diff --git a/configure.ac b/configure.ac +index 1fd6743..71aceed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,11 +134,17 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6, + HAVE_GMIME=yes, + HAVE_GMIME=no)]) + +-PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, ++PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.14, + HAVE_TRACKER_SPARQL=yes, + HAVE_TRACKER_SPARQL=no) + + if test "x$HAVE_TRACKER_SPARQL" = "xno"; then ++ PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, ++ HAVE_TRACKER_SPARQL=yes, ++ HAVE_TRACKER_SPARQL=no) ++fi ++ ++if test "x$HAVE_TRACKER_SPARQL" = "xno"; then + PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11, + HAVE_TRACKER_SPARQL=yes, + HAVE_TRACKER_SPARQL=no) +-- +cgit v0.9.0.2 diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index d7049afb6..6db3eb9b8 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139610 2011-10-03 19:05:04Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157078 2012-04-23 13:10:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.12.0 +pkgver=0.12.1 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64' 'mips64el') @@ -14,18 +14,16 @@ makedepends=('gobject-introspection' 'gtk2' 'gtk-doc') optdepends=('gtk2: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7f02903989b4ac7cfb7508898706a5b4a01c9ace2f6345bd96bf8a3faa30ae1a') +sha256sums=('16acb4cc5249836ebe0e1758b75b85b8d529b51f72d9f68d8e4ae524d55f3347') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 84dcdd62c..0ac0bd635 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,34 +1,43 @@ -# $Id: PKGBUILD 148766 2012-02-05 11:49:40Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 157098 2012-04-23 20:32:20Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=2.14.2 +pkgver=3.0.0 pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 'mips64el') license=('GPL') -url="http://gthumb.sourceforge.net/" -depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') -optdepends=('gstreamer0.10-base: video support') +url="http://live.gnome.org/gthumb" +depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' + 'gstreamer0.10-base') +makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' + 'brasero' 'librsvg' 'libopenraw' 'liboauth') +optdepends=('libopenraw: read RAW files' + 'exiv2: metadata support' + 'libchamplain: map viewer' + 'brasero: burn discs' + 'libsoup-gnome: web albums' + 'liboauth: web albums') options=('!libtool' '!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c') +sha256sums=('5b6116a69897ee9aeba8db3d1ac800e9a62308738367533268acea40519f58b4') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --enable-libchamplain --enable-libopenraw + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gthumb "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gthumb/gthumb.install b/extra/gthumb/gthumb.install index 6046ebb6f..9d4e7822f 100644 --- a/extra/gthumb/gthumb.install +++ b/extra/gthumb/gthumb.install @@ -1,24 +1,19 @@ -pkgname=gthumb - post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + if (( $(vercmp $2 2.90.1) < 0 )); then + gconfpkg --uninstall gthumb + fi } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index a962a152b..c470f3aa5 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142786 2011-11-15 06:28:23Z eric $ -# Maintainer: +# $Id: PKGBUILD 156872 2012-04-23 09:08:01Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gtk-vnc -pkgver=0.4.4 +pkgver=0.5.0 pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,14 @@ optdepends=('gtk2: GTK2 widget') makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7') +sha256sums=('1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81') build() { - cd "$srcdir" - cp -a $pkgname-$pkgver gtk3-build + rm -rf gtk2-build gtk3-build + cp -a $pkgname-$pkgver gtk2-build + mv $pkgname-$pkgver gtk3-build - ( cd $pkgname-$pkgver + ( cd gtk2-build PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --with-python --disable-static --with-gtk=2.0 make ) @@ -34,7 +35,6 @@ build() { } package() { - cd "${srcdir}" - make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install + make -C gtk2-build -j1 DESTDIR="${pkgdir}" install make -C gtk3-build -j1 DESTDIR="${pkgdir}" install } diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 065a51496..aaed4e8d5 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151544 2012-02-27 16:18:08Z ibiru $ +# $Id: PKGBUILD 156874 2012-04-23 09:08:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.2.3 -pkgrel=3 -pkgdesc="GTK+ is a multi-platform toolkit (v3)" +pkgver=3.4.1 +pkgrel=1 +pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" install=gtk3.install @@ -13,16 +13,12 @@ makedepends=('gobject-introspection') options=('!libtool') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz - settings.ini - empty_grid.patch) -sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - 'd05ccfeaf4c558668b72aaacdd11356b6419d2359def6c1b9af1b465fa5a3c25') - +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + settings.ini) +sha256sums=('0716b533de0ff2ffdec1076bb85c7a95e2b7b6ac9ece71e84625043ae3eb25f7' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { - cd "$srcdir/gtk+-$pkgver" - patch -Np1 -i "$srcdir/empty_grid.patch" + cd "gtk+-$pkgver" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -34,7 +30,7 @@ build() { } package() { - cd "$srcdir/gtk+-$pkgver" + cd "gtk+-$pkgver" make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" diff --git a/extra/gtk3/gtk3.install b/extra/gtk3/gtk3.install index cd8965d1f..ca20d2865 100644 --- a/extra/gtk3/gtk3.install +++ b/extra/gtk3/gtk3.install @@ -1,6 +1,6 @@ post_install() { - usr/bin/gtk-query-immodules-3.0 --update-cache - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + /usr/bin/gtk-query-immodules-3.0 --update-cache + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { @@ -8,8 +8,9 @@ post_upgrade() { } pre_remove() { - rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache + rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache } + post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 216b2a128..5a7a167d2 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146306 2012-01-09 13:55:21Z heftig $ +# $Id: PKGBUILD 156876 2012-04-23 09:08:07Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.2.3 +pkgver=4.4.1 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -12,11 +12,11 @@ depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('e9867dafd5685a7887afe77f2eb584aeaf5f8e20df83100b8f24adcfc1e422d1') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236') build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gtkhtml4 \ --localstatedir=/var --disable-static @@ -24,6 +24,6 @@ build() { } package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index ae812c133..beb86ef69 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 139350 2011-10-01 18:59:11Z ibiru $ +# $Id: PKGBUILD 156878 2012-04-23 09:08:09Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.2.0 +pkgver=3.4.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') license=('LGPL') options=('!libtool' '!emptydirs') -url="http://gtkmm.sourceforge.net/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.2/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('6195dac58454e287ae17d380c028827f0a49669a3b93f85e2d4f6eb9459674f2') +url="http://www.gtkmm.org/" +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('42ea4e9acdd37fc3fe7026f8249a5427927b51048adff827bc1312900d6b12e9') build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr make } @@ -23,16 +23,16 @@ build() { package_gtkmm3() { pkgdesc="C++ bindings for gtk3" depends=('gtk3' 'pangomm' 'atkmm') - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } package_gtkmm3-docs() { pkgdesc="Developer documentation for gtkmm v3" - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -C docs DESTDIR="${pkgdir}" install + cd "$_pkgbasename-$pkgver" + make -C docs DESTDIR="$pkgdir" install } diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 98bc38107..71a835d50 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151329 2012-02-25 14:28:40Z pierre $ +# $Id: PKGBUILD 157035 2012-04-23 09:53:22Z ibiru $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod pkgver=2.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64' 'mips64el') url="http://gtkpod.sourceforge.net" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index a26d5b923..fbe8be2c0 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145888 2012-01-03 19:46:57Z ibiru $ +# $Id: PKGBUILD 156880 2012-04-23 09:08:12Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,10 +13,10 @@ makedepends=('intltool' 'gobject-introspection' 'glade') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('73d9c6702ccecd06846132cfb50191092cb50a4bcb3ff810a5605868f0855947') +sha256sums=('8387b33c61efffcafed99ae896aed224a1ea8b3af45677c5d57e0d1842f6ffc1') build() { - cd "$srcdir/$_pkgbasename-$pkgver" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-glade-catalog @@ -24,6 +24,6 @@ build() { } package() { - cd "$srcdir/$_pkgbasename-$pkgver" + cd "$_pkgbasename-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 51ab892ac..1026aeb76 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 142885 2011-11-17 18:34:47Z ibiru $ -# Maintainer: Jan De Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156882 2012-04-23 09:08:14Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.2.2 +pkgver=3.4.1.1 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org" -depends=('gconf' 'hicolor-icon-theme') +depends=('dconf' 'gtk3' 'hicolor-icon-theme') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gucharmap.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --disable-scrollkeeper --enable-introspection + --disable-schemas-compile --enable-introspection make } package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gucharmap $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gucharmap/gucharmap.install b/extra/gucharmap/gucharmap.install index 4de3253f6..0a9ddf4c2 100644 --- a/extra/gucharmap/gucharmap.install +++ b/extra/gucharmap/gucharmap.install @@ -1,22 +1,17 @@ -pkgname=gucharmap - post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap + return 0 } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index 16dcc2de5..97ea02440 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139612 2011-10-03 19:05:21Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157080 2012-04-23 13:11:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thijs Vermeir <thijsvermeir@gmail.com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=gupnp-av -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64') @@ -14,17 +14,16 @@ depends=('gupnp') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('41aeb5d243426b293c315788b41bc79a2be1f466eeff114cf6c89a37140f507e') +sha256sums=('4863c9bcbfa2e9fcb215d43c8d1e4090fbd078f8ae65e45a3314e7f6d59a8cbf') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 5c8810754..6b18c0279 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139611 2011-10-03 19:05:21Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157079 2012-04-23 13:11:06Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.18.0 +pkgver=0.18.2 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64') @@ -14,19 +14,17 @@ makedepends=('gobject-introspection' 'gtk-doc') optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('82f4758b26ef0531cf6301f526fe705f06c329eaef403bb30925128fcbb6a71a') +sha256sums=('3715fa56c1f351132cffe7d69127da1daada7ff50481838c6dbfd17d7182743d') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --with-context-manager=linux make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 90f051f5e..19786d10d 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 150878 2012-02-23 13:48:04Z allan $ +# $Id: PKGBUILD 156884 2012-04-23 09:08:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.10.1 -pkgrel=3 +pkgver=1.12.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('d75dbb0cee87ca93f393c96da56affa51609114814b87771cfc9871c09b5355e') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ @@ -24,7 +24,7 @@ build() { package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' @@ -32,13 +32,13 @@ package_gvfs() { 'gvfs-afp: Apple Filing Protocol (AFP) support') install=gvfs.install - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^am__append_3/#am__append_3/' \ - -e 's/^am__append_4/#am__append_4/' \ + cd "$pkgbase-$pkgver" + sed -e 's/^am__append_4/#am__append_4/' \ + -e 's/^am__append_5/#am__append_5/' \ -i monitor/Makefile - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install - cd "${pkgdir}" + cd "$pkgdir" rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml @@ -47,67 +47,66 @@ package_gvfs() { package_gvfs-smb() { pkgdesc="SMB/CIFS (Windows client) backend for gvfs" - depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring') + depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring') install=gvfs-smb.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -m755 -d "${pkgdir}/usr/lib/gvfs" - install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" + cd "$pkgbase-$pkgver/daemon" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" - install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/" - install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" install -Dm644 org.gnome.system.smb.gschema.xml \ - "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" install -Dm644 gvfs-smb.convert \ - "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert" + "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" } package_gvfs-afc() { pkgdesc="AFC (mobile devices) backend for gvfs" - depends=("gvfs=${pkgver}" 'libimobiledevice') + depends=("gvfs=$pkgver" 'libimobiledevice') install=gvfs-module.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc" - install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount" + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/monitor/afc" + make DESTDIR="$pkgdir" install } package_gvfs-gphoto2() { pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev') + depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') install=gvfs-module.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2" - install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount" + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" + make DESTDIR="$pkgdir" install } package_gvfs-obexftp() { pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server') + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') install=gvfs-module.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp" - install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount" + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" } package_gvfs-afp() { pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" - depends=("gvfs=${pkgver}") + depends=("gvfs=$pkgver") install=gvfs-module.install - install -m755 -d "${pkgdir}/usr/lib/gvfs" - install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/" - install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + cd "$pkgbase-$pkgver/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" } diff --git a/extra/gvfs/gvfs-smb.install b/extra/gvfs/gvfs-smb.install index 0b8783c7b..da6a2ab6d 100644 --- a/extra/gvfs/gvfs-smb.install +++ b/extra/gvfs/gvfs-smb.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas killall -USR1 gvfsd >&/dev/null || : } @@ -8,5 +8,5 @@ post_upgrade() { } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } diff --git a/extra/gvfs/gvfs.install b/extra/gvfs/gvfs.install index 9458b1513..3482d99e3 100644 --- a/extra/gvfs/gvfs.install +++ b/extra/gvfs/gvfs.install @@ -1,6 +1,6 @@ post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas killall -USR1 gvfsd >&/dev/null || : } @@ -9,6 +9,6 @@ post_upgrade() { } post_remove() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas } diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index d66fbebf8..d2d9e817d 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 141339 2011-10-29 15:01:45Z andyrtr $ +# $Id: PKGBUILD 156886 2012-04-23 09:08:21Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=4.8.1.1 -pkgrel=1.1 +pkgver=49.1.1 +pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64 'mips64el') url="http://www.icu-project.org/" license=('custom:"icu"') depends=('gcc-libs' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz - http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz - icu.8198.revert.icu5431.patch) -md5sums=('ea93970a0275be6b42f56953cd332c17' + http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz + icu.8198.revert.icu5431.patch) +md5sums=('7c53f83e0327343f4060c0eb83842daf' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 5a9304dd1..9bc10d2c6 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139369 2011-10-01 18:59:40Z ibiru $ +# $Id: PKGBUILD 156888 2012-04-23 09:08:23Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.0 +pkgver=0.12.2 pkgrel=1 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" @@ -13,16 +13,15 @@ options=('!libtool') depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c6d2b9dc3b8fd1715c95a11b428c9121828953fd02cf301a7eb577c9b5bdba85') +sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static --disable-debug \ - --enable-vala + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-debug --enable-vala make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD index 3778efe01..8d3bca02a 100644 --- a/extra/libcroco/PKGBUILD +++ b/extra/libcroco/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152706 2012-03-09 01:01:22Z heftig $ +# $Id: PKGBUILD 156890 2012-04-23 09:08:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libcroco -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc="A CSS parsing library" arch=('x86_64' 'i686' 'mips64el') @@ -12,15 +12,15 @@ license=('LGPL') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -sha256sums=('c816bad3406c52a98d84a2222c0e4a7b70ee0640b49cde4a236deaa02c4232ea') +sha256sums=('2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 4fcbe3c0e..c6d50d193 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143012 2011-11-20 22:59:47Z heftig $ +# $Id: PKGBUILD 156892 2012-04-23 09:08:29Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=5.0.2 +pkgver=5.0.3 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64 'mips64el') @@ -18,7 +18,7 @@ options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('53e710a76298a224546803ecee711e610c68cf6938bd908e6d7e3c9bab183593') +sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD index 57febb731..fe511a9ff 100644 --- a/extra/libgdata/PKGBUILD +++ b/extra/libgdata/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 139373 2011-10-01 18:59:45Z ibiru $ +# $Id: PKGBUILD 156894 2012-04-23 09:08:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgdata -pkgver=0.10.1 +pkgver=0.12.0 pkgrel=1 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libsoup-gnome' 'liboauth') -makedepends=('pkgconfig' 'intltool' 'gobject-introspection') +makedepends=('intltool' 'gobject-introspection') url="http://www.gnome.org" options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d7f27b1019905792246336599cadc7470b362806ed5e2c038a9f7c0da257f6ef') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e5acd1ca88433306e740fc4cb3836f9710358d0acd48d4ddee1876dd77d2aca3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 3b12c60d2..ef4905150 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,21 +1,21 @@ -#$Id: PKGBUILD 142889 2011-11-17 18:34:54Z ibiru $ +#$Id: PKGBUILD 156896 2012-04-23 09:08:34Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') -depends=('dbus-core' 'libgcrypt' 'glib2') -makedepends=('intltool' 'pkgconfig') +depends=('dbus-core' 'glib2' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e74a3e4521767fe5f05cc97cda8a355239567d9763ec628280ede8c2a4a379e8') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring @@ -23,6 +23,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD index c23d9a555..e33db1eee 100644 --- a/extra/libgnomekbd/PKGBUILD +++ b/extra/libgnomekbd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139375 2011-10-01 18:59:47Z ibiru $ +# $Id: PKGBUILD 156898 2012-04-23 09:08:37Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomekbd -pkgver=3.2.0 +pkgver=3.4.0.2 pkgrel=1 pkgdesc="Gnome keyboard library" url="http://gswitchit.sourceforge.net" @@ -12,17 +12,17 @@ depends=('libxklavier' 'gtk3' 'dconf') makedepends=('intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=libgnomekbd.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('810ff305bbf076f6689911cf7b040d2113f501311a866abc37aa6bf5b28e1a2b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgnomekbd/libgnomekbd.install b/extra/libgnomekbd/libgnomekbd.install index 2ef26aaa9..a3d820459 100644 --- a/extra/libgnomekbd/libgnomekbd.install +++ b/extra/libgnomekbd/libgnomekbd.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index 7eb4462be..38550830b 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 145205 2011-12-19 17:59:06Z jgc $ +# $Id: PKGBUILD 156900 2012-04-23 09:08:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libgsf -pkgver=1.14.22 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=1.14.23 +pkgrel=1 +arch=(i686 x86_64 mips64el) pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" url="http://www.gnome.org/" license=('GPL' 'LGPL') options=('!libtool') depends=('libxml2' 'gdk-pixbuf2' 'bzip2') -conflicts=("libgsf-gnome<$pkgver") -makedepends=('intltool' 'pygtk') +makedepends=('intltool' 'gobject-introspection') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) -sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f') +sha256sums=('bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package_libgsf() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index e98bc6ae5..5f182ad52 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 141132 2011-10-24 16:18:24Z ibiru $ +# $Id: PKGBUILD 156902 2012-04-23 09:08:42Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme') -makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') options=('!libtool' '!emptydirs') url="http://www.gnome.org/" install=libgweather.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gettext-not-xml.patch) -sha256sums=('495f6d0f79947d6e601db3220360b1fcd6ae43608cd1571be5bcd5c05b7388d5' - '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3') +sha256sums=('ee9c4d09f33ae2b066dd1e696aa3e483a689cba6d63bcd388cc2ef95df9b1b60' + '3808da5c27bad1152eee824db2cead21de599af198eca017a18e1b0adb366330') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/gettext-not-xml.patch" + patch -Np1 -i "$srcdir/gettext-not-xml.patch" gtkdocize autoreconf -fi @@ -31,10 +31,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain libgweather "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/libgweather/gettext-not-xml.patch b/extra/libgweather/gettext-not-xml.patch index db9c64148..46ea98f48 100644 --- a/extra/libgweather/gettext-not-xml.patch +++ b/extra/libgweather/gettext-not-xml.patch @@ -1,7 +1,7 @@ -diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac ---- libgweather-3.1.3/configure.ac.gettext 2011-07-04 10:52:13.000000000 -0400 -+++ libgweather-3.1.3/configure.ac 2011-07-06 20:26:17.180168365 -0400 -@@ -43,19 +43,16 @@ GNOME_MAINTAINER_MODE_DEFINES +diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac +--- libgweather-3.4.0.orig/configure.ac 2012-03-08 20:49:21.497783149 +0000 ++++ libgweather-3.4.0/configure.ac 2012-03-08 20:59:21.082941563 +0000 +@@ -43,19 +43,16 @@ LT_PREREQ([2.2.6]) LT_INIT([dlopen win32-dll disable-static]) @@ -16,16 +16,16 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac AC_PATH_PROG(GCONFTOOL, gconftool-2) -AC_ARG_ENABLE(all-translations-in-one-xml, -- [AC_HELP_STRING([--enable-all-translations-in-one-xml], +- [AS_HELP_STRING([--enable-all-translations-in-one-xml], - [Put all translations in a big Locations.xml file (slow to parse)])], - [enable_big_xml=yes], - [enable_big_xml=no]) -AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") - AC_ARG_ENABLE(locations-compression, - [AC_HELP_STRING([--enable-locations-compression], + [AS_HELP_STRING([--enable-locations-compression], [Compress Locations.xml files])], -@@ -191,7 +188,7 @@ AC_OUTPUT([ +@@ -178,7 +175,7 @@ Makefile doc/Makefile po/Makefile.in @@ -34,9 +34,9 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac libgweather/Makefile libgweather/gweather-3.0.pc libgweather/gweather-3.0-uninstalled.pc -@@ -199,12 +196,6 @@ data/Makefile - icons/Makefile +@@ -187,12 +184,6 @@ ]) + AC_OUTPUT -if test "x$enable_big_xml" = "xyes"; then - LOCATIONS_XML_TRANSLATIONS="one big file" @@ -47,17 +47,17 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac dnl *************************************************************************** dnl *** Display Summary *** dnl *************************************************************************** -@@ -215,6 +206,4 @@ libgweather-$VERSION configure summary: +@@ -203,6 +194,4 @@ Source code location: ${srcdir} Compiler: ${CC} Introspection support: ${found_introspection} - Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS} - Locations.xml compression: ${enable_locations_compression} " >&2 -diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makefile.am ---- libgweather-3.1.3/data/Makefile.am.gettext 2011-04-04 16:52:54.000000000 -0400 -+++ libgweather-3.1.3/data/Makefile.am 2011-07-06 20:18:42.244855841 -0400 -@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd +diff -Nur libgweather-3.4.0.orig/data/Makefile.am libgweather-3.4.0/data/Makefile.am +--- libgweather-3.4.0.orig/data/Makefile.am 2012-03-08 20:49:21.484449916 +0000 ++++ libgweather-3.4.0/data/Makefile.am 2012-03-08 21:00:28.359065326 +0000 +@@ -4,55 +4,23 @@ libgweatherlocationsdir = $(pkgdatadir) libgweatherlocations_in_files = Locations.xml.in @@ -119,9 +119,9 @@ diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makef ### Locations.xml.in rebuild rebuild-locations: locationdb.sqlite update-locations.py $(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new -diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3.1.3/libgweather/gweather-location.c ---- libgweather-3.1.3/libgweather/gweather-location.c.gettext 2010-02-09 07:28:03.000000000 -0500 -+++ libgweather-3.1.3/libgweather/gweather-location.c 2011-07-06 20:18:42.251855754 -0400 +diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4.0/libgweather/gweather-location.c +--- libgweather-3.4.0.orig/libgweather/gweather-location.c 2012-03-08 20:49:21.487783240 +0000 ++++ libgweather-3.4.0/libgweather/gweather-location.c 2012-03-08 21:00:28.359065326 +0000 @@ -22,11 +22,14 @@ #include <config.h> #endif @@ -137,7 +137,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE #include "gweather-location.h" -@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p +@@ -185,10 +188,20 @@ tagname = (const char *) xmlTextReaderConstName (parser->xml); if (!strcmp (tagname, "name") && !loc->name) { @@ -160,9 +160,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3 xmlFree (value); normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); loc->sort_name = g_utf8_casefold (normalized, -1); -diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3.1.3/libgweather/gweather-timezone.c ---- libgweather-3.1.3/libgweather/gweather-timezone.c.gettext 2010-02-09 07:28:03.000000000 -0500 -+++ libgweather-3.1.3/libgweather/gweather-timezone.c 2011-07-06 20:18:42.252855742 -0400 +diff -Nur libgweather-3.4.0.orig/libgweather/gweather-timezone.c libgweather-3.4.0/libgweather/gweather-timezone.c +--- libgweather-3.4.0.orig/libgweather/gweather-timezone.c 2012-03-08 20:49:21.487783240 +0000 ++++ libgweather-3.4.0/libgweather/gweather-timezone.c 2012-03-08 21:00:28.359065326 +0000 @@ -23,6 +23,7 @@ #endif @@ -171,7 +171,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE #include "gweather-timezone.h" -@@ -152,7 +153,7 @@ static GWeatherTimezone * +@@ -154,7 +155,7 @@ parse_timezone (GWeatherParser *parser) { GWeatherTimezone *zone = NULL; @@ -180,7 +180,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3 int offset = 0, dst_offset = 0; gboolean has_dst = FALSE; -@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser) +@@ -177,27 +178,34 @@ continue; } @@ -219,9 +219,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3 if (name) xmlFree (name); -diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-locations/LINGUAS ---- libgweather-3.1.3/po-locations/LINGUAS.gettext 2011-07-06 20:18:42.253855730 -0400 -+++ libgweather-3.1.3/po-locations/LINGUAS 2011-07-06 20:18:42.253855730 -0400 +diff -Nur libgweather-3.4.0.orig/po-locations/LINGUAS libgweather-3.4.0/po-locations/LINGUAS +--- libgweather-3.4.0.orig/po-locations/LINGUAS 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/LINGUAS 2012-03-08 21:00:28.359065326 +0000 @@ -0,0 +1,78 @@ +ang +ar @@ -301,9 +301,9 @@ diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-loc +zh_CN +zh_HK +zh_TW -diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3/po-locations/Makefile.in.in ---- libgweather-3.1.3/po-locations/Makefile.in.in.gettext 2011-07-06 20:18:42.254855718 -0400 -+++ libgweather-3.1.3/po-locations/Makefile.in.in 2011-07-06 20:18:42.254855718 -0400 +diff -Nur libgweather-3.4.0.orig/po-locations/Makefile.in.in libgweather-3.4.0/po-locations/Makefile.in.in +--- libgweather-3.4.0.orig/po-locations/Makefile.in.in 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/Makefile.in.in 2012-03-08 21:00:28.359065326 +0000 @@ -0,0 +1,217 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> @@ -522,9 +522,9 @@ diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3 +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -up libgweather-3.1.3/po-locations/POTFILES.in.gettext libgweather-3.1.3/po-locations/POTFILES.in ---- libgweather-3.1.3/po-locations/POTFILES.in.gettext 2011-07-06 20:18:42.254855718 -0400 -+++ libgweather-3.1.3/po-locations/POTFILES.in 2011-07-06 20:18:42.254855718 -0400 +diff -Nur libgweather-3.4.0.orig/po-locations/POTFILES.in libgweather-3.4.0/po-locations/POTFILES.in +--- libgweather-3.4.0.orig/po-locations/POTFILES.in 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/POTFILES.in 2012-03-08 21:00:28.359065326 +0000 @@ -0,0 +1,4 @@ +# This list should contain *only* data/Locations.xml.in. +# Everything else should be in POTFILES.skip. diff --git a/extra/libgweather/libgweather.install b/extra/libgweather/libgweather.install index 7062d4167..0d646b872 100644 --- a/extra/libgweather/libgweather.install +++ b/extra/libgweather/libgweather.install @@ -1,8 +1,8 @@ pkgname=libgweather post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/gnome + gconfpkg --install $pkgname + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome } pre_upgrade() { @@ -14,9 +14,9 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome } diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD new file mode 100644 index 000000000..3436c4868 --- /dev/null +++ b/extra/libgxps/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156904 2012-04-23 09:08:44Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=libgxps +pkgver=0.2.2 +pkgrel=1 +pkgdesc="XPS Documents library" +arch=(i686 x86_64) +url="https://live.gnome.org/libgxps" +license=('GPL2') +depends=('cairo' 'libarchive' 'libjpeg-turbo' 'libtiff' 'lcms2') +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index b5e17535b..2051bffc6 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 135796 2011-08-18 15:04:27Z andyrtr $ +# $Id: PKGBUILD 156906 2012-04-23 09:08:47Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice pkgver=1.1.1 -pkgrel=2.1 +pkgrel=3 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') -depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd') -makedepends=('swig' 'python2') +depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt') +makedepends=('python2' 'swig') options=('!libtool') -source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2 +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 swig-version-check.patch) md5sums=('cdc13037e822d9ac2e109536701d153a' '8bb215e36fe0e08a72332c108c7842cc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" + # SWIG version check is wrong (still not fixed upstream) - patch -p1 -i "$srcdir"/swig-version-check.patch + patch -p1 -i ../swig-version-check.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD index 997a491f5..0069876b1 100644 --- a/extra/libmp4v2/PKGBUILD +++ b/extra/libmp4v2/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 137907 2011-09-12 11:57:06Z pierre $ -# Maintainer: +# $Id: PKGBUILD 157108 2012-04-23 23:49:53Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libmp4v2 pkgver=1.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="MPEG-4 library" arch=('i686' 'x86_64' 'mips64el') license=('MPL') url="http://code.google.com/p/mp4v2/" depends=('gcc-libs') options=('!libtool') -source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2") -md5sums=('986701929ef15b03155ac4fb16444797') +#source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2") +source=("http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2") build() { - cd ${srcdir}/mp4v2-${pkgver} +# cd ${srcdir}/mp4v2-${pkgver} + cd ${srcdir}/mp4v2-trunk-r479 ./configure --prefix=/usr make } package() { - cd ${srcdir}/mp4v2-${pkgver} +# cd ${srcdir}/mp4v2-${pkgver} + cd ${srcdir}/mp4v2-trunk-r479 make DESTDIR=${pkgdir} install make DESTDIR=${pkgdir} install-man } +md5sums=('9ffd774fa88ad993e28236551511850b') diff --git a/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch b/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch new file mode 100644 index 000000000..e1c099aae --- /dev/null +++ b/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch @@ -0,0 +1,28 @@ +From 64c68ad42a9089c92dfa4e74f55b6c1b65b8f11c Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau <cfergeau@redhat.com> +Date: Sun, 4 Mar 2012 14:32:49 +0100 +Subject: [PATCH] Make sure gcc 4.7 can find usleep declaration + +Without this, compilation fails with: + +libmusicbrainz-4.0.0/src/Query.cc: In member function 'void MusicBrainz4::CQuery::WaitRequest() const': +libmusicbrainz-4.0.0/src/Query.cc:295:19: error: 'usleep' was not declared in this scope +--- + src/Query.cc | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/Query.cc b/src/Query.cc +index 5f5934f..9332346 100644 +--- a/src/Query.cc ++++ b/src/Query.cc +@@ -33,6 +33,7 @@ + + #include <string.h> + #include <sys/time.h> ++#include <unistd.h> + + #include <ne_uri.h> + +-- +1.7.7.6 + diff --git a/extra/libmusicbrainz4/PKGBUILD b/extra/libmusicbrainz4/PKGBUILD new file mode 100644 index 000000000..c1e4af3f5 --- /dev/null +++ b/extra/libmusicbrainz4/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 156908 2012-04-23 09:08:49Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Max Fehrm max.fehrm@gmail.com + +pkgname=libmusicbrainz4 +pkgver=4.0.0 +pkgrel=1 +pkgdesc="Library That Provides Access to the MusicBrainz Server " +url="http://musicbrainz.org/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('neon') +makedepends=('cmake') +source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz + 0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch) +md5sums=('21c33f5dd20b8bb945b800e2a964f27e' + 'df1dfa423d32a7a1d08b3fc0114bf087') + +build() { + cd libmusicbrainz-$pkgver + patch -Np1 -i ../0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch + cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr + make +} + +package() { + cd libmusicbrainz-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD index b0abc4d66..ee99d4c45 100644 --- a/extra/libnice/PKGBUILD +++ b/extra/libnice/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: William DÃaz <wdiaz@archlinux.us> pkgname=libnice -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)" arch=('i686' 'x86_64' 'mips64el') @@ -11,16 +11,16 @@ url="http://nice.freedesktop.org" license=('LGPL') depends=('gstreamer0.10') options=('!libtool') -source=(http://nice.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('0906c3523eb78cb3caad170cc75af4b0') +source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) +md5sums=('1914dd98380dd68632d3d448cc23f1e8') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index 5b5b2be1e..73cb7c3f6 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 139383 2011-10-01 19:00:04Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156912 2012-04-23 09:08:54Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.2.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('GPL2') depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') -makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed') +makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed' 'glade') optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' - 'seed: gbject-based plugin engine - seed runtime loader') + 'seed: gobject-based plugin engine - seed runtime loader') options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('871868ff44352367a4b4602352f60fd20eb99794ade454f3b120d87c1560f31c') +sha256sums=('d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var + --sysconfdir=/etc --localstatedir=/var --enable-vala make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD index 8032f5d86..718869420 100644 --- a/extra/libplist/PKGBUILD +++ b/extra/libplist/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 120143 2011-04-20 11:59:42Z ibiru $ +# $Id: PKGBUILD 156914 2012-04-23 09:08:57Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libplist -pkgver=1.4 -pkgrel=1.1 +pkgver=1.8 +pkgrel=2 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" url="http://libimobiledevice.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') depends=('glib2' 'libxml2' 'python2') makedepends=('cmake' 'swig') -source=(http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2ad226abe1131a72e7ecbb2b921ad92f54b8e787c2281c89b00145b519479a71') +source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) +sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec') build() { - cd "${srcdir}" mkdir build cd build - cmake ../"${pkgname}-${pkgver}" \ + cmake ../$pkgname-$pkgver \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX:PATH=/usr make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd build + make DESTDIR="$pkgdir" install } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 300cc8b72..a4381fd6c 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153604 2012-03-16 15:27:04Z andyrtr $ +# $Id: PKGBUILD 157024 2012-04-23 09:27:44Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -16,8 +16,8 @@ pkgname=('libreoffice-common' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-report-builder') -_LOver=3.5.1.2 -pkgver=3.5.1 +_LOver=3.5.2.2 +pkgver=3.5.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') @@ -30,7 +30,7 @@ makedepends=( # makedepends #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg' + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -74,7 +74,8 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a) + buildfix_icu49.diff + libreoffice-common.sh libreoffice-common.csh) noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -103,9 +104,9 @@ noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' - '607b544cd7b38f9e6db6fe7da25007a7' - 'a3fa7818bfab14a6cccec645193e9982' +md5sums=('a21156d5657b8619a523ffdc5cc0003e' + '3c064a24191274fcd8fd466ce9d5dc42' + '17ebcd0d25e716d3905b1a905907fd67' '18f577b374d60b3c760a3a3350407632' 'd28864eb2b59bb57b034c0d4662a3cee' '1f24ab1d39f4a51faf22244c94a6203f' @@ -136,7 +137,9 @@ md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' '185d60944ea767075d27247c3162b3bc' '60ce5dc9bd098f95c2e621a930c98dd9' '661a52a02a31b3afbe4b3b3146061afd' - '15fe8b5d79fbdc0b6bc2b454086671e7') + '9734ea20c9f67e1b6e1c5a1247fbd3ff' + '32fcd844935434807e68d7bd06b94f09' + '06a45184aefe078c4314e002ba666b52') build() { @@ -165,7 +168,7 @@ build() { # one late fix to solve make distro-pack-install issue patch -Np1 -i ${srcdir}/gmake_install.diff patch -Np1 -i ${srcdir}/smp_buildfix.diff - patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff + patch -Np0 -i ${srcdir}/buildfix_icu49.diff # Checks if --hash-style is accepted, not if --hash-style=both is accepted. [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk @@ -285,7 +288,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite' + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' [ "${CARCH}" != "mips64el" ] && depends+=('libgl') @@ -338,12 +341,15 @@ package_libreoffice-common() { ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . - - #fix http://bugs.archlinux.org/task/17656 - find ${pkgdir} -perm 444 -exec ls -lh {} \; - find ${pkgdir} -perm 444 -exec chmod 644 {} \; - find ${pkgdir} -perm 555 -exec ls -lh {} \; - find ${pkgdir} -perm 555 -exec chmod 755 {} \; + + # set python-uno PYTHON path + install -dm755 ${pkgdir}/etc/profile.d + install -m644 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh + rm -rf ${pkgdir}/etc/bash_completion.d } package_libreoffice-base() { @@ -547,19 +553,9 @@ package_libreoffice-sdk() { mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - # fix installation paths - sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ - -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \ - -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ - -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ - -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ - -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ - -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ - -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in + # fix environment path to keep compatibility with openjdk6 and openjdk7 + #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} } package_libreoffice-sdk-doc() { diff --git a/extra/libreoffice/buildfix_icu49.diff b/extra/libreoffice/buildfix_icu49.diff new file mode 100644 index 000000000..7a774dee0 --- /dev/null +++ b/extra/libreoffice/buildfix_icu49.diff @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/show_bug.cgi?id=410307 + +--- i18npool/source/breakiterator/data/char_in.txt ++++ i18npool/source/breakiterator/data/char_in.txt +@@ -15,7 +15,7 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; ++# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; +@@ -72,7 +72,7 @@ + [^$Control $CR $LF] $Extend; + + [^$Control $CR $LF] $SpacingMark; +-$Prepend [^$Control $CR $LF]; ++# $Prepend [^$Control $CR $LF]; + + + ## ------------------------------------------------- +@@ -94,7 +94,7 @@ + + $Extend [^$Control $CR $LF]; + $SpacingMark [^$Control $CR $LF]; +-[^$Control $CR $LF] $Prepend; ++# [^$Control $CR $LF] $Prepend; + + + ## ------------------------------------------------- +--- i18npool/source/breakiterator/data/char.txt ++++ i18npool/source/breakiterator/data/char.txt +@@ -16,7 +16,7 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; ++# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh new file mode 100644 index 000000000..625917add --- /dev/null +++ b/extra/libreoffice/libreoffice-common.csh @@ -0,0 +1 @@ +setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh new file mode 100644 index 000000000..ea04b2e6d --- /dev/null +++ b/extra/libreoffice/libreoffice-common.sh @@ -0,0 +1 @@ +export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 57b99efbb..ec9d20cc9 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,31 +1,28 @@ -# $Id: PKGBUILD 148836 2012-02-05 11:52:19Z ibiru $ +# $Id: PKGBUILD 156916 2012-04-23 09:09:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.34.2 -pkgrel=3 +pkgver=2.36.1 +pkgrel=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64 'mips64el') license=('LGPL') -depends=('gdk-pixbuf2>=2.24.1-3' 'pango' 'libcroco') -makedepends=('intltool' 'gtk2') -optdepends=('gtk2: for rsvg-view support') +depends=('gdk-pixbuf2' 'pango' 'libcroco') +makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') +optdepends=('gtk3: for rsvg-view-3') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) -sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('786b95e1a091375c5ef2997a21c69ff24d7077afeff18197355f54d9dcbcd8c5') build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ - --with-croco --disable-static \ - --with-svgz + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/librsvg/librsvg.install b/extra/librsvg/librsvg.install index 4d48b071f..8852ebf28 100644 --- a/extra/librsvg/librsvg.install +++ b/extra/librsvg/librsvg.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache + gdk-pixbuf-query-loaders --update-cache } post_upgrade() { diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD index da3b61637..07c96ab9a 100644 --- a/extra/libsocialweb/PKGBUILD +++ b/extra/libsocialweb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153544 2012-03-15 18:27:40Z ibiru $ +# $Id: PKGBUILD 156918 2012-04-23 09:09:02Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libsocialweb pkgver=0.25.20 -pkgrel=0 +pkgrel=1 pkgdesc="A personal social data server" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 353bc6673..f5d92b33b 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140935 2011-10-20 05:43:56Z ibiru $ +# $Id: PKGBUILD 156920 2012-04-23 09:09:05Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.36.1 +pkgver=2.38.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') +makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65') +sha256sums=('71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make @@ -24,25 +24,25 @@ package_libsoup() { pkgdesc="GNOME HTTP Library - base library" depends=('glib2' 'libxml2' 'glib-networking') - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install - rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4" - rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" + rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4" + rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" } package_libsoup-gnome() { pkgdesc="GNOME HTTP Library - GNOME libraries" - depends=("libsoup=${pkgver}" 'libgnome-keyring') + depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite') - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install - rm -f "${pkgdir}"/usr/lib/libsoup-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-2.4" - rm -rf "${pkgdir}/usr/share" - rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib" + rm -f "$pkgdir"/usr/lib/libsoup-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-2.4" + rm -rf "$pkgdir/usr/share" + rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib" } diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD new file mode 100644 index 000000000..794b02c55 --- /dev/null +++ b/extra/libwacom/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 156922 2012-04-23 09:09:07Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=libwacom +pkgver=0.4 +pkgrel=1 +pkgdesc="Library to identify Wacom tablets and their features" +arch=('x86_64' 'i686') +depends=('glib2' 'udev') +license=('LGPL') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +url="http://www.gnome.org" +sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index 0536be453..aa7574bec 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 148844 2012-02-05 11:52:38Z ibiru $ +# $Id: PKGBUILD 157142 2012-04-24 22:33:15Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.6.3 -pkgrel=1.1 +pkgver=1.8.1 +pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') -depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') -makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') +depends=('libxt' 'libxslt' 'sqlite' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl' + 'geoclue') +makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa') options=('!libtool' '!emptydirs') -install=libwebkit.install -source=(http://webkitgtk.org/webkit-$pkgver.tar.xz) -sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3') +source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz) +sha256sums=('9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28') build() { cd "$srcdir/webkit-$pkgver" @@ -29,6 +29,10 @@ build() { Source/JavaScriptCore/wtf/Platform.h fi + # clear makeflags: race during introspection. + # WebKit*.gir should be created before WebKit*.typelib, but isn't + MAKEFLAGS= + ( cd build-gtk2 && _build --with-gtk=2.0 ) ( cd build-gtk3 && _build --with-gtk=3.0 ) } @@ -47,7 +51,7 @@ package_libwebkit() { depends+=(gtk2) cd "$srcdir/webkit-$pkgver/build-gtk2" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE" } @@ -59,3 +63,6 @@ package_libwebkit3() { make DESTDIR="$pkgdir" install install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE" } + + + diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index e9e202629..f9ca3f615 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140937 2011-10-20 05:43:59Z ibiru $ +# $Id: PKGBUILD 156926 2012-04-23 09:09:12Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.2.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,17 @@ depends=('gtk3' 'startup-notification' 'libxres') makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad') build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libxklavier/PKGBUILD b/extra/libxklavier/PKGBUILD index 7f455878b..eb2631f30 100644 --- a/extra/libxklavier/PKGBUILD +++ b/extra/libxklavier/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 151075 2012-02-24 18:04:26Z ibiru $ +# $Id: PKGBUILD 156928 2012-04-23 09:09:15Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> pkgname=libxklavier -pkgver=5.1 +pkgver=5.2.1 pkgrel=2 pkgdesc="High-level API for X Keyboard Extension" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes') -makedepends=('pkgconfig') +makedepends=('gobject-introspection') options=('!libtool' '!emptydirs') url="http://gswitchit.sourceforge.net" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --with-xkb-base=/usr/share/X11/xkb --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD new file mode 100644 index 000000000..a45496af2 --- /dev/null +++ b/extra/lv2/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 157185 2012-04-25 12:13:02Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> + +pkgname=lv2 +pkgver=1.0.0 +pkgrel=2 +pkgdesc="Successor to the LADSPA audio plug-in standard" +url="http://lv2plug.in/" +license=('LGPL' 'custom') +arch=('i686' 'x86_64') +makedepends=('python2' 'libsndfile' 'gtk2') +optdepends=('libsndfile: lv2-eg-sampler' + 'gtk2: lv2-eg-sampler') +provides=('lv2core') +conflicts=('lv2core') +replaces=('lv2core') +source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2") +md5sums=('af98a50d8dfa8318a69800ea48b421f6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD index 409c2b1bc..496e7250e 100644 --- a/extra/mash/PKGBUILD +++ b/extra/mash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139393 2011-10-01 19:00:18Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157037 2012-04-23 09:53:25Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=mash -pkgver=0.1.0 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="A small library for using 3D models within a Clutter scene" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" @@ -11,8 +11,8 @@ options=('!libtool') license=('LGPL') depends=('clutter') makedepends=('gtk-doc' 'gobject-introspection') -source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('81f4b01d5661010dd742d4a82f9af4555624601ba3fb4e0780cfe2b34c13c24f') +source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD index 3453ccf57..1df8330b8 100644 --- a/extra/metacity/PKGBUILD +++ b/extra/metacity/PKGBUILD @@ -1,34 +1,31 @@ -# $Id: PKGBUILD 148852 2012-02-05 11:52:53Z ibiru $ +# $Id: PKGBUILD 156930 2012-04-23 09:09:17Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=metacity -pkgver=2.34.1 -pkgrel=2 +pkgver=2.34.3 +pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm') -makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') +depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') +makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/metacity \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/metacity/metacity.install b/extra/metacity/metacity.install index 2eb1e5094..ba0feffc1 100644 --- a/extra/metacity/metacity.install +++ b/extra/metacity/metacity.install @@ -1,17 +1,19 @@ pkgname=metacity post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi } post_upgrade() { - post_install $1 + post_install } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} +post_remove() { + post_install } diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index 0a65e8f60..77e114cfb 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -1,8 +1,9 @@ # $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=mousetweaks -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -14,16 +15,16 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=mousetweaks.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734') +sha256sums=('92571119dd0ee0c74e508bb8155b7b894c5185da52753fa431bb12e9bfe10c6f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper + --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 0f6e845c0..5c88e297d 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 149222 2012-02-06 13:47:09Z ibiru $ +# $Id: PKGBUILD 156934 2012-04-23 09:09:23Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.2.2 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="A window manager for GNOME" -arch=(i686 x86_64 'mips64el') +arch=(i686 x86_64) license=('GPL') -depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection') +depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity') makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1') +sha256sums=('dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static \ - --enable-compile-warnings=no + --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain mutter "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/mutter/mutter.install b/extra/mutter/mutter.install index 199f12584..c47f1cef2 100644 --- a/extra/mutter/mutter.install +++ b/extra/mutter/mutter.install @@ -1,17 +1,19 @@ pkgname=mutter post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi } post_upgrade() { - post_install $1 + post_install } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} +post_remove() { + post_install } diff --git a/extra/mx/PKGBUILD b/extra/mx/PKGBUILD index fd5d6554d..c3c8f3827 100644 --- a/extra/mx/PKGBUILD +++ b/extra/mx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152895 2012-03-10 15:57:25Z heftig $ +# $Id: PKGBUILD 156936 2012-04-23 09:09:25Z ibiru $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Guenther Wutz <admin@wutzara.de> pkgname=mx pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A widget toolkit using Clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org" diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD index f55150cab..fa082fcdc 100644 --- a/extra/nautilus-sendto/PKGBUILD +++ b/extra/nautilus-sendto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139403 2011-10-01 19:00:34Z ibiru $ +# $Id: PKGBUILD 156940 2012-04-23 09:09:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-sendto -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Nautilus context menu for sending files." arch=('i686' 'x86_64' 'mips64el') url="http://download.gnome.org/sources/nautilus-sendto/" @@ -15,17 +15,17 @@ depends=('evolution-data-server' 'nautilus' 'dconf') makedepends=('pidgin' 'gajim' 'gettext' 'intltool') options=('!libtool' '!emptydirs') install=nautilus-sendto.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('34617084b731db8bf3ffb517497d5645283f4aa7a9ebfa2a05da8c12066a0f14') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/nautilus-sendto/nautilus-sendto.install b/extra/nautilus-sendto/nautilus-sendto.install index e5204bcab..d33a1b261 100644 --- a/extra/nautilus-sendto/nautilus-sendto.install +++ b/extra/nautilus-sendto/nautilus-sendto.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index f66533aaa..b6c7c8c43 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140943 2011-10-20 05:44:06Z ibiru $ +# $Id: PKGBUILD 156938 2012-04-23 09:09:28Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME file manager" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nautilus \ @@ -29,6 +29,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/nautilus/nautilus.install b/extra/nautilus/nautilus.install index 631e38649..082126d24 100644 --- a/extra/nautilus/nautilus.install +++ b/extra/nautilus/nautilus.install @@ -1,14 +1,8 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall nautilus - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime > /dev/null } post_upgrade() { diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index e0e0b19d2..49e01e847 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142489 2011-11-10 19:42:01Z ibiru $ +# $Id: PKGBUILD 156942 2012-04-23 09:09:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,22 +6,23 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.2.0 +pkgver=0.9.4.1 pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes') +depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' + 'mobile-broadband-provider-info' 'gconf' 'iso-codes') makedepends=('intltool' 'gnome-bluetooth') optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de') +sha256sums=('b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/networkmanager \ @@ -31,7 +32,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 14ca124b2..935c34fa7 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142493 2011-11-10 19:42:06Z ibiru $ +# $Id: PKGBUILD 156946 2012-04-23 09:09:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('169094ae93f982a45e4c57fa7226637eb948ae309a2a6ece88e179ce798a86c0') +sha256sums=('60732587befd062fb8d979540c4410831f5e686b5d092ec24b0237ebd09e1084') build() { - cd "${srcdir}/NetworkManager-openconnect-${pkgver}" + cd NetworkManager-openconnect-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-openconnect-${pkgver}" + cd NetworkManager-openconnect-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 4a237161d..a95bae8a3 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142495 2011-11-10 19:42:11Z ibiru $ +# $Id: PKGBUILD 156948 2012-04-23 09:09:44Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('a23705a0ece4d9c5438ca7c3905abc25a43aaf3a49cabb9ef21d043c338a2744') +sha256sums=('d04870b10c2cd3a0671a4be645f595ad0362bcfd23cb849690b27bbac53683e0') build() { - cd "${srcdir}/NetworkManager-openvpn-${pkgver}" + cd NetworkManager-openvpn-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-openvpn-${pkgver}" + cd NetworkManager-openvpn-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index 35f071145..18b53e2fb 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142497 2011-11-10 19:42:13Z ibiru $ +# $Id: PKGBUILD 156950 2012-04-23 09:09:48Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('2b340db7f63d39aa781099b888d4e3352e8eaa14ec4d46154bf504262fda42ba') +sha256sums=('6fb772985a7273793296375d0ecba59362fe5575f70a8dd36da622db8a8d235d') build() { - cd "${srcdir}/NetworkManager-pptp-${pkgver}" + cd NetworkManager-pptp-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-pptp-${pkgver}" + cd NetworkManager-pptp-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index d992f7886..2d9ebdb93 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142499 2011-11-10 19:42:16Z ibiru $ +# $Id: PKGBUILD 156952 2012-04-23 09:09:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('d74bda9df11f4d3f0589d08c7f6247dc884de6daa1bab8d9c33636bc09752e40') +sha256sums=('1d52720ce39bd772753a40c879d0a654fc2efcc4ef7b49ec18f55ae2e82efc7d') build() { - cd "${srcdir}/NetworkManager-vpnc-${pkgver}" + cd NetworkManager-vpnc-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-vpnc-${pkgver}" + cd NetworkManager-vpnc-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 0d362036d..06c30c3ab 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152264 2012-03-06 08:15:52Z heftig $ +# $Id: PKGBUILD 157134 2012-04-24 18:49:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,13 +6,15 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.9.2.0 -pkgrel=3 +_pkgname=NetworkManager +pkgver=0.9.4.0 +pkgrel=4 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') +url="http://www.gnome.org/projects/$_pkgname/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' + 'libsoup') makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' @@ -23,18 +25,24 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) -sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' +#source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch + initialize-GError.patch dont-fight-over-ipv6.patch) +sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' + '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6' + 'cc66f2fdf59f4f9873a5b775421e1968861c5541d7e29b83b4d30351ad1f9e94') build() { - cd "${srcdir}/NetworkManager-${pkgver}" + cd $_pkgname-$pkgver - patch -Np1 -i "${srcdir}/disable_set_hostname.patch" - patch -Np1 -i "${srcdir}/dnsmasq-path.patch" + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch + patch -Np1 -i ../initialize-GError.patch + patch -Np1 -i ../dont-fight-over-ipv6.patch ./configure \ --prefix=/usr \ @@ -46,8 +54,10 @@ build() { --with-dhclient=/usr/sbin/dhclient \ --with-dhcpcd=/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=ck \ --disable-static \ --enable-more-warnings=no \ --disable-wimax @@ -56,10 +66,10 @@ build() { } package() { - cd "${srcdir}/NetworkManager-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - rm -rf "${pkgdir}/var/run/" + rm -r "$pkgdir/var/run" } diff --git a/extra/networkmanager/dont-fight-over-ipv6.patch b/extra/networkmanager/dont-fight-over-ipv6.patch new file mode 100644 index 000000000..f7945335f --- /dev/null +++ b/extra/networkmanager/dont-fight-over-ipv6.patch @@ -0,0 +1,121 @@ +From 77de91e5a8b1c1993ae65c54b37e0411e78e6fe6 Mon Sep 17 00:00:00 2001 +From: Dan Winship <danw@gnome.org> +Date: Thu, 19 Apr 2012 18:27:12 +0000 +Subject: core: don't fight with the kernel over the default IPv6 route + +The kernel wants there to be a default route over every RA-ed IPv6 +interface, and it gets confused and annoyed if we remove that default +route and replace it with our own (causing it to effectively drop all +further RAs on the floor, which is particularly bad if some of the +information in the earlier RA had an expiration time). + +So, rather than replacing the kernel's default route(s), just add an +additional one of our own, with a lower (ie, higher priority) metric. + +https://bugzilla.redhat.com/show_bug.cgi?id=785772 +--- +diff --git a/src/nm-system.c b/src/nm-system.c +index 91153ec..4cebb13 100644 +--- a/src/nm-system.c ++++ b/src/nm-system.c +@@ -1023,7 +1023,7 @@ add_ip6_route_to_gateway (int ifindex, const struct in6_addr *gw) + } + + static int +-replace_default_ip6_route (int ifindex, const struct in6_addr *gw) ++add_default_ip6_route (int ifindex, const struct in6_addr *gw) + { + struct rtnl_route *route = NULL; + struct nl_sock *nlh; +@@ -1037,22 +1037,36 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw) + route = nm_netlink_route_new (ifindex, AF_INET6, 0, + NMNL_PROP_SCOPE, RT_SCOPE_UNIVERSE, + NMNL_PROP_TABLE, RT_TABLE_MAIN, ++ NMNL_PROP_PRIO, 1, + NULL); + g_return_val_if_fail (route != NULL, -ENOMEM); + + /* Add the new default route */ +- err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_REPLACE); +- if (err == -NLE_EXIST) { +- /* FIXME: even though we use NLM_F_REPLACE the kernel won't replace +- * the route if it's the same. Suppress the pointless error. +- */ ++ err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE); ++ if (err == -NLE_EXIST) + err = 0; +- } + + rtnl_route_put (route); + return err; + } + ++static struct rtnl_route * ++find_static_default_routes (struct rtnl_route *route, ++ struct nl_addr *dst, ++ const char *iface, ++ gpointer user_data) ++{ ++ GList **def_routes = user_data; ++ ++ if ( nl_addr_get_prefixlen (dst) == 0 ++ && rtnl_route_get_protocol (route) == RTPROT_STATIC) { ++ rtnl_route_get (route); ++ *def_routes = g_list_prepend (*def_routes, route); ++ } ++ ++ return NULL; ++} ++ + /* + * nm_system_replace_default_ip6_route + * +@@ -1062,12 +1076,35 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw) + gboolean + nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw) + { +- struct rtnl_route *gw_route = NULL; ++ GList *def_routes, *iter; ++ struct rtnl_route *route, *gw_route = NULL; + gboolean success = FALSE; + char *iface; + int err; + +- err = replace_default_ip6_route (ifindex, gw); ++ /* We can't just use NLM_F_REPLACE here like in the IPv4 case, because ++ * the kernel doesn't like it if we replace the default routes it ++ * creates. (See rh#785772.) So we delete any non-kernel default routes, ++ * and then add a new default route of our own with a lower metric than ++ * the kernel ones. ++ */ ++ def_routes = NULL; ++ nm_netlink_foreach_route (ifindex, AF_INET6, RT_SCOPE_UNIVERSE, TRUE, ++ find_static_default_routes, &def_routes); ++ for (iter = def_routes; iter; iter = iter->next) { ++ route = iter->data; ++ if (!nm_netlink_route_delete (route)) { ++ iface = nm_netlink_index_to_iface (ifindex); ++ nm_log_err (LOGD_DEVICE | LOGD_IP6, ++ "(%s): failed to delete existing IPv6 default route", ++ iface); ++ g_free (iface); ++ } ++ rtnl_route_put (route); ++ } ++ g_list_free (def_routes); ++ ++ err = add_default_ip6_route (ifindex, gw); + if (err == 0) + return TRUE; + +@@ -1091,7 +1128,7 @@ nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw) + goto out; + + /* Try adding the original route again */ +- err = replace_default_ip6_route (ifindex, gw); ++ err = add_default_ip6_route (ifindex, gw); + if (err != 0) { + nm_netlink_route_delete (gw_route); + nm_log_err (LOGD_DEVICE | LOGD_IP6, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/networkmanager/initialize-GError.patch b/extra/networkmanager/initialize-GError.patch new file mode 100644 index 000000000..58f0b9cb3 --- /dev/null +++ b/extra/networkmanager/initialize-GError.patch @@ -0,0 +1,23 @@ +From 8bb278944496102a4afad46b53e1e8279425aaac Mon Sep 17 00:00:00 2001 +From: Jiřà KlimeÅ¡ <jklimes@redhat.com> +Date: Mon, 02 Apr 2012 14:37:55 +0000 +Subject: libnm-glib: initialize GError, else invalid free() crash can occur (rh #809123) + +--- +(limited to 'libnm-glib/nm-remote-settings.c') + +diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c +index 9a81a8d..68aaeb4 100644 +--- a/libnm-glib/nm-remote-settings.c ++++ b/libnm-glib/nm-remote-settings.c +@@ -109,7 +109,7 @@ static void + _nm_remote_settings_ensure_inited (NMRemoteSettings *self) + { + NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self); +- GError *error; ++ GError *error = NULL; + + if (!priv->inited) { + if (!g_initable_init (G_INITABLE (self), NULL, &error)) { +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/networkmanager/systemd-fallback.patch b/extra/networkmanager/systemd-fallback.patch new file mode 100644 index 000000000..f5acc9dc6 --- /dev/null +++ b/extra/networkmanager/systemd-fallback.patch @@ -0,0 +1,470 @@ +diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac +--- NetworkManager-0.9.3.995/configure.ac 2012-03-02 01:05:21.000000000 +0100 ++++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac 2012-03-06 16:55:58.294793902 +0100 +@@ -344,7 +344,7 @@ + case $with_session_tracking in + ck|none) ;; + systemd) +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + ;; + *) + AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd]) +diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c +--- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c 2012-03-06 16:55:01.285264295 +0100 +@@ -28,6 +28,10 @@ + #include <glib/gstdio.h> + #include <systemd/sd-login.h> + #include <stdlib.h> ++#include <systemd/sd-daemon.h> ++#include <sys/stat.h> ++#include <gio/gio.h> ++#include "nm-logging.h" + + #include "nm-session-utils.h" + #include "nm-session-monitor.h" +@@ -107,10 +111,20 @@ + return source; + } + ++/********************************************************************/ ++ ++#define CKDB_PATH "/var/run/ConsoleKit/database" ++ + struct _NMSessionMonitor { + GObject parent_instance; + + GSource *sd_source; ++ ++ GKeyFile *database; ++ GFileMonitor *database_monitor; ++ time_t database_mtime; ++ GHashTable *sessions_by_uid; ++ GHashTable *sessions_by_user; + }; + + struct _NMSessionMonitorClass { +@@ -130,6 +144,215 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + ++typedef struct { ++ char *user; ++ uid_t uid; ++ gboolean local; ++ gboolean active; ++} Session; ++ ++static void ++session_free (Session *s) ++{ ++ g_free (s->user); ++ memset (s, 0, sizeof (Session)); ++ g_free (s); ++} ++ ++static gboolean ++check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error) ++{ ++ if (g_key_file_has_key (keyfile, group, key, error)) ++ return TRUE; ++ ++ if (!error) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, ++ "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key", ++ group, key); ++ } ++ return FALSE; ++} ++ ++static Session * ++session_new (GKeyFile *keyfile, const char *group, GError **error) ++{ ++ GError *local = NULL; ++ Session *s; ++ const char *uname = NULL; ++ ++ s = g_new0 (Session, 1); ++ g_assert (s); ++ ++ s->uid = G_MAXUINT; /* paranoia */ ++ if (!check_key (keyfile, group, "uid", &local)) ++ goto error; ++ s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_active", &local)) ++ goto error; ++ s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_local", &local)) ++ goto error; ++ s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local); ++ if (local) ++ goto error; ++ ++ if (!nm_session_uid_to_user (s->uid, &uname, error)) ++ return FALSE; ++ s->user = g_strdup (uname); ++ ++ return s; ++ ++error: ++ session_free (s); ++ g_propagate_error (error, local); ++ return NULL; ++} ++ ++static void ++session_merge (Session *src, Session *dest) ++{ ++ g_return_if_fail (src != NULL); ++ g_return_if_fail (dest != NULL); ++ ++ g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0); ++ g_warn_if_fail (src->uid == dest->uid); ++ ++ dest->local = (dest->local || src->local); ++ dest->active = (dest->active || src->active); ++} ++ ++/********************************************************************/ ++ ++static void ++free_database (NMSessionMonitor *self) ++{ ++ if (self->database != NULL) { ++ g_key_file_free (self->database); ++ self->database = NULL; ++ } ++ ++ g_hash_table_remove_all (self->sessions_by_uid); ++ g_hash_table_remove_all (self->sessions_by_user); ++} ++ ++static gboolean ++reload_database (NMSessionMonitor *self, GError **error) ++{ ++ struct stat statbuf; ++ char **groups = NULL; ++ gsize len = 0, i; ++ Session *s; ++ ++ free_database (self); ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH ": %s", ++ strerror (errno)); ++ goto error; ++ } ++ self->database_mtime = statbuf.st_mtime; ++ ++ self->database = g_key_file_new (); ++ if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error)) ++ goto error; ++ ++ groups = g_key_file_get_groups (self->database, &len); ++ if (!groups) { ++ g_set_error_literal (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Could not load groups from " CKDB_PATH ""); ++ goto error; ++ } ++ ++ for (i = 0; i < len; i++) { ++ Session *found; ++ ++ if (!g_str_has_prefix (groups[i], "Session ")) ++ continue; ++ ++ s = session_new (self->database, groups[i], error); ++ if (!s) ++ goto error; ++ ++ found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user); ++ if (found) { ++ session_merge (s, found); ++ session_free (s); ++ } else { ++ /* Entirely new user */ ++ g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s); ++ g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s); ++ } ++ } ++ ++ g_strfreev (groups); ++ return TRUE; ++ ++error: ++ if (groups) ++ g_strfreev (groups); ++ free_database (self); ++ return FALSE; ++} ++ ++static gboolean ++ensure_database (NMSessionMonitor *self, GError **error) ++{ ++ gboolean ret = FALSE; ++ ++ if (self->database != NULL) { ++ struct stat statbuf; ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH " to check timestamp: %s", ++ strerror (errno)); ++ goto out; ++ } ++ ++ if (statbuf.st_mtime == self->database_mtime) { ++ ret = TRUE; ++ goto out; ++ } ++ } ++ ++ ret = reload_database (self, error); ++ ++out: ++ return ret; ++} ++ ++static void ++on_file_monitor_changed (GFileMonitor * file_monitor, ++ GFile * file, ++ GFile * other_file, ++ GFileMonitorEvent event_type, ++ gpointer user_data) ++{ ++ NMSessionMonitor *self = NM_SESSION_MONITOR (user_data); ++ ++ /* throw away cache */ ++ free_database (self); ++ ++ g_signal_emit (self, signals[CHANGED_SIGNAL], 0); ++} ++ + static gboolean + sessions_changed (gpointer user_data) + { +@@ -143,9 +366,50 @@ + static void + nm_session_monitor_init (NMSessionMonitor *monitor) + { +- monitor->sd_source = sd_source_new (); +- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); +- g_source_attach (monitor->sd_source, NULL); ++ if (sd_booted () > 0) { ++ monitor->sd_source = sd_source_new (); ++ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); ++ g_source_attach (monitor->sd_source, NULL); ++ ++ monitor->database_monitor = NULL; ++ monitor->database = NULL; ++ } else { ++ monitor->sd_source = NULL; ++ ++ GError *error = NULL; ++ GFile *file; ++ ++ /* Sessions-by-user is responsible for destroying the Session objects */ ++ monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal, ++ NULL, (GDestroyNotify) session_free); ++ monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal); ++ ++ ++ error = NULL; ++ if (!ensure_database (monitor, &error)) { ++ /* Ignore the first error if the CK database isn't found yet */ ++ if (g_error_matches (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) { ++ nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message); ++ } ++ g_error_free (error); ++ } ++ ++ error = NULL; ++ file = g_file_new_for_path (CKDB_PATH); ++ monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); ++ g_object_unref (file); ++ if (monitor->database_monitor == NULL) { ++ nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } else { ++ g_signal_connect (monitor->database_monitor, ++ "changed", ++ G_CALLBACK (on_file_monitor_changed), ++ monitor); ++ } ++ } + } + + static void +@@ -158,6 +422,12 @@ + g_source_unref (monitor->sd_source); + } + ++ if (monitor->database_monitor != NULL) ++ g_object_unref (monitor->database_monitor); ++ ++ if (monitor->database != NULL) ++ free_database (monitor); ++ + if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL) + G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object); + } +@@ -206,15 +476,36 @@ + uid_t *out_uid, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; + +- if (out_uid) +- *out_uid = uid; ++ if (out_uid) ++ *out_uid = uid; + +- return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } ++ ++ if (out_uid) ++ *out_uid = s->uid; ++ return TRUE; ++ } + } + + gboolean +@@ -222,12 +513,31 @@ + const char *username, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; ++ ++ return nm_session_monitor_uid_active (monitor, uid, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } + +- return nm_session_monitor_uid_active (monitor, uid, error); ++ return s->active; ++ } + } + + gboolean +@@ -236,10 +546,31 @@ + const char **out_user, + GError **error) + { +- if (!nm_session_uid_to_user (uid, out_user, error)) +- return FALSE; ++ if (monitor->sd_source != NULL) { ++ if (!nm_session_uid_to_user (uid, out_user, error)) ++ return FALSE; + +- return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid %d", ++ uid); ++ return FALSE; ++ } ++ ++ if (out_user) ++ *out_user = s->user; ++ return TRUE; ++ } + } + + gboolean +@@ -247,5 +578,24 @@ + uid_t uid, + GError **error) + { +- return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ if (monitor->sd_source != NULL) ++ return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid '%d'", ++ uid); ++ return FALSE; ++ } ++ ++ return s->active; ++ } + } diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index f4200f93f..7831d5f68 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139410 2011-10-01 19:00:42Z ibiru $ +# $Id: PKGBUILD 156955 2012-04-23 09:09:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.29.4 -pkgrel=1.1 +pkgver=1.30.0 +pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,12 +11,12 @@ depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2') makedepends=('gobject-introspection' 'libxt' 'gtk-doc') options=('!libtool' '!emptydirs') install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.29/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f') +sha256sums=('7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-included-modules=basic-fc @@ -24,6 +24,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD index 8b05c1357..453068042 100644 --- a/extra/perl-term-readkey/PKGBUILD +++ b/extra/perl-term-readkey/PKGBUILD @@ -1,36 +1,39 @@ -# $Id: PKGBUILD 125285 2011-05-25 19:22:27Z foutrelis $ +# $Id: PKGBUILD 157151 2012-04-25 02:51:00Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-term-readkey _realname=TermReadKey -pkgver=2.30.01 -pkgrel=4 +pkgver=2.30.02 +pkgrel=1 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('perl>=5.10.0' 'glibc') url="http://search.cpan.org/~stsi/${_realname}/" -source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) options=('!emptydirs') -md5sums=('6c099eddb76ec9b92179f1ed929be71a') +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) +md5sums=('69b92c8ddca8691c83823c683cd9838a') -build() -{ - cd ${srcdir}/TermReadKey-$pkgver +build() { + cd "${srcdir}/TermReadKey-$pkgver" perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/TermReadKey-$pkgver" make test } package() { - cd ${srcdir}/TermReadKey-$pkgver - make DESTDIR=${pkgdir} install - install -d ${pkgdir}/usr/share/licenses/$pkgname/ - head -7 README > ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + cd "${srcdir}/TermReadKey-$pkgver" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/licenses/$pkgname/" + head -7 README > "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 230fdc8e5..bade1768f 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149966 2012-02-11 23:31:22Z allan $ +# $Id: PKGBUILD 157026 2012-04-23 09:27:54Z ibiru $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.10 _suhosinver=5.3.9-0.9.10 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index de77f191b..c3bd974da 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154327 2012-03-26 11:27:11Z foutrelis $ +# $Id: PKGBUILD 156957 2012-04-23 09:10:00Z ibiru $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,29 +7,29 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' - 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' + 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - port-to-farstream-v2.patch) + port-to-farstream-v3.patch) sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b' - '03ba48e0da1331a976efc28a66810be4f51599a2b8065ac449965e0aefca4482') + '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca') build() { cd "$srcdir/$pkgname-$pkgver" # Apply patch for farsight -> farstream transition # http://developer.pidgin.im/ticket/14936 - #patch -Np1 -i "$srcdir/port-to-farstream-v2.patch" + patch -Np1 -i "$srcdir/port-to-farstream-v3.patch" # The farstream patch changes configure.ac - #autoreconf -vi + autoreconf -vi # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ @@ -77,7 +77,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss') + depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') diff --git a/extra/pidgin/port-to-farstream-v3.patch b/extra/pidgin/port-to-farstream-v3.patch new file mode 100644 index 000000000..93e29af50 --- /dev/null +++ b/extra/pidgin/port-to-farstream-v3.patch @@ -0,0 +1,447 @@ +diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac +--- pidgin-2.10.1.orig/configure.ac 2011-12-06 10:44:32.000000000 +0200 ++++ pidgin-2.10.1/configure.ac 2012-03-10 18:21:12.000000000 +0200 +@@ -780,18 +780,18 @@ else + fi + + dnl ####################################################################### +-dnl # Check for Farsight ++dnl # Check for Farstream + dnl ####################################################################### +-AC_ARG_ENABLE(farsight, +- [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], +- enable_farsight="$enableval", enable_farsight="yes") +-if test "x$enable_farsight" != "xno"; then +- PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ +- AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) +- AC_SUBST(FARSIGHT_CFLAGS) +- AC_SUBST(FARSIGHT_LIBS) ++AC_ARG_ENABLE(farstream, ++ [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], ++ enable_farstream="$enableval", enable_farstream="yes") ++if test "x$enable_farstream" != "xno"; then ++ PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ ++ AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video]) ++ AC_SUBST(FARSTREAM_CFLAGS) ++ AC_SUBST(FARSTREAM_LIBS) + ], [ +- enable_farsight="no" ++ enable_farstream="no" + ]) + fi + +@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv, + [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], + enable_vv="$enableval", enable_vv="yes") + if test "x$enable_vv" != "xno"; then +- if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then ++ if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then + AC_DEFINE(USE_VV, 1, [Use voice and video]) + else + enable_vv="no" + if test "x$force_deps" = "xyes"; then + AC_MSG_ERROR([ + Dependencies for voice/video were not met. +-Install the necessary gstreamer and farsight packages first. ++Install the necessary gstreamer and farstream packages first. + Or use --disable-vv if you do not need voice/video support. + ]) + fi + fi + fi +-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") ++AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") + + dnl ####################################################################### + dnl # Check for Internationalized Domain Name support +diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am +--- pidgin-2.10.1.orig/libpurple/Makefile.am 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/Makefile.am 2012-03-10 18:21:19.000000000 +0200 +@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \ + $(LIBXML_LIBS) \ + $(NETWORKMANAGER_LIBS) \ + $(INTLLIBS) \ +- $(FARSIGHT_LIBS) \ ++ $(FARSTREAM_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GSTINTERFACES_LIBS) \ + $(IDN_LIBS) \ +@@ -322,7 +322,7 @@ AM_CPPFLAGS = \ + $(DEBUG_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBXML_CFLAGS) \ +- $(FARSIGHT_CFLAGS) \ ++ $(FARSTREAM_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \ + $(IDN_CFLAGS) \ +diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c +--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media/backend-fs2.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1,5 +1,5 @@ + /** +- * @file backend-fs2.c Farsight 2 backend for media API ++ * @file backend-fs2.c Farstream backend for media API + * @ingroup core + */ + +@@ -34,8 +34,9 @@ + #include "network.h" + #include "media-gst.h" + +-#include <gst/farsight/fs-conference-iface.h> +-#include <gst/farsight/fs-element-added-notifier.h> ++#include <farstream/fs-conference.h> ++#include <farstream/fs-element-added-notifier.h> ++#include <farstream/fs-utils.h> + + /** @copydoc _PurpleMediaBackendFs2Class */ + typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class; +@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream + gchar *participant; + FsStream *stream; + ++ gboolean supports_add; ++ + GstElement *src; + GstElement *tee; + GstElement *volume; +@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private + FsConference *conference; + gchar *conference_type; + ++ FsElementAddedNotifier *notifier; ++ + GHashTable *sessions; + GHashTable *participants; + +@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject + + purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n"); + ++ if (priv->notifier) { ++ g_object_unref(priv->notifier); ++ priv->notifier = NULL; ++ } ++ + if (priv->confbin) { + GstElement *pipeline; + +@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus, + priv->conference != FS_CONFERENCE(src)) + return; + +- if (gst_structure_has_name(msg->structure, "farsight-error")) { ++ if (gst_structure_has_name(msg->structure, "farstream-error")) { + FsError error_no; + gst_structure_get_enum(msg->structure, "error-no", + FS_TYPE_ERROR, (gint*)&error_no); +@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus, + " strict.")); + purple_media_end(priv->media, NULL, NULL); + break; +- case FS_ERROR_UNKNOWN_CNAME: +- /* +- * Unknown CName is only a problem for the +- * multicast transmitter which isn't used. +- * It is also deprecated. +- */ +- break; + default: + purple_debug_error("backend-fs2", +- "farsight-error: %i: %s\n", ++ "farstream-error: %i: %s\n", + error_no, + gst_structure_get_string( + msg->structure, "error-msg")); +@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus, + + if (FS_ERROR_IS_FATAL(error_no)) { + purple_media_error(priv->media, _("A non-recoverable " +- "Farsight2 error has occurred.")); ++ "Farstream error has occurred.")); + purple_media_end(priv->media, NULL, NULL); + } + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-local-candidate")) { ++ "farstream-new-local-candidate")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus, + session->id, name, candidate); + g_object_unref(candidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-local-candidates-prepared")) { ++ "farstream-local-candidates-prepared")) { + const GValue *value; + FsStream *stream; + FsParticipant *participant; +@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus, + g_signal_emit_by_name(self, "candidates-prepared", + session->id, name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-active-candidate-pair")) { ++ "farstream-new-active-candidate-pair")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus, + g_object_unref(lcandidate); + g_object_unref(rcandidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-recv-codecs-changed")) { ++ "farstream-recv-codecs-changed")) { + const GValue *value; + GList *codecs; + FsCodec *codec; +@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus, + codec = codecs->data; + + purple_debug_info("backend-fs2", +- "farsight-recv-codecs-changed: %s\n", ++ "farstream-recv-codecs-changed: %s\n", + codec->encoding_name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-component-state-changed")) { ++ "farstream-component-state-changed")) { + const GValue *value; + FsStreamState fsstate; + guint component; +@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus, + } + + purple_debug_info("backend-fs2", +- "farsight-component-state-changed: " ++ "farstream-component-state-changed: " + "component: %u state: %s\n", + component, state); + } else if (gst_structure_has_name(msg->structure, +- "farsight-send-codec-changed")) { ++ "farstream-send-codec-changed")) { + const GValue *value; + FsCodec *codec; + gchar *codec_str; +@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus, + codec_str = fs_codec_to_string(codec); + + purple_debug_info("backend-fs2", +- "farsight-send-codec-changed: codec: %s\n", ++ "farstream-send-codec-changed: codec: %s\n", + codec_str); + + g_free(codec_str); + } else if (gst_structure_has_name(msg->structure, +- "farsight-codecs-changed")) { ++ "farstream-codecs-changed")) { + const GValue *value; + FsSession *fssession; + GList *sessions; +@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl + purple_media_is_initiator(media, sid, name)) + return; + +- fs_stream_set_remote_candidates(stream->stream, +- stream->remote_candidates, &err); ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); + + if (err == NULL) + return; +@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s + GstElement *pipeline; + GstBus *bus; + gchar *name; ++ GKeyFile *default_props; + + priv->conference = FS_CONFERENCE( + gst_element_factory_make(priv->conference_type, NULL)); +@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s + return FALSE; + } + ++ default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference)); ++ if (default_props != NULL) { ++ priv->notifier = fs_element_added_notifier_new(); ++ fs_element_added_notifier_add(priv->notifier, ++ GST_BIN(priv->confbin)); ++ fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props); ++ } ++ + g_signal_connect(G_OBJECT(bus), "message", + G_CALLBACK(gst_bus_cb), self); + gst_object_unref(bus); +@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se + * receiving the src-pad-added signal. + * Only works for non-multicast FsRtpSessions. + */ +- if (is_nice || !strcmp(transmitter, "rawudp")) ++ if (!!strcmp(transmitter, "multicast")) + g_object_set(G_OBJECT(session->session), + "no-rtcp-timeout", 0, NULL); + +@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2 + GError *err = NULL; + + participant = fs_conference_new_participant( +- priv->conference, name, &err); ++ priv->conference, &err); + + if (err) { + purple_debug_error("backend-fs2", +@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2 + return FALSE; + } + ++ if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant), ++ "cname")) { ++ g_object_set(participant, "cname", name, NULL); ++ } ++ ++ + if (!priv->participants) { + purple_debug_info("backend-fs2", + "Creating hash table for participants\n"); +@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel + } + } + ++ ++ session = get_session(self, sess_id); ++ ++ if (session == NULL) { ++ purple_debug_error("backend-fs2", ++ "Couldn't find session to create stream.\n"); ++ return FALSE; ++ } ++ ++ participant = get_participant(self, who); ++ ++ if (participant == NULL) { ++ purple_debug_error("backend-fs2", "Couldn't find " ++ "participant to create stream.\n"); ++ return FALSE; ++ } ++ ++ fsstream = fs_session_new_stream(session->session, participant, ++ initiator == TRUE ? type_direction : ++ (type_direction & FS_DIRECTION_RECV), &err); ++ ++ if (fsstream == NULL) { ++ if (err) { ++ purple_debug_error("backend-fs2", ++ "Error creating stream: %s\n", ++ err && err->message ? ++ err->message : "NULL"); ++ g_error_free(err); ++ } else ++ purple_debug_error("backend-fs2", ++ "Error creating stream\n"); ++ return FALSE; ++ } ++ + memcpy(_params, params, sizeof(GParameter) * num_params); + + /* set the controlling mode parameter */ +@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel + _num_params++; + } + +- session = get_session(self, sess_id); + +- if (session == NULL) { +- purple_debug_error("backend-fs2", +- "Couldn't find session to create stream.\n"); +- return FALSE; +- } +- +- participant = get_participant(self, who); +- +- if (participant == NULL) { +- purple_debug_error("backend-fs2", "Couldn't find " +- "participant to create stream.\n"); +- return FALSE; ++ if(!fs_stream_set_transmitter(fsstream, transmitter, ++ _params, _num_params, &err)) { ++ purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message); ++ g_clear_error(&err); ++ g_free(_params); ++ return FALSE; + } +- +- fsstream = fs_session_new_stream(session->session, participant, +- initiator == TRUE ? type_direction : +- (type_direction & FS_DIRECTION_RECV), transmitter, +- _num_params, _params, &err); + g_free(_params); + +- if (fsstream == NULL) { +- if (err) { +- purple_debug_error("backend-fs2", +- "Error creating stream: %s\n", +- err && err->message ? +- err->message : "NULL"); +- g_error_free(err); +- } else +- purple_debug_error("backend-fs2", +- "Error creating stream\n"); +- return FALSE; +- } + + stream = g_new0(PurpleMediaBackendFs2Stream, 1); + stream->participant = g_strdup(who); + stream->session = session; + stream->stream = fsstream; ++ stream->supports_add = !strcmp(transmitter, "nice"); + + priv->streams = g_list_append(priv->streams, stream); + +@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand + if (purple_media_is_initiator(priv->media, sess_id, participant) || + purple_media_accepted( + priv->media, sess_id, participant)) { +- fs_stream_set_remote_candidates(stream->stream, ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, + stream->remote_candidates, &err); + + if (err) { +diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c +--- pidgin-2.10.1.orig/libpurple/media.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med + { + #ifdef USE_VV + PurpleMediaSession *session; +- PurpleMediaStream *stream = NULL; + + g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE); + +@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med + } + + if (purple_media_get_stream(media, sess_id, who) == NULL) { +- stream = purple_media_insert_stream(session, who, initiator); ++ purple_media_insert_stream(session, who, initiator); + + g_signal_emit(media, purple_media_signals[STATE_CHANGED], + 0, PURPLE_MEDIA_STATE_NEW, +diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c +--- pidgin-2.10.1.orig/libpurple/mediamanager.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/mediamanager.c 2012-03-10 18:27:05.000000000 +0200 +@@ -39,7 +39,7 @@ + #ifdef USE_VV + #include <media/backend-fs2.h> + +-#include <gst/farsight/fs-element-added-notifier.h> ++#include <farstream/fs-element-added-notifier.h> + #include <gst/interfaces/xoverlay.h> + + /** @copydoc _PurpleMediaManagerPrivate */ diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 2335f722e..bba892fbc 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155960 2012-04-10 05:23:46Z bisson $ +# $Id: PKGBUILD 157140 2012-04-24 22:10:55Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.9.1 -pkgrel=3 +pkgver=2.9.2 +pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('d4f6572ab1ac5fc15626ac2de6d18c340aae2cef' +sha1sums=('fda7ec5ac79300577f61a68561171bd501b1b20c' '5fc3de6c7df1e5851a0a379e825148868808318b' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index cb09eccda..4faada42b 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145056 2011-12-15 22:17:57Z ibiru $ +# $Id: PKGBUILD 156960 2012-04-23 09:10:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.0.3 +pkgver=3.2.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="https://live.gnome.org/PyGObject" @@ -11,10 +11,9 @@ license=('LGPL') makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('088b1e682be02a969a0a3f2e650e4fe72bb3638ee8229819841d3e8f4cde2d7c') +sha256sums=('1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3') build() { - cd "$srcdir" cp -a "$pkgbase-$pkgver" python2-build mkdir devel @@ -36,7 +35,7 @@ package_python-gobject() { pkgdesc="Python 3 bindings for GObject" depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" make DESTDIR="$pkgdir" install rm -r "$pkgdir"/usr/{include,lib/pkgconfig} } @@ -45,14 +44,14 @@ package_python2-gobject() { pkgdesc="Python 2 bindings for GObject" depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") - cd "$srcdir/python2-build" + cd "python2-build" make DESTDIR="$pkgdir" install mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" } package_pygobject-devel() { pkgdesc="Development files for the pygobject bindings" - cd "$srcdir/devel" + cd "devel" mkdir -p "$pkgdir"/usr/{include,lib} mv include "$pkgdir/usr/" mv pkgconfig "$pkgdir/usr/lib/" diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 67144bfed..54de0af4b 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154325 2012-03-26 11:01:20Z tomegun $ +# $Id: PKGBUILD 157028 2012-04-23 09:28:03Z ibiru $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> @@ -6,7 +6,7 @@ pkgname=raptor pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 0a06c738e..0539510f8 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 146665 2012-01-15 21:21:39Z ibiru $ +# $Id: PKGBUILD 156962 2012-04-23 09:10:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.95 -pkgrel=1 +pkgver=2.96 +pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.rhythmbox.org" depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3' - 'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser') + 'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser' 'tdb') makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' @@ -19,10 +19,10 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' options=('!libtool' '!emptydirs') install=rhythmbox.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('12cab95c89514b5c01a2daf9d6bdf74c8652b35e49625e2906d51b487bc68c06') +sha256sums=('3f93c74b2f7f8d7e1002e288db9abf8f182684277dec0a106d5e38415084b2b6') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ @@ -32,7 +32,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/rhythmbox/rhythmbox.install b/extra/rhythmbox/rhythmbox.install index cbea0e6b3..e02ee2c16 100644 --- a/extra/rhythmbox/rhythmbox.install +++ b/extra/rhythmbox/rhythmbox.install @@ -1,22 +1,13 @@ -pkgname=rhythmbox - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -f -q -t usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor } post_upgrade() { - post_install $1 + post_install } - post_remove() { - post_install $1 + post_install } diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 1b06de270..dfd7ff235 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 144929 2011-12-10 21:36:00Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156964 2012-04-23 09:10:10Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.2.2 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') license=('GPL') url="http://projects.gnome.org/seahorse/" -depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') +depends=('gtk3' 'gcr' 'libgnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') +makedepends=('libldap' 'intltool' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') optdepends=('openssh: SSH support') provides=('x11-ssh-askpass') options=('!libtool' '!emptydirs') @@ -18,22 +19,20 @@ groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' +sha256sums=('841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-ldap --enable-hkp \ - --disable-scrollkeeper \ - --disable-update-mime-database \ --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" diff --git a/extra/seahorse/seahorse.install b/extra/seahorse/seahorse.install index 9a98d52e0..1571179ca 100644 --- a/extra/seahorse/seahorse.install +++ b/extra/seahorse/seahorse.install @@ -1,15 +1,7 @@ -pkgname=seahorse - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - usr/sbin/gconfpkg --uninstall $pkgname - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD index d69d60c5d..a7133cf72 100644 --- a/extra/sound-juicer/PKGBUILD +++ b/extra/sound-juicer/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 151078 2012-02-24 18:18:27Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributer: Ben <contrasutra@myrealbox.com> +# $Id: PKGBUILD 156966 2012-04-23 09:10:13Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Ben <contrasutra@myrealbox.com> pkgname=sound-juicer -pkgver=2.32.1 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="A cd ripper application" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('libmusicbrainz3' 'libgnome-media-profiles' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gnome-common' 'gtk-doc') +depends=('libmusicbrainz4' 'libdiscid' 'gtk3' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') options=(!emptydirs) -#source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110501.tar.xz) +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) groups=('gnome-extra') install=sound-juicer.install -url="http://www.burtonini.com/blog/computers/sound-juicer" -sha256sums=('e4312ebf75c8798dd3f7a9d2d9ee7291b593bd68c7b0559742b91ca7a52674fe') +sha256sums=('49805cc73617e745ee09b62fec46979387e5713d39e5f75320b91ee8f0c44f12') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-scrollkeeper make } diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index 721620a38..4c12fd746 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140953 2011-10-20 05:44:16Z ibiru $ +# $Id: PKGBUILD 156968 2012-04-23 09:10:15Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=sushi -pkgver=0.2.1 +pkgver=0.4.1 pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) @@ -12,17 +12,17 @@ groups=(gnome-extra) depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince') makedepends=('intltool' 'gobject-introspection') options=(!libtool) -source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7889e4309443dd7dfd5c9546af23565d15813c3f8f2af6c6776702ca8911a7bd') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --libexecdir=/usr/lib/sushi make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD index 613310cf1..f0b269a09 100644 --- a/extra/telepathy-farstream/PKGBUILD +++ b/extra/telepathy-farstream/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 142940 2011-11-18 18:23:32Z ibiru $ +# $Id: PKGBUILD 156970 2012-04-23 09:10:17Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-farstream -pkgver=0.1.2 +pkgver=0.4.0 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=(i686 x86_64 mips64el) url="http://telepathy.freedesktop.org" license=('LGPL2.1') -depends=('telepathy-glib' 'farsight2') -makedepends=('libxslt' 'python2') +depends=('telepathy-glib' 'farstream') +makedepends=('libxslt' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('telepathy-farsight') +replaces=('telepathy-farsight') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f858fc02e1981bb8ccd29c2bed567e50') +md5sums=('52d110f8a9f27bce0a6c2c07e18aee56') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -25,7 +27,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index a00bd59d8..594be0211 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143507 2011-11-25 10:37:09Z ibiru $ +# $Id: PKGBUILD 156972 2012-04-23 09:10:20Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.14.1 +pkgver=0.16.0 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -12,19 +12,20 @@ groups=('telepathy') license=('LGPL2.1') depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') makedepends=('libxslt' 'python2') -options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/$pkgname-$pkgver.tar.gz) +options=('!libtool' '!emptydirs') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('f6dfcd3da49eb6a558085fc917cdbdd4') +md5sums=('15b15fb58a3c54102c3e3489b4bd5ee0') build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy --with-tls=openssl make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console" } diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index 08f37c7ef..8f71df019 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145052 2011-12-15 21:38:17Z ibiru $ +# $Id: PKGBUILD 156974 2012-04-23 09:10:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.16.4 +pkgver=0.18.1 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ license=('LGPL2.1') options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') -source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('8335f83117323d2c1b8b012c233b7e4e') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('461732739e3fbf8467991bbe661fb29a') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-vala-bindings \ @@ -26,6 +26,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD index c406f75cc..9eb64e501 100644 --- a/extra/telepathy-haze/PKGBUILD +++ b/extra/telepathy-haze/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 131178 2011-07-11 14:00:11Z ibiru $ +# $Id: PKGBUILD 157068 2012-04-23 12:17:39Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=telepathy-haze -pkgver=0.5.0 -pkgrel=1 +pkgver=0.6.0 +pkgrel=2 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols." arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" license=('GPL') depends=('telepathy-glib' 'libpurple') -makedepends=('libxslt') +makedepends=('libxslt' 'python2') +replaces=('telepathy-butterfly') install=telepathy-haze.install groups=('telepathy') -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4378726d61e1e5df789a05760a94d172') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('622e0b2f7ff4050a29f907f2ef0f039c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy make } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 04308db2b..3a09140e5 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 143877 2011-11-30 08:41:16Z andrea $ +# $Id: PKGBUILD 157039 2012-04-23 09:53:28Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm -pkgver=0.2.0 -pkgrel=2 +_pkgname=ktp-accounts-kcm +pkgver=0.3.1 +pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list' - 'telepathy-kde-auth-handler' 'telepathy-kde-integration-module' 'telepathy-kde-approver' - 'telepathy-kde-filetransfer-handler') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support' 'telepathy-haze: all protocols supported by libpurple') -groups=('telepathy-kde') +groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('2ebc4ac117a3e28e2812a2a9c97f7d0ee97dac67') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('290daae2530a0bb8473fbb5239a039766776c831') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index cc475f04b..350934a48 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 143563 2011-11-26 13:58:28Z andrea $ +# $Id: PKGBUILD 157041 2012-04-23 09:53:31Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver -pkgver=0.2.0 +_pkgname=ktp-approver +pkgver=0.3.1 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4' 'telepathy-kde-contact-list') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6488f3119a19c38fc72e0afe3007a49394f36b13') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('156418a7f194a1df8f50fe6f8b371adac067f840') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index fa8492069..cf9f0a3b0 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143577 2011-11-26 14:06:41Z andrea $ +# $Id: PKGBUILD 157043 2012-04-23 09:53:33Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler -pkgver=0.2.0 +_pkgname=ktp-auth-handler +pkgver=0.3.1 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f482134e041541a5d45ff14b9dc6a1fb2db9520c') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('153ddfd1c19c4a6719993df27357c70f18700f88') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD new file mode 100644 index 000000000..3d86f181d --- /dev/null +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 157059 2012-04-23 09:55:28Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=telepathy-kde-common-internals +_pkgname=ktp-common-internals +pkgver=0.3.1 +pkgrel=2 +pkgdesc="Common components for KDE-Telepathy" +arch=('i686' 'x86_64') +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" +license=('GPL') +depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') +makedepends=('cmake' 'automoc4') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('f68c4587377fde7e2bd0e7201b30219f8aa7ce84') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD index 4e8e4421c..0e52c568e 100644 --- a/extra/telepathy-kde-contact-applet/PKGBUILD +++ b/extra/telepathy-kde-contact-applet/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143578 2011-11-26 14:07:09Z andrea $ +# $Id: PKGBUILD 157045 2012-04-23 09:53:35Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-applet -pkgver=0.2.0 +_pkgname=ktp-contact-applet +pkgver=0.3.1 pkgrel=1 -pkgdesc="The kde-telepathy contact plasmoid" +pkgdesc="The KDE-Telepathy contact plasmoid" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b1e2ad706deccd6ca4d745828a8b54fd87bc2066') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('f0eba19beaa97029e3012047108c27710d3a9a63') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index 95b9166fd..17c62c7ae 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 143879 2011-11-30 08:42:07Z andrea $ +# $Id: PKGBUILD 157047 2012-04-23 09:53:38Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list -pkgver=0.2.0 -pkgrel=2 +_pkgname=ktp-contact-list +pkgver=0.3.1 +pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4' 'telepathy-kde-text-ui' 'telepathy-kde-send-file') +depends=('telepathy-kde-common-internals' 'kdebase-runtime') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') +groups=('kde-telepathy') install=${pkgname}.install -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('7ec01e08d991123db9c2ce17d6350d8dd835793f') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('5126abb03184da209b8745afb6ee0ab70a24536e') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 14082b80d..7ac79027c 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143567 2011-11-26 13:59:37Z andrea $ +# $Id: PKGBUILD 157049 2012-04-23 09:53:40Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler -pkgver=0.2.0 +_pkgname=ktp-filetransfer-handler +pkgver=0.3.1 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('25c52485cb5653fa79d0eb9724b494803a8f0ad9') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('16c677416bf2c3ac8f99cdb6da10140af9252b3b') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 56dc5b27a..e61e77aaa 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143579 2011-11-26 14:07:39Z andrea $ +# $Id: PKGBUILD 157051 2012-04-23 09:53:43Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module -pkgver=0.2.0 +_pkgname=ktp-kded-integration-module +pkgver=0.3.1 pkgrel=1 -pkgdesc="Provide several plugins for the Telepathy KDE suite" +pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('5ad3e5786707b624a0f785c6891ed6de4a5d79c7') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('f5c9cd6ddd300ae824d63e7a69ae5ae4c7c4da20') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD new file mode 100644 index 000000000..02b922435 --- /dev/null +++ b/extra/telepathy-kde-presence-applet/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 157053 2012-04-23 09:53:45Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Laurent Carlier <lordheavym@gmail.com> + +pkgname=telepathy-kde-presence-applet +_pkgname=ktp-presence-applet +pkgver=0.3.1 +pkgrel=1 +pkgdesc="Plasma applet for managing your Telepathy account presence" +arch=('i686' 'x86_64') +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" +license=('GPL') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') +makedepends=('cmake' 'automoc4') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('b15b66dd0783fefb9df2acaedb242c9008cb688b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 106d2f0a7..d9e5ded32 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 143573 2011-11-26 14:01:08Z andrea $ +# $Id: PKGBUILD 157055 2012-04-23 09:53:48Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file -pkgver=0.2.0 +_pkgname=ktp-send-file +pkgver=0.3.1 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('telepathy-kde-filetransfer-handler') # 'telepathy-kde-contact-list') +depends=('telepathy-kde-common-internals' 'telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') +groups=('kde-telepathy') install=${pkgname}.install -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d6cdd99b6feef58f81c2c0c39325954c239deb2d') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('ce523b929c05df3149e3e674ba3bc4f61658aac3') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 42679608c..e4c6ccdf3 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 143575 2011-11-26 14:01:45Z andrea $ +# $Id: PKGBUILD 157057 2012-04-23 09:53:50Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui -pkgver=0.2.0 +_pkgname=ktp-text-ui +pkgver=0.3.1 pkgrel=1 -pkgdesc="Telepathy text chat handler" +pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4') # 'telepathy-kde-contact-list') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fb7c5dc02bb9d150d0e372c3584f50670d620f4a') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('78741579fa62d5beca6ff87f074a3821c02d1f15') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD index 16cbc416a..e7645f939 100644 --- a/extra/telepathy-logger/PKGBUILD +++ b/extra/telepathy-logger/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 141683 2011-11-02 09:28:54Z ibiru $ +# $Id: PKGBUILD 156978 2012-04-23 09:10:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-logger -pkgver=0.2.12 +pkgver=0.4.0 pkgrel=1 pkgdesc="Telepathy framework logging daemon" arch=(i686 x86_64 'mips64el') @@ -10,11 +10,12 @@ license=('LGPL2.1') depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection') options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('102a622855a3e20a191b0812ae7c9b8e') +install=telepathy-logger.install +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('0b891b860c7f3a01926f5cc22fd26120') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -27,7 +28,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/extra/telepathy-logger/telepathy-logger.install b/extra/telepathy-logger/telepathy-logger.install index 8fd591f55..56fb6a232 100644 --- a/extra/telepathy-logger/telepathy-logger.install +++ b/extra/telepathy-logger/telepathy-logger.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index dfc000ed5..3a4d51fef 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 142335 2011-11-08 15:59:21Z ibiru $ +# $Id: PKGBUILD 156980 2012-04-23 09:10:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> + pkgname=telepathy-mission-control -pkgver=5.10.1 +pkgver=5.12.0 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org/wiki/Mission Control" license=('LGPL2.1') -depends=('telepathy-glib' 'libgnome-keyring') +depends=('telepathy-glib' 'libgnome-keyring' 'dconf') makedepends=('libxslt' 'python2') install=telepathy-mission-control.install options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('50594028ebb2dba0181fec99e6f56ff5') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('f39dcfef785a37dc21efa9af06be2e61') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-gnome-keyring \ @@ -27,6 +28,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD new file mode 100644 index 000000000..18ffc0fba --- /dev/null +++ b/extra/telepathy-qt/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 156982 2012-04-23 09:10:33Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=telepathy-qt +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A library for Qt-based Telepathy clients" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/" +license=('LGPL') +options=('!libtool') +depends=('qt' 'telepathy-farstream') +makedepends=('libxslt' 'python2' 'cmake' 'doxygen') +conflicts=('telepathy-qt4') +replaces=('telepathy-qt4') +provides=('telepathy-qt4') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gcc47.patch') +md5sums=('e0e6c1a987bbeae44c778344a2cc9d80' + '32aa8eb06c76cb03af5ced27a674ebfb') + +build() { + cd "$srcdir" + patch -Np0 -i gcc47.patch + + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir"/build + make DESTDIR="$pkgdir" install +} diff --git a/extra/telepathy-qt/gcc47.patch b/extra/telepathy-qt/gcc47.patch new file mode 100644 index 000000000..ac6ae67fb --- /dev/null +++ b/extra/telepathy-qt/gcc47.patch @@ -0,0 +1,36 @@ +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp 2012-04-01 17:44:00.013466055 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -39,6 +39,8 @@ + #include <TelepathyQt/MethodInvocationContext> + #include <TelepathyQt/PendingComposite> + #include <TelepathyQt/PendingReady> ++ ++#include <stdint.h> + + namespace Tp + { +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:44:00.006799442 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -38,6 +38,8 @@ + #include <QAbstractSocket> + #include <QHash> + ++#include <stdint.h> ++ + namespace Tp + { + +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:44:00.003466134 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -38,6 +38,8 @@ + #include <TelepathyQt/OutgoingStreamTubeChannel> + #include <TelepathyQt/StreamTubeChannel> + ++#include <stdint.h> ++ + namespace Tp + { + diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD index 9cc79c69d..c3309d05d 100644 --- a/extra/telepathy-salut/PKGBUILD +++ b/extra/telepathy-salut/PKGBUILD @@ -1,31 +1,34 @@ -# $Id: PKGBUILD 140754 2011-10-18 17:03:04Z ibiru $ +# $Id: PKGBUILD 156984 2012-04-23 09:10:36Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> pkgname=telepathy-salut -pkgver=0.6.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="A link-local XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" groups=('telepathy') license=('LGPL') -depends=('telepathy-glib' 'avahi' 'libsoup') +depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3') makedepends=('libxslt' 'python2' 'xmldiff') install=telepathy-salut.install -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('a0df48e6c2e137a928f8f39655b8dc26') +options=(!libtool) +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('43639c23de33e8466540de02816d23bf') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --disable-plugins --disable-Werror \ - --with-tls=openssl + --with-tls=openssl \ + --enable-avahi-tests=no \ + --enable-static=no make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index c04a71226..f97f95e57 100644 --- a/extra/tomboy/PKGBUILD +++ b/extra/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142896 2011-11-17 18:35:10Z ibiru $ +# $Id: PKGBUILD 156986 2012-04-23 09:10:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tomboy -pkgver=1.8.3 +pkgver=1.10.1 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64' 'mips64el') @@ -13,25 +13,25 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') options=('!libtool' '!emptydirs' '!makeflags') groups=('gnome-extra') install=tomboy.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('3f704bac772a54cf668aca769c766bc1fb9ebc8823a903ef108927805c020bea') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('85bc277b278fe6aaa38fc0ec8b1777804ea0de647111a5065d43614d1ad10077') build() { export MONO_SHARED_DIR="$srcdir/.wabi" mkdir -p "$MONO_SHARED_DIR" - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ + --localstatedir=/var \ --disable-update-mimedb make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/tomboy/tomboy.install b/extra/tomboy/tomboy.install index f8e2e4a07..84e225486 100644 --- a/extra/tomboy/tomboy.install +++ b/extra/tomboy/tomboy.install @@ -1,10 +1,10 @@ pkgname=tomboy post_install() { - usr/sbin/gconfpkg --install ${pkgname} + gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime } pre_upgrade() { @@ -16,10 +16,10 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall ${pkgname} } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime } diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 90e76c40b..7ea181bc6 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 146713 2012-01-16 19:49:27Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156990 2012-04-23 09:10:44Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=2.32.6 -pkgrel=3 -url="http://www.hadess.net/totem.php3" +pkgver=3.4.1 +pkgrel=1 +url="http://www.gnome.org" pkgdesc="Totem playlist parser library" license=('LGPL') arch=(i686 x86_64 'mips64el') -depends=('gmime' 'libsoup-gnome' 'libarchive') +depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi') makedepends=('intltool' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-$pkgver.tar.xz) -sha256sums=('8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874') +source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) +sha256sums=('00b5b6c7a7a3679a1e4b03146eab71cb387a71f5c0c8c16a7c24697b9f56a192') build() { - cd "$srcdir/totem-pl-parser-$pkgver" + cd totem-pl-parser-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -24,6 +25,6 @@ build() { } package(){ - cd "$srcdir/totem-pl-parser-$pkgver" + cd totem-pl-parser-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index fb6f2155d..39ef02531 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 150691 2012-02-20 11:01:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156988 2012-04-23 09:10:41Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" @@ -12,19 +13,21 @@ license=('GPL2' 'custom') depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst' - 'clutter-gtk' 'mx') -makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'lirc-utils' + 'clutter-gtk' 'mx' 'python2-gobject' 'pylint') +makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils' 'libepc' 'bluez' 'vala' 'grilo') [ "$CARCH" = "mips64el" ] && { makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'libepc' 'bluez' 'vala' 'grilo') } options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + browser-plugins.ini) +sha256sums=('eadf138068c2e31bf8fe31b3d63536cb0fe32f834fcf4fbfb453a3fff5eec7ef' + 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') build() { - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/totem \ @@ -48,11 +51,11 @@ package_totem() { 'grilo-plugins: Browse sidebar (remote media)' 'pyxdg: opensubtitles plugin') - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" make DESTDIR="${pkgdir}" install rm -r "$pkgdir/usr/lib/mozilla" - rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer" + rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py} @@ -63,12 +66,15 @@ package_totem() { package_totem-plugin() { pkgdesc="Totem plugin for web browsers" depends=("totem=$pkgver") + backup=(etc/totem/browser-plugins.ini) - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" make -C browser-plugin \ plugindir=/usr/lib/mozilla/plugins \ xptdir=/usr/lib/mozilla/plugins \ DESTDIR="$pkgdir" install + + install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" } diff --git a/extra/totem/browser-plugins.ini b/extra/totem/browser-plugins.ini new file mode 100644 index 000000000..cf3014997 --- /dev/null +++ b/extra/totem/browser-plugins.ini @@ -0,0 +1,2 @@ +[Plugins] +application/x-shockwave-flash.disabled=true diff --git a/extra/totem/totem.install b/extra/totem/totem.install index 07cb42dcb..7f0fc704b 100644 --- a/extra/totem/totem.install +++ b/extra/totem/totem.install @@ -1,13 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91) < 0 )); then - usr/sbin/gconfpkg --uninstall totem - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 12dbdf44f..c0d67f0b3 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 150242 2012-02-15 16:56:51Z heftig $ +# $Id: PKGBUILD 156992 2012-04-23 09:10:47Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.10 +pkgver=0.14.0 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=3 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -19,10 +19,10 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69') +sha256sums=('78e432c5c14b9d186ccca3c382accdcdb4f07c2c6e25989fda48401b4a68f7d4') build() { - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver ./configure \ --prefix=/usr \ @@ -53,7 +53,7 @@ package_tracker() { groups=('gnome-extra') install=tracker.install - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install ### Split libtracker-sparql @@ -78,7 +78,7 @@ package_tracker() { package_libtracker-sparql() { pkgdesc="$pkgdesc (SPARQL library)" - depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') mv "$srcdir"/sparql/* "$pkgdir" } diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD new file mode 100644 index 000000000..5b2177e49 --- /dev/null +++ b/extra/udisks2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 156994 2012-04-23 09:10:49Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=udisks2 +pkgver=1.94.0 +pkgrel=1 +pkgdesc="Disk Management Service, version 2" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL2') +depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') +optdepends=('parted: partition management' + 'gptfdisk: GUID partition table support') +options=(!libtool) +source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) +sha256sums=('e58193c2f2f4fba030b6dd684708352b1eccf6826843e42899a26fef4249b0bc') + +build() { + cd "udisks-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "udisks-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index 439425fbb..8f3acae5e 100644 --- a/extra/vala/PKGBUILD +++ b/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148412 2012-01-31 15:56:29Z ibiru $ +# $Id: PKGBUILD 156996 2012-04-23 09:10:51Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=vala -pkgver=0.14.2 +pkgver=0.16.0 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('LGPL') depends=('glib2') makedepends=('libxslt') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.14/$pkgname-$pkgver.tar.xz) -sha256sums=('807e6978484f66cab3cf4fefd72f37a4293d2831d7a5fd29119bdf9d38a5b3d0') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 5f141bb08..f4c46ae7f 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 142898 2011-11-17 18:35:12Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# $Id: PKGBUILD 156998 2012-04-23 09:10:54Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,24 +15,20 @@ install=vinagre.install depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') optdepends=('openssh: SSH plugin' 'rdesktop: RDP plugin') -makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') +makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd') +sha256sums=('5b79bbdafe57e1ceaeddfc1091a9f02aa6e3a54e55ffd2517be512d35e89654f') build() { - cd "$srcdir/$pkgname-$pkgver" - - #building with as-needed breaks rdp - #https://bugzilla.gnome.org/show_bug.cgi?id=653558 - export LDFLAGS="$LDFLAGS,--no-as-needed" - ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \ + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/vinagre/vinagre.install b/extra/vinagre/vinagre.install index 68158ac80..4998e6e8b 100644 --- a/extra/vinagre/vinagre.install +++ b/extra/vinagre/vinagre.install @@ -1,16 +1,10 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-mime-database usr/share/mime > /dev/null } -pre_upgrade() { - if (( $(vercmp $2 2.91.91-2) < 0 )); then - usr/sbin/gconfpkg --uninstall vinagre - fi -} - post_upgrade() { post_install } diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index 2cbfc7219..931db3f1f 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 142900 2011-11-17 18:35:14Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 157000 2012-04-23 09:10:56Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +15,10 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('51089c35b5187c37ebcd4f8ad921123f9a56713316876531189a3f3765dc87d1') +sha256sums=('85011594e9b5c4c5449c049e7c3563538c7a80dafecbb5891720b22290b83cb8') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vino \ --localstatedir=/var \ @@ -28,6 +29,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/vino/vino.install b/extra/vino/vino.install index 469266843..fabaa1ed7 100644 --- a/extra/vino/vino.install +++ b/extra/vino/vino.install @@ -1,14 +1,8 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q } -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall vino - fi -} - post_upgrade() { post_install } diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 61583fbef..143f5a2b7 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148047 2012-01-30 18:21:09Z andrea $ +# $Id: PKGBUILD 157183 2012-04-25 11:45:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=virtuoso -pkgver=6.1.4 -pkgrel=2 +pkgver=6.1.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' url='http://virtuoso.openlinksw.com/wiki/main/Main/' @@ -13,7 +13,7 @@ depends=('libldap') makedepends=('bison' 'flex') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") -md5sums=('7110a0b4b171b84850d346f4fe648172') +md5sums=('61b53395e14a11dd7e7715b50261b9eb') build() { cd ${srcdir}/${pkgname}-opensource-${pkgver} diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 1add7a362..89daf83e9 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 142687 2011-11-12 18:46:20Z ibiru $ +# $Id: PKGBUILD 157002 2012-04-23 09:10:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.30.1 -pkgrel=2 +pkgver=0.32.1 +pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-$pkgver.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) -sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64' +sha256sums=('543e489943d439dc82a4ba54871984ea843c3ef0a1fffa24aa65dabc57e7e4da' '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "$srcdir/vte-$pkgver" - #warning: type-punning to incomplete type might break strict-aliasing rules - export CFLAGS="$CFLAGS -fno-strict-aliasing" - + cd "vte-$pkgver" patch -Np1 -R -i "$srcdir/make_alt_work.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ @@ -31,7 +28,7 @@ build() { package_vte3(){ depends=('gtk3' 'vte-common') - cd "$srcdir/vte-$pkgver" + cd "vte-$pkgver" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/vte/gnome-pty-helper @@ -39,7 +36,7 @@ package_vte3(){ package_vte-common() { pkgdesc="Common files used by vte and vte3" - cd "$srcdir/vte-$pkgver" + cd "vte-$pkgver" make -C gnome-pty-helper DESTDIR="$pkgdir" install } diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index 9ab46fb6d..880b66185 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152241 2012-03-05 19:12:45Z tpowa $ +# $Id: PKGBUILD 157190 2012-04-25 13:14:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin pkgver=1.580 -pkgrel=1 +pkgrel=2 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64 'mips64el') license=('custom:webmin') @@ -86,7 +86,8 @@ install=webmin.install source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 - webmin.rc) + webmin.rc + webmin.service) options=(!strip) build() { @@ -203,6 +204,9 @@ build() { #install rc file install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin + # install systemd files + install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service + # delete temp dir rm -r $startdir/pkg/tmp # change sticky bit @@ -213,4 +217,5 @@ build() { md5sums=('2aa5378bc3ed6471c460d18e87a06fa3' '43a77243acd519c4efe9577090b59912' 'bfebb75bb94029b48c46b7f1ba1aa811' - '0673e51af0e81418b4a6c1e205f7e5cd') + 'c77dfcd621b417a7826d25f56a1e60ae' + 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/extra/webmin/webmin.rc b/extra/webmin/webmin.rc index ee83fbea2..6aac8941d 100644 --- a/extra/webmin/webmin.rc +++ b/extra/webmin/webmin.rc @@ -14,6 +14,7 @@ case "$1" in RETVAL=$? if [ "$RETVAL" = "0" ]; then touch $lockfile >/dev/null 2>&1 + add_daemon webmin stat_done else stat_fail @@ -26,6 +27,7 @@ fi RETVAL=$? if [ "$RETVAL" = "0" ]; then rm -f $lockfile + rm_daemon webmin stat_done else stat_fail @@ -33,8 +35,8 @@ fi ;; 'restart') - $stop && $start - RETVAL=$? + $0 stop + $0 start ;; *) echo "Usage: $0 { start | stop | restart }" diff --git a/extra/webmin/webmin.service b/extra/webmin/webmin.service new file mode 100644 index 000000000..a8a384a8c --- /dev/null +++ b/extra/webmin/webmin.service @@ -0,0 +1,11 @@ +[Unit] +Description=Webmin + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/etc/webmin/start +ExecStop=/etc/webmin/stop + +[Install] +WantedBy=multi-user.target diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD new file mode 100644 index 000000000..6f80312ed --- /dev/null +++ b/extra/xdg-user-dirs-gtk/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 157004 2012-04-23 09:11:01Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=xdg-user-dirs-gtk +pkgver=0.8 +pkgrel=1 +pkgdesc="Creates user dirs and asks to relocalize them" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk2' 'xdg-user-dirs') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2 + lxde.patch) +sha256sums=('971e5cd121606c437c2b07e189c8f34791ae0c4d81e155266d71acc7b263ad32' + '5db6a2fd5bb293deff0322e9f20a383130e05df2d35d64568a47b5fe63d6ebf4') + +build() { + cd $pkgname-$pkgver + patch -p1 -i ../lxde.patch + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/xdg-user-dirs-gtk/lxde.patch b/extra/xdg-user-dirs-gtk/lxde.patch new file mode 100644 index 000000000..c5520475c --- /dev/null +++ b/extra/xdg-user-dirs-gtk/lxde.patch @@ -0,0 +1,15 @@ +diff -up xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in +--- xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde 2010-02-13 23:52:49.130115833 -0500 ++++ xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in 2010-02-13 23:54:57.574114211 -0500 +@@ -1,10 +1,9 @@ + [Desktop Entry] +-Encoding=UTF-8 + Exec=xdg-user-dirs-gtk-update + _Name=User folders update + _Comment=Update common folders names to match current locale + Terminal=false +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;LXDE; + Type=Application + StartupNotify=false + X-KDE-autostart-after=panel diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD index 7464bd8ea..e32504ee4 100644 --- a/extra/xfce4-mount-plugin/PKGBUILD +++ b/extra/xfce4-mount-plugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156689 2012-04-22 23:46:49Z eric $ +# $Id: PKGBUILD 157202 2012-04-25 17:31:31Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-mount-plugin -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0b9dee13886639aea8b4ca3158b9cdf7') +sha1sums=('dbbf8e29c50ec1cd9ba0fa65f7255ca0788a372e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD index 2797c31be..703ca6146 100644 --- a/extra/xfce4-wavelan-plugin/PKGBUILD +++ b/extra/xfce4-wavelan-plugin/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 156573 2012-04-21 04:42:41Z eric $ +# $Id: PKGBUILD 157144 2012-04-24 23:57:43Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-wavelan-plugin pkgver=0.5.10 -pkgrel=1 +pkgrel=2 pkgdesc="Plugin to monitor wifi connectivity for the Xfce4 panel" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/" groups=('xfce4-goodies') -depends=('xfce4-panel') +depends=('xfce4-panel' 'net-tools') makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index bcc94143e..2ece9d487 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 140963 2011-10-20 05:44:26Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 157006 2012-04-23 09:11:04Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') -depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') -makedepends=('intltool' 'gtk-doc') +depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' + 'desktop-file-utils' 'dconf') +makedepends=('intltool' 'gtk-doc' 'itstool') groups=('gnome') license=('GPL') options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d') +sha256sums=('0485c170210b681a07b709fad7c43010cd683f33f7cb5a62eb05fcccf2507184') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/yelp/yelp.install b/extra/yelp/yelp.install index f3bf19a93..2a1cb91e9 100644 --- a/extra/yelp/yelp.install +++ b/extra/yelp/yelp.install @@ -1,15 +1,9 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-desktop-database -q } -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall yelp - fi -} - post_upgrade() { post_install } diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD index 13b8b846a..982c1caaa 100644 --- a/extra/zenity/PKGBUILD +++ b/extra/zenity/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139461 2011-10-01 19:02:18Z ibiru $ +# $Id: PKGBUILD 157010 2012-04-23 09:11:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=zenity -pkgver=3.2.0 +pkgver=3.4.0 pkgrel=1 pkgdesc="Display graphical dialog boxes from shell scripts" arch=(i686 x86_64 'mips64el') @@ -11,16 +11,16 @@ depends=('gtk3' 'libnotify') makedepends=('intltool' 'gtk-doc') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e6a778db3655957770653745a2ecaef08a41a71f4a0a92cb7c5dc8ce0e9902d8') +sha256sums=('5cf068597c649b5adee60c5948abdf383dbfb16a6c6d57c2ec42ced136730baf') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper + --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD new file mode 100644 index 000000000..fe102f9b8 --- /dev/null +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -0,0 +1,274 @@ +# Maintainer: Si Feng <sci.feng at gmail.com> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Thomas Baechler <thomas@archlinux.org> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> + +pkgbase=linux-libre-lts-xen +pkgname=('linux-libre-lts-xen' 'linux-libre-lts-xen-headers') # Build stock -LIBRE kernel with Xen guest support +# pkgname=linux-custom # Build kernel with a different name +_kernelname=-LIBRE-LTS-XEN +_basekernel=3.0 +pkgver=${_basekernel}.28 +pkgrel=1 +arch=('i686') +url="http://linux-libre.fsfla.org/" +license=('GPL2') +makedepends=('xmlto' 'docbook-xsl') +options=('!strip') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" + # the main kernel config files + 'config.i686' + # standard config files for mkinitcpio ramdisk + "${pkgname}.preset" + 'boot-logo.patch' + 'change-default-console-loglevel.patch' + 'i915-fix-ghost-tv-output.patch' + 'ext4-options.patch') +md5sums=('5f64180fe7df4e574dac5911b78f5067' + '150cef79eaa9a41cd5ccd65c696e7f10' + 'd260f5926a4ffec1e6d0408dcde732df' + 'f967e9030fc45775a2141fbae18b8c6e' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + 'bb7fd1aa23016c8057046b84fd4eb528') + +build() { + cd "${srcdir}/linux-${_basekernel}" + + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + fi + + # Add freedo as boot logo + patch -Np1 -i "${srcdir}/boot-logo.patch" + + # Some chips detect a ghost TV output + # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html + # Arch Linux bug report: FS#19234 + # + # It is unclear why this patch wasn't merged upstream, it was accepted, + # then dropped because the reasoning was unclear. However, it is clearly + # needed. + patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" + + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) + # remove this when a Kconfig knob is made available by upstream + # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) + patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + + cat "${srcdir}/config.${CARCH}" > ./.config # simpler + + if [ "${_kernelname}" != "" ]; then + sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config + fi + + # set extraversion to pkgrel + sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + + # get kernel version + make prepare + + # load configuration + # Configure the kernel. Replace the line below with one of your choice. + #make menuconfig # CLI menu for configuration + #make nconfig # new CLI menu for configuration + #make xconfig # X-based configuration + #make oldconfig # using old config from previous kernel version + # ... or manually edit .config + + #################### + # stop here + # this is useful to configure the kernel + #msg "Stopping build" + #return 1 + #################### + + yes "" | make config + + # build! + make ${MAKEFLAGS} bzImage modules +} + +package_linux-libre-lts-xen() { + pkgdesc="The Linux-libre Kernel and modules with Xen guest support - stable longtime supported kernel package suitable for servers" + depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + optdepends=('crda: to set the correct wireless channels of your country') + provides=('kernel26-lts-xen' "linux-lts-xen=$pkgver") + conflicts=('kernel26-lts-xen' 'kernel26-libre-lts-xen' 'linux-lts-xen') + replaces=('kernel26-lts-xen' 'kernel26-libre-lts-xen' 'linux-lts-xen') + backup=("etc/mkinitcpio.d/${pkgname}.preset") + install=${pkgname}.install + + cd "${srcdir}/linux-${_basekernel}" + + KARCH=x86 + + # get kernel version + _kernver="$(make kernelrelease)" + + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + make INSTALL_MOD_PATH="${pkgdir}" modules_install + cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}" + + # add vmlinux + install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" + + # install fallback mkinitcpio.conf file and preset file for kernel + install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" + + # set correct depmod command for install + sed \ + -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \ + -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \ + -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" + + # remove build and source links + rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} + # remove the firmware + rm -rf "${pkgdir}/lib/firmware" + # gzip -9 all modules to save 100MB of space + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + # make room for external modules + ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + # add real version for building modules and running depmod from post_install/upgrade + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" +} + +package_linux-libre-lts-xen-headers() { + pkgdesc="Header files and scripts for building modules for linux-libre-lts-xen longtime supported kernel" + provides=('kernel26-lts-xen-headers' "linux-lts-xen-headers=${pkgver}") + conflicts=('kernel26-lts-xen-headers' 'kernel26-libre-lts-xen-headers' 'linux-lts-xen-headers') + replaces=('kernel26-lts-xen-headers' 'kernel26-libre-lts-xen-headers' 'linux-lts-xen-headers') + + mkdir -p "${pkgdir}/lib/modules/${_kernver}" + + cd "${pkgdir}/lib/modules/${_kernver}" + ln -sf ../../../usr/src/linux-${_kernver} build + + cd "${srcdir}/linux-${_basekernel}" + install -D -m644 Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Makefile" + install -D -m644 kernel/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile" + install -D -m644 .config \ + "${pkgdir}/usr/src/linux-${_kernver}/.config" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" + + for i in acpi asm-generic config crypto drm generated linux math-emu \ + media mtd net pcmcia scsi sound trace video xen; do + cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" + done + + # copy arch includes for external modules + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86" + cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/" + + # copy files necessary for later builds + cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" + cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" + + # fix permissions on scripts dir + chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel" + + cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + + if [ "${CARCH}" = "i686" ]; then + cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + fi + + cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" + + # add headers for lirc package + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" + + cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" + + for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + done + + # add docbook makefile + install -D -m644 Documentation/DocBook/Makefile \ + "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" + + # add dm headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + + # add inotify.h + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux" + cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/" + + # add wireless headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + + # add dvb headers for external modules + # in reference to: + # http://bugs.archlinux.org/task/9912 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" + cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + # and... + # http://bugs.archlinux.org/task/11194 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + + # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new + # in reference to: + # http://bugs.archlinux.org/task/13146 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + + # add dvb headers + # in reference to: + # http://bugs.archlinux.org/task/20402 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" + cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" + cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" + cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + + # add xfs and shmem for aufs building + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm" + cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h" + + # copy in Kconfig files + for i in `find . -name "Kconfig*"`; do + mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'` + cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}" + done + + chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \; + + # strip scripts directory + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "${binary}")" in + *application/x-sharedlib*) # Libraries (.so) + /usr/bin/strip ${STRIP_SHARED} "${binary}";; + *application/x-archive*) # Libraries (.a) + /usr/bin/strip ${STRIP_STATIC} "${binary}";; + *application/x-executable*) # Binaries + /usr/bin/strip ${STRIP_BINARIES} "${binary}";; + esac + done + + # remove unneeded architectures + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} +} diff --git a/kernels/linux-libre-lts-xen/boot-logo.patch b/kernels/linux-libre-lts-xen/boot-logo.patch new file mode 100644 index 000000000..c392928a5 --- /dev/null +++ b/kernels/linux-libre-lts-xen/boot-logo.patch @@ -0,0 +1,23163 @@ +diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm +--- linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm 2011-06-02 21:34:20.000000000 -0300 ++++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm 2011-06-22 13:42:06.000000000 -0300 +@@ -1,1604 +1,861 @@ + P3 +-# Standard 224-color Linux logo +-80 80 ++80 78 + 255 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 6 6 6 10 10 10 10 10 10 +- 10 10 10 6 6 6 6 6 6 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 10 10 10 14 14 14 +- 22 22 22 26 26 26 30 30 30 34 34 34 +- 30 30 30 30 30 30 26 26 26 18 18 18 +- 14 14 14 10 10 10 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 26 26 26 42 42 42 +- 54 54 54 66 66 66 78 78 78 78 78 78 +- 78 78 78 74 74 74 66 66 66 54 54 54 +- 42 42 42 26 26 26 18 18 18 10 10 10 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 22 22 22 42 42 42 66 66 66 86 86 86 +- 66 66 66 38 38 38 38 38 38 22 22 22 +- 26 26 26 34 34 34 54 54 54 66 66 66 +- 86 86 86 70 70 70 46 46 46 26 26 26 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 26 26 26 +- 50 50 50 82 82 82 58 58 58 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 54 54 54 86 86 86 66 66 66 +- 38 38 38 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 22 22 22 50 50 50 +- 78 78 78 34 34 34 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 6 6 6 70 70 70 +- 78 78 78 46 46 46 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 42 42 42 82 82 82 +- 26 26 26 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 14 14 14 +- 46 46 46 34 34 34 6 6 6 2 2 6 +- 42 42 42 78 78 78 42 42 42 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 10 10 10 30 30 30 66 66 66 58 58 58 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 26 26 26 +- 86 86 86 101 101 101 46 46 46 10 10 10 +- 2 2 6 58 58 58 70 70 70 34 34 34 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 14 14 14 42 42 42 86 86 86 10 10 10 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 30 30 30 +- 94 94 94 94 94 94 58 58 58 26 26 26 +- 2 2 6 6 6 6 78 78 78 54 54 54 +- 22 22 22 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 22 22 22 62 62 62 62 62 62 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 26 26 26 +- 54 54 54 38 38 38 18 18 18 10 10 10 +- 2 2 6 2 2 6 34 34 34 82 82 82 +- 38 38 38 14 14 14 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 30 30 30 78 78 78 30 30 30 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 10 10 10 +- 10 10 10 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 78 78 78 +- 50 50 50 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 86 86 86 14 14 14 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 54 54 54 +- 66 66 66 26 26 26 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 82 82 82 2 2 6 2 2 6 +- 2 2 6 6 6 6 10 10 10 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 6 6 6 +- 14 14 14 10 10 10 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 18 18 18 +- 82 82 82 34 34 34 10 10 10 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 2 2 6 +- 6 6 6 6 6 6 22 22 22 34 34 34 +- 6 6 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 18 18 18 34 34 34 +- 10 10 10 50 50 50 22 22 22 2 2 6 +- 2 2 6 2 2 6 2 2 6 10 10 10 +- 86 86 86 42 42 42 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 2 2 6 +- 38 38 38 116 116 116 94 94 94 22 22 22 +- 22 22 22 2 2 6 2 2 6 2 2 6 +- 14 14 14 86 86 86 138 138 138 162 162 162 +-154 154 154 38 38 38 26 26 26 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 86 86 86 46 46 46 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 14 14 14 +-134 134 134 198 198 198 195 195 195 116 116 116 +- 10 10 10 2 2 6 2 2 6 6 6 6 +-101 98 89 187 187 187 210 210 210 218 218 218 +-214 214 214 134 134 134 14 14 14 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 86 86 86 50 50 50 18 18 18 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 54 54 54 +-218 218 218 195 195 195 226 226 226 246 246 246 +- 58 58 58 2 2 6 2 2 6 30 30 30 +-210 210 210 253 253 253 174 174 174 123 123 123 +-221 221 221 234 234 234 74 74 74 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 70 70 70 58 58 58 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 82 82 82 2 2 6 106 106 106 +-170 170 170 26 26 26 86 86 86 226 226 226 +-123 123 123 10 10 10 14 14 14 46 46 46 +-231 231 231 190 190 190 6 6 6 70 70 70 +- 90 90 90 238 238 238 158 158 158 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 70 70 70 58 58 58 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 86 86 86 6 6 6 116 116 116 +-106 106 106 6 6 6 70 70 70 149 149 149 +-128 128 128 18 18 18 38 38 38 54 54 54 +-221 221 221 106 106 106 2 2 6 14 14 14 +- 46 46 46 190 190 190 198 198 198 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 74 74 74 62 62 62 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 0 +- 0 0 1 0 0 0 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 94 94 94 14 14 14 101 101 101 +-128 128 128 2 2 6 18 18 18 116 116 116 +-118 98 46 121 92 8 121 92 8 98 78 10 +-162 162 162 106 106 106 2 2 6 2 2 6 +- 2 2 6 195 195 195 195 195 195 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 74 74 74 62 62 62 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 1 +- 0 0 1 0 0 0 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 90 90 90 14 14 14 58 58 58 +-210 210 210 26 26 26 54 38 6 154 114 10 +-226 170 11 236 186 11 225 175 15 184 144 12 +-215 174 15 175 146 61 37 26 9 2 2 6 +- 70 70 70 246 246 246 138 138 138 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 70 70 70 66 66 66 26 26 26 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 86 86 86 14 14 14 10 10 10 +-195 195 195 188 164 115 192 133 9 225 175 15 +-239 182 13 234 190 10 232 195 16 232 200 30 +-245 207 45 241 208 19 232 195 16 184 144 12 +-218 194 134 211 206 186 42 42 42 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 50 50 50 74 74 74 30 30 30 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 34 34 34 86 86 86 14 14 14 2 2 6 +-121 87 25 192 133 9 219 162 10 239 182 13 +-236 186 11 232 195 16 241 208 19 244 214 54 +-246 218 60 246 218 38 246 215 20 241 208 19 +-241 208 19 226 184 13 121 87 25 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 50 50 50 82 82 82 34 34 34 10 10 10 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 34 34 34 82 82 82 30 30 30 61 42 6 +-180 123 7 206 145 10 230 174 11 239 182 13 +-234 190 10 238 202 15 241 208 19 246 218 74 +-246 218 38 246 215 20 246 215 20 246 215 20 +-226 184 13 215 174 15 184 144 12 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 26 26 26 94 94 94 42 42 42 14 14 14 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 50 50 50 104 69 6 +-192 133 9 216 158 10 236 178 12 236 186 11 +-232 195 16 241 208 19 244 214 54 245 215 43 +-246 215 20 246 215 20 241 208 19 198 155 10 +-200 144 11 216 158 10 156 118 10 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 90 90 90 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 46 46 46 22 22 22 +-137 92 6 210 162 10 239 182 13 238 190 10 +-238 202 15 241 208 19 246 215 20 246 215 20 +-241 208 19 203 166 17 185 133 11 210 150 10 +-216 158 10 210 150 10 102 78 10 2 2 6 +- 6 6 6 54 54 54 14 14 14 2 2 6 +- 2 2 6 62 62 62 74 74 74 30 30 30 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 34 34 34 78 78 78 50 50 50 6 6 6 +- 94 70 30 139 102 15 190 146 13 226 184 13 +-232 200 30 232 195 16 215 174 15 190 146 13 +-168 122 10 192 133 9 210 150 10 213 154 11 +-202 150 34 182 157 106 101 98 89 2 2 6 +- 2 2 6 78 78 78 116 116 116 58 58 58 +- 2 2 6 22 22 22 90 90 90 46 46 46 +- 18 18 18 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 86 86 86 50 50 50 6 6 6 +-128 128 128 174 154 114 156 107 11 168 122 10 +-198 155 10 184 144 12 197 138 11 200 144 11 +-206 145 10 206 145 10 197 138 11 188 164 115 +-195 195 195 198 198 198 174 174 174 14 14 14 +- 2 2 6 22 22 22 116 116 116 116 116 116 +- 22 22 22 2 2 6 74 74 74 70 70 70 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 101 101 101 26 26 26 10 10 10 +-138 138 138 190 190 190 174 154 114 156 107 11 +-197 138 11 200 144 11 197 138 11 192 133 9 +-180 123 7 190 142 34 190 178 144 187 187 187 +-202 202 202 221 221 221 214 214 214 66 66 66 +- 2 2 6 2 2 6 50 50 50 62 62 62 +- 6 6 6 2 2 6 10 10 10 90 90 90 +- 50 50 50 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 34 34 34 +- 74 74 74 74 74 74 2 2 6 6 6 6 +-144 144 144 198 198 198 190 190 190 178 166 146 +-154 121 60 156 107 11 156 107 11 168 124 44 +-174 154 114 187 187 187 190 190 190 210 210 210 +-246 246 246 253 253 253 253 253 253 182 182 182 +- 6 6 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 62 62 62 +- 74 74 74 34 34 34 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 10 10 10 22 22 22 54 54 54 +- 94 94 94 18 18 18 2 2 6 46 46 46 +-234 234 234 221 221 221 190 190 190 190 190 190 +-190 190 190 187 187 187 187 187 187 190 190 190 +-190 190 190 195 195 195 214 214 214 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +- 82 82 82 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 14 14 14 +- 86 86 86 54 54 54 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 46 46 46 90 90 90 +- 46 46 46 18 18 18 6 6 6 182 182 182 +-253 253 253 246 246 246 206 206 206 190 190 190 +-190 190 190 190 190 190 190 190 190 190 190 190 +-206 206 206 231 231 231 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-202 202 202 14 14 14 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 42 42 42 86 86 86 42 42 42 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 14 14 14 38 38 38 74 74 74 66 66 66 +- 2 2 6 6 6 6 90 90 90 250 250 250 +-253 253 253 253 253 253 238 238 238 198 198 198 +-190 190 190 190 190 190 195 195 195 221 221 221 +-246 246 246 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 82 82 82 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 78 78 78 70 70 70 34 34 34 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 34 34 34 66 66 66 78 78 78 6 6 6 +- 2 2 6 18 18 18 218 218 218 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 +-226 226 226 231 231 231 246 246 246 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 178 178 178 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 18 18 18 90 90 90 62 62 62 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 26 26 26 +- 58 58 58 90 90 90 18 18 18 2 2 6 +- 2 2 6 110 110 110 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 231 231 231 18 18 18 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 18 18 18 94 94 94 +- 54 54 54 26 26 26 10 10 10 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 22 22 22 50 50 50 +- 90 90 90 26 26 26 2 2 6 2 2 6 +- 14 14 14 195 195 195 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 242 242 242 54 54 54 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 38 38 38 +- 86 86 86 50 50 50 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 38 38 38 82 82 82 +- 34 34 34 2 2 6 2 2 6 2 2 6 +- 42 42 42 195 195 195 246 246 246 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-242 242 242 242 242 242 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 250 250 250 246 246 246 238 238 238 +-226 226 226 231 231 231 101 101 101 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 38 38 38 82 82 82 42 42 42 14 14 14 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 10 10 10 26 26 26 62 62 62 66 66 66 +- 2 2 6 2 2 6 2 2 6 6 6 6 +- 70 70 70 170 170 170 206 206 206 234 234 234 +-246 246 246 250 250 250 250 250 250 238 238 238 +-226 226 226 231 231 231 238 238 238 250 250 250 +-250 250 250 250 250 250 246 246 246 231 231 231 +-214 214 214 206 206 206 202 202 202 202 202 202 +-198 198 198 202 202 202 182 182 182 18 18 18 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 62 62 62 66 66 66 30 30 30 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 14 14 14 42 42 42 82 82 82 18 18 18 +- 2 2 6 2 2 6 2 2 6 10 10 10 +- 94 94 94 182 182 182 218 218 218 242 242 242 +-250 250 250 253 253 253 253 253 253 250 250 250 +-234 234 234 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 +-238 238 238 226 226 226 210 210 210 202 202 202 +-195 195 195 195 195 195 210 210 210 158 158 158 +- 6 6 6 14 14 14 50 50 50 14 14 14 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 86 86 86 46 46 46 +- 18 18 18 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 22 22 22 54 54 54 70 70 70 2 2 6 +- 2 2 6 10 10 10 2 2 6 22 22 22 +-166 166 166 231 231 231 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-242 242 242 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 +-231 231 231 206 206 206 198 198 198 226 226 226 +- 94 94 94 2 2 6 6 6 6 38 38 38 +- 30 30 30 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 62 62 62 66 66 66 +- 26 26 26 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 74 74 74 50 50 50 2 2 6 +- 26 26 26 26 26 26 2 2 6 106 106 106 +-238 238 238 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 246 246 246 218 218 218 202 202 202 +-210 210 210 14 14 14 2 2 6 2 2 6 +- 30 30 30 22 22 22 2 2 6 2 2 6 +- 2 2 6 2 2 6 18 18 18 86 86 86 +- 42 42 42 14 14 14 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 90 90 90 22 22 22 2 2 6 +- 42 42 42 2 2 6 18 18 18 218 218 218 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 250 250 250 221 221 221 +-218 218 218 101 101 101 2 2 6 14 14 14 +- 18 18 18 38 38 38 10 10 10 2 2 6 +- 2 2 6 2 2 6 2 2 6 78 78 78 +- 58 58 58 22 22 22 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 54 54 54 82 82 82 2 2 6 26 26 26 +- 22 22 22 2 2 6 123 123 123 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-238 238 238 198 198 198 6 6 6 38 38 38 +- 58 58 58 26 26 26 38 38 38 2 2 6 +- 2 2 6 2 2 6 2 2 6 46 46 46 +- 78 78 78 30 30 30 10 10 10 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 30 30 30 +- 74 74 74 58 58 58 2 2 6 42 42 42 +- 2 2 6 22 22 22 231 231 231 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 246 246 246 46 46 46 38 38 38 +- 42 42 42 14 14 14 38 38 38 14 14 14 +- 2 2 6 2 2 6 2 2 6 6 6 6 +- 86 86 86 46 46 46 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 14 14 14 42 42 42 +- 90 90 90 18 18 18 18 18 18 26 26 26 +- 2 2 6 116 116 116 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 250 250 250 238 238 238 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 94 94 94 6 6 6 +- 2 2 6 2 2 6 10 10 10 34 34 34 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 74 74 74 58 58 58 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 10 10 10 26 26 26 66 66 66 +- 82 82 82 2 2 6 38 38 38 6 6 6 +- 14 14 14 210 210 210 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 246 246 246 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 144 144 144 2 2 6 +- 2 2 6 2 2 6 2 2 6 46 46 46 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 42 42 42 74 74 74 30 30 30 10 10 10 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 42 42 42 90 90 90 +- 26 26 26 6 6 6 42 42 42 2 2 6 +- 74 74 74 250 250 250 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 242 242 242 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 182 182 182 2 2 6 +- 2 2 6 2 2 6 2 2 6 46 46 46 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 10 10 10 86 86 86 38 38 38 10 10 10 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 10 10 10 26 26 26 66 66 66 82 82 82 +- 2 2 6 22 22 22 18 18 18 2 2 6 +-149 149 149 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 206 206 206 2 2 6 +- 2 2 6 2 2 6 2 2 6 38 38 38 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 86 86 86 46 46 46 14 14 14 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 18 18 18 46 46 46 86 86 86 18 18 18 +- 2 2 6 34 34 34 10 10 10 6 6 6 +-210 210 210 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 221 221 221 6 6 6 +- 2 2 6 2 2 6 6 6 6 30 30 30 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 82 82 82 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 26 26 26 66 66 66 62 62 62 2 2 6 +- 2 2 6 38 38 38 10 10 10 26 26 26 +-238 238 238 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 238 238 238 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 6 6 6 +- 2 2 6 2 2 6 10 10 10 30 30 30 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 58 58 58 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 78 78 78 6 6 6 2 2 6 +- 2 2 6 46 46 46 14 14 14 42 42 42 +-246 246 246 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 10 10 10 +- 2 2 6 2 2 6 22 22 22 14 14 14 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 62 62 62 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 74 74 74 2 2 6 2 2 6 +- 14 14 14 70 70 70 34 34 34 62 62 62 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 14 14 14 +- 2 2 6 2 2 6 30 30 30 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 62 62 62 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 54 54 54 62 62 62 2 2 6 2 2 6 +- 2 2 6 30 30 30 46 46 46 70 70 70 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 226 226 226 10 10 10 +- 2 2 6 6 6 6 30 30 30 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 58 58 58 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 22 22 22 +- 58 58 58 62 62 62 2 2 6 2 2 6 +- 2 2 6 2 2 6 30 30 30 78 78 78 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 206 206 206 2 2 6 +- 22 22 22 34 34 34 18 14 6 22 22 22 +- 26 26 26 18 18 18 6 6 6 2 2 6 +- 2 2 6 82 82 82 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 26 26 26 +- 62 62 62 106 106 106 74 54 14 185 133 11 +-210 162 10 121 92 8 6 6 6 62 62 62 +-238 238 238 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 158 158 158 18 18 18 +- 14 14 14 2 2 6 2 2 6 2 2 6 +- 6 6 6 18 18 18 66 66 66 38 38 38 +- 6 6 6 94 94 94 50 50 50 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 10 10 10 10 10 10 18 18 18 38 38 38 +- 78 78 78 142 134 106 216 158 10 242 186 14 +-246 190 14 246 190 14 156 118 10 10 10 10 +- 90 90 90 238 238 238 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 250 250 250 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 230 190 +-238 204 91 238 204 91 181 142 44 37 26 9 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 38 38 38 46 46 46 +- 26 26 26 106 106 106 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 14 14 14 22 22 22 +- 30 30 30 38 38 38 50 50 50 70 70 70 +-106 106 106 190 142 34 226 170 11 242 186 14 +-246 190 14 246 190 14 246 190 14 154 114 10 +- 6 6 6 74 74 74 226 226 226 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 250 250 250 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 228 184 62 +-241 196 14 241 208 19 232 195 16 38 30 10 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 30 30 30 26 26 26 +-203 166 17 154 142 90 66 66 66 26 26 26 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 38 38 38 58 58 58 +- 78 78 78 86 86 86 101 101 101 123 123 123 +-175 146 61 210 150 10 234 174 13 246 186 14 +-246 190 14 246 190 14 246 190 14 238 190 10 +-102 78 10 2 2 6 46 46 46 198 198 198 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 224 178 62 +-242 186 14 241 196 14 210 166 10 22 18 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 6 6 6 121 92 8 +-238 202 15 232 195 16 82 82 82 34 34 34 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 14 14 14 38 38 38 70 70 70 154 122 46 +-190 142 34 200 144 11 197 138 11 197 138 11 +-213 154 11 226 170 11 242 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-225 175 15 46 32 6 2 2 6 22 22 22 +-158 158 158 250 250 250 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 250 250 250 242 242 242 224 178 62 +-239 182 13 236 186 11 213 154 11 46 32 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 61 42 6 225 175 15 +-238 190 10 236 186 11 112 100 78 42 42 42 +- 14 14 14 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 22 22 22 54 54 54 154 122 46 213 154 11 +-226 170 11 230 174 11 226 170 11 226 170 11 +-236 178 12 242 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-241 196 14 184 144 12 10 10 10 2 2 6 +- 6 6 6 116 116 116 242 242 242 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 231 231 231 198 198 198 214 170 54 +-236 178 12 236 178 12 210 150 10 137 92 6 +- 18 14 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 70 47 6 200 144 11 236 178 12 +-239 182 13 239 182 13 124 112 88 58 58 58 +- 22 22 22 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 70 70 70 180 133 36 226 170 11 +-239 182 13 242 186 14 242 186 14 246 186 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 232 195 16 98 70 6 2 2 6 +- 2 2 6 2 2 6 66 66 66 221 221 221 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 206 206 206 198 198 198 214 166 58 +-230 174 11 230 174 11 216 158 10 192 133 9 +-163 110 8 116 81 8 102 78 10 116 81 8 +-167 114 7 197 138 11 226 170 11 239 182 13 +-242 186 14 242 186 14 162 146 94 78 78 78 +- 34 34 34 14 14 14 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 30 30 30 78 78 78 190 142 34 226 170 11 +-239 182 13 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 241 196 14 203 166 17 22 18 6 +- 2 2 6 2 2 6 2 2 6 38 38 38 +-218 218 218 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 206 206 206 198 198 198 202 162 69 +-226 170 11 236 178 12 224 166 10 210 150 10 +-200 144 11 197 138 11 192 133 9 197 138 11 +-210 150 10 226 170 11 242 186 14 246 190 14 +-246 190 14 246 186 14 225 175 15 124 112 88 +- 62 62 62 30 30 30 14 14 14 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 174 135 50 224 166 10 +-239 182 13 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 241 196 14 139 102 15 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 78 78 78 250 250 250 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 214 214 214 198 198 198 190 150 46 +-219 162 10 236 178 12 234 174 13 224 166 10 +-216 158 10 213 154 11 213 154 11 216 158 10 +-226 170 11 239 182 13 246 190 14 246 190 14 +-246 190 14 246 190 14 242 186 14 206 162 42 +-101 101 101 58 58 58 30 30 30 14 14 14 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 74 74 74 174 135 50 216 158 10 +-236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 241 196 14 226 184 13 +- 61 42 6 2 2 6 2 2 6 2 2 6 +- 22 22 22 238 238 238 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 226 226 226 187 187 187 180 133 36 +-216 158 10 236 178 12 239 182 13 236 178 12 +-230 174 11 226 170 11 226 170 11 230 174 11 +-236 178 12 242 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 186 14 239 182 13 +-206 162 42 106 106 106 66 66 66 34 34 34 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 26 26 26 70 70 70 163 133 67 213 154 11 +-236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 241 196 14 +-190 146 13 18 14 6 2 2 6 2 2 6 +- 46 46 46 246 246 246 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 221 221 221 86 86 86 156 107 11 +-216 158 10 236 178 12 242 186 14 246 186 14 +-242 186 14 239 182 13 239 182 13 242 186 14 +-242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-242 186 14 225 175 15 142 122 72 66 66 66 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 26 26 26 70 70 70 163 133 67 210 150 10 +-236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-232 195 16 121 92 8 34 34 34 106 106 106 +-221 221 221 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-242 242 242 82 82 82 18 14 6 163 110 8 +-216 158 10 236 178 12 242 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 242 186 14 163 133 67 +- 46 46 46 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 163 133 67 210 150 10 +-236 178 12 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-241 196 14 215 174 15 190 178 144 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 218 218 218 +- 58 58 58 2 2 6 22 18 6 167 114 7 +-216 158 10 236 178 12 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 186 14 242 186 14 190 150 46 +- 54 54 54 22 22 22 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 38 38 38 86 86 86 180 133 36 213 154 11 +-236 178 12 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 232 195 16 190 146 13 214 214 214 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 250 250 250 170 170 170 26 26 26 +- 2 2 6 2 2 6 37 26 9 163 110 8 +-219 162 10 239 182 13 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 186 14 236 178 12 224 166 10 142 122 72 +- 46 46 46 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 109 106 95 192 133 9 224 166 10 +-242 186 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-242 186 14 226 184 13 210 162 10 142 110 46 +-226 226 226 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-198 198 198 66 66 66 2 2 6 2 2 6 +- 2 2 6 2 2 6 50 34 6 156 107 11 +-219 162 10 239 182 13 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 242 186 14 +-234 174 13 213 154 11 154 122 46 66 66 66 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 22 22 22 +- 58 58 58 154 121 60 206 145 10 234 174 13 +-242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 186 14 236 178 12 210 162 10 163 110 8 +- 61 42 6 138 138 138 218 218 218 250 250 250 +-253 253 253 253 253 253 253 253 253 250 250 250 +-242 242 242 210 210 210 144 144 144 66 66 66 +- 6 6 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 61 42 6 163 110 8 +-216 158 10 236 178 12 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 239 182 13 230 174 11 216 158 10 +-190 142 34 124 112 88 70 70 70 38 38 38 +- 18 18 18 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 22 22 22 +- 62 62 62 168 124 44 206 145 10 224 166 10 +-236 178 12 239 182 13 242 186 14 242 186 14 +-246 186 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 236 178 12 216 158 10 175 118 6 +- 80 54 7 2 2 6 6 6 6 30 30 30 +- 54 54 54 62 62 62 50 50 50 38 38 38 +- 14 14 14 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 80 54 7 167 114 7 +-213 154 11 236 178 12 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 242 186 14 239 182 13 239 182 13 +-230 174 11 210 150 10 174 135 50 124 112 88 +- 82 82 82 54 54 54 34 34 34 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 158 118 36 192 133 9 200 144 11 +-216 158 10 219 162 10 224 166 10 226 170 11 +-230 174 11 236 178 12 239 182 13 239 182 13 +-242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 186 14 230 174 11 210 150 10 163 110 8 +-104 69 6 10 10 10 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 91 60 6 167 114 7 +-206 145 10 230 174 11 242 186 14 246 190 14 +-246 190 14 246 190 14 246 186 14 242 186 14 +-239 182 13 230 174 11 224 166 10 213 154 11 +-180 133 36 124 112 88 86 86 86 58 58 58 +- 38 38 38 22 22 22 10 10 10 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 34 34 34 70 70 70 138 110 50 158 118 36 +-167 114 7 180 123 7 192 133 9 197 138 11 +-200 144 11 206 145 10 213 154 11 219 162 10 +-224 166 10 230 174 11 239 182 13 242 186 14 +-246 186 14 246 186 14 246 186 14 246 186 14 +-239 182 13 216 158 10 185 133 11 152 99 6 +-104 69 6 18 14 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 80 54 7 152 99 6 +-192 133 9 219 162 10 236 178 12 239 182 13 +-246 186 14 242 186 14 239 182 13 236 178 12 +-224 166 10 206 145 10 192 133 9 154 121 60 +- 94 94 94 62 62 62 42 42 42 22 22 22 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 18 18 18 34 34 34 58 58 58 78 78 78 +-101 98 89 124 112 88 142 110 46 156 107 11 +-163 110 8 167 114 7 175 118 6 180 123 7 +-185 133 11 197 138 11 210 150 10 219 162 10 +-226 170 11 236 178 12 236 178 12 234 174 13 +-219 162 10 197 138 11 163 110 8 130 83 6 +- 91 60 6 10 10 10 2 2 6 2 2 6 +- 18 18 18 38 38 38 38 38 38 38 38 38 +- 38 38 38 38 38 38 38 38 38 38 38 38 +- 38 38 38 38 38 38 26 26 26 2 2 6 +- 2 2 6 6 6 6 70 47 6 137 92 6 +-175 118 6 200 144 11 219 162 10 230 174 11 +-234 174 13 230 174 11 219 162 10 210 150 10 +-192 133 9 163 110 8 124 112 88 82 82 82 +- 50 50 50 30 30 30 14 14 14 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 22 22 22 34 34 34 +- 42 42 42 58 58 58 74 74 74 86 86 86 +-101 98 89 122 102 70 130 98 46 121 87 25 +-137 92 6 152 99 6 163 110 8 180 123 7 +-185 133 11 197 138 11 206 145 10 200 144 11 +-180 123 7 156 107 11 130 83 6 104 69 6 +- 50 34 6 54 54 54 110 110 110 101 98 89 +- 86 86 86 82 82 82 78 78 78 78 78 78 +- 78 78 78 78 78 78 78 78 78 78 78 78 +- 78 78 78 82 82 82 86 86 86 94 94 94 +-106 106 106 101 101 101 86 66 34 124 80 6 +-156 107 11 180 123 7 192 133 9 200 144 11 +-206 145 10 200 144 11 192 133 9 175 118 6 +-139 102 15 109 106 95 70 70 70 42 42 42 +- 22 22 22 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 10 10 10 +- 14 14 14 22 22 22 30 30 30 38 38 38 +- 50 50 50 62 62 62 74 74 74 90 90 90 +-101 98 89 112 100 78 121 87 25 124 80 6 +-137 92 6 152 99 6 152 99 6 152 99 6 +-138 86 6 124 80 6 98 70 6 86 66 30 +-101 98 89 82 82 82 58 58 58 46 46 46 +- 38 38 38 34 34 34 34 34 34 34 34 34 +- 34 34 34 34 34 34 34 34 34 34 34 34 +- 34 34 34 34 34 34 38 38 38 42 42 42 +- 54 54 54 82 82 82 94 86 76 91 60 6 +-134 86 6 156 107 11 167 114 7 175 118 6 +-175 118 6 167 114 7 152 99 6 121 87 25 +-101 98 89 62 62 62 34 34 34 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 6 6 6 10 10 10 +- 18 18 18 22 22 22 30 30 30 42 42 42 +- 50 50 50 66 66 66 86 86 86 101 98 89 +-106 86 58 98 70 6 104 69 6 104 69 6 +-104 69 6 91 60 6 82 62 34 90 90 90 +- 62 62 62 38 38 38 22 22 22 14 14 14 +- 10 10 10 10 10 10 10 10 10 10 10 10 +- 10 10 10 10 10 10 6 6 6 10 10 10 +- 10 10 10 10 10 10 10 10 10 14 14 14 +- 22 22 22 42 42 42 70 70 70 89 81 66 +- 80 54 7 104 69 6 124 80 6 137 92 6 +-134 86 6 116 81 8 100 82 52 86 86 86 +- 58 58 58 30 30 30 14 14 14 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 10 10 10 14 14 14 +- 18 18 18 26 26 26 38 38 38 54 54 54 +- 70 70 70 86 86 86 94 86 76 89 81 66 +- 89 81 66 86 86 86 74 74 74 50 50 50 +- 30 30 30 14 14 14 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 34 34 34 58 58 58 +- 82 82 82 89 81 66 89 81 66 89 81 66 +- 94 86 66 94 86 76 74 74 74 50 50 50 +- 26 26 26 14 14 14 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 6 6 6 14 14 14 18 18 18 +- 30 30 30 38 38 38 46 46 46 54 54 54 +- 50 50 50 42 42 42 30 30 30 18 18 18 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 14 14 14 26 26 26 +- 38 38 38 50 50 50 58 58 58 58 58 58 +- 54 54 54 42 42 42 30 30 30 18 18 18 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 6 6 6 10 10 10 14 14 14 18 18 18 +- 18 18 18 14 14 14 10 10 10 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 14 14 14 18 18 18 22 22 22 22 22 22 +- 18 18 18 14 14 14 10 10 10 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 ++103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 ++82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 ++82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 ++0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 ++15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 ++10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 ++0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 ++62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 ++180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 ++43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 ++158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 ++250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 ++0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 ++215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 ++164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 ++49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 ++40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 ++141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 ++78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 ++188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 ++232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 ++23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 ++52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 ++226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 ++152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 ++0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 ++170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 ++34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 ++0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 ++226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 ++0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 ++170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 ++250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 ++126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 ++8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 ++183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 ++3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 ++170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 ++250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 ++38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 ++49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 ++188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 ++34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 ++170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 ++0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 ++52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 ++198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 ++21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 ++170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 ++0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 ++25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 ++169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 ++0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 ++170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 ++0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 ++0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 ++183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 ++0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 ++170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 ++38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 ++0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 ++185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 ++134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 ++170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 ++134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 ++39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 ++148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 ++250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 ++170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 ++183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 ++226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 ++248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 ++170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 ++56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 ++218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 ++170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 ++254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 ++250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 ++170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 ++41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 ++229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 ++250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 ++34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 ++141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 ++250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 ++129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 ++78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 ++250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 ++170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 ++10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 ++250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 ++115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 ++140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 ++0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 ++250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 ++49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 ++102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 ++250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 ++0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 ++138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 ++126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 ++242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 ++159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 ++109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 ++0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 ++25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 ++0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 ++254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 ++72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 ++0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 ++41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 ++10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 ++87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 ++254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 ++0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 ++126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 ++92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 ++215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 ++254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 ++7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 ++143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 ++254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 ++141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 ++138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 ++170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 ++254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 ++0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 ++170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 ++254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 ++31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 ++170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 ++170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 ++254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 ++170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 ++254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 ++170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 ++254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 ++170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 ++154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 ++254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 ++170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 ++105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 ++254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 ++254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 ++170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 ++63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 ++254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 ++254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 ++170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 ++18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 ++254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 ++254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 ++170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 ++0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 ++254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 ++254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 ++149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 ++0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 ++210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 ++143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 ++129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 ++0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 ++69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 ++0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 ++129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 ++0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 ++0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 ++134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 ++0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 ++44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 ++138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 ++0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 ++143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 ++0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 ++143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 ++0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 ++149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 ++0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 ++170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 ++0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 ++170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 ++15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 ++170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 ++41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 ++170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 ++68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 ++170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 ++91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 ++28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 ++146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 ++154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 ++0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 ++170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 ++170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 ++180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 ++170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 ++250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 ++170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 ++44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 ++98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 ++248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 ++250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 ++234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 ++0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 ++248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 ++0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 ++254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 ++219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 ++164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 ++187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 ++44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 ++82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 ++248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 ++250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 ++248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 ++238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 ++250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 ++248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 ++31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 ++0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 ++134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 ++248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 ++75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 ++248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 ++15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 ++248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 ++ +diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm +--- linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm 2011-06-02 21:34:20.000000000 -0300 ++++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm 2011-06-22 13:42:06.000000000 -0300 +@@ -1,203 +1,159 @@ +-P1 +-# Standard black and white Linux logo +-80 80 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 +-1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 +-1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1 +-1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1 +-1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 +-1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1 +-1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 +-1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1 +-1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 +-1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1 +-1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 +-0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 +-1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 +-0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1 +-1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 +-0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 +-1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 +-1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 +-0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 +-1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 +-0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 +-1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 +-0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1 +-1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0 +-0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0 +-0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 +-1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 +-1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 +-1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 +-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 +-1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 +-1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 ++P2 ++80 78 ++255 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 ++255 0 0 0 0 0 0 0 0 0 ++0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 ++255 255 0 0 0 0 0 0 0 0 ++0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 ++255 255 0 0 0 0 0 0 0 0 ++0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 ++255 255 255 0 0 0 0 0 0 0 ++0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 ++255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 ++255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 ++255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 ++255 255 255 255 255 255 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 ++255 255 255 255 255 255 255 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 ++255 255 255 255 255 255 255 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 ++0 255 255 255 255 255 255 255 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 ++0 255 255 255 255 255 255 255 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 ++0 0 255 255 255 255 255 255 0 0 ++0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 ++255 0 0 255 255 255 255 255 0 0 ++0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 ++255 0 0 255 255 255 255 0 0 0 ++0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 ++255 255 0 0 255 255 255 0 0 0 ++0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 ++255 255 255 0 0 255 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 ++255 255 255 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 ++255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 ++255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 ++255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 ++255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 ++255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 ++255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 ++255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 ++255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 ++255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 ++0 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 ++0 0 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ++0 0 0 0 0 0 0 0 0 0 +diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm +--- linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm 2011-06-02 21:34:20.000000000 -0300 ++++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm 2011-06-22 13:42:06.000000000 -0300 +@@ -1,1604 +1,18724 @@ + P3 +-# Standard 16-color Linux logo +-80 80 ++# CREATOR: GIMP PNM Filter Version 1.1 ++80 78 + 255 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 85 85 85 85 85 85 85 85 85 +- 85 85 85 85 85 85 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 85 85 85 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 85 85 85 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 170 170 170 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +-170 170 170 170 170 170 85 85 85 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 170 170 170 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 170 170 170 170 170 +-170 170 170 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 85 85 85 170 170 170 170 170 170 170 170 170 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 170 170 170 255 255 255 255 255 255 +-255 255 255 170 170 170 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +-170 170 170 170 170 170 255 255 255 255 255 255 +- 0 0 0 0 0 0 0 0 0 0 0 0 +-170 170 170 255 255 255 170 170 170 170 170 170 +-255 255 255 170 170 170 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +-170 170 170 0 0 0 0 0 0 255 255 255 +- 85 85 85 0 0 0 0 0 0 0 0 0 +-255 255 255 170 170 170 0 0 0 85 85 85 +-170 170 170 255 255 255 170 170 170 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +- 85 85 85 0 0 0 0 0 0 170 170 170 +- 85 85 85 0 0 0 0 0 0 0 0 0 +-255 255 255 85 85 85 0 0 0 0 0 0 +- 85 85 85 255 255 255 170 170 170 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +-170 170 170 0 0 0 0 0 0 170 170 170 +- 85 85 85 85 85 85 85 85 85 85 85 85 +-255 255 255 85 85 85 0 0 0 0 0 0 +- 85 85 85 255 255 255 170 170 170 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +-255 255 255 0 0 0 0 0 0 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 0 0 0 0 0 0 +- 85 85 85 255 255 255 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +-170 170 170 170 170 170 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 170 170 170 170 170 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 85 85 85 0 0 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 85 85 85 0 0 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 170 85 0 +-170 85 0 170 85 0 85 85 85 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 85 85 85 0 0 0 +- 85 85 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 85 85 85 0 0 0 +- 0 0 0 85 85 85 170 170 170 85 85 85 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 85 85 85 0 0 0 +- 85 85 85 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 170 170 170 170 170 170 170 170 0 0 0 +- 0 0 0 0 0 0 170 170 170 170 170 170 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 85 85 85 170 170 170 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 170 170 170 170 170 +-170 170 170 170 170 170 170 170 170 85 85 85 +- 0 0 0 0 0 0 85 85 85 85 85 85 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 85 85 85 170 170 170 170 170 170 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 170 170 170 170 170 170 170 170 170 170 170 +-255 255 255 255 255 255 255 255 255 170 170 170 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 85 85 85 +-255 255 255 255 255 255 170 170 170 170 170 170 +-170 170 170 170 170 170 170 170 170 170 170 170 +-170 170 170 170 170 170 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 170 170 170 +-255 255 255 255 255 255 170 170 170 170 170 170 +-170 170 170 170 170 170 170 170 170 170 170 170 +-170 170 170 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-170 170 170 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 85 85 85 255 255 255 +-255 255 255 255 255 255 255 255 255 170 170 170 +-170 170 170 170 170 170 170 170 170 170 170 170 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 85 85 85 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 85 85 85 170 170 170 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 170 170 170 170 170 170 170 170 170 +-255 255 255 255 255 255 255 255 255 170 170 170 +-170 170 170 170 170 170 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-170 170 170 170 170 170 170 170 170 170 170 170 +-170 170 170 170 170 170 170 170 170 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +-170 170 170 170 170 170 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-170 170 170 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 170 170 170 +-170 170 170 170 170 170 170 170 170 85 85 85 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +-170 170 170 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 170 170 170 170 170 170 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 85 85 85 0 0 0 0 0 0 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 170 170 170 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 170 170 170 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-170 170 170 85 85 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +- 0 0 0 0 0 0 85 85 85 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 0 0 0 85 85 85 +- 85 85 85 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +- 0 0 0 85 85 85 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 0 0 0 85 85 85 +- 85 85 85 0 0 0 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 85 85 85 +- 0 0 0 170 170 170 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 85 85 85 0 0 0 +- 0 0 0 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 85 85 85 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 85 85 85 0 0 0 0 0 0 +-170 170 170 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 0 0 0 +- 85 85 85 85 85 85 85 85 85 85 85 85 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 0 0 0 170 85 0 +-255 255 85 170 85 0 0 0 0 0 0 0 +- 85 85 85 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 85 85 85 85 85 85 0 0 0 +- 0 0 0 85 85 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 0 0 0 +- 0 0 0 85 85 85 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 85 170 85 0 255 255 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 85 85 85 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +- 0 0 0 0 0 0 85 85 85 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 85 +-170 85 0 255 255 85 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 0 0 0 0 0 0 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 170 85 0 +-255 255 85 170 85 0 255 255 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 170 85 0 +-255 255 85 170 85 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 0 0 0 0 0 0 0 0 0 +- 85 85 85 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 85 +-170 85 0 255 255 85 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 255 255 85 +-170 85 0 255 255 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 0 0 0 0 0 0 +- 0 0 0 85 85 85 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 255 255 85 170 85 0 +-255 255 85 170 85 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 0 0 0 +- 0 0 0 0 0 0 85 85 85 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 170 170 170 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 170 170 170 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 170 170 170 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 170 170 170 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 0 0 0 0 0 0 0 0 0 +- 85 85 85 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 170 170 170 85 85 85 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 85 85 85 85 85 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-170 170 170 85 85 85 85 85 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 170 170 170 +- 85 85 85 0 0 0 0 0 0 170 85 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 85 85 85 +- 0 0 0 0 0 0 0 0 0 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-170 170 170 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-170 170 170 85 85 85 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 170 85 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 170 85 0 +-170 85 0 170 170 170 255 255 255 255 255 255 +-255 255 255 255 255 255 255 255 255 255 255 255 +-255 255 255 255 255 255 170 170 170 85 85 85 +- 85 85 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 170 85 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 170 85 0 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 170 85 0 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 85 85 85 170 85 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 170 85 0 170 85 0 170 85 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 170 85 0 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 85 85 85 85 85 85 85 85 85 85 85 85 +- 85 85 85 85 85 85 85 85 85 85 85 85 +- 85 85 85 85 85 85 85 85 85 0 0 0 +- 0 0 0 0 0 0 0 0 0 170 85 0 +-170 85 0 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 255 255 85 170 85 0 +-170 85 0 170 85 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 255 255 85 170 85 0 +-255 255 85 170 85 0 170 85 0 170 85 0 +- 85 85 85 85 85 85 85 85 85 85 85 85 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 85 85 85 +- 85 85 85 85 85 85 85 85 85 170 85 0 +-170 85 0 170 85 0 170 85 0 255 255 85 +-170 85 0 255 255 85 170 85 0 170 85 0 +-170 85 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +-170 85 0 170 85 0 170 85 0 170 85 0 +-170 85 0 170 85 0 170 85 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++170 ++170 ++170 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++170 ++170 ++170 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++170 ++170 ++170 ++85 ++85 ++85 ++170 ++170 ++170 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++255 ++255 ++255 ++170 ++170 ++170 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++170 ++170 ++170 ++170 ++170 ++170 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++85 ++85 ++255 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++170 ++170 ++170 ++0 ++0 ++0 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++255 ++255 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++170 ++170 ++170 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++255 ++170 ++170 ++170 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++85 ++85 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++85 ++85 ++85 ++255 ++255 ++85 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 ++0 diff --git a/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch b/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch new file mode 100644 index 000000000..63435d84f --- /dev/null +++ b/kernels/linux-libre-lts-xen/change-default-console-loglevel.patch @@ -0,0 +1,12 @@ +diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c +--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 ++++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 +@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea + + /* We show everything that is MORE important than this.. */ + #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ +-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ + + DECLARE_WAIT_QUEUE_HEAD(log_wait); + diff --git a/kernels/linux-libre-lts-xen/config.i686 b/kernels/linux-libre-lts-xen/config.i686 new file mode 100644 index 000000000..a0406c4e7 --- /dev/null +++ b/kernels/linux-libre-lts-xen/config.i686 @@ -0,0 +1,5801 @@ +# +# Automatically generated make config: don't edit +# Linux/i386 3.0.28 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" +CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-LIBRE-LTS-XEN" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_FHANDLE is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_PERF_COUNTERS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_JUMP_LABEL=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +# CONFIG_INLINE_SPIN_UNLOCK is not set +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_X86_32_IRIS=m +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=128 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +# CONFIG_XEN_DEBUG is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_LGUEST_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MELAN is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_CMPXCHG=y +CONFIG_CMPXCHG_LOCAL=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +# CONFIG_X86_PPRO_FENCE is not set +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_IOMMU_API=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_CLEANCACHE=y +# CONFIG_HIGHPTE is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_EFI=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_TRACE_RTC is not set +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=m +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=m +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y +CONFIG_X86_APM_BOOT=y +CONFIG_APM=y +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +CONFIG_APM_DO_ENABLE=y +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_ALLOW_INTS is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_GX_SUSPMOD=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_FLOPPY_WA=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=m +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_IOV=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_COMPAQ=m +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y +CONFIG_RAPIDIO_DEBUG=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_DROP_MONITOR=y +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_REGULATOR=m +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +CONFIG_SYS_HYPERVISOR=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_TESTS=m +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +# CONFIG_MTD_SBC_GXX is not set +# CONFIG_MTD_AMD76XROM is not set +# CONFIG_MTD_ICHXROM is not set +# CONFIG_MTD_ESB2ROM is not set +# CONFIG_MTD_CK804XROM is not set +CONFIG_MTD_SCB2_FLASH=m +# CONFIG_MTD_NETtel is not set +# CONFIG_MTD_L440GX is not set +CONFIG_MTD_PCI=m +# CONFIG_MTD_PCMCIA is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_LATCH_ADDR is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +# CONFIG_PNPBIOS is not set +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_MISC_DEVICES=y +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +CONFIG_AD525X_DPOT_SPI=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_TI_DAC7512=m +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=m +# CONFIG_PCH_PHUB is not set +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_HAVE_IDE=y +CONFIG_IDE=m + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +CONFIG_IDE_XFER_MODE=y +CONFIG_IDE_TIMINGS=y +CONFIG_IDE_ATAPI=y +CONFIG_IDE_LEGACY=y +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=m +CONFIG_IDE_GD_ATA=y +CONFIG_IDE_GD_ATAPI=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEACPI=y +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +CONFIG_BLK_DEV_PLATFORM=m +CONFIG_BLK_DEV_CMD640=m +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +CONFIG_BLK_DEV_IDEPNP=m +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_OPTI621=m +CONFIG_BLK_DEV_RZ1000=m +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_AEC62XX=m +CONFIG_BLK_DEV_ALI15X3=m +CONFIG_BLK_DEV_AMD74XX=m +CONFIG_BLK_DEV_ATIIXP=m +CONFIG_BLK_DEV_CMD64X=m +CONFIG_BLK_DEV_TRIFLEX=m +CONFIG_BLK_DEV_CS5520=m +CONFIG_BLK_DEV_CS5530=m +CONFIG_BLK_DEV_CS5535=m +CONFIG_BLK_DEV_CS5536=m +CONFIG_BLK_DEV_HPT366=m +CONFIG_BLK_DEV_JMICRON=m +CONFIG_BLK_DEV_SC1200=m +CONFIG_BLK_DEV_PIIX=m +CONFIG_BLK_DEV_IT8172=m +CONFIG_BLK_DEV_IT8213=m +CONFIG_BLK_DEV_IT821X=m +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=m +CONFIG_BLK_DEV_PDC202XX_NEW=m +CONFIG_BLK_DEV_SVWKS=m +CONFIG_BLK_DEV_SIIMAGE=m +CONFIG_BLK_DEV_SIS5513=m +CONFIG_BLK_DEV_SLC90E66=m +CONFIG_BLK_DEV_TRM290=m +CONFIG_BLK_DEV_VIA82CXXX=m +CONFIG_BLK_DEV_TC86C001=m + +# +# Other IDE chipsets support +# + +# +# Note: most of these also require special kernel boot parameters +# +CONFIG_BLK_DEV_4DRIVES=m +CONFIG_BLK_DEV_ALI14XX=m +CONFIG_BLK_DEV_DTC2278=m +CONFIG_BLK_DEV_HT6560B=m +CONFIG_BLK_DEV_QD65XX=m +CONFIG_BLK_DEV_UMC8672=m +CONFIG_BLK_DEV_IDEDMA=y + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_FC_TGT_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_AIC7XXX_OLD is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ARCMSR_AER=y +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_WINBOND_VLB=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set +CONFIG_TCM_FC=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_OHCI_DEBUG=y +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_IFB=m +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +# CONFIG_ARCNET is not set +CONFIG_MII=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL2=m +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_LANCE=m +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=m +CONFIG_ULTRA=m +CONFIG_SMC9194=m +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_ETHOC=m +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NI52=m +CONFIG_NI65=m +CONFIG_DNET=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_AT1700=m +CONFIG_DEPCA=m +CONFIG_HP100=m +CONFIG_NET_ISA=y +CONFIG_E2100=m +CONFIG_EWRK3=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +CONFIG_LP486E=m +CONFIG_ETH16I=m +CONFIG_NE2000=m +CONFIG_ZNET=m +CONFIG_SEEQ8005=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_AC3200=m +CONFIG_KSZ884X_PCI=m +CONFIG_APRICOT=m +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +CONFIG_CS89x0=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_KS8842=m +CONFIG_KS8851=m +CONFIG_KS8851_MLL=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_ATL2=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_JME=m +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_DUAL_MAC=y +CONFIG_PCH_GBE=m +CONFIG_NETDEV_10000=y +CONFIG_MDIO=m +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_ENIC=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_BNA=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_BE2NET=m +# CONFIG_TR is not set +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLAGN=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +CONFIG_IWLWIFI_DEVICE_SVTOOL=y +CONFIG_IWL_P2P=y +CONFIG_IWLWIFI_LEGACY=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_LEGACY_DEBUG is not set +# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set +CONFIG_IWL4965=m +CONFIG_IWL3945=m +CONFIG_IWM=m +# CONFIG_IWM_DEBUG is not set +CONFIG_IWM_TRACING=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +CONFIG_P54_SPI_DEFAULT_EEPROM=y +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTL8192C_COMMON=m +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_HT=y +CONFIG_WL12XX_SPI=m +CONFIG_WL12XX_SDIO=m +CONFIG_WL12XX_SDIO_TEST=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +# CONFIG_WIMAX_IWMC3200_SDIO is not set +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +# CONFIG_WAN is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +CONFIG_SLHC=m +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_NET_FC is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_VIRTIO_NET=m +CONFIG_VMXNET3=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_0=y +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_AVM_A1=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_IX1MICROR2=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_ASUSCOM=y +CONFIG_HISAX_TELEINT=y +CONFIG_HISAX_HFCS=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_SPORTSTER=y +CONFIG_HISAX_MIC=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_ISURF=y +CONFIG_HISAX_HSTSAPHIR=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_DRV_ICN=m +CONFIG_ISDN_DRV_PCBIT=m +CONFIG_ISDN_DRV_SC=m +CONFIG_ISDN_DRV_ACT2000=m +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_INPORT=m +# CONFIG_MOUSE_ATIXL is not set +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_MOUSE_GPIO=m +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_AD7879_SPI=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_WM831X=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_PCAP=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AB8500_PONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_WM831X_ON=m +# CONFIG_INPUT_PCAP is not set +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_MAX3107=m +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_UARTLITE=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_TIMBERDALE=m +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_IFX6X60=m +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_RAMOOPS=m +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_GPIO=m +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m +CONFIG_I2C_EG20T=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_STUB is not set +CONFIG_SCx200_ACB=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ALTERA=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=y +CONFIG_SPI_TOPCLIFF_PCH=m +CONFIG_SPI_XILINX=m +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO drivers: +# +CONFIG_GPIO_BASIC_MMIO_CORE=m +CONFIG_GPIO_BASIC_MMIO=m +CONFIG_GPIO_IT8761E=m +CONFIG_GPIO_SCH=m +CONFIG_GPIO_VX855=m + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_WM831X=m +CONFIG_GPIO_ADP5588=m + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=m +CONFIG_GPIO_LANGWELL=y +CONFIG_GPIO_PCH=m +CONFIG_GPIO_ML_IOH=m +CONFIG_GPIO_TIMBERDALE=y +CONFIG_GPIO_RDC321X=m + +# +# SPI GPIO expanders: +# +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MCP23S08=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_74X164=m + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# +CONFIG_GPIO_JANZ_TTL=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_WM831X_BACKUP=m +CONFIG_WM831X_POWER=m +CONFIG_TEST_POWER=m +CONFIG_BATTERY_DS2760=m +CONFIG_BATTERY_DS2780=m +CONFIG_BATTERY_DS2782=m +CONFIG_BATTERY_BQ20Z75=m +CONFIG_BATTERY_BQ27x00=m +CONFIG_BATTERY_BQ27X00_I2C=y +CONFIG_BATTERY_BQ27X00_PLATFORM=y +CONFIG_BATTERY_MAX17040=m +CONFIG_BATTERY_MAX17042=m +CONFIG_CHARGER_PCF50633=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_MAX8903=m +CONFIG_CHARGER_GPIO=m +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_WM831X=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_MC13783_ADC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_WM831X_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_XEN_WDT=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_DEBUG is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +CONFIG_TPS6105X=m +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_WM831X=y +CONFIG_MFD_WM831X_SPI=y +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +CONFIG_ABX500_CORE=y +CONFIG_EZX_PCAP=y +CONFIG_AB8500_CORE=y +# CONFIG_AB8500_DEBUG is not set +CONFIG_AB8500_GPADC=y +CONFIG_MFD_CS5535=m +CONFIG_MFD_TIMBERDALE=m +CONFIG_LPC_SCH=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_JANZ_CMODIO=m +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_DUMMY=y +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_WM831X=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_TPS6105X=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_AB8500=y +CONFIG_REGULATOR_TPS6524X=m +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_RC_CORE=m +CONFIG_LIRC=m +CONFIG_RC_MAP=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders, decoders, sensors and other helper chips +# + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_AK881X=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_TCM825X=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_TIMBERDALE=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_SOC_CAMERA_OV2640=m +CONFIG_SOC_CAMERA_OV6650=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MIROPCM20=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +CONFIG_RADIO_TYPHOON=m +CONFIG_RADIO_ZOLTRIX=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_TIMBERDALE=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +CONFIG_DVB_PT1=m + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_STUB_POULSBO=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +CONFIG_FB_UDL=m +CONFIG_FB_VIRTUAL=m +CONFIG_XEN_FBDEV_FRONTEND=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_APPLE=m +CONFIG_BACKLIGHT_SAHARA=m +CONFIG_BACKLIGHT_WM831X=m +CONFIG_BACKLIGHT_ADP8860=m +CONFIG_BACKLIGHT_ADP8870=m +CONFIG_BACKLIGHT_PCF50633=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_OPL4_LIB_SEQ=m +CONFIG_SND_SBAWE_SEQ=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_WSS_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_ISA=y +CONFIG_SND_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT1605=m +CONFIG_SND_AZT2316=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4236=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_JAZZ16=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +CONFIG_SND_MSND_PINNACLE=m +CONFIG_SND_MSND_CLASSIC=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_CACHE_LZO=y +CONFIG_SND_SOC_I2C_AND_SPI=m +# CONFIG_SND_SOC_ALL_CODECS is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LOGITECH=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWII_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_QUANTA=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KONE=m +CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m +CONFIG_HID_ROCCAT_PYRA=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WACOM_POWER_SUPPLY=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FUSB300 is not set +# CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA_U2O is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_CI13XXX_PCI is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LANGWELL is not set +# CONFIG_USB_GADGET_EG20T is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=m +CONFIG_NOP_USB_XCEIV=m +CONFIG_AB8500_USB=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_CLKGATE=y + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_NET5501=m +CONFIG_LEDS_ALIX2=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_PLATFORM=y +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_WM831X_STATUS=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_NFC_DEVICES=y +CONFIG_PN544_NFC=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_MCE=y +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_DS3234=m +CONFIG_RTC_DRV_PCF2123=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM831X=m +CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB8500=m + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_PCAP is not set +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=m +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_XEN_PLATFORM_PCI=m +CONFIG_SWIOTLB_XEN=y +CONFIG_STAGING=y +# CONFIG_DIGIEPCA is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_COMPUTONE is not set +CONFIG_ET131X=m +# CONFIG_ET131X_DEBUG is not set +CONFIG_SLICOSS=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +CONFIG_VIDEO_GO7007_OV7640=m +CONFIG_VIDEO_GO7007_SAA7113=m +CONFIG_VIDEO_GO7007_SAA7115=m +CONFIG_VIDEO_GO7007_TW9903=m +CONFIG_VIDEO_GO7007_UDA1342=m +CONFIG_VIDEO_GO7007_SONY_TUNER=m +CONFIG_VIDEO_GO7007_TW2804=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_DVB_CXD2099=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +# CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_ISA_DRIVERS=m +CONFIG_COMEDI_ACL7225B=m +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL725=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_PCM3730=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_POC=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +# CONFIG_COMEDI_CB_PCIMDAS is not set +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_R8712_AP=y +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_POHMELFS=m +# CONFIG_POHMELFS_DEBUG is not set +CONFIG_POHMELFS_CRYPTO=y +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_DEBUG is not set +# CONFIG_LINE6_USB_DUMP_CTRL is not set +# CONFIG_LINE6_USB_DUMP_MIDI is not set +# CONFIG_LINE6_USB_DUMP_PCM is not set +# CONFIG_LINE6_USB_RAW is not set +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_DEBUG=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_USB_SERIAL_QUATECH_USB2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_MOUSE=m +# CONFIG_VME_BUS is not set +CONFIG_DX_SEP=m +# CONFIG_IIO is not set +CONFIG_CS5535_GPIO=m +CONFIG_XVMALLOC=y +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZCACHE=m +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m +CONFIG_EASYCAP=m +CONFIG_EASYCAP_SND=y +# CONFIG_EASYCAP_OSS is not set +# CONFIG_EASYCAP_DEBUG is not set +CONFIG_SOLO6X10=m +CONFIG_ACPI_QUICKSTART=m +CONFIG_MACH_NO_WESTBRIDGE=y +CONFIG_ATH6K_LEGACY=m +CONFIG_AR600x_SD31_XXX=y +# CONFIG_AR600x_WB31_XXX is not set +# CONFIG_AR600x_SD32_XXX is not set +# CONFIG_AR600x_CUSTOM_XXX is not set +CONFIG_ATH6KL_ENABLE_COEXISTENCE=y +CONFIG_AR600x_DUAL_ANTENNA=y +# CONFIG_AR600x_SINGLE_ANTENNA is not set +# CONFIG_AR600x_BT_QCOM is not set +# CONFIG_AR600x_BT_CSR is not set +CONFIG_AR600x_BT_AR3001=y +CONFIG_ATH6KL_HCI_BRIDGE=y +CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y +CONFIG_AR600x_BT_RESET_PIN=22 +CONFIG_ATH6KL_HTC_RAW_INTERFACE=y +CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y +CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m +CONFIG_FT1000_PCMCIA=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m +CONFIG_DRM_PSB=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_TC1100_WMI=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_ACPI_ASUS=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +CONFIG_IBM_RTL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_CLKSRC_I8253=y + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_SIGMA=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=m +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_NEW_IDMAPPER is not set +CONFIG_NFSD=m +# CONFIG_NFSD_DEPRECATED is not set +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_LKDTM=m +CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE_TEST is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=m +CONFIG_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_X86_PTDUMP is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_DEBUG_NX_TEST is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_INTEL_TXT is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_LGUEST=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y diff --git a/kernels/linux-libre-lts-xen/ext4-options.patch b/kernels/linux-libre-lts-xen/ext4-options.patch new file mode 100644 index 000000000..ea48c384b --- /dev/null +++ b/kernels/linux-libre-lts-xen/ext4-options.patch @@ -0,0 +1,50 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen <teg@jklm.no> +Cc: Thomas Baechler <thomas@archlinux.org> +Cc: Tobias Powalowski <tobias.powalowski@googlemail.com> +Cc: Dave Reisner <d@falconindy.com> +--- + fs/ext4/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 502c61f..30de9cd 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1333,6 +1333,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_dioread_nolock, Opt_dioread_lock, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, ++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum, + }; + + static const match_table_t tokens = { +@@ -1408,6 +1409,10 @@ static const match_table_t tokens = { + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, ++ {Opt_nocheck, "nocheck"}, ++ {Opt_reservation, "reservation"}, ++ {Opt_noreservation, "noreservation"}, ++ {Opt_journal_inum, "journal=%u"}, + {Opt_err, NULL}, + }; + +@@ -1904,6 +1909,16 @@ set_qf_format: + case Opt_noinit_itable: + clear_opt(sb, INIT_INODE_TABLE); + break; ++#ifdef CONFIG_EXT4_USE_FOR_EXT23 ++ case Opt_nocheck: ++ case Opt_reservation: ++ case Opt_noreservation: ++ case Opt_journal_inum: ++ ext4_msg(sb, KERN_WARNING, ++ "ext3 mount option \"%s\" ignored " ++ "by ext4 module", p); ++ break; ++#endif + default: + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" " + diff --git a/kernels/linux-libre-lts-xen/fix-i915.patch b/kernels/linux-libre-lts-xen/fix-i915.patch new file mode 100644 index 000000000..25d4bca87 --- /dev/null +++ b/kernels/linux-libre-lts-xen/fix-i915.patch @@ -0,0 +1,105 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> +<head> +<title>abslibre.git - Libre PKGBUILDs repository</title> +<meta name='generator' content='cgit v0.9.0.2'/> +<meta name='robots' content='index, nofollow'/> +<link rel='stylesheet' type='text/css' href='/cgit.css'/> +<link rel='shortcut icon' href='/favicon.ico'/> +<link rel='alternate' title='Atom feed' href='http://projects.parabolagnulinux.org/abslibre.git/atom/kernels/linux-libre-xen/fix-i915.patch?h=master' type='application/atom+xml'/> +</head> +<body> + <div id="archnavbar" class=""> + <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Parabola</a></h1></div> + <div id="archnavbarmenu"> + <ul id="archnavbarlist"> + <li id="anb-home"><a href="//parabolagnulinux.org" title="Parabola news, packages, projects and more">Home</a></li> + <li id="anb-packages"><a href="//parabolagnulinux.org/packages/" title="Parabola Package Database">Packages</a></li> + <li id="anb-wiki"><a href="//wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li> + <li id="anb-bugs"><a href="//bugs.parabolagnulinux.org" title="Issue Tracker">Bugs</a></li> + <li id="anb-projects"><a href="//projects.parabolagnulinux.org" title="Our Code">Projects</a></li> + <li id="anb-download"><a href="//parabolagnulinux.org/download" title="Get Parabola">Download</a></li> + </ul> + </div> + </div><!-- #archnavbar --> +<div id='cgit'><table id='header'> +<tr> +<td class='main'><a href='/'>index</a> : <a title='abslibre.git' href='/abslibre.git/'>abslibre.git</a></td><td class='form'><form method='get' action=''> +<select name='h' onchange='this.form.submit();'> +<option value='master' selected='selected'>master</option> +</select> <input type='submit' name='' value='switch'/></form></td></tr> +<tr><td class='sub'>Libre PKGBUILDs repository</td><td class='sub right'>packages@list.parabolagnulinux.org</td></tr></table> +<table class='tabs'><tr><td> +<a href='/abslibre.git/'>summary</a><a href='/abslibre.git/refs/'>refs</a><a href='/abslibre.git/log/kernels/linux-libre-xen/fix-i915.patch'>log</a><a class='active' href='/abslibre.git/tree/kernels/linux-libre-xen/fix-i915.patch'>tree</a><a href='/abslibre.git/commit/kernels/linux-libre-xen/fix-i915.patch'>commit</a><a href='/abslibre.git/diff/kernels/linux-libre-xen/fix-i915.patch'>diff</a><a href='/abslibre.git/stats/kernels/linux-libre-xen/fix-i915.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/abslibre.git/log/kernels/linux-libre-xen/fix-i915.patch'> +<select name='qt'> +<option value='grep'>log msg</option> +<option value='author'>author</option> +<option value='committer'>committer</option> +<option value='range'>range</option> +</select> +<input class='txt' type='text' size='10' name='q' value=''/> +<input type='submit' value='search'/> +</form> +</td></tr></table> +<div class='path'>path: <a href='/abslibre.git/tree/'>root</a>/<a href='/abslibre.git/tree/kernels'>kernels</a>/<a href='/abslibre.git/tree/kernels/linux-libre-xen'>linux-libre-xen</a>/<a href='/abslibre.git/tree/kernels/linux-libre-xen/fix-i915.patch'>fix-i915.patch</a></div><div class='content'>blob: 3b631361a15ee4ba6491f0b8960f0e18044e2cf0 (<a href='/abslibre.git/plain/kernels/linux-libre-xen/fix-i915.patch'>plain</a>) +<table summary='blob content' class='blob'> +<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a> +<a class='no' id='n2' name='n2' href='#n2'>2</a> +<a class='no' id='n3' name='n3' href='#n3'>3</a> +<a class='no' id='n4' name='n4' href='#n4'>4</a> +<a class='no' id='n5' name='n5' href='#n5'>5</a> +<a class='no' id='n6' name='n6' href='#n6'>6</a> +<a class='no' id='n7' name='n7' href='#n7'>7</a> +<a class='no' id='n8' name='n8' href='#n8'>8</a> +<a class='no' id='n9' name='n9' href='#n9'>9</a> +<a class='no' id='n10' name='n10' href='#n10'>10</a> +<a class='no' id='n11' name='n11' href='#n11'>11</a> +<a class='no' id='n12' name='n12' href='#n12'>12</a> +<a class='no' id='n13' name='n13' href='#n13'>13</a> +<a class='no' id='n14' name='n14' href='#n14'>14</a> +<a class='no' id='n15' name='n15' href='#n15'>15</a> +<a class='no' id='n16' name='n16' href='#n16'>16</a> +<a class='no' id='n17' name='n17' href='#n17'>17</a> +<a class='no' id='n18' name='n18' href='#n18'>18</a> +<a class='no' id='n19' name='n19' href='#n19'>19</a> +<a class='no' id='n20' name='n20' href='#n20'>20</a> +<a class='no' id='n21' name='n21' href='#n21'>21</a> +<a class='no' id='n22' name='n22' href='#n22'>22</a> +<a class='no' id='n23' name='n23' href='#n23'>23</a> +<a class='no' id='n24' name='n24' href='#n24'>24</a> +<a class='no' id='n25' name='n25' href='#n25'>25</a> +<a class='no' id='n26' name='n26' href='#n26'>26</a> +</pre></td> +<td class='lines'><pre><code>Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> +Tested-by: Santi <santi@agolina.net> +<span class="hl kwb">---</span> + drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c +index dc83b7a..c8f67bf 100644 +<span class="hl kwb">--- a/drivers/gpu/drm/i915/intel_tv.c</span> +<span class="hl kwa">+++ b/drivers/gpu/drm/i915/intel_tv.c</span> +<span class="hl kwd">@@ -1267,6 +1267,15 @@</span> + DAC_B_0_7_V | + DAC_C_0_7_V); + +<span class="hl kwa">+ /*</span> +<span class="hl kwa">+ * The TV sense state should be cleared to zero on cantiga platform. Otherwise</span> +<span class="hl kwa">+ * the TV is misdetected. This is hardware requirement.</span> +<span class="hl kwa">+ */</span> +<span class="hl kwa">+ if (IS_GM45(dev))</span> +<span class="hl kwa">+ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |</span> +<span class="hl kwa">+ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);</span> +<span class="hl kwa">+</span> +<span class="hl kwa">+ </span> + I915_WRITE(TV_CTL, tv_ctl); + I915_WRITE(TV_DAC, tv_dac); + POSTING_READ(TV_DAC); +</code></pre></td></tr></table> +</div> <!-- class=content --> +<div class='footer'>generated by cgit v0.9.0.2 at 2012-02-21 13:29:45 (GMT)</div> +</div> <!-- id=cgit --> +</body> +</html> diff --git a/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch new file mode 100644 index 000000000..3b631361a --- /dev/null +++ b/kernels/linux-libre-lts-xen/i915-fix-ghost-tv-output.patch @@ -0,0 +1,26 @@ +Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> +Tested-by: Santi <santi@agolina.net> +--- + drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c +index dc83b7a..c8f67bf 100644 +--- a/drivers/gpu/drm/i915/intel_tv.c ++++ b/drivers/gpu/drm/i915/intel_tv.c +@@ -1267,6 +1267,15 @@ + DAC_B_0_7_V | + DAC_C_0_7_V); + ++ /* ++ * The TV sense state should be cleared to zero on cantiga platform. Otherwise ++ * the TV is misdetected. This is hardware requirement. ++ */ ++ if (IS_GM45(dev)) ++ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | ++ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); ++ ++ + I915_WRITE(TV_CTL, tv_ctl); + I915_WRITE(TV_DAC, tv_dac); + POSTING_READ(TV_DAC); diff --git a/kernels/linux-libre-lts-xen/i915-gpu-finish.patch b/kernels/linux-libre-lts-xen/i915-gpu-finish.patch new file mode 100644 index 000000000..5840c9181 --- /dev/null +++ b/kernels/linux-libre-lts-xen/i915-gpu-finish.patch @@ -0,0 +1,55 @@ +commit 389a55581e30607af0fcde6cdb4e54f189cf46cf +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue Nov 29 15:12:16 2011 +0000 + + drm/i915: Only clear the GPU domains upon a successful finish + + By clearing the GPU read domains before waiting upon the buffer, we run + the risk of the wait being interrupted and the domains prematurely + cleared. The next time we attempt to wait upon the buffer (after + userspace handles the signal), we believe that the buffer is idle and so + skip the wait. + + There are a number of bugs across all generations which show signs of an + overly haste reuse of active buffers. + + Such as: + + https://bugs.freedesktop.org/show_bug.cgi?id=29046 + https://bugs.freedesktop.org/show_bug.cgi?id=35863 + https://bugs.freedesktop.org/show_bug.cgi?id=38952 + https://bugs.freedesktop.org/show_bug.cgi?id=40282 + https://bugs.freedesktop.org/show_bug.cgi?id=41098 + https://bugs.freedesktop.org/show_bug.cgi?id=41102 + https://bugs.freedesktop.org/show_bug.cgi?id=41284 + https://bugs.freedesktop.org/show_bug.cgi?id=42141 + + A couple of those pre-date i915_gem_object_finish_gpu(), so may be + unrelated (such as a wild write from a userspace command buffer), but + this does look like a convincing cause for most of those bugs. + + Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> + Cc: stable@kernel.org + Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> + Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com> + +diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c +index d560175..036bc58 100644 +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -3087,10 +3087,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj) + return ret; + } + ++ ret = i915_gem_object_wait_rendering(obj); ++ if (ret) ++ return ret; ++ + /* Ensure that we invalidate the GPU's caches and TLBs. */ + obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS; +- +- return i915_gem_object_wait_rendering(obj); ++ return 0; + } + + /** diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install new file mode 100644 index 000000000..8510e226d --- /dev/null +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install @@ -0,0 +1,62 @@ +# arg 1: the new package version +# arg 2: the old package version + +KERNEL_NAME=-lts-xen +KERNEL_VERSION=3.0.28-1-LIBRE-LTS-XEN + +post_install () { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + + # compat symlinks for the official kernels only + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-xen" ]; then + loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" + [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" + if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then + # add compat symlinks for the initramfs images + ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img + ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \ + boot/kernel26${KERNEL_NAME}-fallback.img + ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} + fi + fi +} + +post_upgrade() { + pacman -Q grub &>/dev/null + hasgrub=$? + pacman -Q grub2 &>/dev/null + hasgrub2=$? + pacman -Q lilo &>/dev/null + haslilo=$? + # reminder notices + if [ $haslilo -eq 0 ]; then + echo ">>>" + if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then + echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting." + else + echo ">>> You appear to be using the LILO bootloader. You should run" + echo ">>> 'lilo' before rebooting." + fi + echo ">>>" + fi + + if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then + echo "WARNING: /boot appears to be a separate partition but is not mounted." + fi + + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} +} + +post_remove() { + # also remove the compat symlinks + rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img + rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img +} diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset new file mode 100644 index 000000000..84c7c4be6 --- /dev/null +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.preset @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the 'linux-libre-lts-xen' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-libre-lts-xen" + +PRESETS=('default' 'fallback') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-linux-libre-lts-xen.img" +#default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-linux-libre-lts-xen-fallback.img" +fallback_options="-S autodetect" diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD index de86019a3..9beba51a8 100644 --- a/libre-testing/icedove-libre/PKGBUILD +++ b/libre-testing/icedove-libre/PKGBUILD @@ -1,5 +1,6 @@ # Maintainer : Márcio Silva <coadde@adinet.com.uy> # Maintainer : André Silva <andre.paulista@adinet.com.uy> +# Contributor: Esteban V. Carnevale <evcarnevale@gmail.com> # We're getting this from Debian Sid _debname=icedove @@ -26,14 +27,20 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" mozconfig channel-prefs.js vendor.js - gcc47.patch) + makefile.patch + gcc47.patch + rules.patch + searchplugins-libre.patch) md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' 'cb3dba2916bdf2deb72248b0984c4302' '57e21e997a75d85fcc0dcfe30b83f1ee' '76e01cfd6de4d4289265882774d1ba7d' '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' - '66376a8e934013078f0e646e49614937') + '5a6282bb005d596aa4ab1884ac6b0517' + '66376a8e934013078f0e646e49614937' + '2e6a57dc04b4a7255f5f1f3642af23ac' + '8f6d5be227bb68e1558dd6674cbba446') build() { export QUILT_PATCHES=debian/patches @@ -50,7 +57,11 @@ build() { cp "$srcdir/mozconfig" .mozconfig patch -Np1 -i "$srcdir/gcc47.patch" - rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml + patch -Np1 -i "$srcdir/makefile.patch" + patch -Np1 -i "$srcdir/rules.patch" + + # Removing non-free search plugins replacing them with duckduckgo and identi.ca + patch -Np0 -i "$srcdir/searchplugins-libre.patch" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } @@ -63,9 +74,11 @@ package() { install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" + install -Dm644 debian/app-icons/$_pkgname${i/x*/}.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png" + install -Dm644 debian/app-icons/icedovebig.svg \ + "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" done - install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" diff --git a/libre-testing/icedove-libre/searchplugins-libre.patch b/libre-testing/icedove-libre/searchplugins-libre.patch new file mode 100644 index 000000000..19c1ea5ab --- /dev/null +++ b/libre-testing/icedove-libre/searchplugins-libre.patch @@ -0,0 +1,141 @@ +--- mail.orig/locales/en-US/searchplugins/list.txt 2012-03-27 15:56:00.000000000 -0300 ++++ mail/locales/en-US/searchplugins/list.txt 2012-04-13 05:43:25.227475353 -0300 +@@ -1,8 +1,5 @@ +-amazondotcom +-aol-web-search +-bing ++duckduckgo-ssl + eBay +-google +-twitter ++identica-notice-search ++identica-people-search + wikipedia +-yahoo +--- mail/locales/en-US/searchplugins/amazondotcom.xml 2012-03-27 15:56:00.000000000 -0300 ++++ /dev/null 2012-04-12 23:52:53.981159155 -0300 +@@ -1,11 +0,0 @@ +-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +-<ShortName>Amazon.com</ShortName> +-<Description>Amazon.com Search</Description> +-<InputEncoding>ISO-8859-1</InputEncoding> +-<Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHgSURBVHjalFM9TNtQEP4cB7PwM1RITUXIgsRaYEEVEyKZwhiyZAQyd0BhpFOlIjoBqhjSqVQMoVMLLAjEwECCQJkSkBqJYDOAFOMKFSf28d7DTUxiUDnp/Pzeu/vuu7t3ICKF6SLTMv2/lB0fRWKfjwDm4JJisYh0Oo3fpZLYT0SjSCQS8JAFMADNDZ3NZsnf1taiqVTKi4nGASruk5lkkmTmMB6JUKFQqO+DfX1eABWeQoVR6f7HSdM0obqu48Yw8G1tDT82NsRd1TSbU9BbGPCog8PDj+jLzurFoAVgMh4XxoNDQ6SqKi0tL9eBvAB8zZwymYxYY7EYAoEA8vm82BNTg6XUIs0MeGTZoR1mhXSnwNl4pmAbjU7mcjkKhkL1ynMnntZ4OEw3VyrV8utk7s5TdW++0QXz+1i3P7IK36t+PCfVn1OQOoOA0gXr5DPak+cPXbBK+/T3S69AtY3LJ98vZ1or/iLr+pTuvr59/A6s003UdqZFJF/PCKQ3o5CUznoBST2AfbEF/9iqYEDaIfwj73VJPEfgNTe0tWNYR0uwy9uOW0OkrgHI7z5ADo2C7v48nLV3XHKAT+x/1m1sX58xsBxg8rZJrDYD8DHHp4aJj/MK09sXjPOt46PcCzAACXY8/u34wN0AAAAASUVORK5CYII=</Image> +-<Url type="text/html" method="GET" template="http://www.amazon.com/exec/obidos/external-search/"> +- <Param name="field-keywords" value="{searchTerms}"/> +- <Param name="mode" value="blended"/> +-</Url> +-<SearchForm>http://www.amazon.com/</SearchForm> +-</SearchPlugin> +--- mail/locales/en-US/searchplugins/aol-web-search.xml 2012-03-27 15:56:00.000000000 -0300 ++++ /dev/null 2012-04-12 23:52:53.981159155 -0300 +@@ -1,10 +0,0 @@ +-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +-<os:ShortName>AOL Web Search</os:ShortName> +-<os:Description>The AOL Search engine delivers great web search results, enhanced by Google, plus relevant multimedia results delivered on a single page-so you can search less and discover more.</os:Description> +-<os:InputEncoding>UTF-8</os:InputEncoding> +-<os:Image width="16" height="16">data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%06bKGD%00%FF%00%FF%00%FF%A0%BD%A7%93%00%00%00%09pHYs%00%00%00H%00%00%00H%00F%C9k%3E%00%00%00%FAIDAT8%CB%9D%D3%B1q%C2%40%10%85%E1%0F%8F%0B%A0%04%97%00%1D%40%05%C6%01%B9%95*1%AA%C0C%05%E0%84%D4%E4%0A%0C%15H%EE%40%1D%98%12%D4%81%1D%E84%C8B%60%C9%2F9%AD%EE%EE%9F%DD%B7%7B%23%B0%DC%7D%A3D%22%8D%F7%06h%D4%00%D4*%02(%EF%03%B8%EB%F87Af%B9%7B%EF%03%B8o%C59%DE%A4%F1%E1%3F%25%EC%91%60%83%87%B0%FF%89m%F8%5Et%F9S%032%3C%E1%0B%E3%D6%99%02s%7C%848%91%C6E%1B0%C1%0B%9E%AFd%9A%E0%D4%80l%B1%96%C6eebE%9C%DC(%F51dRk%15%B2%FD%D5%85%B1a*%CF%80%AA%84%FC%C6%E1%23f%8Dx%8D)%E76n%10aq%C5%C4%03%B2%B0%26%D2%F8To%D6%80Y0q%8AW%97m%1C%23%EA%9A%CE%E6%20%AD%82%91%5D%83T%AA%BAp%A1%AE%B7Pk%2F%8D%A3%BF%9C%ECz%0B9%E6%7D.7K(%C3%3A%F89%FF%00_%82G%C3%D5%0E(%3E%00%00%00%00IEND%AEB%60%82</os:Image> +-<SearchForm>http://search.aol.com</SearchForm> +-<os:Url type="text/html" method="GET" template="http://search.aol.com/aol/search"> +- <os:Param name="query" value="{searchTerms}"/> +-</os:Url> +-</SearchPlugin> +--- mail/locales/en-US/searchplugins/bing.xml 2012-03-06 13:44:50.000000000 -0200 ++++ /dev/null 2012-04-25 14:16:16.847855589 -0300 +@@ -1,17 +0,0 @@ +-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +- <ShortName>Bing</ShortName> +- <Description>Bing. Search by Microsoft.</Description> +- <InputEncoding>UTF-8</InputEncoding> +- <Image width="16" height="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAVpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8ysf97zf+24//F6f/F6f/F6f+K0/9QvP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8krP+Z2P/////////w+f/F6f/F6f/i9P/////////T7v9Bt/8Vpv8Vpv8Vpv8Vpv/T7v/////w+f97zf8Vpv8Vpv8Vpv8Vpv9QvP/T7v/////w+f9Bt/8Vpv8Vpv97zf////////9QvP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8krP/i9P/////i9P8Vpv8Vpv+24//////i9P8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv+K0/////////8Vpv8Vpv/F6f////////8krP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv+n3v/////w+f8Vpv8Vpv/F6f////////+n3v8krP8Vpv8Vpv8Vpv8Vpv8Vpv9tx/////////+Z2P8Vpv8Vpv/F6f/////////////i9P+K0/9QvP9QvP9tx//F6f////////+n3v8Vpv8Vpv8Vpv/F6f/////T7v+Z2P/i9P////////////////////+24/9QvP8Vpv8Vpv8Vpv8Vpv/F6f/////F6f8Vpv8Vpv8krP9QvP9QvP9Bt/8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv/F6f/////F6f8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv9Bt/9QvP9Bt/8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8AAHBsAABhdAAAbiAAAHJ0AABsaQAAdGkAACBDAABlbgAAUEEAAEVYAAAuQwAAOy4AAEU7AABBVAAAQ00AAC5W</Image> +- <Url type="application/x-suggestions+json" template="http://api.bing.com/osjson.aspx"> +- <Param name="query" value="{searchTerms}"/> +- <Param name="form" value="OSDJAS"/> +- </Url> +- <Url type="text/html" method="GET" template="http://www.bing.com/search"> +- <Param name="q" value="{searchTerms}"/> +- </Url> +- <Url type="application/x-moz-keywordsearch" method="GET" template="http://www.bing.com/search"> +- <Param name="q" value="{searchTerms}"/> +- </Url> +- <SearchForm>http://www.bing.com/search</SearchForm> +-</SearchPlugin> +--- mail/locales/en-US/searchplugins/google.xml 2012-03-27 15:56:00.000000000 -0300 ++++ /dev/null 2012-04-12 23:52:53.981159155 -0300 +@@ -1,14 +0,0 @@ +-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +-<ShortName>Google</ShortName> +-<Description>Google Search</Description> +-<InputEncoding>UTF-8</InputEncoding> +-<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image> +-<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&hl={moz:locale}&q={searchTerms}"/> +-<Url type="text/html" method="GET" template="http://www.google.com/search"> +- <Param name="q" value="{searchTerms}"/> +- <Param name="ie" value="utf-8"/> +- <Param name="oe" value="utf-8"/> +- <Param name="aq" value="t"/> +-</Url> +-<SearchForm>http://www.google.com</SearchForm> +-</SearchPlugin> +--- mail/locales/en-US/searchplugins/twitter.xml 2012-03-27 15:56:00.000000000 -0300 ++++ /dev/null 2012-04-12 23:52:53.981159155 -0300 +@@ -1,10 +0,0 @@ +-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +-<ShortName>Twitter Search</ShortName> +-<Description>Realtime Twitter Search</Description> +-<InputEncoding>UTF-8</InputEncoding> +-<Image width="16" height="16">data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%20%00%00%00%20%08%06%00%00%00szz%F4%00%00%00%19tEXtSoftware%00Adobe%20ImageReadyq%C9e%3C%00%00%06%60IDATx%DA%ACWMLSY%14%BE%F7%F5%97%B6%96%96%16P%84q%02H%A0%01%85%08%26%C4%18%C9D%60%D8L2%0Bfm2%89%86%85%3B%E2l%5D%BA%9Ad%E2%CEY%B8%18c2a%8C%B3%10%893%02e%98d%F0%07%22c%D0%22%88%C4%01K)%D0%3F%FA%FF%DE%BB%F3%DD%F7Z%82%B5%16%A8%DE%E4%B6%AF%AF%EF%DD%F3%DDs%BEs%BEs)c%8C%F0A)%25%D9q%F9%F2eC%7F%7F%7F%1D.%BF%12%04%A1%F30F%22%91%10%A3%D1%E8%92%C1%60ponn%FE%3D99%E9%BDz%F5%AAL%3Ea(%B6%F9G%16%04%1F%83%83%83%E6%B1%B1%B1oVVV%86%E2%F1%F8%7F%C9d2%22%8Ab%2C%95J%C5p%1D%8A%C5b%9E%85%85%85%1F%EF%DF%BF%DF%06%90%9A%CF%0A%00%3B%D2%3Fy%F2%A4okkk%0C%06%A3%B8%CF%D22c1%91%B1%B8%C4%98%84kY%96%19%3C%B1%B6%B8%B8%F83F%13w%DE%E7%02%40%1F%3E%7CX%BB%BA%BAz%0B%C6%23%DCx%24%CD%D8%F30c%7F%FAe%E6%DE%90%D9%1B%40JIL%19%E1px%05%5E%F8a%60%60%C0%FE)%00%B4%D9%1F%D8%BDA%92%A4%13v%BB%FD%8CN%A7%B3D%25B%A6%02%8C%3C%0E2%12H1%A2%C1%3EkJ(%E9rP%D2x%88%92%92%92%92J%97%CB%F5%F5%F2%F2%F2%08%5E%0FcJ%C5%80%D8%01p%EC%D81%23%10%B94%1A%8DM%82C%BC%09BfB%8C%F8%93%8Cp~%8A%A0%DB%9B%18%23V%1D!%D5%00R%AA%D3j%9DNg%3D%80%B8n%DF%BE%ED%EB%EC%ECL%EE%5E8%18%0C%12%84J%9A%9B%9BK%5C%BAt)%BD'%00%B0%5D%83Lp%02%84%86%03%88%88%8C%84E%D5%B8%40%D4H%F3%FB~%98%89c%AF%1C%08%3CU%D6%D6%D6%F6%9D%CDfs%99%CD%E64%F8%B1%C3%07%AC%25%E9%F5%FA%8D%8E%8E%0E%CF%F8%F8%F8%FC%C4%C4%C4z%BE%AC%D1%E6%FC%D6dl%91%EC%93%BB%19%C6%C1H%84%E1%3F%CE%1BJ%60%C0%D4%D4%D4%D4%AB%D5j%BBr%C9%98%E1V%1A%E9%EB%F5%F9%7C%7F%9C%3Bw%EE%D7%8B%17%2F%CE%DE%B8q%23%5D%08%40%C1A3%93%7B%22%8DI9w%B5z%93H%88%E9%83g%E16-%1E%B6X%2C%0E%84%F5%08%C0V%9D%3F%7F%FE%A7%40%200%3D44%24%15%0D%20%81W%E7%B7%19%F1%26%0B%E7%9F%11%00%1CzJ%9Cz%22%80'%E5eee%3D%B5%B5%B5%1B%ED%ED%ED%EF%00%60%A5(%00%0A%B9%E0%C0%F1%0D%BEuV%F09%9E5%87%0D%94%9C%B6S%D2b%A5%C4d29%EB%EA%EA%BE%9E%99%99%19%ED%EA%EA%DAp%BB%DD%09%85%7B%C5%A4NB%DE%7Bn%23.%8BQF%FEA*%AF'9%5CJP%C6%2B0%DBz%7B%7BKv%C8_%0C%00%BA%8F)P%D5G%3E%A4%F1%26%08%23%AA%0E%D3%19%8D%C6%A3%C8%16%FD'%018%C8%1023%ABu(v4%9DNgq%1E%9C%03d%CF%E8%ABCfd%A7zV%80%8C%3C%23R%B2%9C%0E%85B%3E%BF%DF%9F%CE.s%60%00%DC%B5%A5Z%F5%BB0%09)%A92%12%D2%5E%8AL0%A8%85%01)%E8%F7z%BDsSSS%F1%A2%B2%80C%B6%A3%02v%97%0B%CA%A2TY7%0FG%A8%0A%E0%10%CA%9AE%ABz%C2%EF%DF%D8z%F4%E8%91%7Bzz%FA%19f%B2%E84%D4!%A0G%60%BC%D2H%F7%24%10%F7%12%E2-n%05%83%5BH%BF%C9%7B%F7%EE%0D%0D%0F%0F%2F%EF%16.m1%F1%CF%EA%C3%5Ea%E0%C6%D1%BC%2CC%07%1E%8C%8E%8E%FE~%E7%CE%9D%C7%3C%8BsI%BA%BB~%B3%BDH%26g%CA%F0~%DA%10%A6%F4%2Fr%10%A5x%B1%B2%B2r%1E%B7%22%B9%CB%EFx%00%82%22%A3%F5%8AB%C5d%BEC%BD%A0%C6.w%F0%02%F36F%88%13%5C0%EF%E1%3F%D4%7F%7DCCC3%A4%FEBww%B7%EE%E4%C9%93%B7%20%CD%DE%BC%1E%98%9D%9D%15%A1%E1k%40%2CrI%2CE%DE%98%81%20%D7%1B1D%EF)%9A%14tJ%8A4%87E.%DD%1FN~%9F%CB%B6N%AF7B%90N%94%97%97%7F%7F%FC%F8%F1o%A1%88%A5y%3D%80%064%05%97-!n%DB(%97%0E%0E%80%A7%91%2F%99%89%7Bf%F2%EB%95%04%23%0F%FC%10%1B4%2C%5Cth%1EO%F1M%1C%C6%FB'%AC%02%BE)%85%16%D4566%F6%9F%3Auj%1A%7F%3D%CD%12q%C7%03%D7%AF_O%A1%C1XX__%7F%89j%952a%85F%0BUr%5Ef%EF%97a%3Ex%B3%C2%3B%A4%97P%C6%17%91%0F%E7%BF%F0%D0%C4%86%3A%03)%A5%E1%D1Z%ADV%DEqu%5C%B9r%C5%94%8F%84%CC%E3%F1%AC%A3%85%FA%0BMD%88%A7%5B%BD%99%12%17%FA%3F%83%A0%F6%00%B9ZPP%2F%F0%40%1C%A2%B4%00A%E2z%C0%B5%00%C6%E1%08SCEE%85!o%16%A0e%8A%A0L%8E%A2-%9F%85%17%D2%A5%20%DAi%BB%A0%82%D0%A8%20%D8%01D%89%A7i%12%EEK%CA%AA%17%11b8B%B0%80g%DA%8Fi%81%84%5C%F5%A0%D9%FC%0D%C4%F9%02MDC5%E2%D8%E5%14%00%40%26sp%2B%EF%96%E5%7Dx%80e%AA%A4MG%89%15%7C%D2(%ED%1C%91%E1%DD%08%0E7%F2G%0B%D1%C8%C8H%B8%BE%BE~%18%00%8E%B6%B6%B6%5Ep8%1C55Po%B3F%20%D5FF%3C%88%EF%BB%04%CF%06%F6%5EX%F2%15%2B%1BD%A8%0DZ%C0%C9%C8%01%80%E8%DBkkk%8B(%C9%89%82b%04B%AEB%B7%7F%C1%A5%01%20x%D7%5B%E3%D0k4%ED6%AA%10%937%18%5C%E3%A3%A2%1A%16%9A%07%80%5E%A3vD_*%E0%15%E3%C9%D7%AF_%3F%C7%89%EA%196%19%CF%ED%5E%F3%F2%08%A7%9EZ%F4o%83x%F11NB!%14*)%7B%5CKH%EA%91%AD%D0%E4%CF%F1%C1%8D%BFz%F5%EA%D9%B5k%D7%06%AA%AA%AA%9C%D9%08r%BB4%DF%E9x7%88%BE%BE%3E%E7%D9%B3g%CF477%F7%B5%B4%B4t%22%24UHWd6%E5%E7%08%0Af%D3%DC%0D%F0%B5%F8%19%92%D7a%C4%3B%B6%B4%B4%F4%12%C7%BE%BB7o%DE%BC%3B%3F%3F%FF6%5B%03%F6%03%40%19%D5%D5%D5%25%3D%3D%3DG%90%C7%AD%A8%E9%EDh.%1BA%D4%0A%FC6%E1%5BGs%5E%86%5D%02%EDO%E3%3C%10x%81%81*%EB%86%18M%E1%DC%B9%86%BF%C5%DD%DE%FF_%80%01%00%94%13%9D%26%E9%81%03P%00%00%00%00IEND%AEB%60%82</Image> +-<Url type="text/html" method="get" +- template="http://search.twitter.com/search?q={searchTerms}"/> +-<SearchForm>http://search.twitter.com/</SearchForm> +-</SearchPlugin> +- +--- mail/locales/en-US/searchplugins/yahoo.xml 2012-03-27 15:56:00.000000000 -0300 ++++ /dev/null 2012-04-12 23:52:53.981159155 -0300 +@@ -1,13 +0,0 @@ +-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +-<ShortName>Yahoo</ShortName> +-<Description>Yahoo Search</Description> +-<InputEncoding>UTF-8</InputEncoding> +-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgJqAIoCdgCaAnoAnhKCAKYijgCuLpIAskKeALpSpgC+Yq4AzHy8ANqezgDmvt4A7tLqAPz5+wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKlRFIoABWAKERERE6ADcKMzzu2hOgAAhERK8REWCWBERE36ERMHMEREvo6iEgY6hEn6Pu0mAzqkz/xjMzoDNwpERERDoAMzAKlERIoAAzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA//8AAP//AADAOQAAgBkAAAAPAAAACQAAAAkAAAAIAAAACAAAAAgAAIAYAADAOAAA//8AAP//AAD//wAA</Image> +-<Url type="application/x-suggestions+json" method="GET" +- template="http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}" /> +-<Url type="text/html" method="GET" template="http://search.yahoo.com/search"> +- <Param name="p" value="{searchTerms}"/> +- <Param name="ei" value="UTF-8"/> +-</Url> +-<SearchForm>http://search.yahoo.com/</SearchForm> +-</SearchPlugin> +--- /dev/null 2012-04-12 23:52:53.981159155 -0300 ++++ mail/locales/en-US/searchplugins/duckduckgo-ssl.xml 2012-04-09 14:43:56.000000000 -0300 +@@ -0,0 +1,11 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> ++<os:ShortName>DuckDuckGo RU SSL</os:ShortName> ++<os:Description>DDG Search + Google's suggestions (Russian)</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> ++<SearchForm>https://duckduckgo.com/</SearchForm> ++<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}&kl=ru-ru"> ++</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="http://ddgg.nfriedly.com/complete/search?output=firefox&hl=ru&q={searchTerms}"> ++</os:Url><os:Url type="application/opensearchdescription+xml" method="GET" template="http://mycroft.mozdev.org/updateos.php/id0/duckduckgo_ssl.xml" rel="self"> ++</os:Url> ++</SearchPlugin> +--- /dev/null 2012-04-12 23:52:53.981159155 -0300 ++++ mail/locales/en-US/searchplugins/identica-notice-search.xml 2012-04-13 05:15:55.000000000 -0300 +@@ -0,0 +1,7 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> ++<os:ShortName>Identi.ca Notice Search</os:ShortName> ++<os:InputEncoding>UTF-8</os:InputEncoding> ++<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAABGD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAABAQEBAQEBAQEBAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAABAQEBAQEBAQEBAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAABAQEBAQEBAQEBAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAD//wAA//8AAOAHAADgBwAA4AcAAOAHAADgBwAA4AcAAOAHAADgBwAA4AcAAOAHAADgBwAA//8AAP//AAA=</os:Image> ++<os:Url type="text/html" method="GET" template="http://identi.ca/search/notice?q={searchTerms}"> ++</os:Url> ++</SearchPlugin> +--- /dev/null 2012-04-12 23:52:53.981159155 -0300 ++++ mail/locales/en-US/searchplugins/identica-people-search.xml 2012-04-13 05:15:53.000000000 -0300 +@@ -0,0 +1,7 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> ++<os:ShortName>Identi.ca People Search</os:ShortName> ++<os:InputEncoding>UTF-8</os:InputEncoding> ++<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAABGD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAABAQEBAQEBAQEBAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAABAQEBAQEBAQEBAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAABAQEBAQEBAQEBAAAAAAAAAQEBAQEBAQEBAQAAAAAAAAEBAQEBAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAD//wAA//8AAOAHAADgBwAA4AcAAOAHAADgBwAA4AcAAOAHAADgBwAA4AcAAOAHAADgBwAA//8AAP//AAA=</os:Image> ++<os:Url type="text/html" method="GET" template="http://identi.ca/search/people?q={searchTerms}"> ++</os:Url> ++</SearchPlugin> diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 5fe592460..4c7de83e5 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=28 +_sublevel=29 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.26 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.27 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '150cef79eaa9a41cd5ccd65c696e7f10' - 'c7acde811ca6808b294dc06480048c61' - '792766d6d403cc967977f6a46aa95d1d' + '6c1dcf39863434add4043d0a3678001f' + 'df7e69a7b238c6492b589cc2beb894d2' + '2ef390e115d6ae1c074c30fec9258442' 'd2c0701480bce49fd4b40dc46b9863f1' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '40e46dd7c7ffe2f4276ea91a0aad5fd4') + '6f0a19113e73495e24873c31feab8464') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -206,7 +206,7 @@ package_linux-libre-lts() { } package_linux-libre-lts-headers() { - pkgdesc="Header files and scripts for building modules for linux-libre-lts-headers longtime supported kernel" + pkgdesc="Header files and scripts for building modules for linux-libre-lts longtime supported kernel" provides=('kernel26-lts-headers' "linux-lts-headers=${pkgver}") conflicts=('kernel26-lts-headers' 'kernel26-libre-lts-headers' 'linux-lts-headers') replaces=('kernel26-lts-headers' 'kernel26-libre-lts-headers' 'linux-lts-headers') @@ -355,4 +355,3 @@ package_linux-libre-lts-headers() { rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips fi } - diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 35ab3faeb..7094b2731 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.26-1 Kernel Configuration +# Linux/i386 3.0.29-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1105,7 +1105,30 @@ CONFIG_XPS=y # CONFIG_NET_PKTGEN=m CONFIG_NET_DROP_MONITOR=y -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +# CONFIG_SCC_DELAY is not set +# CONFIG_SCC_TRXECHO is not set +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m # CONFIG_CAN is not set CONFIG_IRDA=m @@ -4663,7 +4686,133 @@ CONFIG_BRCMUTIL=m CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set # CONFIG_BRCMDBG is not set -# CONFIG_COMEDI is not set +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_ISA_DRIVERS=m +CONFIG_COMEDI_ACL7225B=m +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL725=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_PCM3730=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_POC=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +# CONFIG_COMEDI_CB_PCIMDAS is not set +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m # CONFIG_FB_OLPC_DCON is not set CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 11043d568..f7cd1263b 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1071,11 +1071,30 @@ CONFIG_BPF_JIT=y # CONFIG_NET_PKTGEN=m CONFIG_NET_DROP_MONITOR=y -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y # CONFIG_CAN is not set CONFIG_IRDA=m # +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m + +# # IrDA protocols # CONFIG_IRLAN=m @@ -4455,7 +4474,91 @@ CONFIG_BRCMUTIL=m CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set # CONFIG_BRCMDBG is not set -# CONFIG_COMEDI is not set +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set CONFIG_R8187SE=m diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 5f32392c0..714f68a17 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.28-1-LIBRE-LTS +KERNEL_VERSION=3.0.29-1-LIBRE-LTS post_install () { # updating module dependencies diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index 093e8daf1..fc516a3e9 100644 --- a/libre/thunderbird-libre/PKGBUILD +++ b/libre/thunderbird-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155759 2012-04-06 07:48:34Z ibiru $ +# $Id: PKGBUILD 157168 2012-04-25 08:44:38Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,13 +6,13 @@ # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=thunderbird-libre -pkgver=11.0.1 -pkgrel=2.1 +pkgver=12.0 +pkgrel=1 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL') url="http://www.mozilla.org/thunderbird/" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') optdepends=('libcanberra: for sound support') replaces=('thunderbird') @@ -25,27 +25,24 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc thunderbird-install-dir.patch channel-prefs.js vendor.js - libvpx.patch gcc47.patch clrf.patch searchplugins-libre.patch) -md5sums=('b500560a006cb10194281263c78841f2' +md5sums=('7b30b72472a65bce74ba0ae60e4d4e6c' '41511a6bcdd04cf56706218e4670e631' 'af3e5b344d2edf1c7d61bb0a5a96de9a' 'aea906acf72c43dd82ead2fabcc1c6db' '476ec205162340fb0679f522c9d31c3b' '5a53179d14ae9631b7afe5e4d0fc0b25' - '5b2aaff7dfe7f1f94ad965905b20e782' - '07b255039a2ffbcab5b5be7986245e36' - '5c8d79a9f1ecadffa818205ce1c23f2f' + '1e3ad86899c61f0993c429d10913edb4' + 'abe8f73faa71ea2a1e4c6f5a33f56c27' '6a1d132b0275876678cb0b08c527805a') build() { cd "$srcdir/comm-release" patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - patch -Np1 -i "$srcdir/libvpx.patch" patch -Np1 -i "$srcdir/gcc47.patch" - patch -Np2 -i "$srcdir/clrf.patch" + patch -Np1 -i "$srcdir/clrf.patch" # Removing non-free search plugins replacing them with duckduckgo and identi.ca patch -Np1 -i "$srcdir/searchplugins-libre.patch" diff --git a/libre/thunderbird-libre/clrf.patch b/libre/thunderbird-libre/clrf.patch index 9b6fcb8fb..5a77f2b01 100644 --- a/libre/thunderbird-libre/clrf.patch +++ b/libre/thunderbird-libre/clrf.patch @@ -1,7 +1,7 @@ -diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp ---- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-03-13 03:37:12.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-16 07:20:29.299342799 +0100 -@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV +diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp +--- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 01:09:10.468804374 +0000 ++++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -688,7 +688,7 @@ PL_strcat(encoding, "{"); lengthStr.AppendInt((PRInt32) strlen(value)); PL_strcat(encoding, lengthStr.get()); @@ -10,10 +10,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapt PL_strcat(encoding, value); return NS_OK; } -diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp ---- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-16 07:20:29.300342735 +0100 -@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns +diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp +--- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 01:09:10.475470988 +0000 ++++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -758,7 +758,7 @@ } } } @@ -22,7 +22,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cp // if status offset isn't in the first block, this code won't work. There's no good reason // for the status offset not to be at the beginning of the message anyway. -@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila +@@ -1216,7 +1216,7 @@ // check if there's an envelope header; if not, write one. if (strncmp(m_dataBuffer, "From ", 5)) { @@ -31,19 +31,19 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cp m_offlineMsgSize += bytesWritten; } } -diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp ---- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-16 07:23:01.225877457 +0100 -@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit() +diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp +--- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 01:09:10.542137136 +0000 ++++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -1722,7 +1722,7 @@ { - m_sendDone = PR_TRUE; + m_sendDone = true; nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL); - SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server. + SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server. m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_DONE; return(0); -@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI +@@ -1969,7 +1969,7 @@ { nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL); // send a quit command to close the connection with the server. @@ -52,15 +52,15 @@ diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.7 { m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_ERROR_DONE; -@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC +@@ -2118,4 +2118,3 @@ NS_ENSURE_SUCCESS(rv,rv); return rv; } - -diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp ---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-16 07:20:29.309342162 +0100 -@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore +diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp +--- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 01:09:10.605469976 +0000 ++++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -8309,7 +8309,7 @@ bool needMoreData = false; char * newLine = nsnull; PRUint32 numBytesInLine = 0; @@ -69,10 +69,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.73 offlineStore->Write(envelope, strlen(envelope), &bytesWritten); fileSize += bytesWritten; do -diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp ---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-03-16 07:20:29.314341844 +0100 -@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses +diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp +--- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 01:09:10.605469976 +0000 ++++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -1409,7 +1409,7 @@ { // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages(); nsCAutoString commandBuffer(GetServerCommandTag()); @@ -81,7 +81,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 do { -@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c +@@ -3287,7 +3287,7 @@ commandString.Append(messageIds); commandString.Append(" ("); commandString.Append(attribute); @@ -90,7 +90,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(commandString.get()); if (NS_SUCCEEDED(rv)) -@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge() +@@ -5283,7 +5283,7 @@ IncrementCommandTagNumber(); nsCAutoString command(GetServerCommandTag()); @@ -99,7 +99,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID() +@@ -5359,7 +5359,7 @@ command.Append(gAppName); command.Append("\" \"version\" \""); command.Append(gAppVersion); @@ -108,16 +108,16 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const +@@ -5816,7 +5816,7 @@ nsCAutoString correctedPassword; EscapeUserNamePasswordString(password.get(), &correctedPassword); command.Append(correctedPassword); - command.Append("\""CRLF); + command.Append("\"" CRLF); - rv = SendData(command.get(), PR_TRUE /* suppress logging */); + rv = SendData(command.get(), true /* suppress logging */); NS_ENSURE_SUCCESS(rv, rv); ParseIMAPandCheckForNewMail(); -@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const +@@ -7447,7 +7447,7 @@ nsCString command(GetServerCommandTag()); command += " create \""; command += escapedName; @@ -126,7 +126,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if(NS_SUCCEEDED(rv)) -@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma +@@ -7550,7 +7550,7 @@ nsCString command (GetServerCommandTag()); command += " lsub \"\" \""; command += escapedPattern; @@ -135,7 +135,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 PR_Free(boxnameWithOnlineDirectory); -@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma +@@ -7579,7 +7579,7 @@ command += useXLIST ? " xlist \"\" \"" : " list \"\" \""; command += escapedPattern; @@ -144,7 +144,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 PR_Free(boxnameWithOnlineDirectory); -@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha +@@ -7600,7 +7600,7 @@ nsCString command (GetServerCommandTag()); command += " subscribe \""; command += escapedName; @@ -153,7 +153,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c +@@ -7618,7 +7618,7 @@ nsCString command (GetServerCommandTag()); command += " unsubscribe \""; command += escapedName; @@ -162,7 +162,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle() +@@ -7632,7 +7632,7 @@ if (m_urlInProgress) return; nsCAutoString command (GetServerCommandTag()); @@ -171,7 +171,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) { -@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo +@@ -7659,7 +7659,7 @@ nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream); if (asyncInputStream) asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull); @@ -180,7 +180,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 // set a short timeout if we don't want to wait for a response if (m_transport && !waitForResponse) m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5); -@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m +@@ -7728,8 +7728,8 @@ PRUint32 msgsHandled = 0; const char *formatString; formatString = (idsAreUid) @@ -191,22 +191,22 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 do { -diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp ---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-16 07:20:29.316341717 +0100 -@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM +diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp +--- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 01:09:10.605469976 +0000 ++++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -185,7 +185,7 @@ NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string"); - bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF); + bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF); if (sendingIdleDone) - fWaitingForMoreClientInput = PR_FALSE; + fWaitingForMoreClientInput = false; -diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp ---- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-03-16 07:23:38.980300990 +0100 -@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList() +diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp +--- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 01:09:10.492137526 +0000 ++++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -2483,7 +2483,7 @@ return(MK_OUT_OF_MEMORY); m_pop3ConData->next_state_after_response = POP3_GET_LIST; m_listpos = 0; @@ -215,10 +215,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733 } -diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp ---- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp 2012-03-16 07:20:29.320341461 +0100 -@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio +diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp +--- comm-release.orig/mailnews/mime/src/mimedrft.cpp 2012-04-25 01:09:10.488804218 +0000 ++++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -1473,7 +1473,7 @@ *newbody = 0; PL_strcatn(newbody, newbodylen, "<PRE>"); PL_strcatn(newbody, newbodylen, body); @@ -227,10 +227,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thu PR_Free(body); body = newbody; } -diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp ---- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp 2012-03-16 07:20:29.321341397 +0100 -@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li +diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp +--- comm-release.orig/mailnews/mime/src/mimemult.cpp 2012-04-25 01:09:10.488804218 +0000 ++++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-25 01:12:53.383735715 +0000 +@@ -280,7 +280,7 @@ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\"")); MimeWriteAString(obj, fileName); @@ -239,7 +239,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thu MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: ")); MimeWriteAString(obj, obj->options->state->detachedFilePath); MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); -@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li +@@ -293,10 +293,10 @@ status = MimeWriteAString(obj, header); if (status < 0) return status; @@ -252,7 +252,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thu } nsCString result; char timeBuffer[128]; -@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li +@@ -306,8 +306,8 @@ "%a %b %d %H:%M:%S %Y", &now); MimeWriteAString(obj, nsDependentCString(timeBuffer)); @@ -260,6 +260,6 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thu - MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); + MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK)); - MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE); + MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false); } PRInt32 old_nchildren = container->nchildren; diff --git a/libre/thunderbird-libre/gcc47.patch b/libre/thunderbird-libre/gcc47.patch index 3e1e9b98a..080502c23 100644 --- a/libre/thunderbird-libre/gcc47.patch +++ b/libre/thunderbird-libre/gcc47.patch @@ -1,18 +1,6 @@ -diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000 -@@ -8,7 +8,7 @@ - #include <io.h> - #endif - #include <stdio.h> --#if defined(ANDROID) -+#if defined(ANDROID) || defined(OS_POSIX) - #include <unistd.h> - #endif - diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:38:11.381450924 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:43:29.218995578 +0000 +--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-24 23:15:57.347221336 +0000 ++++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-24 23:18:34.116046872 +0000 @@ -5,6 +5,9 @@ #include "base/file_util.h" @@ -24,8 +12,8 @@ diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc com #include <string> #include <vector> diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:38:11.438117153 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:43:29.218995578 +0000 +--- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-24 23:15:57.353887955 +0000 ++++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-24 23:18:34.116046872 +0000 @@ -6,6 +6,9 @@ #include <errno.h> @@ -37,27 +25,15 @@ diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent. #include "eintr_wrapper.h" #include "base/logging.h" diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:38:11.418117308 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:43:29.218995578 +0000 -@@ -14,6 +14,8 @@ +--- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-24 23:15:57.350554645 +0000 ++++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-24 23:18:34.116046872 +0000 +@@ -13,6 +13,9 @@ + #else #include <time.h> #endif - ++#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> -+ - #include <limits> ++#endif - #include "base/basictypes.h" -diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in ---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000 -+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000 -@@ -69,6 +69,9 @@ - $(STDCXX_COMPAT) \ - $(NULL) + #include <limits> -+# Needed for moz_free -+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc -+ - ifeq ($(OS_ARCH),WINNT) - CPPSRCS += crashreporter_win.cpp - LIBS += \ diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index 837f34b2d..95154cc76 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -2,36 +2,41 @@ # Contributor: N30N <archlinux@alunamation.com> pkgname=unarchiver -pkgver=3.0 -pkgrel=1.1 +pkgver=3.1 +pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') -url="http://wakaba.c3.cx/s/apps/unarchiver.html" +url="http://unarchiver.c3.cx/" license=('LGPL2.1') depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') makedepends=('gcc-objc') source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip" "native_obj_exceptions.patch" "libz.patch") +sha1sums=('a8a28e3372a8811689c39871f5de86c64c8c466c' + 'b8024026607dc2de758479b73d8b01ca6f692b59' + '003d114a0ba9a919af602881ef5e04cdba2e4c50') build() { - cd $srcdir/ + cd "$srcdir/The Unarchiver" + + patch -p1 < ../native_obj_exceptions.patch + patch -p1 < ../libz.patch - patch -Np1 -i native_obj_exceptions.patch - patch -Np1 -i libz.patch - cd XADMaster . /usr/share/GNUstep/Makefiles/GNUstep.sh make -f Makefile.linux } package() { - cd "$srcdir/XADMaster" + cd "$srcdir/The Unarchiver/XADMaster" install -d "$pkgdir/usr/bin/" install -m755 unar lsar "$pkgdir/usr/bin/" + + cd "$srcdir/The Unarchiver/Extra" + install -d "$pkgdir/usr/share/man/man1" + gzip -c lsar.1 > "$pkgdir/usr/share/man/man1"/lsar.1.gz + gzip -c unar.1 > "$pkgdir/usr/share/man/man1"/unar.1.gz } # vim:set ts=2 sw=2 et: -md5sums=('c7c42cd3640bf477b79b21436344f098' - '4fa4ecc6e4ba14d3b6952d064e728511' - '665d01bf93191cc6f57dc80d8c1d3d5a') diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD deleted file mode 100644 index ebfb32c78..000000000 --- a/testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 156648 2012-04-22 08:05:14Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: mario <mario_vazq@hotmail.com> - -pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.0 -_pkgver=9.9.0 -pkgrel=2 - -pkgdesc='DNS utilities: dig host nslookup' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -options=('!makeflags') -depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'remove-bind.patch') -sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094' - 'b465ef6160b004838f04de9978fe1be8422af777') - -replaces=('bind-tools' 'host') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-bind.patch - export STD_CDEFINES='-DDIG_SIGCHASE' - - # hack to remove unused bloat from the binaries - CFLAGS+=' -fdata-sections -ffunction-sections' - LDFLAGS+=' -Wl,--gc-sections' - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-idn \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - cd bin; make DESTDIR="${pkgdir}" install -} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch deleted file mode 100644 index 19d650964..000000000 --- a/testing/dnsutils/remove-bind.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig - TARGETS = - - @BIND9_MAKE_RULES@ -diff -aur old/lib/Makefile.in new/lib/Makefile.in ---- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 -+++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/testing/freenx/PKGBUILD b/testing/freenx/PKGBUILD deleted file mode 100644 index 0e5aaf81b..000000000 --- a/testing/freenx/PKGBUILD +++ /dev/null @@ -1,95 +0,0 @@ -# $Id: PKGBUILD 156628 2012-04-21 23:25:55Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=freenx -pkgver=0.7.3 -pkgrel=11 -pkgdesc="Free Software (GPL) Implementation of the NX Server" -arch=(i686 x86_64) -url="http://freenx.berlios.de" -license=('GPL') -depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python' - 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') -optdepends=('cups: adds printing support') -makedepends=('imake') -options=('!makeflags') -conflicts=('nxserver') -provides=('nxserver') -backup=(etc/nxserver/node.conf) -install=freenx.install -source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz - keymap.patch - nxagent-startup.patch - freenx-latest-svn.patch - remove-dialog.patch - freenx-server-0.7.3-nxipp.patch) -md5sums=('856f597e139018f7ed62713c9d6c9ed5' - 'f0867659c925f6363fb2b7661f349248' - '30dc16d8e2093ff71d5834a169ad9d00' - '788f30322783cf2c2dc833e2e4d5e8ad' - 'cae1773312506eeefe6a8de07c492bd8' - 'b3244c52a6bafc6d9b528eb4d4426e36') - -build() { - # patch and install nxserver - cd $srcdir/$pkgname-server-$pkgver - # add latest svn fixes - patch -Np3 -i ../freenx-latest-svn.patch - # patch from inside nx - patch < gentoo-nomachine.diff - # patch broken keymap remapping - patch -Np0 -i ${srcdir}/keymap.patch - # patch nxagent startup to avoid login issues - patch -Np0 -i ${srcdir}/nxagent-startup.patch - # check for cups existance and then symlinks the backend - patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch - # remove broken dialog function - patch -Np0 -i ${srcdir}/remove-dialog.patch - sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig - sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample - sed -i -e 's,netcat,nc,g' nxloadconfig - sed -i -e 's/utmp/nx/g' nxsetup - sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig - sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig - sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample - sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig - sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig - sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup - sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig - sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig - sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig - sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig - sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig - sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig - sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample - sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog - - # fix key generation - sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup - - make -} - -package() { - cd $srcdir/$pkgname-server-$pkgver - - make install DESTDIR="${pkgdir}" - - # create symlinks - install -dm755 ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - for file in ${pkgdir}/usr/lib/nx/bin/*; do - ln -sv /usr/lib/nx/bin/`basename $file` . - done - - mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf - - # create some missing nxserver directories - mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db} - mkdir -m700 -p $pkgdir/usr/lib/nx/share - - # remove files that are part of nxclient - rm -f ${pkgdir}/usr/lib/nx/bin/nxprint - rm -f ${pkgdir}/usr/bin/nxprint -} diff --git a/testing/freenx/freenx-latest-svn.patch b/testing/freenx/freenx-latest-svn.patch deleted file mode 100644 index bcc8ddd17..000000000 --- a/testing/freenx/freenx-latest-svn.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ur freenx-server-0.7.3//ChangeLog ../trunk/freenx-server//ChangeLog ---- freenx-server-0.7.3//ChangeLog 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//ChangeLog 2011-01-26 23:23:36.850005855 +0100 -@@ -1,3 +1,20 @@ -+xx.11.2008 FreeNX 0.7.4 -+ * Opened the 0.7.4 development. -+ * Fixed missing export of NX_ETC_DIR in Makefile, -+ so node.conf.sample is installed correctly. -+ (fabianx@bat.berlios.de) -+ * Fixed broken round-robin load balance algorithm. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ load balancing case. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ usermode case. -+ (fabianx@bat.berlios.de) -+ * Fixed non-encrypted session mode. You might need to -+ set EXTERNAL_PROXY_IP in node.conf. -+ (fabianx@bat.berlios.de) -+ - 18.08.2008 FreeNX 0.7.3 "Priscilla One Year Edition" - * Opened the 0.7.3 development. - * Added logging of failed authentication attempts -diff -ur freenx-server-0.7.3//Makefile ../trunk/freenx-server//Makefile ---- freenx-server-0.7.3//Makefile 2008-08-18 04:16:25.000000000 +0200 -+++ ../trunk/freenx-server//Makefile 2011-01-26 23:23:36.856672521 +0100 -@@ -8,7 +8,7 @@ - all: - cd nxviewer-passwd && xmkmf && make Makefiles && make depend - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - for i in $(SUBDIRS) ; \ - do\ - echo "making" all "in $$i..."; \ -@@ -44,5 +44,5 @@ - - install: - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - $(MAKE) nxenv_install -diff -ur freenx-server-0.7.3//node.conf.sample ../trunk/freenx-server//node.conf.sample ---- freenx-server-0.7.3//node.conf.sample 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//node.conf.sample 2011-01-26 23:23:36.850005855 +0100 -@@ -37,7 +37,7 @@ - # - # https://mail.kde.org/mailman/listinfo/freenx-knx - # --# SVN: $Id: node.conf.sample 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: node.conf.sample 613 2008-09-01 20:42:31Z fabianx $ - - ######################################################################### - # General FreeNX directives -@@ -47,6 +47,11 @@ - # different than the default hostname (as returned by `hostname`) - #SERVER_NAME="$(hostname)" - -+# The node ip which is used by NX Node in unecnrypted session mode. -+# Set it if you want to use a specific external ip or the autodetection -+# is not working. -+#EXTERNAL_PROXY_IP="" -+ - # The port number where local 'sshd' is listening. - #SSHD_PORT=22 - -diff -ur freenx-server-0.7.3//nxloadconfig ../trunk/freenx-server//nxloadconfig ---- freenx-server-0.7.3//nxloadconfig 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxloadconfig 2011-01-26 23:23:36.856672521 +0100 -@@ -5,7 +5,7 @@ - # - # License: GPL, version 2 - # --# SVN: $Id: nxloadconfig 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxloadconfig 613 2008-09-01 20:42:31Z fabianx $ - # - # ======================================================================== - -@@ -52,7 +52,7 @@ - # DO NOT TOUCH unless you REALLY know what you are doing - ######################################################################### - --NX_VERSION=3.2.0-73 -+NX_VERSION=3.2.0-74-SVN - NX_LICENSE="OS (GPL, using backend: %BACKEND%)" - - # Where can different nx components be found -@@ -85,6 +85,7 @@ - # General FreeNX directives - - SERVER_NAME="$(hostname)" -+EXTERNAL_PROXY_IP="" - SSHD_PORT=22 - - # Authentication / Security directives -diff -ur freenx-server-0.7.3//nxnode ../trunk/freenx-server//nxnode ---- freenx-server-0.7.3//nxnode 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxnode 2011-01-26 23:23:36.853339188 +0100 -@@ -13,7 +13,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxnode 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxnode 613 2008-09-01 20:42:31Z fabianx $ - # - # 21.06.2004: - Full reconnection support - -@@ -1184,6 +1184,17 @@ - [ -z "$userip" -a "$host" = "127.0.0.1" ] && userip="127.0.0.1" - [ -z "$userip" ] && userip="*" - fi -+ -+ # We need our own external IP -+ proxyip="$EXTERNAL_PROXY_IP" -+ -+ if [ -z "$proxyip" -a -n "$host" ] -+ then -+ [ "$host" = "127.0.0.1" ] && host=$(hostname) -+ proxyip=$(ping -c1 "$host" | grep 'PING' | cut -d'(' -f2 | cut -d')' -f1) -+ fi -+ -+ [ -z "$proxyip" ] && proxyip="127.0.0.1" - - # ok, lets make the session dir first: - -@@ -1316,7 +1327,7 @@ - NX> 705 Session display: $display - NX> 703 Session type: $type - NX> 701 Proxy cookie: $proxy_cookie --NX> 702 Proxy IP: $userip -+NX> 702 Proxy IP: $proxyip - NX> 706 Agent cookie: $cookie - NX> 704 Session cache: $type - NX> 707 SSL tunneling: $ssl_tunnel -diff -ur freenx-server-0.7.3//nxserver ../trunk/freenx-server//nxserver ---- freenx-server-0.7.3//nxserver 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxserver 2011-01-26 23:23:36.856672521 +0100 -@@ -11,7 +11,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxserver 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxserver 612 2008-08-25 03:28:15Z fabianx $ - # - - # Read the config file -@@ -1192,7 +1192,7 @@ - # Lock held - - SERVER_LB_NR=$(cat $NX_SESS_DIR/round-robin 2>/dev/null) -- let SERVER_LB_NR=(SERVER_LB_NR+1) % SERVER_LB_NR_OF_HOSTS -+ let SERVER_LB_NR=(SERVER_LB_NR+1)%SERVER_LB_NR_OF_HOSTS - echo $SERVER_LB_NR >$NX_SESS_DIR/round-robin - - # Exit critical section -@@ -1961,71 +1961,71 @@ - session_history "$user" "$sessid" - } - --cmd_terminate() -+cmd_execute() - { -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- for i in $CMD_PARAMS; -+ cmd_host="$1" -+ cmd_user="$2" -+ cmd_cmd="$3" -+ -+ if [ "$ENABLE_USERMODE_AUTHENTICATION" = "1" ] -+ then -+ sh -c "$cmd_cmd" -+ elif [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ then -+ su - "$cmd_user" -c "$cmd_cmd" -+ else -+ ssh "$cmd_host" su - "$cmd_user" -c "'$cmd_cmd'" -+ fi -+} -+ -+cmd_terminate_or_send() -+{ -+ CMD="$1" -+ -+ if [ "$CMD" = "--broadcast" ] -+ then -+ CMD_PARAMS=$(session_find_all) -+ [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -+ else -+ CMD_PARAMS=$(cmd_parse_3_params "$2") -+ [ -z "$CMD_PARAMS" ] && exit 1 -+ shift -+ fi -+ shift -+ -+ for i in $CMD_PARAMS - do - CMDLINE=$(session_get_cmdline $i) - cmd_sessionid=$(getparam sessionId) -+ cmd_display=$(getparam display) - cmd_user=$(getparam userName) - cmd_type=$(getparam type) - cmd_status=$(getparam status) -+ cmd_host=$(getparam host) - - # is it a "good" session? -- case "$1" in -+ case "$CMD" in - --suspend) - if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --suspend" - fi - ;; - --terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - ;; - --force-terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - session_close $cmd_sessionid - ;; -- esac -- done -- --} -- --cmd_send() --{ -- if [ "$1" = "--broadcast" ] -- then -- CMD_PARAMS=$(session_find_all) -- [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -- else -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- shift -- fi -- shift -- for i in $CMD_PARAMS; -- do -- CMDLINE=$(session_get_cmdline $i) -- cmd_display=$(getparam display) -- cmd_user=$(getparam userName) -- cmd_type=$(getparam type) -- cmd_status=$(getparam status) -- cmd_host=$(getparam host) -- -- # is it a "good" session? -- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" -- then -- if [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ --send|--broadcast) -+ # is it a "good" session? -+ if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- su - "$cmd_user" -c "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" -- else -- ssh $cmd_host su - "$cmd_user" -c "'$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &'" -+ cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" - fi -- fi -+ esac - done -- #nxnode_start --send "$CMD_PARAMS" - } - - # -@@ -2099,13 +2099,13 @@ - cmd_history "$@" - ;; - --terminate|--suspend|--force-terminate) -- cmd_terminate "$@" -+ cmd_terminate_or_send "$@" - ;; - --cleanup) -- cmd_terminate "--force-terminate" "*" -+ cmd_terminate_or_send "--force-terminate" "*" - ;; - --send|--broadcast) -- cmd_send "$@" -+ cmd_terminate_or_send "$@" - ;; - *) - cmd_abort "Error: Function $CMD not implemented yet." diff --git a/testing/freenx/freenx-server-0.7.3-nxipp.patch b/testing/freenx/freenx-server-0.7.3-nxipp.patch deleted file mode 100644 index 81b286593..000000000 --- a/testing/freenx/freenx-server-0.7.3-nxipp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup ---- freenx-server-0.7.3/nxsetup~ 2011-12-30 23:04:53.515194711 +0200 -+++ freenx-server-0.7.3/nxsetup 2011-12-30 23:05:55.499954085 +0200 -@@ -366,11 +366,10 @@ EOF - - echo "done" - -- if [ -d "$CUPS_BACKEND" ] -+ if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ] - then - echo -n "Setting up cups nxipp backend ..." -- cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" -- chmod 755 "$CUPS_IPP_BACKEND" -+ ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" - echo "done" - fi - } diff --git a/testing/freenx/freenx.install b/testing/freenx/freenx.install deleted file mode 100644 index 0f3260166..000000000 --- a/testing/freenx/freenx.install +++ /dev/null @@ -1,59 +0,0 @@ -post_install() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo 'Generating keys ...' - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - echo "ATTENTION FREENX:" - echo "For correct setup please take a look at the wiki:" - echo "http://wiki.archlinux.org/index.php/FreeNX" -} - -post_upgrade() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo "Rerunning nxsetup ..." - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then - # important upgrade notice - echo "*** config file location has been moved ***" - echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave" - echo "into /etc/nxserver/node.conf. A new key set is required." - echo "Please copy to your clients the new client key:" - echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\"" - echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"." - fi -} - -# arg 1: the old package version -pre_remove() { - /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null -# usr/sbin/groupdel nx &>/dev/null - userdel nx &> /dev/null - groupdel nx &> /dev/null || /bin/true -} diff --git a/testing/freenx/keymap.patch b/testing/freenx/keymap.patch deleted file mode 100644 index a0bb678e4..000000000 --- a/testing/freenx/keymap.patch +++ /dev/null @@ -1,32 +0,0 @@ -=== modified file 'nxnode' ---- nxnode 2009-01-14 04:22:40 +0000 -+++ nxnode 2009-01-14 04:24:02 +0000 -@@ -555,7 +555,8 @@ - - # Start the agent - -- PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ #PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & - fi - - # -@@ -1094,6 +1095,8 @@ - # Rootless fix from 2x nxserver 1.5.0 - realtype=$type - [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop" -+ [ "$type" = "unix-gnome" ] && realtype="gnome" -+ [ "$type" = "unix-kde" ] && realtype="kde" - - # NX 2.1.0 file-sharing port options - client=$(getparam client) -@@ -1272,7 +1275,7 @@ - umask 0077 - - cat << EOF > "$USER_FAKE_HOME/.nx/C-$sess_id/options" --${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${clipboard:+,clipboard=$clipboard}${menu:+,menu=$menu}:$display -+nx/nx,${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${geometry:+geometry=$geometry,}${client:+client=$client,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype${clipboard:+,clipboard=$clipboard}${composite:+composite=$composite},cleanup=0,product=LFE/None/LFEN/None,shmem=1,${backingstore:+backingstore=$backingstore,}shpix=1,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${menu:+,menu=$menu}:$display - EOF - umask $OLD_UMASK - #samba=$samba, - diff --git a/testing/freenx/nxagent-startup.patch b/testing/freenx/nxagent-startup.patch deleted file mode 100644 index e3c5497c1..000000000 --- a/testing/freenx/nxagent-startup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nxnode~ 2010-04-30 15:42:46.000000000 +0200 -+++ nxnode 2010-04-30 15:42:46.000000000 +0200 -@@ -328,6 +328,9 @@ - NODE_WM_PID=$! - fi - -+ # Patch - delay to allow nxagent to complete launching -+ sleep 4 -+ - echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - diff --git a/testing/freenx/remove-dialog.patch b/testing/freenx/remove-dialog.patch deleted file mode 100644 index 054f1f6c4..000000000 --- a/testing/freenx/remove-dialog.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- nxdialog~ 2011-02-01 09:05:28.993333438 +0100 -+++ nxdialog 2011-02-01 09:05:29.010000106 +0100 -@@ -85,29 +85,6 @@ - then - dialog_interface="xdialog" - DIALOG=/usr/bin/Xdialog # just in case that we have no good path --elif [ -x /usr/bin/dialog ] --then -- #JJK: Added 'dialog_interface=dialog' option because Xdialog not standard -- #JJK: on some distros such as Fedora and xmessage won't handle long -- #JJK: lists of ppd files while the combination of 'dialog' and 'xterm' -- #JJK: should be present on most setups. -- -- dialog_interface="dialog" -- DIALOG=/usr/bin/dialog -- if [ -z "$NXCLIENT_FIRST_TIME" ] -- then -- # Run only once in case of subdialogs. Capture result in tempfile -- TMPFILE=$(mktemp /tmp/nxclient.XXXXX) -- export NXCLIENT_FIRST_TIME=1 -- -- xterm -geometry 120x24+100+100 +sb -title "NXclient" -e \ -- /bin/bash -c "$DIALOG --infobox 'Please wait...' 3 25; $0 $INPUTS | tee $TMPFILE" || exit 1 -- -- #Need to recover the last line output (and not remove non-printing chars, because --stdout is used) -- tail -1 $TMPFILE -- rm -f $TMPFILE -- exit 0 -- fi - else - dialog_interface="xmessage" - xmessage=$(which xmessage 2>/dev/null) diff --git a/testing/gmime/PKGBUILD b/testing/gmime/PKGBUILD deleted file mode 100644 index 9459596a7..000000000 --- a/testing/gmime/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 156679 2012-04-22 23:09:57Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=gmime -pkgver=2.6.9 -pkgrel=1 -pkgdesc="Core mime parsing library" -arch=('i686' 'x86_64') -license=('GPL') -url="http://spruce.sourceforge.net/gmime/" -depends=('glib2' 'gpgme' 'zlib') -makedepends=('gtk-sharp-2') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5ebb60a35fa5c0789fe10f6e4af5040cb7bc4a707a8a962fbd57b4fc5595c0b9') - -build() { - # get rid of that .wapi errors in fakeroot - export MONO_SHARED_DIR="$srcdir/weird" - mkdir -p "$MONO_SHARED_DIR" - - cd "$pkgname-$pkgver" - - ./configure --prefix=/usr --enable-smime \ - --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/gtkpod/PKGBUILD b/testing/gtkpod/PKGBUILD deleted file mode 100644 index 7a3a1dff6..000000000 --- a/testing/gtkpod/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 156691 2012-04-22 23:50:01Z heftig $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=gtkpod -pkgver=2.1.1 -pkgrel=2 -pkgdesc="A platform independent GUI for Apple's iPod using GTK3" -arch=('i686' 'x86_64') -url="http://gtkpod.sourceforge.net" -license=('GPL') -depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') -makedepends=('flex' 'intltool') -optdepends=('libmp4v2: MP4/h264 support' - 'vorbis-tools: OGG support' - 'id3v2: mp3 conversion support') -install=gtkpod.install -options=('!libtool') -source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") -md5sums=('36fd0324fd1d1da00fcddacef1b09983') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#python#python2#' scripts/sync-palm-jppy.py - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libgsf/PKGBUILD b/testing/libgsf/PKGBUILD deleted file mode 100644 index d9e44d8ae..000000000 --- a/testing/libgsf/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 156592 2012-04-21 11:46:06Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=libgsf -pkgver=1.14.23 -pkgrel=1 -arch=(i686 x86_64) -pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" -url="http://www.gnome.org/" -license=('GPL' 'LGPL') -options=('!libtool') -depends=('libxml2' 'gdk-pixbuf2' 'bzip2') -makedepends=('intltool' 'gobject-introspection') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) -sha256sums=('bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17') - -build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package_libgsf() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/testing/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD deleted file mode 100644 index bace88ed4..000000000 --- a/testing/nx-common/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 156626 2012-04-21 23:25:51Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=5 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' -makedepends=('xorg-server-devel' 'nx-headers') -source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch) -options=('!libtool') -md5sums=('84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c') - -build() { - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - ./configure --prefix=/usr/lib/nx - make - - # nxssh - cd ${srcdir}/nxssh - sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib - make -} - -package() { - install -dm755 ${pkgdir}/usr/{bin,lib/nx} - - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} . - # ^ really needed? - - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh - cd ${pkgdir}/usr/bin - ln -sv /usr/lib/nx/bin/nxssh . -} diff --git a/testing/nx-common/nx-3.5.0-libpng15.patch b/testing/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/testing/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/testing/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/testing/nx/PKGBUILD b/testing/nx/PKGBUILD deleted file mode 100644 index 4cf19311a..000000000 --- a/testing/nx/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 156665 2012-04-22 17:10:42Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=nx -pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') -pkgver=3.5.0.12 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://wiki.x2go.org/" -license=('GPL') -options=('!makeflags') -makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages - 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends - ) -source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz - nx-x11.ld.so.conf.d) -md5sums=('a2011e034a318016cf2260c30a567301' - 'f2ec60c7e2d81bef2f7292d2b33681a6') - -build() { - cd "${srcdir}/nx-libs_$pkgver" - make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" - # fake install - mkdir $srcdir/fakeinstall - make DESTDIR="$srcdir/fakeinstall" install -} - -package_libxcomp() { - - pkgdesc="NX X compression library" - depends=('libjpeg-turbo' 'libpng' 'gcc-libs') - - install -dm755 ${pkgdir}/usr/lib/nx/lib - cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} . -} - -package_nxproxy() { - - pkgdesc="NX proxy" - depends=('libxcomp') - - install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin} - cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxproxy . - - # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxproxy - cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1 -} - -package_nx-xcompext() { - - pkgdesc="Xcompext/Xcompshad library for NX" - depends=('libxcomp' 'nx-x11') - - install -dm755 ${pkgdir}/usr/lib/nx - cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/nx - ln -sv libXcompext.so.3.5.0 libXcompext.so.3 - ln -sv libXcompext.so.3.5.0 libXcompext.so - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} . -} - -package_nx-x11() { - - pkgdesc="NX-X11 lib for the NX framework" - depends=('libxcomp') - - install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin} - cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx - - cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxauth . - - # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxauth - - install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf" -} - -package_nxagent() { - - pkgdesc="NX X server based on Xnest" - depends=('nx-xcompext') - - install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin} - cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxagent . - - # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxagent - # required nxcompshad libs - cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/nx - ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3 - ln -sv libXcompshad.so.3.5.0 libXcompshad.so - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . -} - -package_nx-headers() { - - pkgdesc="NX headers" - - install -dm755 ${pkgdir}/usr/include/nx - cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx -} diff --git a/testing/nx/nx-x11.ld.so.conf.d b/testing/nx/nx-x11.ld.so.conf.d deleted file mode 100644 index 5d15cb6e2..000000000 --- a/testing/nx/nx-x11.ld.so.conf.d +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/nx/ diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD deleted file mode 100644 index 0a52bc805..000000000 --- a/testing/openssh/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id: PKGBUILD 156652 2012-04-22 08:07:55Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=openssh -pkgver=6.0p1 -pkgrel=1 -pkgdesc='Free version of the SSH connectivity tools' -url='http://www.openssh.org/portable.html' -license=('custom:BSD') -arch=('i686' 'x86_64') -depends=('krb5' 'openssl' 'libedit' 'ldns') -optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.close-sessions' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' - '954bf1660aa32620c37034320877f4511b767ccb' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '3413909fd45a28701c92e6e5b59c6b65346ddb0f' - '21fa88de6cc1c7912e71655f50896ba17991a1c2') - -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-ldns \ - --with-libedit \ - --with-ssl-engine \ - --with-pam \ - --with-privsep-user=nobody \ - --with-kerberos5=/usr \ - --with-xauth=/usr/bin/xauth \ - --with-mantype=man \ - --with-md5-passwords \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # The connect.sh test must be run by a user with a decent login shell; - # chroot builds use nobody with /bin/false. - make tests || true -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} diff --git a/testing/openssh/sshd b/testing/openssh/sshd deleted file mode 100755 index 1d68fb877..000000000 --- a/testing/openssh/sshd +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/var/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -d /var/empty ]] || mkdir -p /var/empty - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions deleted file mode 100644 index be2a709fc..000000000 --- a/testing/openssh/sshd.close-sessions +++ /dev/null @@ -1,17 +0,0 @@ -# Close sshd sessions before shutting down the network; see FS#17389. - -sshd_close_sessions () { - if ck_daemon sshd; then - return - fi - /etc/rc.d/sshd stop - stat_busy "Stopping Secure Shell Sessions" - for i in $(pgrep sshd); do - if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then - kill $i - fi - done &>/dev/null - stat_done -} - -add_hook shutdown_start sshd_close_sessions diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/testing/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam deleted file mode 100644 index c7b91cdfb..000000000 --- a/testing/openssh/sshd.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #Disable remote root -auth required pam_unix.so -auth required pam_env.so -account required pam_nologin.so -account required pam_unix.so -account required pam_time.so -password required pam_unix.so -session required pam_unix_session.so -session required pam_limits.so --session optional pam_ck_connector.so nox11 --session optional pam_systemd.so |